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 holidays from renderHolidays

Browse source
This commit is contained in:
Thomas Lauf 2018-12-27 23:40:50 +01:00
parent 63d56a84d0
commit 4484d507e3
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/commands/CmdChart.cpp
View file

@ -44,7 +44,7 @@ static std::string renderTotal (const std::string&, const Rules&, time
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);
std::string renderHolidays (const Rules &rules, const Interval &filter); std::string renderHolidays (const Rules&, const Interval&, const std::vector<std::string>&);
static std::string renderSummary (const std::string&, const Interval&, const std::vector <Range>&, const std::vector <Interval>&, bool); static std::string renderSummary (const std::string&, const Interval&, const std::vector <Range>&, const std::vector <Interval>&, bool);
unsigned long getIndentSize (const std::string &type, const Rules &rules); unsigned long getIndentSize (const std::string &type, const Rules &rules);
@ -219,7 +219,7 @@ int renderChart (
const auto with_holidays = rules.getBoolean ("reports." + type + ".holidays"); const auto with_holidays = rules.getBoolean ("reports." + type + ".holidays");
std::cout << renderSubTotal (type, rules, first_hour, last_hour, total_work) std::cout << renderSubTotal (type, rules, first_hour, last_hour, total_work)
<< (with_holidays ? renderHolidays (rules, filter) : "") << (with_holidays ? renderHolidays (rules, filter, rules.all ("holidays.")) : "")
<< (with_summary ? renderSummary (indent, filter, exclusions, tracked, blank) : ""); << (with_summary ? renderSummary (indent, filter, exclusions, tracked, blank) : "");
return 0; return 0;
@ -603,10 +603,10 @@ static void renderInterval (
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
std::string renderHolidays ( std::string renderHolidays (
const Rules& rules, const Rules& rules,
const Interval& filter) const Interval& filter,
const std::vector <std::string>& holidays)
{ {
std::stringstream out; std::stringstream out;
auto holidays = rules.all ("holidays.");
for (auto& entry : holidays) for (auto& entry : holidays)
{ {

4
src/commands/CmdSummary.cpp
View file

@ -33,7 +33,7 @@
#include <iostream> #include <iostream>
// Implemented in CmdChart.cpp. // Implemented in CmdChart.cpp.
std::string renderHolidays (const Rules &rules, const Interval &filter); std::string renderHolidays (const Rules&, const Interval&, const std::vector <std::string>&);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CmdSummary ( int CmdSummary (
@ -181,7 +181,7 @@ int CmdSummary (
std::cout << '\n' std::cout << '\n'
<< table.render () << table.render ()
<< (with_holidays ? renderHolidays (rules, filter) : "") << (with_holidays ? renderHolidays (rules, filter, rules.all ("holidays.")) : "")
<< '\n'; << '\n';
return 0; return 0;