feat: including TODOs from future daily note pages, #52

ahonn · Apr 23, 2023 · 035ebac · 035ebac
1 parent 38422f3
commit 035ebac
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 18 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -104,10 +104,7 @@ function App() {
               {settings.showNextNDaysTask && (
                 <TaskSection
                   title={`Next ${settings.numberOfNextNDays} Days`}
-                  query={getNextNDaysTaskQuery(
-                    settings.numberOfNextNDays,
-                    customMarkers,
-                  )}
+                  query={getNextNDaysTaskQuery(settings.numberOfNextNDays)}
                 />
               )}
               <TaskSection
@@ -116,9 +113,8 @@ function App() {
                   settings.showNextNDaysTask
                     ? getScheduledTaskQuery(
                         dayjs().add(settings.numberOfNextNDays, 'd'),
-                        customMarkers,
                       )
-                    : getScheduledTaskQuery(dayjs(), customMarkers)
+                    : getScheduledTaskQuery()
                 }
               />
               <TaskSection

diff --git a/src/querys/next-n-days.ts b/src/querys/next-n-days.ts
@@ -1,18 +1,14 @@
 import dayjs from 'dayjs';
 
-export default function getNextNDaysTaskQuery(
-  days: number,
-  customMarkers: string[] = [],
-) {
+export default function getNextNDaysTaskQuery(days: number) {
   const start = dayjs().format('YYYYMMDD');
   const next = dayjs().add(days, 'd').format('YYYYMMDD');
-  const markers = customMarkers.map((m) => '"' + m + '"').join(' ');
 
   const query = `
     [:find (pull ?b [*])
      :where
      [?b :block/marker ?marker]
-     [(contains? #{"NOW" "LATER" "TODO" "DOING" ${markers}} ?marker)]
+     [(contains? #{"NOW" "LATER" "TODO" "DOING"} ?marker)]
      [?b :block/page ?p]
      (or
        [?b :block/scheduled ?d]

diff --git a/src/querys/scheduled.ts b/src/querys/scheduled.ts
@@ -2,20 +2,21 @@ import dayjs, { Dayjs } from 'dayjs';
 
 export default function getScheduledTaskQuery(
   startDate: Dayjs | Date = new Date(),
-  customMarkers: string[] = [],
 ) {
   const start = dayjs(startDate).format('YYYYMMDD');
-  const markers = customMarkers.map((m) => '"' + m + '"').join(' ');
-
   const query = `
     [:find (pull ?b [*])
      :where
      [?b :block/marker ?marker]
-     [(contains? #{"NOW" "LATER" "TODO" "DOING" ${markers}} ?marker)]
+     [(contains? #{"NOW" "LATER" "TODO" "DOING"} ?marker)]
      [?b :block/page ?p]
      (or
-       [?b :block/scheduled ?d]
-       [?b :block/deadline ?d])
+       (or
+         [?b :block/scheduled ?d]
+         [?b :block/deadline ?d])
+       (and
+         [?p :block/journal? true]
+         [?p :block/journal-day ?d]))
      [(> ?d ${start})]]
   `;