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 1

Extract rules from renderTotal

Browse source
This commit is contained in:
Thomas Lauf 2018-12-28 12:25:54 +01:00
parent 879a870c43
commit c73359ad7e
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/commands/CmdChart.cpp
View file

@ -42,7 +42,7 @@ static std::string renderMonth (const Datetime&, const Datetime&);
static std::string renderWeek (const Datetime&, const Datetime&); static std::string renderWeek (const Datetime&, const Datetime&);
static std::string renderWeekday (const Rules&, Datetime&, Color&, Color&); static std::string renderWeekday (const Rules&, Datetime&, Color&, Color&);
static std::string renderDay (const Rules&, Datetime&, Color&, Color&); static std::string renderDay (const Rules&, Datetime&, Color&, Color&);
static std::string renderTotal (const std::string&, const Rules&, time_t); static std::string renderTotal (time_t);
static std::string renderSubTotal (const std::string&, const Rules&, int, int, time_t); static std::string renderSubTotal (const std::string&, const Rules&, int, int, time_t);
static void renderExclusionBlocks (const std::string&, const Rules&, std::vector <Composite>&, bool, const Datetime&, int, int, const std::vector <Range>&); static void renderExclusionBlocks (const std::string&, const Rules&, std::vector <Composite>&, bool, const Datetime&, int, int, const std::vector <Range>&);
static void renderInterval (const std::string&, const Rules&, std::vector <Composite>&, const Datetime&, const Interval&, std::map <std::string, Color>&, int, time_t&, bool); static void renderInterval (const std::string&, const Rules&, std::vector <Composite>&, const Datetime&, const Interval&, std::map <std::string, Color>&, int, time_t&, bool);
@ -219,7 +219,9 @@ int renderChart (
<< indent << indent
<< lines[i].str (); << lines[i].str ();
std::cout << renderTotal (type, rules, work) const auto with_totals = rules.getBoolean ("reports." + type + ".totals");
std::cout << (with_totals ? renderTotal (work) : "")
<< '\n'; << '\n';
previous = day; previous = day;
@ -433,15 +435,11 @@ static std::string renderDay (
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static std::string renderTotal ( static std::string renderTotal (time_t work)
const std::string& type,
const Rules& rules,
time_t work)
{ {
auto showTotal = rules.getBoolean ("reports." + type + ".totals");
std::stringstream out; std::stringstream out;
if (showTotal && work)
if (work)
{ {
int hours = work / 3600; int hours = work / 3600;
int minutes = (work % 3600) / 60; int minutes = (work % 3600) / 60;