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

CmdBurndown: Removed unreachable code (completed/deleted tasks have no 'start' date)

Browse Source
This commit is contained in:
Paul Beckingham
2015-10-28 17:06:47 -04:00
parent 258328facd
commit 958637e2ca
1 changed files with 16 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/commands/CmdBurndown.cpp
View File

@@ -293,51 +293,20 @@ void Chart::scan (std::vector <Task>& tasks)
continue; continue;
} }
if (task.has ("start")) while (from < end)
{ {
ISO8601d start = quantize (ISO8601d (task.get_date ("start"))); epoch = from.toEpoch ();
while (from < start) if (_bars.find (epoch) != _bars.end ())
{ ++_bars[epoch]._pending;
epoch = from.toEpoch (); from = increment (from);
if (_bars.find (epoch) != _bars.end ())
++_bars[epoch]._pending;
from = increment (from);
}
while (from < end)
{
epoch = from.toEpoch ();
if (_bars.find (epoch) != _bars.end ())
++_bars[epoch]._started;
from = increment (from);
}
while (from < now)
{
epoch = from.toEpoch ();
if (_bars.find (epoch) != _bars.end ())
++_bars[epoch]._done;
from = increment (from);
}
} }
else
{
ISO8601d end = quantize (ISO8601d (task.get_date ("end")));
while (from < end)
{
epoch = from.toEpoch ();
if (_bars.find (epoch) != _bars.end ())
++_bars[epoch]._pending;
from = increment (from);
}
while (from < now) while (from < now)
{ {
epoch = from.toEpoch (); epoch = from.toEpoch ();
if (_bars.find (epoch) != _bars.end ()) if (_bars.find (epoch) != _bars.end ())
++_bars[epoch]._done; ++_bars[epoch]._done;
from = increment (from); from = increment (from);
}
} }
} }
@@ -354,35 +323,12 @@ void Chart::scan (std::vector <Task>& tasks)
if (end < _earliest) if (end < _earliest)
continue; continue;
if (task.has ("start")) while (from < end)
{ {
ISO8601d start = quantize (ISO8601d (task.get_date ("start"))); epoch = from.toEpoch ();
while (from < start) if (_bars.find (epoch) != _bars.end ())
{ ++_bars[epoch]._pending;
epoch = from.toEpoch (); from = increment (from);
if (_bars.find (epoch) != _bars.end ())
++_bars[epoch]._pending;
from = increment (from);
}
while (from < end)
{
epoch = from.toEpoch ();
if (_bars.find (epoch) != _bars.end ())
++_bars[epoch]._started;
from = increment (from);
}
}
else
{
ISO8601d end = quantize (ISO8601d (task.get_date ("end")));
while (from < end)
{
epoch = from.toEpoch ();
if (_bars.find (epoch) != _bars.end ())
++_bars[epoch]._pending;
from = increment (from);
}
} }
} }
} }