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

TW-1313: some recurring intervals reset due time to midnight

Browse source 
- Thanks to James Dietrich.
This commit is contained in:
Paul Beckingham 2015-11-07 17:12:25 -05:00
parent 072acdbb18
commit 8e778712ea
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/recur.cpp
View file

@ -166,9 +166,8 @@ bool generateDueDates (Task& parent, std::vector <ISO8601d>& allDue)
// Determine due date, recur period and until date.
ISO8601d due (parent.get_date ("due"));
if (due._date == 0)
{
return false;
}
std::string recur = parent.get ("recur");
bool specificEnd = false;
@ -215,6 +214,9 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
int m = current.month ();
int d = current.day ();
int y = current.year ();
int ho = current.hour ();
int mi = current.minute ();
int se = current.second ();
// Some periods are difficult, because they can be vague.
if (period == "monthly" ||
@ -229,7 +231,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
while (! ISO8601d::valid (m, d, y))
--d;
return ISO8601d (m, d, y);
return ISO8601d (m, d, y, ho, mi, se);
}
else if (period == "weekdays")
@ -259,7 +261,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
while (! ISO8601d::valid (m, d, y))
--d;
return ISO8601d (m, d, y);
return ISO8601d (m, d, y, ho, mi, se);
}
else if (period[0] == 'P' &&
@ -294,7 +296,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
while (! ISO8601d::valid (m, d, y))
--d;
return ISO8601d (m, d, y);
return ISO8601d (m, d, y, ho, mi, se);
}
else if (Lexer::isDigit (period[0]) && period[period.length () - 1] == 'q')
@ -311,7 +313,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
while (! ISO8601d::valid (m, d, y))
--d;
return ISO8601d (m, d, y);
return ISO8601d (m, d, y, ho, mi, se);
}
else if (period == "semiannual" ||
@ -327,7 +329,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
while (! ISO8601d::valid (m, d, y))
--d;
return ISO8601d (m, d, y);
return ISO8601d (m, d, y, ho, mi, se);
}
else if (period == "bimonthly" ||
@ -343,7 +345,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
while (! ISO8601d::valid (m, d, y))
--d;
return ISO8601d (m, d, y);
return ISO8601d (m, d, y, ho, mi, se);
}
else if (period == "biannual" ||
@ -352,7 +354,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
{
y += 2;
return ISO8601d (m, d, y);
return ISO8601d (m, d, y, ho, mi, se);
}
else if (period == "annual" ||
@ -366,7 +368,7 @@ ISO8601d getNextRecurrence (ISO8601d& current, std::string& period)
if (m == 2 && d == 29)
d = 28;
return ISO8601d (m, d, y);
return ISO8601d (m, d, y, ho, mi, se);
}
// Add the period to current, and we're done.