CmdGaps: Is a clone of export with /tracked/untraced/ for now

This commit is contained in:
Paul Beckingham 2016-04-27 22:56:59 -04:00
parent 0fa7e32182
commit 3b45e90c5e
5 changed files with 17 additions and 16 deletions

View file

@ -109,9 +109,9 @@ std::vector <Interval> Timeline::tracked (Rules& rules) const
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Untracked time is that which is not excluded, and not filled. Gaps. // Untracked time is that which is not excluded, and not filled. Gaps.
std::vector <Interval> Timeline::untracked (Rules& rules) const std::vector <Range> Timeline::untracked (Rules& rules) const
{ {
std::vector <Interval> gaps; std::vector <Range> gaps;
// Get the set of expanded exclusions that overlap the range defined by the // Get the set of expanded exclusions that overlap the range defined by the
// timeline. If no range is defined, derive it from the set of all data. // timeline. If no range is defined, derive it from the set of all data.

View file

@ -40,7 +40,7 @@ public:
void include (const Interval&); void include (const Interval&);
void exclude (const Exclusion&); void exclude (const Exclusion&);
std::vector <Interval> tracked (Rules&) const; std::vector <Interval> tracked (Rules&) const;
std::vector <Interval> untracked (Rules&) const; std::vector <Range> untracked (Rules&) const;
std::vector <Range> excluded (Rules&) const; std::vector <Range> excluded (Rules&) const;
std::string dump () const; std::string dump () const;

View file

@ -25,21 +25,22 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#include <cmake.h> #include <cmake.h>
#include <commands.h>
#include <timew.h>
#include <iostream> #include <iostream>
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CmdGaps () int CmdGaps (
const CLI& cli,
Rules& rules,
Database& database)
{ {
std::cout << "[gaps: shows untracked gaps in the current day/week/month]\n"; auto filter = createFilterIntervalFromCLI (cli);
auto timeline = createTimelineFromData (rules, database, filter);
// TODO If there are no exclusions defineѕ. for (auto& gap : timeline.untracked (rules))
// TODO Error {
std::cout << "# gap " << gap.dump () << "\n";
// TODO Load all data. }
// TODO Apply filter.
// TODO Invert the union exclusions and incluѕions
// TODO For each interval
// TODO Display
return 0; return 0;
} }

View file

@ -39,7 +39,7 @@ int CmdDefault ( Rules&, Database& );
int CmdDiagnostics ( Rules&, Database&, const Extensions&); int CmdDiagnostics ( Rules&, Database&, const Extensions&);
int CmdExport (const CLI&, Rules&, Database& ); int CmdExport (const CLI&, Rules&, Database& );
int CmdExtensions ( Rules&, const Extensions&); int CmdExtensions ( Rules&, const Extensions&);
int CmdGaps ( ); int CmdGaps (const CLI&, Rules&, Database& );
int CmdHelpUsage ( ); int CmdHelpUsage ( );
int CmdHelp (const CLI& ); int CmdHelp (const CLI& );
int CmdImport ( ); int CmdImport ( );

View file

@ -227,7 +227,7 @@ int dispatchCommand (
else if (command == "diagnostics") status = CmdDiagnostics ( rules, database, extensions); else if (command == "diagnostics") status = CmdDiagnostics ( rules, database, extensions);
else if (command == "export") status = CmdExport (cli, rules, database ); else if (command == "export") status = CmdExport (cli, rules, database );
else if (command == "extensions") status = CmdExtensions ( rules, extensions); else if (command == "extensions") status = CmdExtensions ( rules, extensions);
else if (command == "gaps") status = CmdGaps ( ); else if (command == "gaps") status = CmdGaps (cli, rules, database );
else if (command == "help") status = CmdHelp (cli ); else if (command == "help") status = CmdHelp (cli );
else if (command == "import") status = CmdImport ( ); else if (command == "import") status = CmdImport ( );
else if (command == "report") status = CmdReport (cli, rules, database, extensions); else if (command == "report") status = CmdReport (cli, rules, database, extensions);