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

CmdReportMonth: Renamed internal functions from 'report' to 'chart'

Browse source
This commit is contained in:
Paul Beckingham 2016-05-20 16:16:47 -05:00
parent 0a1088f383
commit 31940d8807
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/commands/CmdReportMonth.cpp
View file

@ -37,14 +37,14 @@
#include <iostream> #include <iostream>
#include <iomanip> #include <iomanip>
int renderReport (const std::string&, Interval&, Rules&, Database&); int renderChart (const std::string&, Interval&, Rules&, Database&);
static void renderAxis (const std::string&, const Rules&, Palette&, const std::string&, int, int); static void renderAxis (const std::string&, const Rules&, Palette&, const std::string&, int, int);
static void renderExclusionBlocks (const std::string&, const Rules&, std::vector <Composite>&, Palette&, const Datetime&, int, int, const std::vector <Range>&); static void renderExclusionBlocks (const std::string&, const Rules&, std::vector <Composite>&, Palette&, const Datetime&, int, int, const std::vector <Range>&);
static void renderInterval (const std::string&, const Rules&, std::vector <Composite>&, const Datetime&, const Interval&, Palette&, std::map <std::string, Color>&, time_t&); static void renderInterval (const std::string&, const Rules&, std::vector <Composite>&, const Datetime&, const Interval&, Palette&, std::map <std::string, Color>&, time_t&);
static void renderSummary (const std::string&, const Interval&, const std::vector <Range>&, const std::vector <Interval>&); static void renderSummary (const std::string&, const Interval&, const std::vector <Range>&, const std::vector <Interval>&);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CmdReportDay ( int CmdChartDay (
const CLI& cli, const CLI& cli,
Rules& rules, Rules& rules,
Database& database) Database& database)
@ -54,11 +54,11 @@ int CmdReportDay (
if (! filter.range.is_started ()) if (! filter.range.is_started ())
filter.range = Range (Datetime ("today"), Datetime ("tomorrow")); filter.range = Range (Datetime ("today"), Datetime ("tomorrow"));
return renderReport ("day", filter, rules, database); return renderChart ("day", filter, rules, database);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CmdReportWeek ( int CmdChartWeek (
const CLI& cli, const CLI& cli,
Rules& rules, Rules& rules,
Database& database) Database& database)
@ -68,11 +68,11 @@ int CmdReportWeek (
if (! filter.range.is_started ()) if (! filter.range.is_started ())
filter.range = Range (Datetime ("socw"), Datetime ("eocw")); filter.range = Range (Datetime ("socw"), Datetime ("eocw"));
return renderReport ("week", filter, rules, database); return renderChart ("week", filter, rules, database);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CmdReportMonth ( int CmdChartMonth (
const CLI& cli, const CLI& cli,
Rules& rules, Rules& rules,
Database& database) Database& database)
@ -82,11 +82,11 @@ int CmdReportMonth (
if (! filter.range.is_started ()) if (! filter.range.is_started ())
filter.range = Range (Datetime ("socm"), Datetime ("eocm")); filter.range = Range (Datetime ("socm"), Datetime ("eocm"));
return renderReport ("month", filter, rules, database); return renderChart ("month", filter, rules, database);
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int renderReport ( int renderChart (
const std::string& type, const std::string& type,
Interval& filter, Interval& filter,
Rules& rules, Rules& rules,

6
src/commands/commands.h
View file

@ -52,9 +52,9 @@ int CmdTags ( Rules&, Database& );
int CmdTrack (const CLI&, Rules&, Database& ); int CmdTrack (const CLI&, Rules&, Database& );
int CmdUndo ( ); int CmdUndo ( );
int CmdReportDay (const CLI&, Rules&, Database& ); int CmdChartDay (const CLI&, Rules&, Database& );
int CmdReportWeek (const CLI&, Rules&, Database& ); int CmdChartWeek (const CLI&, Rules&, Database& );
int CmdReportMonth (const CLI&, Rules&, Database& ); int CmdChartMonth (const CLI&, Rules&, Database& );
int CmdSummary (const CLI&, Rules&, Database& ); int CmdSummary (const CLI&, Rules&, Database& );
#endif #endif

6
src/init.cpp
View file

@ -230,14 +230,14 @@ int dispatchCommand (
else if (command == "clear") status = CmdClear (cli, rules, database ); else if (command == "clear") status = CmdClear (cli, rules, database );
else if (command == "config") status = CmdConfig (cli, rules, database ); else if (command == "config") status = CmdConfig (cli, rules, database );
else if (command == "continue") status = CmdContinue ( rules, database ); else if (command == "continue") status = CmdContinue ( rules, database );
else if (command == "day") status = CmdReportDay (cli, rules, database ); else if (command == "day") status = CmdChartDay (cli, rules, database );
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 (cli, rules, database ); 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 == "month") status = CmdReportMonth (cli, rules, database ); else if (command == "month") status = CmdChartMonth (cli, rules, database );
else if (command == "report") status = CmdReport (cli, rules, database, extensions); else if (command == "report") status = CmdReport (cli, rules, database, extensions);
else if (command == "show") status = CmdShow ( rules ); else if (command == "show") status = CmdShow ( rules );
else if (command == "start") status = CmdStart (cli, rules, database ); else if (command == "start") status = CmdStart (cli, rules, database );
@ -246,7 +246,7 @@ int dispatchCommand (
else if (command == "tags") status = CmdTags ( rules, database ); else if (command == "tags") status = CmdTags ( rules, database );
else if (command == "track") status = CmdTrack (cli, rules, database ); else if (command == "track") status = CmdTrack (cli, rules, database );
else if (command == "undo") status = CmdUndo ( ); else if (command == "undo") status = CmdUndo ( );
else if (command == "week") status = CmdReportWeek (cli, rules, database ); else if (command == "week") status = CmdChartWeek (cli, rules, database );
else status = CmdReport (cli, rules, database, extensions); else status = CmdReport (cli, rules, database, extensions);
} }
else else