Recurrence: Updated 'until' handling

This commit is contained in:
Paul Beckingham 2017-07-22 13:30:49 +01:00
parent ce012d6430
commit 05979025d2

View file

@ -355,13 +355,18 @@ void handleUntil ()
auto tasks = context.tdb2.pending.get_tasks (); auto tasks = context.tdb2.pending.get_tasks ();
for (auto& t : tasks) for (auto& t : tasks)
{ {
// TODO What about expiring template tasks?
if (t.getStatus () == Task::pending && if (t.getStatus () == Task::pending &&
t.has ("until") && t.has ("until"))
Datetime (t.get_date ("until")) < now)
{ {
t.setStatus (Task::deleted); auto until = Datetime (t.get_date ("until"));
context.tdb2.modify(t); if (until < now)
context.footnote (onExpiration (t)); {
context.debug (format ("handleUntil: recurrence expired until {1} < now {2}", until.toISOLocalExtended (), now.toISOLocalExtended ()));
t.setStatus (Task::deleted);
context.tdb2.modify(t);
context.footnote (onExpiration (t));
}
} }
} }
} }