mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-08-21 07:43:08 +02:00
Merge branch 'master' into 1.3.0
This commit is contained in:
commit
969ecd7b5d
1 changed files with 12 additions and 12 deletions
24
src/task.cpp
24
src/task.cpp
|
@ -507,8 +507,8 @@ void handleList (const TDB& tdb, T& task, Config& conf)
|
|||
due = dt.toString (conf.get ("dateformat", "m/d/Y"));
|
||||
|
||||
overdue = (dt < now) ? true : false;
|
||||
now += 7 * 86400;
|
||||
imminent = dt < now ? true : false;
|
||||
Date nextweek = now + 7 * 86400;
|
||||
imminent = dt < nextweek ? true : false;
|
||||
}
|
||||
|
||||
std::string active;
|
||||
|
@ -677,8 +677,8 @@ void handleSmallList (const TDB& tdb, T& task, Config& conf)
|
|||
due = dt.toString (conf.get ("dateformat", "m/d/Y"));
|
||||
|
||||
overdue = (dt < now) ? true : false;
|
||||
now += 7 * 86400;
|
||||
imminent = dt < now ? true : false;
|
||||
Date nextweek = now + 7 * 86400;
|
||||
imminent = dt < nextweek ? true : false;
|
||||
}
|
||||
|
||||
std::string active;
|
||||
|
@ -953,8 +953,8 @@ void handleInfo (const TDB& tdb, T& task, Config& conf)
|
|||
if (due.length ())
|
||||
{
|
||||
overdue = (dt < now) ? true : false;
|
||||
now += 7 * 86400;
|
||||
imminent = dt < now ? true : false;
|
||||
Date nextweek = now + 7 * 86400;
|
||||
imminent = dt < nextweek ? true : false;
|
||||
|
||||
if (conf.get ("color", true))
|
||||
{
|
||||
|
@ -1173,8 +1173,8 @@ void handleLongList (const TDB& tdb, T& task, Config& conf)
|
|||
due = dt.toString (conf.get ("dateformat", "m/d/Y"));
|
||||
|
||||
overdue = (dt < now) ? true : false;
|
||||
now += 7 * 86400;
|
||||
imminent = dt < now ? true : false;
|
||||
Date nextweek = now + 7 * 86400;
|
||||
imminent = dt < nextweek ? true : false;
|
||||
}
|
||||
|
||||
std::string age;
|
||||
|
@ -1529,8 +1529,8 @@ void handleReportNext (const TDB& tdb, T& task, Config& conf)
|
|||
due = dt.toString (conf.get ("dateformat", "m/d/Y"));
|
||||
|
||||
overdue = (dt < now) ? true : false;
|
||||
now += 7 * 86400;
|
||||
imminent = dt < now ? true : false;
|
||||
Date nextweek = now + 7 * 86400;
|
||||
imminent = dt < nextweek ? true : false;
|
||||
}
|
||||
|
||||
std::string active;
|
||||
|
@ -2111,8 +2111,8 @@ void handleReportActive (const TDB& tdb, T& task, Config& conf)
|
|||
|
||||
Date now;
|
||||
overdue = dt < now ? true : false;
|
||||
now += 7 * 86400;
|
||||
imminent = dt < now ? true : false;
|
||||
Date nextweek = now + 7 * 86400;
|
||||
imminent = dt < nextweek ? true : false;
|
||||
}
|
||||
|
||||
// All criteria match, so add refTask to the output table.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue