gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

CmdCalendar: Adjust styling

Browse Source
This commit is contained in:
Tomas Babej
2021-04-21 23:06:21 -04:00
parent 14fd8ea673
commit 282f3d344a
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/commands/CmdCalendar.cpp
View File

@@ -407,8 +407,8 @@ int CmdCalendar::execute (std::string& output)
} }
auto format = config.get ("report." + auto format = config.get ("report." +
config.get ("calendar.details.report") + config.get ("calendar.details.report") +
".dateformat"); ".dateformat");
if (format == "") if (format == "")
format = config.get ("dateformat.report"); format = config.get ("dateformat.report");
if (format == "") if (format == "")
@@ -564,8 +564,8 @@ std::string CmdCalendar::renderMonths (
// colorize holidays // colorize holidays
if (config.get ("calendar.holidays") != "none") if (config.get ("calendar.holidays") != "none")
{ {
auto dateFormat = config.get ("dateformat.holiday"); auto dateFormat = config.get ("dateformat.holiday");
for (auto& hol : config) for (auto& hol : config)
{ {
if (hol.first.substr (0, 8) == "holiday.") if (hol.first.substr (0, 8) == "holiday.")
{ {
@@ -584,8 +584,7 @@ std::string CmdCalendar::renderMonths (
auto end = config.get ("holiday." + hol.first.substr (8, hol.first.size () - 14) + ".end"); auto end = config.get ("holiday." + hol.first.substr (8, hol.first.size () - 14) + ".end");
Datetime holStart (start.c_str (), dateFormat); Datetime holStart (start.c_str (), dateFormat);
Datetime holEnd (end.c_str (), dateFormat); Datetime holEnd (end.c_str (), dateFormat);
if (holStart <= date && if (holStart <= date && date <= holEnd)
date <= holEnd)
cellColor.blend (color_holiday); cellColor.blend (color_holiday);
} }
} }