GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-28 22:47:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Dates

Browse source 
+ Fixed bug with 'socm' date calculation that failed on some days, by
  simplifying the implementation.
This commit is contained in:
Paul Beckingham 2012-12-31 08:48:57 -05:00
parent b0bb56cfa8
commit cfac0c42e8
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -71,6 +71,8 @@ Bugs
abbreviation.minimum is greater than 4. abbreviation.minimum is greater than 4.
+ Fixed bug where shadow files are not properly created when there is a missing + Fixed bug where shadow files are not properly created when there is a missing
.taskrc file (thanks to Pietro Cerutti). .taskrc file (thanks to Pietro Cerutti).
+ Fixed bug with 'socm' date calculation that failed on some days, by
simplifying the implementation.
------ old releases ------------------------------ ------ old releases ------------------------------

14
src/Date.cpp
View file

@ -830,8 +830,7 @@ bool Date::isRelativeDate (const std::string& input)
found == "eocw" || found == "eocw" ||
found == "sow" || found == "sow" ||
found == "soww" || found == "soww" ||
found == "socw" || found == "socw")
found == "socm")
{ {
if (found == "eow" || found == "eoww") if (found == "eow" || found == "eoww")
dow = 5; dow = 5;
@ -850,9 +849,6 @@ bool Date::isRelativeDate (const std::string& input)
else else
today += (dow - today.dayOfWeek ()) * 86400; today += (dow - today.dayOfWeek ()) * 86400;
if (found == "socm")
today -= (today.day () - 1) * 86400;
int m, d, y; int m, d, y;
today.toMDY (m, d, y); today.toMDY (m, d, y);
Date then (m, d, y); Date then (m, d, y);
@ -907,6 +903,14 @@ bool Date::isRelativeDate (const std::string& input)
_t = then._t; _t = then._t;
return true; return true;
} }
else if (found == "socm")
{
int m = today.month ();
int y = today.year ();
Date then (m, 1, y);
_t = then._t;
return true;
}
else if (found == "som") else if (found == "som")
{ {
int m = today.month () + 1; int m = today.month () + 1;