GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-20 04:13:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Dates

Browse source 
- Fixed problem with eoy, where is was YYYY-12-31T00:00:00, which is
  24 hours earlier than actual eoy. Other 'eo*' names were also wrong.
  So much for unit tests.
This commit is contained in:
Paul Beckingham 2014-06-15 22:34:16 -04:00
parent cfb7fdc987
commit 3116ddcd6d
1 changed files with 63 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

70
src/Dates.cpp
View file

@ -189,14 +189,31 @@ bool namedDates (const std::string& name, Variant& value)
value = Variant (now, Variant::type_date);
}
else if (name == "today" || name == "sod")
else if (name == "today")
{
t->tm_hour = t->tm_min = t->tm_sec = 0;
t->tm_isdst = -1;
value = Variant (mktime (t), Variant::type_date);
}
else if (name == "tomorrow" || name == "eod")
else if (name == "sod")
{
t->tm_mday++;
t->tm_hour = t->tm_min = t->tm_sec = 0;
t->tm_isdst = -1;
value = Variant (mktime (t), Variant::type_date);
}
else if (name == "eod")
{
t->tm_mday++;
t->tm_hour = t->tm_min = 0;
t->tm_sec = -1;
t->tm_isdst = -1;
value = Variant (mktime (t), Variant::type_date);
}
else if (name == "tomorrow")
{
t->tm_mday++;
t->tm_hour = t->tm_min = t->tm_sec = 0;
@ -245,7 +262,18 @@ bool namedDates (const std::string& name, Variant& value)
value = Variant (mktime (t), Variant::type_date);
}
else if (name == "soy" || name == "eoy")
else if (name == "eoy")
{
t->tm_hour = t->tm_min = 0;
t->tm_sec = -1;
t->tm_mon = 0;
t->tm_mday = 1;
t->tm_year++;
t->tm_isdst = -1;
value = Variant (mktime (t), Variant::type_date);
}
else if (name == "soy")
{
t->tm_hour = t->tm_min = t->tm_sec = 0;
t->tm_mon = 0;
@ -255,7 +283,23 @@ bool namedDates (const std::string& name, Variant& value)
value = Variant (mktime (t), Variant::type_date);
}
else if (name == "soq" || name == "eoq")
else if (name == "eoq")
{
t->tm_hour = t->tm_min = 0;
t->tm_sec = -1;
t->tm_mon += 3 - (t->tm_mon % 3);
if (t->tm_mon > 11)
{
t->tm_mon -= 12;
++t->tm_year;
}
t->tm_mday = 1;
t->tm_isdst = -1;
value = Variant (mktime (t), Variant::type_date);
}
else if (name == "soq")
{
t->tm_hour = t->tm_min = t->tm_sec = 0;
t->tm_mon += 3 - (t->tm_mon % 3);
@ -296,8 +340,9 @@ bool namedDates (const std::string& name, Variant& value)
else if (name == "eom" || name == "eocm")
{
t->tm_min = t->tm_sec = 0;
t->tm_hour = 24;
t->tm_min = 0;
t->tm_sec = -1;
t->tm_mday = daysInMonth (t->tm_year + 1900, t->tm_mon + 1);
t->tm_isdst = -1;
value = Variant (mktime (t), Variant::type_date);
@ -311,7 +356,16 @@ bool namedDates (const std::string& name, Variant& value)
value = Variant (mktime (t) - extra, Variant::type_date);
}
else if (name == "sow" || name == "eow" || name == "eocw")
else if (name == "eow" || name == "eocw")
{
t->tm_hour = t->tm_min = 0;
t->tm_sec = -1;
int extra = (7 - t->tm_wday) * 86400;
t->tm_isdst = -1;
value = Variant (mktime (t) + extra, Variant::type_date);
}
else if (name == "sow")
{
t->tm_hour = t->tm_min = t->tm_sec = 0;
int extra = (7 - t->tm_wday) * 86400;
@ -332,7 +386,9 @@ bool namedDates (const std::string& name, Variant& value)
else if (name == "eoww")
{
t->tm_hour = t->tm_min = t->tm_sec = 0;
t->tm_hour = 24;
t->tm_min = 0;
t->tm_sec = -1;
int extra = (5 - t->tm_wday) * 86400;
if (extra < 0)
extra += 7 * 86400;