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

- "calendar" command now uses oldest and newest due dates for limits.

Browse Source
This commit is contained in:
Paul Beckingham
2008-06-01 15:44:26 -04:00
parent 0ec24aaef5
commit 3077c50774
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/task.cpp
View File

@@ -1876,38 +1876,43 @@ void handleReportCalendar (const TDB& tdb, T& task, Config& conf)
// Find the oldest pending due date. // Find the oldest pending due date.
Date oldest; Date oldest;
Date newest;
std::vector <T>::iterator it; std::vector <T>::iterator it;
for (it = pending.begin (); it != pending.end (); ++it) for (it = pending.begin (); it != pending.end (); ++it)
{ {
if (it->getAttribute ("due") != "") if (it->getAttribute ("due") != "")
{ {
Date d (::atoi (it->getAttribute ("due").c_str ())); Date d (::atoi (it->getAttribute ("due").c_str ()));
if (d < oldest)
oldest = d; if (d < oldest) oldest = d;
if (d > newest) newest = d;
} }
} }
// Iterate from oldest due month, year to now. // Iterate from oldest due month, year to newest month, year.
Date today; Date today;
int m = oldest.month (); int mFrom = oldest.month ();
int y = oldest.year (); int yFrom = oldest.year ();
int mTo = newest.month ();
int yTo = newest.year ();
std::cout << std::endl; std::cout << std::endl;
std::string output; std::string output;
while (y < today.year () || (y == today.year () && m <= today.month ())) while (yFrom < yTo || (yFrom == yTo && mFrom <= mTo))
{ {
std::cout << Date::monthName (m) std::cout << Date::monthName (mFrom)
<< " " << " "
<< y << yFrom
<< std::endl << std::endl
<< std::endl << std::endl
<< renderMonth (m, y, today, pending, conf) << renderMonth (mFrom, yFrom, today, pending, conf)
<< std::endl; << std::endl;
if (++m == 13) if (++mFrom == 13)
{ {
m = 1; mFrom = 1;
++y; ++yFrom;
} }
} }
} }