GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-27 12:16:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CmdReport: Udated to new API

Browse source
This commit is contained in:
Paul Beckingham 2016-04-28 20:33:04 -04:00
parent 89ecb27742
commit ee5985471b
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/commands/CmdReport.cpp
View file

@ -78,12 +78,10 @@ int CmdReport (
if (script == "") if (script == "")
throw std::string ("Specify which report to run."); throw std::string ("Specify which report to run.");
// Filter the data.
auto filter = getFilter (cli);
auto timeline = createTimelineFromData (rules, database, filter);
auto intervals = timeline.tracked (rules);
// Compose Header info. // Compose Header info.
auto filter = getFilter (cli);
auto tracked = getTrackedIntervals (database, rules, filter);
rules.set ("temp.report.start", filter.range.start.toEpoch () > 0 ? filter.range.start.toISO () : ""); rules.set ("temp.report.start", filter.range.start.toEpoch () > 0 ? filter.range.start.toISO () : "");
rules.set ("temp.report.end", filter.range.end.toEpoch () > 0 ? filter.range.end.toISO () : ""); rules.set ("temp.report.end", filter.range.end.toEpoch () > 0 ? filter.range.end.toISO () : "");
std::string combinedTags; std::string combinedTags;
@ -99,9 +97,10 @@ int CmdReport (
for (auto& name : rules.all ()) for (auto& name : rules.all ())
header << name << ": " << rules.get (name) << '\n'; header << name << ": " << rules.get (name) << '\n';
// Get the data.
auto input = header.str () auto input = header.str ()
+ '\n' + '\n'
+ jsonFromIntervals (intervals); + jsonFromIntervals (tracked);
// Run the extensions. // Run the extensions.
std::vector <std::string> output; std::vector <std::string> output;