From 9a9ede7878e268074ecf1e3ec40ba5ac47b62e95 Mon Sep 17 00:00:00 2001 From: "Dustin J. Mitchell" Date: Sun, 8 Aug 2021 17:50:52 +0000 Subject: [PATCH] update built-in reports to use +WAITING, and doc --- doc/man/task.1.in | 9 +++++---- src/Context.cpp | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/doc/man/task.1.in b/doc/man/task.1.in index 90e92cfce..95d952dd8 100644 --- a/doc/man/task.1.in +++ b/doc/man/task.1.in @@ -304,7 +304,7 @@ value. .B task ready Shows a page of the most urgent ready tasks, sorted by urgency with started tasks first. A ready task is one that is either unscheduled, or has a scheduled -date that is past and has no wait date. +date that is past and is not waiting. .TP .B task oldest @@ -796,9 +796,10 @@ to 25 lines. .TP .B wait: -When a task is given a wait date, it is hidden from most reports by changing -its status to 'waiting'. When that date is passed, the status is changed back -to 'pending', and the task becomes visible. +When a task is given a wait date, it is hidden from most built-in reports, which +exclude +WAITING. When the date is in the past, the task is not considered +WAITING, +and again becomes visible. Note that, for compatibilty, such tasks are shown as +having status "waiting", but this will change in a future release. .TP .B depends: diff --git a/src/Context.cpp b/src/Context.cpp index 085c2a87c..41c1b656b 100644 --- a/src/Context.cpp +++ b/src/Context.cpp @@ -292,43 +292,43 @@ std::string configurationDefaults = "report.long.description=All details of tasks\n" "report.long.labels=ID,A,Created,Mod,Deps,P,Project,Tags,Recur,Wait,Sched,Due,Until,Description\n" "report.long.columns=id,start.active,entry,modified.age,depends,priority,project,tags,recur,wait.remaining,scheduled,due,until,description\n" - "report.long.filter=status:pending\n" + "report.long.filter=status:pending -WAITING\n" "report.long.sort=modified-\n" "\n" "report.list.description=Most details of tasks\n" "report.list.labels=ID,Active,Age,D,P,Project,Tags,R,Sch,Due,Until,Description,Urg\n" "report.list.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur.indicator,scheduled.countdown,due,until.remaining,description.count,urgency\n" - "report.list.filter=status:pending\n" + "report.list.filter=status:pending -WAITING\n" "report.list.sort=start-,due+,project+,urgency-\n" "\n" "report.ls.description=Few details of tasks\n" "report.ls.labels=ID,A,D,Project,Tags,R,Wait,S,Due,Until,Description\n" "report.ls.columns=id,start.active,depends.indicator,project,tags,recur.indicator,wait.remaining,scheduled.countdown,due.countdown,until.countdown,description.count\n" - "report.ls.filter=status:pending\n" + "report.ls.filter=status:pending -WAITING\n" "report.ls.sort=start-,description+\n" "\n" "report.minimal.description=Minimal details of tasks\n" "report.minimal.labels=ID,Project,Tags,Description\n" "report.minimal.columns=id,project,tags.count,description.count\n" - "report.minimal.filter=status:pending or status:waiting\n" + "report.minimal.filter=status:pending\n" "report.minimal.sort=project+/,description+\n" "\n" "report.newest.description=Newest tasks\n" "report.newest.labels=ID,Active,Created,Age,Mod,D,P,Project,Tags,R,Wait,Sch,Due,Until,Description\n" "report.newest.columns=id,start.age,entry,entry.age,modified.age,depends.indicator,priority,project,tags,recur.indicator,wait.remaining,scheduled.countdown,due,until.age,description\n" - "report.newest.filter=status:pending or status:waiting\n" + "report.newest.filter=status:pending\n" "report.newest.sort=entry-\n" "\n" "report.oldest.description=Oldest tasks\n" "report.oldest.labels=ID,Active,Created,Age,Mod,D,P,Project,Tags,R,Wait,Sch,Due,Until,Description\n" "report.oldest.columns=id,start.age,entry,entry.age,modified.age,depends.indicator,priority,project,tags,recur.indicator,wait.remaining,scheduled.countdown,due,until.age,description\n" - "report.oldest.filter=status:pending or status:waiting\n" + "report.oldest.filter=status:pending\n" "report.oldest.sort=entry+\n" "\n" "report.overdue.description=Overdue tasks\n" "report.overdue.labels=ID,Active,Age,Deps,P,Project,Tag,R,S,Due,Until,Description,Urg\n" "report.overdue.columns=id,start.age,entry.age,depends,priority,project,tags,recur.indicator,scheduled.countdown,due,until,description,urgency\n" - "report.overdue.filter=(status:pending or status:waiting) and +OVERDUE\n" + "report.overdue.filter=status:pending and +OVERDUE\n" "report.overdue.sort=urgency-,due+\n" "\n" "report.active.description=Active tasks\n" @@ -346,7 +346,7 @@ std::string configurationDefaults = "report.recurring.description=Recurring Tasks\n" "report.recurring.labels=ID,Active,Age,D,P,Project,Tags,Recur,Sch,Due,Until,Description,Urg\n" "report.recurring.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur,scheduled.countdown,due,until.remaining,description,urgency\n" - "report.recurring.filter=(status:pending or status:waiting) and (+PARENT or +CHILD)\n" + "report.recurring.filter=status:pending and (+PARENT or +CHILD)\n" "report.recurring.sort=due+,urgency-,entry+\n" "\n" "report.waiting.description=Waiting (hidden) tasks\n" @@ -363,7 +363,7 @@ std::string configurationDefaults = "report.next.description=Most urgent tasks\n" "report.next.labels=ID,Active,Age,Deps,P,Project,Tag,Recur,S,Due,Until,Description,Urg\n" "report.next.columns=id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.relative,until.remaining,description,urgency\n" - "report.next.filter=status:pending limit:page\n" + "report.next.filter=status:pending -WAITING limit:page\n" "report.next.sort=urgency-\n" "\n" "report.ready.description=Most urgent actionable tasks\n" @@ -376,19 +376,19 @@ std::string configurationDefaults = "report.blocked.columns=id,depends,project,priority,due,start.active,entry.age,description\n" "report.blocked.labels=ID,Deps,Proj,Pri,Due,Active,Age,Description\n" "report.blocked.sort=due+,priority-,start-,project+\n" - "report.blocked.filter=status:pending +BLOCKED\n" + "report.blocked.filter=status:pending -WAITING +BLOCKED\n" "\n" "report.unblocked.description=Unblocked tasks\n" "report.unblocked.columns=id,depends,project,priority,due,start.active,entry.age,description\n" "report.unblocked.labels=ID,Deps,Proj,Pri,Due,Active,Age,Description\n" "report.unblocked.sort=due+,priority-,start-,project+\n" - "report.unblocked.filter=status:pending -BLOCKED\n" + "report.unblocked.filter=status:pending -WAITING -BLOCKED\n" "\n" "report.blocking.description=Blocking tasks\n" "report.blocking.labels=ID,UUID,A,Deps,Project,Tags,R,W,Sch,Due,Until,Description,Urg\n" "report.blocking.columns=id,uuid.short,start.active,depends,project,tags,recur,wait,scheduled.remaining,due.relative,until.remaining,description.count,urgency\n" "report.blocking.sort=urgency-,due+,entry+\n" - "report.blocking.filter=status:pending +BLOCKING\n" + "report.blocking.filter=status:pending -WAITING +BLOCKING\n" "\n" "report.timesheet.filter=(+PENDING and start.after:now-4wks) or (+COMPLETED and end.after:now-4wks)\n" "\n";