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

CmdChart: renderSubTotal wasn't actually conditional

Browse source
This commit is contained in:
Paul Beckingham 2016-05-21 16:30:43 -05:00
parent 198902821c
commit 1aed409832
1 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/commands/CmdChart.cpp
View file

@ -323,26 +323,28 @@ static std::string renderSubTotal (
time_t total_work) time_t total_work)
{ {
std::stringstream out; std::stringstream out;
if (rules.getBoolean ("reports." + type + ".total"))
{
int indent = (rules.getBoolean ("reports." + type + ".month") ? 4 : 0) +
(rules.getBoolean ("reports." + type + ".week") ? 4 : 0) +
(rules.getBoolean ("reports." + type + ".day") ? 3 : 0) +
(rules.getBoolean ("reports." + type + ".weekday") ? 4 : 0);
int spacing = rules.getInteger ("reports." + type + ".spacing");
int indent = (rules.getBoolean ("reports." + type + ".month") ? 4 : 0) + std::string pad (indent + ((last_hour - first_hour + 1) * (4 + spacing)) + 1, ' ');
(rules.getBoolean ("reports." + type + ".week") ? 4 : 0) +
(rules.getBoolean ("reports." + type + ".day") ? 3 : 0) +
(rules.getBoolean ("reports." + type + ".weekday") ? 4 : 0);
int spacing = rules.getInteger ("reports." + type + ".spacing");
std::string pad (indent + ((last_hour - first_hour + 1) * (4 + spacing)) + 1, ' '); int hours = total_work / 3600;
int minutes = (total_work % 3600) / 60;
int hours = total_work / 3600; out << pad
int minutes = (total_work % 3600) / 60; << Color ("underline").colorize (" ")
<< '\n'
out << pad << pad
<< Color ("underline").colorize (" ") << std::setw (3) << std::setfill (' ') << hours
<< '\n' << ':'
<< pad << std::setw (2) << std::setfill ('0') << minutes
<< std::setw (3) << std::setfill (' ') << hours << '\n';
<< ':' }
<< std::setw (2) << std::setfill ('0') << minutes
<< '\n';
return out.str (); return out.str ();
} }