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

Merge pull request #2052 from janikrabe/burndown-current

Browse Source 
TW #2007: Compute number of current tasks correctly
This commit is contained in:
Paul Beckingham
2018-08-12 09:45:34 -04:00
committed by GitHub
parent 5d0a577deb e2573d4516
commit e0adb4536c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/commands/CmdBurndown.cpp
View File

@@ -195,6 +195,8 @@ Chart::~Chart ()
void Chart::scanForPeak (std::vector <Task>& tasks) void Chart::scanForPeak (std::vector <Task>& tasks)
{ {
std::map <time_t, int> pending; std::map <time_t, int> pending;
_current_count = 0;
for (auto& task : tasks) for (auto& task : tasks)
{ {
// The entry date is when the counting starts. // The entry date is when the counting starts.
@@ -203,6 +205,8 @@ void Chart::scanForPeak (std::vector <Task>& tasks)
Datetime end; Datetime end;
if (task.has ("end")) if (task.has ("end"))
end = Datetime (task.get_date ("end")); end = Datetime (task.get_date ("end"));
else
++_current_count;
while (entry < end) while (entry < end)
{ {
@@ -216,7 +220,7 @@ void Chart::scanForPeak (std::vector <Task>& tasks)
} }
} }
// Find the peak, peak date and current. // Find the peak and peak date.
for (auto& count : pending) for (auto& count : pending)
{ {
if (count.second > _peak_count) if (count.second > _peak_count)
@@ -224,8 +228,6 @@ void Chart::scanForPeak (std::vector <Task>& tasks)
_peak_count = count.second; _peak_count = count.second;
_peak_epoch = count.first; _peak_epoch = count.first;
} }
_current_count = count.second;
} }
} }