GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-06-26 10:54:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CmdChart: Now renders holdiays in a different color

Browse source
This commit is contained in:
Paul Beckingham 2016-05-22 10:27:00 -04:00
parent a997479335
commit 2c1dc654b4
3 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/commands/CmdChart.cpp
View file

@ -41,7 +41,7 @@ int renderChart (const CLI&, const std::string&, Interv
static void determineHourRange (const std::string&, const Rules&, const std::vector <Interval>&, int&, int&);
static void renderAxis (const std::string&, const Rules&, Palette&, const std::string&, int, int);
static std::string renderMonth (const std::string&, const Rules&, const Datetime&, const Datetime&);
static std::string renderDayName (const std::string&, const Rules&, Datetime&, Color&);
static std::string renderDayName (const std::string&, const Rules&, Datetime&, Color&, Color&);
static std::string renderTotal (const std::string&, const Rules&, 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>&, Palette&, const Datetime&, int, int, const std::vector <Range>&);
@ -106,6 +106,7 @@ int renderChart (
auto palette = createPalette (rules);
auto tag_colors = createTagColorMap (rules, palette, tracked);
Color colorToday (palette.enabled ? rules.get ("theme.colors.today") : "");
Color colorHoliday (palette.enabled ? rules.get ("theme.colors.holiday") : "");
// Determine hours shown.
int first_hour = 0;
@ -167,7 +168,7 @@ int renderChart (
}
auto labelMonth = renderMonth (type, rules, previous, day);
auto labelDay = renderDayName (type, rules, day, colorToday);
auto labelDay = renderDayName (type, rules, day, colorToday, colorHoliday);
std::cout << labelMonth
<< labelDay
@ -275,14 +276,19 @@ static std::string renderDayName (
const std::string& type,
const Rules& rules,
Datetime& day,
Color& color)
Color& colorToday,
Color& colorHoliday)
{
auto showDay = rules.getBoolean ("reports." + type + ".day");
auto showWeekday = rules.getBoolean ("reports." + type + ".weekday");
std::stringstream out;
Color color;
if (day.sameDay (Datetime ()))
{
color = colorToday;
else if (dayIsHoliday (rules, day))
color = colorHoliday;
std::stringstream out;
if (showWeekday)
out << color.colorize (day.dayNameShort (day.dayOfWeek ()))
<< ' ';
@ -290,17 +296,6 @@ static std::string renderDayName (
if (showDay)
out << color.colorize (rightJustify (day.day (), 2))
<< ' ';
}
else
{
if (showWeekday)
out << day.dayNameShort (day.dayOfWeek ())
<< ' ';
if (showDay)
out << rightJustify (day.day (), 2)
<< ' ';
}
return out.str ();
}

9
src/helper.cpp
View file

@ -235,3 +235,12 @@ int quantizeTo15Minutes (const int minutes)
}
////////////////////////////////////////////////////////////////////////////////
bool dayIsHoliday (const Rules& rules, const Datetime& day)
{
// TODO Look up exclusions.
return false;
}
////////////////////////////////////////////////////////////////////////////////

1
src/timew.h
View file

@ -70,6 +70,7 @@ std::string jsonFromIntervals (const std::vector <Interval>&);
Palette createPalette (const Rules&);
std::map <std::string, Color> createTagColorMap (const Rules&, Palette&, const std::vector <Interval>&);
int quantizeTo15Minutes (const int);
bool dayIsHoliday (const Rules&, const Datetime&);
// utiŀ.cpp
std::string osName ();