From 07eff0f3c12336cb82f267165d8ecc8a87476810 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 3 Jan 2015 17:56:20 -0500 Subject: [PATCH] Bug - Changed assorted reports so they do not use '.age' format for dates that are in the future, because those are never shown with this format. --- ChangeLog | 3 +++ src/Config.cpp | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6a859b1f..c7500380f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ - TW-1486 task wait shows completed tasks which has a wait attribute (thanks to Sujeevan Vijayakumaran). +- Fixed assorted color theme problems. +- Changed assorted reports so they do not use '.age' format for dates that are + in the future, because those are never shown with this format. ------ current release --------------------------- diff --git a/src/Config.cpp b/src/Config.cpp index 1485cd1bb..a9eba1454 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -358,19 +358,19 @@ std::string Config::_defaults = "\n" "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.age,scheduled,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.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.age,description.count,urgency\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.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.age,scheduled.countdown,due.countdown,until.countdown,description.count\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.sort=start-,description+\n" "\n" @@ -382,13 +382,13 @@ std::string Config::_defaults = "\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.age,scheduled.countdown,due,until.age,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) and recur.none:\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.age,scheduled.countdown,due,until.age,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.sort=entry+\n" "\n" @@ -400,7 +400,7 @@ std::string Config::_defaults = "\n" "report.active.description=Active tasks\n" "report.active.labels=ID,Started,Active,Age,D,P,Project,Tags,Recur,W,Sch,Due,Until,Description\n" - "report.active.columns=id,start,start.age,entry.age,depends.indicator,priority,project,tags,recur,wait.indicator,scheduled.age,due,until,description\n" + "report.active.columns=id,start,start.age,entry.age,depends.indicator,priority,project,tags,recur,wait.indicator,scheduled.remaining,due,until,description\n" "report.active.filter=status:pending and +ACTIVE\n" "report.active.sort=project+,start+\n" "\n" @@ -412,30 +412,30 @@ std::string Config::_defaults = "\n" "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.age,description,urgency\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.sort=due+,urgency-,entry+\n" "\n" "report.waiting.description=Waiting (hidden) tasks\n" "report.waiting.labels=ID,A,Age,D,P,Project,Tags,R,Wait,for,Sched,Due,Until,Description\n" - "report.waiting.columns=id,start.active,entry.age,depends.indicator,priority,project,tags,recur.indicator,wait,wait.age,scheduled,due,until,description\n" + "report.waiting.columns=id,start.active,entry.age,depends.indicator,priority,project,tags,recur.indicator,wait,wait.remaining,scheduled,due,until,description\n" "report.waiting.filter=+WAITING\n" "report.waiting.sort=due+,wait+,entry+\n" "\n" "report.all.description=All tasks\n" "report.all.labels=ID,St,UUID,A,Age,Done,D,P,Project,Tags,R,Wait,Sch,Due,Until,Description\n" - "report.all.columns=id,status.short,uuid.short,start.active,entry.age,end.age,depends.indicator,priority,project.parent,tags.count,recur.indicator,wait.age,scheduled.age,due,until.age,description\n" + "report.all.columns=id,status.short,uuid.short,start.active,entry.age,end.age,depends.indicator,priority,project.parent,tags.count,recur.indicator,wait.remaining,scheduled.remaining,due,until.remaining,description\n" "report.all.sort=entry-\n" "\n" "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.age,until.age,description,urgency\n" + "report.next.columns=id,start.age,entry.age,depends,priority,project,tags,recur,scheduled.countdown,due.remaining,until.remaining,description,urgency\n" "report.next.filter=status:pending limit:page\n" "report.next.sort=start-,urgency-\n" "\n" "report.ready.description=Most urgent actionable tasks\n" "report.ready.labels=ID,Active,Age,D,P,Project,Tags,R,S,Due,Until,Description,Urg\n" - "report.ready.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur.indicator,scheduled.countdown,due.countdown,until.age,description,urgency\n" + "report.ready.columns=id,start.age,entry.age,depends.indicator,priority,project,tags,recur.indicator,scheduled.countdown,due.countdown,until.remaining,description,urgency\n" "report.ready.filter=+READY\n" "report.ready.sort=start-,urgency-\n" "\n" @@ -453,7 +453,7 @@ std::string Config::_defaults = "\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.indicator,scheduled.age,due.age,until.age,description.count,urgency\n" + "report.blocking.columns=id,uuid.short,start.active,depends,project,tags,recur,wait.indicator,scheduled.remaining,due.remaining,until.remaining,description.count,urgency\n" "report.blocking.sort=urgency-,due+,entry+\n" "report.blocking.filter= status:pending +BLOCKING\n" "\n";