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

TW-1621: Recurrent parent tasks shouldn't be counted in history

Browse Source 
- Tthanks to Denis Kasak.
This commit is contained in:
Paul Beckingham
2015-07-29 00:04:16 -04:00
parent 87c438d51d
commit e0f7983a28
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -69,6 +69,8 @@
- TW-1617 Can't search for multi-word project (thanks to Audrey Easterday). - TW-1617 Can't search for multi-word project (thanks to Audrey Easterday).
- TW-1619 fish completion contain backspaces in fish master version (thanks to - TW-1619 fish completion contain backspaces in fish master version (thanks to
Johannes Wienke₎. Johannes Wienke₎.
- TW-1621 Recurrent parent tasks shouldn't be counted in history (thanks to
Denis Kasak).
- TW-1622 Duration UDA can't take an algebraic expression (thanks to Jeremy John - TW-1622 Duration UDA can't take an algebraic expression (thanks to Jeremy John
Reeder). Reeder).
- TW-1626 Wrong wait date (thanks to Andrea Rizzi). - TW-1626 Wrong wait date (thanks to Andrea Rizzi).

20
src/commands/CmdHistory.cpp
View File

@@ -74,8 +74,9 @@ int CmdHistoryMonthly::execute (std::string& output)
time_t epoch = entry.startOfMonth ().toEpoch (); time_t epoch = entry.startOfMonth ().toEpoch ();
groups[epoch] = 0; groups[epoch] = 0;
// Every task has an entry date. // Every task has an entry date, but exclude templates.
++addedGroup[epoch]; if (task.getStatus () != Task::recurring)
++addedGroup[epoch];
// All deleted tasks have an end date. // All deleted tasks have an end date.
if (task.getStatus () == Task::deleted) if (task.getStatus () == Task::deleted)
@@ -230,8 +231,9 @@ int CmdHistoryAnnual::execute (std::string& output)
time_t epoch = entry.startOfYear ().toEpoch (); time_t epoch = entry.startOfYear ().toEpoch ();
groups[epoch] = 0; groups[epoch] = 0;
// Every task has an entry date. // Every task has an entry date, but exclude templates.
++addedGroup[epoch]; if (task.getStatus () != Task::recurring)
++addedGroup[epoch];
// All deleted tasks have an end date. // All deleted tasks have an end date.
if (task.getStatus () == Task::deleted) if (task.getStatus () == Task::deleted)
@@ -383,8 +385,9 @@ int CmdGHistoryMonthly::execute (std::string& output)
time_t epoch = entry.startOfMonth ().toEpoch (); time_t epoch = entry.startOfMonth ().toEpoch ();
groups[epoch] = 0; groups[epoch] = 0;
// Every task has an entry date. // Every task has an entry date, but exclude templates.
++addedGroup[epoch]; if (task.getStatus () != Task::recurring)
++addedGroup[epoch];
// All deleted tasks have an end date. // All deleted tasks have an end date.
if (task.getStatus () == Task::deleted) if (task.getStatus () == Task::deleted)
@@ -577,8 +580,9 @@ int CmdGHistoryAnnual::execute (std::string& output)
time_t epoch = entry.startOfYear ().toEpoch (); time_t epoch = entry.startOfYear ().toEpoch ();
groups[epoch] = 0; groups[epoch] = 0;
// Every task has an entry date. // Every task has an entry date, but exclude templates.
++addedGroup[epoch]; if (task.getStatus () != Task::recurring)
++addedGroup[epoch];
// All deleted tasks have an end date. // All deleted tasks have an end date.
if (task.getStatus () == Task::deleted) if (task.getStatus () == Task::deleted)