Recurrence: Relocate nag function out of the way

This commit is contained in:
Paul Beckingham 2017-03-31 08:34:25 -04:00
parent 704dfd462e
commit f6f79d28ee
4 changed files with 68 additions and 33 deletions

View file

@ -413,36 +413,3 @@ void updateRecurrenceMask (Task& task)
}
////////////////////////////////////////////////////////////////////////////////
// Returns a Boolean indicator as to whether a nag message was generated, so
// that commands can control the number of nag messages displayed (ie one is
// enough).
//
// Otherwise generates a nag message, if one is defined, if there are tasks of
// higher urgency.
bool nag (Task& task)
{
// Special tag overrides nagging.
if (task.hasTag ("nonag"))
return false;
auto nagMessage = context.config.get ("nag");
if (nagMessage != "")
{
// Scan all pending, non-recurring tasks.
auto pending = context.tdb2.pending.get_tasks ();
for (auto& t : pending)
{
if ((t.getStatus () == Task::pending ||
t.getStatus () == Task::waiting) &&
t.urgency () > task.urgency ())
{
context.footnote (nagMessage);
return true;
}
}
}
return false;
}
////////////////////////////////////////////////////////////////////////////////