gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Task: Made better use of ::sameN methods

Browse Source
This commit is contained in:
Paul Beckingham
2016-05-30 14:11:29 -04:00
parent 630a1530e0
commit ed7097d5da
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Task.cpp
View File

@@ -445,8 +445,7 @@ bool Task::is_dueweek () const
status != Task::deleted) status != Task::deleted)
{ {
ISO8601d due (get_date ("due")); ISO8601d due (get_date ("due"));
if (due >= ISO8601d ("socw") && if (due.sameWeek (ISO8601d ()))
due <= ISO8601d ("eocw"))
return true; return true;
} }
} }
@@ -465,8 +464,7 @@ bool Task::is_duemonth () const
status != Task::deleted) status != Task::deleted)
{ {
ISO8601d due (get_date ("due")); ISO8601d due (get_date ("due"));
if (due >= ISO8601d ("socm") && if (due.sameMonth (ISO8601d ()))
due <= ISO8601d ("eocm"))
return true; return true;
} }
} }
@@ -503,9 +501,8 @@ bool Task::is_dueyear () const
if (status != Task::completed && if (status != Task::completed &&
status != Task::deleted) status != Task::deleted)
{ {
ISO8601d now;
ISO8601d due (get_date ("due")); ISO8601d due (get_date ("due"));
if (now.year () == due.year ()) if (due.sameYear (ISO8601d ()))
return true; return true;
} }
} }