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

Filter: Merged Filter and Interval, removing Filter

Browse source
This commit is contained in:
Paul Beckingham 2016-04-22 22:10:26 -04:00
parent 35f54b64e1
commit e7dd8edf26
8 changed files with 20 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/CmdExport.cpp
View file

@ -35,7 +35,7 @@ int CmdExport (
Rules& rules,
Database& database)
{
auto filter = createFilterFromCLI (cli);
auto filter = createFilterIntervalFromCLI (cli);
auto timeline = createTimelineFromData (rules, database, filter);
std::cout << jsonFromIntervals (timeline.tracked (rules));
return 0;

2
src/commands/CmdReport.cpp
View file

@ -79,7 +79,7 @@ int CmdReport (
throw std::string ("Specify which report to run.");
// Filter the data.
auto filter = createFilterFromCLI (cli);
auto filter = createFilterIntervalFromCLI (cli);
auto timeline = createTimelineFromData (rules, database, filter);
auto intervals = timeline.tracked (rules);

7
src/commands/CmdTrack.cpp
View file

@ -35,13 +35,12 @@ int CmdTrack (
Rules& rules,
Database& database)
{
auto filter = createFilterFromCLI (cli);
auto tracked = createIntervalFromFilter (filter);
database.addInterval (tracked);
auto filter = createFilterIntervalFromCLI (cli);
database.addInterval (filter);
// User feedback.
if (rules.getBoolean ("verbose"))
std::cout << intervalSummarize (rules, tracked);
std::cout << intervalSummarize (rules, filter);
return 0;
}