mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-07-07 20:06:36 +02:00
Bug 452 - Need relative date value 'now' to fully support times
- Added 'now' as a relative date. - Modified 'overdue' report to use 'now' instead of 'today' as the distinction between due and overdue.
This commit is contained in:
parent
1cf1e79e43
commit
d0db821298
5 changed files with 25 additions and 6 deletions
10
ChangeLog
10
ChangeLog
|
@ -37,14 +37,16 @@
|
||||||
+ Fixed bug #439, which ignored dateformat.annotation for sparse annotations.
|
+ Fixed bug #439, which ignored dateformat.annotation for sparse annotations.
|
||||||
+ Fixed bug #441, which misparsed '/a/a:/' as an attribute, rather than a
|
+ Fixed bug #441, which misparsed '/a/a:/' as an attribute, rather than a
|
||||||
substitution (thanks to Michelle Crane).
|
substitution (thanks to Michelle Crane).
|
||||||
+ Fixed bug #445, which caused task to not notice that the command 'h' is
|
|
||||||
ambiguous.
|
|
||||||
+ Fixed problem with command line configuration overrides that had no
|
|
||||||
values.
|
|
||||||
+ Fixed bug #444, which made task shell unusable after canceling out of an
|
+ Fixed bug #444, which made task shell unusable after canceling out of an
|
||||||
undo command.
|
undo command.
|
||||||
|
+ Fixed bug #445, which caused task to not notice that the command 'h' is
|
||||||
|
ambiguous.
|
||||||
+ Fixed bug #449, so the wait: attribute can be applied to a task at any
|
+ Fixed bug #449, so the wait: attribute can be applied to a task at any
|
||||||
time, not just on add.
|
time, not just on add.
|
||||||
|
+ Fixed bug #452, which defines a higher resolution division between due
|
||||||
|
and overdue.
|
||||||
|
+ Fixed problem with command line configuration overrides that had no
|
||||||
|
values.
|
||||||
|
|
||||||
------ old releases ------------------------------
|
------ old releases ------------------------------
|
||||||
|
|
||||||
|
|
3
NEWS
3
NEWS
|
@ -7,6 +7,9 @@ New Features in task 1.9.3
|
||||||
$ task ... due:4d
|
$ task ... due:4d
|
||||||
$ task ... due:3wks
|
$ task ... due:3wks
|
||||||
- Now supports the beginning of the week, month and year in dates.
|
- Now supports the beginning of the week, month and year in dates.
|
||||||
|
- Now supports 'now' as a date.
|
||||||
|
- Now defines an overdue task as being one second after the due date,
|
||||||
|
instead of the day after the due date.
|
||||||
|
|
||||||
Please refer to the ChangeLog file for full details. There are too many to
|
Please refer to the ChangeLog file for full details. There are too many to
|
||||||
list here.
|
list here.
|
||||||
|
|
|
@ -303,7 +303,7 @@ std::string Config::defaults =
|
||||||
"report.overdue.columns=id,project,priority,due,active,age,description\n"
|
"report.overdue.columns=id,project,priority,due,active,age,description\n"
|
||||||
"report.overdue.labels=ID,Project,Pri,Due,Active,Age,Description\n"
|
"report.overdue.labels=ID,Project,Pri,Due,Active,Age,Description\n"
|
||||||
"report.overdue.sort=due+,priority-,active-,project+\n"
|
"report.overdue.sort=due+,priority-,active-,project+\n"
|
||||||
"report.overdue.filter=status:pending due.before:today\n"
|
"report.overdue.filter=status:pending due.before:now\n"
|
||||||
"#report.overdue.dateformat=m/d/Y\n"
|
"#report.overdue.dateformat=m/d/Y\n"
|
||||||
"#report.overdue.annotations=full\n"
|
"#report.overdue.annotations=full\n"
|
||||||
"\n"
|
"\n"
|
||||||
|
|
|
@ -868,6 +868,7 @@ bool Date::isEpoch (const std::string& input)
|
||||||
// eow (end of week)
|
// eow (end of week)
|
||||||
// eom (end of month)
|
// eom (end of month)
|
||||||
// eoy (end of year)
|
// eoy (end of year)
|
||||||
|
// now
|
||||||
bool Date::isRelativeDate (const std::string& input)
|
bool Date::isRelativeDate (const std::string& input)
|
||||||
{
|
{
|
||||||
std::string in (lowerCase (input));
|
std::string in (lowerCase (input));
|
||||||
|
@ -901,6 +902,7 @@ bool Date::isRelativeDate (const std::string& input)
|
||||||
supported.push_back ("pentecost");
|
supported.push_back ("pentecost");
|
||||||
supported.push_back ("midsommar");
|
supported.push_back ("midsommar");
|
||||||
supported.push_back ("midsommarafton");
|
supported.push_back ("midsommarafton");
|
||||||
|
supported.push_back ("now");
|
||||||
|
|
||||||
std::vector <std::string> matches;
|
std::vector <std::string> matches;
|
||||||
if (autoComplete (in, supported, matches) == 1)
|
if (autoComplete (in, supported, matches) == 1)
|
||||||
|
@ -1052,6 +1054,11 @@ bool Date::isRelativeDate (const std::string& input)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (found == "now")
|
||||||
|
{
|
||||||
|
mT = time (NULL);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Support "21st" to indicate the next date that is the 21st day.
|
// Support "21st" to indicate the next date that is the 21st day.
|
||||||
|
|
|
@ -34,7 +34,7 @@ Context context;
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
int main (int argc, char** argv)
|
int main (int argc, char** argv)
|
||||||
{
|
{
|
||||||
UnitTest t (150);
|
UnitTest t (154);
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
@ -49,6 +49,13 @@ int main (int argc, char** argv)
|
||||||
t.ok (now >= yesterday, "now >= yesterday");
|
t.ok (now >= yesterday, "now >= yesterday");
|
||||||
t.ok (now > yesterday, "now > yesterday");
|
t.ok (now > yesterday, "now > yesterday");
|
||||||
|
|
||||||
|
// Date::Date ("now")
|
||||||
|
Date relative_now ("now");
|
||||||
|
t.ok (relative_now.sameHour (now), "Date ().sameHour (Date (now))");
|
||||||
|
t.ok (relative_now.sameDay (now), "Date ().sameDay (Date (now))");
|
||||||
|
t.ok (relative_now.sameMonth (now), "Date ().sameMonth (Date (now))");
|
||||||
|
t.ok (relative_now.sameYear (now), "Date ().sameYear (Date (now))");
|
||||||
|
|
||||||
// Loose comparisons.
|
// Loose comparisons.
|
||||||
Date left ("7/4/2008");
|
Date left ("7/4/2008");
|
||||||
Date comp1 ("7/4/2008");
|
Date comp1 ("7/4/2008");
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue