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

Feature

Browse Source 
- New virtual tags (WEEK, MONTH, YEAR, PARENT).
This commit is contained in:
Paul Beckingham
2013-08-26 09:25:29 -07:00
parent 3a8a513d17
commit bc41e7378a
5 changed files with 76 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/Task.cpp
View File

@@ -361,6 +361,68 @@ bool Task::is_duetoday () const
return false;
}
////////////////////////////////////////////////////////////////////////////////
bool Task::is_dueweek () const
{
if (has ("due"))
{
Task::status status = getStatus ();
if (status != Task::completed &&
status != Task::deleted)
{
Date now;
Date due (get_date ("due"));
if (now.year () == due.year () &&
now.week () == due.week ())
return true;
}
}
return false;
}
////////////////////////////////////////////////////////////////////////////////
bool Task::is_duemonth () const
{
if (has ("due"))
{
Task::status status = getStatus ();
if (status != Task::completed &&
status != Task::deleted)
{
Date now;
Date due (get_date ("due"));
if (now.year () == due.year () &&
now.month () == due.month ())
return true;
}
}
return false;
}
////////////////////////////////////////////////////////////////////////////////
bool Task::is_dueyear () const
{
if (has ("due"))
{
Task::status status = getStatus ();
if (status != Task::completed &&
status != Task::deleted)
{
Date now;
Date due (get_date ("due"));
if (now.year () == due.year ())
return true;
}
}
return false;
}
////////////////////////////////////////////////////////////////////////////////
bool Task::is_overdue () const
{
@@ -1026,6 +1088,9 @@ bool Task::hasTag (const std::string& tag) const
if (tag == "DUETODAY") return is_duetoday ();
if (tag == "TODAY") return is_duetoday ();
if (tag == "OVERDUE") return is_overdue ();
if (tag == "WEEK") return is_dueweek ();
if (tag == "MONTH") return is_duemonth ();
if (tag == "YEAR") return is_dueyear ();
#endif
if (tag == "ACTIVE") return has ("start");
if (tag == "SCHEDULED") return has ("scheduled");
@@ -1033,16 +1098,12 @@ bool Task::hasTag (const std::string& tag) const
if (tag == "UNTIL") return has ("until");
if (tag == "WAITING") return has ("wait");
if (tag == "ANNOTATED") return hasAnnotations ();
if (tag == "PARENT") return has ("mask");
/*
TODO YESTERDAY - due yesterday
TODO TOMORROW - due tomorrow
TODO WEEK - due this week
TODO MONTH - due this month
TODO YEAR - due this year
TODO READY - is ready
TODO WAITING - is waiting
TODO PARENT - is a parent
*/
// Concrete tags.