GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Bug #919

Browse source 
- Modified to allow multiple holiday file sources, in other words
  duplicate dates.

Signed-off-by: Paul Beckingham <paul@beckingham.net>
This commit is contained in:
Jörg Plate 2012-05-26 13:29:50 -04:00 • committed by Paul Beckingham
parent ddd7bc3f0a
commit f2f6b788e8
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/commands/CmdCalendar.cpp
View file

@ -361,7 +361,7 @@ int CmdCalendar::execute (std::string& output)
holTable.add (Column::factory ("string", STRING_CMD_CAL_LABEL_HOL)); holTable.add (Column::factory ("string", STRING_CMD_CAL_LABEL_HOL));
std::vector <std::string>::iterator it; std::vector <std::string>::iterator it;
std::map <time_t, std::string> hm; std::map <time_t, std::vector<std::string> > hm; // we need to store multiple holidays per day
for (it = holidays.begin (); it != holidays.end (); ++it) for (it = holidays.begin (); it != holidays.end (); ++it)
if (it->substr (0, 8) == "holiday.") if (it->substr (0, 8) == "holiday.")
if (it->substr (it->size () - 4) == "name") if (it->substr (it->size () - 4) == "name")
@ -372,7 +372,7 @@ int CmdCalendar::execute (std::string& output)
if (date_after < hDate && hDate < date_before) if (date_after < hDate && hDate < date_before)
{ {
hm[hDate.toEpoch()] = holName; hm[hDate.toEpoch()].push_back(holName);
} }
} }
@ -384,13 +384,18 @@ int CmdCalendar::execute (std::string& output)
if (format == "") if (format == "")
format = context.config.get ("dateformat"); format = context.config.get ("dateformat");
std::map <time_t, std::string>::iterator hm_it; std::map <time_t, std::vector<std::string> >::iterator hm_it;
for (hm_it = hm.begin(); hm_it != hm.end(); ++hm_it) for (hm_it = hm.begin(); hm_it != hm.end(); ++hm_it)
{ {
int row = holTable.addRow (); std::vector <std::string> v = hm_it->second;
Date hDate (hm_it->first); Date hDate (hm_it->first);
holTable.set (row, 0, hDate.toString (format)); std::string d = hDate.toString (format);
holTable.set (row, 1, hm_it->second); for (size_t i = 0; i < v.size(); i++)
{
int row = holTable.addRow ();
holTable.set (row, 0, d);
holTable.set (row, 1, v[i]);
}
} }
out << optionalBlankLine () out << optionalBlankLine ()