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

Feature #813

Browse source 
- applied patch for eoq and soq (thanks to Paulo Almeida)
This commit is contained in:
Federico Hernandez 2011-09-03 16:38:26 +02:00
parent 45a07f4d85
commit 4083883ec4
2 changed files with 13 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/Date.cpp
View file

@ -881,20 +881,10 @@ bool Date::isRelativeDate (const std::string& input)
}
else if (found == "eoq")
{
int m = today.month ();
int y = today.year ();
int q;
if (m <= 3)
q = 3;
else if (m >= 4 && m <= 6)
q = 6;
else if (m >= 7 && m <= 9)
q = 9;
else
q = 12;
Date then (q,
Date::daysInMonth (q, y),
y);
int eoq_month = today.month () + 2 - (today.month () - 1) % 3;
Date then (eoq_month,
daysInMonth (eoq_month, today.year ()),
today.year ());
_t = then._t;
return true;
}
@ -919,20 +909,14 @@ bool Date::isRelativeDate (const std::string& input)
}
else if (found == "soq")
{
int m = today.month ();
int m = today.month () + 3 - (today.month () - 1) % 3;
int y = today.year ();
int q;
if (m <= 3)
q = 1;
else if (m >= 4 && m <= 6)
q = 4;
else if (m >= 7 && m <= 9)
q = 7;
else
q = 10;
Date then (q,
1,
y);
if (m > 12)
{
m -=12;
y++;
}
Date then (m , 1, y);
_t = then._t;
return true;
}