GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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).

12
src/commands/CmdHistory.cpp
View file

@ -74,7 +74,8 @@ 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.
if (task.getStatus () != Task::recurring)
++addedGroup[epoch]; ++addedGroup[epoch];
// All deleted tasks have an end date. // All deleted tasks have an end date.
@ -230,7 +231,8 @@ 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.
if (task.getStatus () != Task::recurring)
++addedGroup[epoch]; ++addedGroup[epoch];
// All deleted tasks have an end date. // All deleted tasks have an end date.
@ -383,7 +385,8 @@ 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.
if (task.getStatus () != Task::recurring)
++addedGroup[epoch]; ++addedGroup[epoch];
// All deleted tasks have an end date. // All deleted tasks have an end date.
@ -577,7 +580,8 @@ 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.
if (task.getStatus () != Task::recurring)
++addedGroup[epoch]; ++addedGroup[epoch];
// All deleted tasks have an end date. // All deleted tasks have an end date.