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

Bug: The rc.reports.<type>.totals setting should control 'Totals' label

Browse source 
- Thanks to Matthew Lemon.
This commit is contained in:
Paul Beckingham 2016-06-28 19:01:41 -04:00
parent b62a977bd5
commit 52c294cc4c
3 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/commands/CmdChart.cpp
View file

@ -203,8 +203,7 @@ int renderChart (
<< std::string (indent, ' ')
<< lines[i].str ();
std::cout << " "
<< renderTotal (type, rules, work)
std::cout << renderTotal (type, rules, work)
<< '\n';
previous = day;
@ -281,6 +280,7 @@ static void renderAxis (
int last_hour)
{
auto spacing = rules.getInteger ("reports." + type + ".spacing");
auto showTotal = rules.getBoolean ("reports." + type + ".totals");
Color colorLabel (palette.enabled ? rules.get ("theme.colors.label") : "");
Color colorToday (palette.enabled ? rules.get ("theme.colors.today") : "");
@ -293,7 +293,10 @@ static void renderAxis (
else
std::cout << colorLabel.colorize (leftJustify (hour, 4 + spacing));
std::cout << " " << colorLabel.colorize ("Total") << "\n";
if (showTotal)
std::cout << " " << colorLabel.colorize ("Total");
std::cout << '\n';
}
////////////////////////////////////////////////////////////////////////////////
@ -363,7 +366,8 @@ static std::string renderTotal (
{
int hours = work / 3600;
int minutes = (work % 3600) / 60;
std::cout << std::setw (3) << std::setfill (' ') << hours
std::cout << " "
<< std::setw (3) << std::setfill (' ') << hours
<< ':'
<< std::setw (2) << std::setfill ('0') << minutes;
}