GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-29 10:03:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CmdHistory: Migrated from Date to ISO8601d

Browse source
This commit is contained in:
Paul Beckingham 2015-10-03 19:22:51 -04:00
parent aa3304798b
commit 69c8125ea7
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/commands/CmdHistory.cpp
View file

@ -32,7 +32,6 @@
#include <main.h> #include <main.h>
#include <text.h> #include <text.h>
#include <i18n.h> #include <i18n.h>
#include <Date.h>
#include <ISO8601.h> #include <ISO8601.h>
#include <CmdHistory.h> #include <CmdHistory.h>
@ -72,11 +71,11 @@ int CmdHistoryMonthly::execute (std::string& output)
for (auto& task : filtered) for (auto& task : filtered)
{ {
Date entry (task.get_date ("entry")); ISO8601d entry (task.get_date ("entry"));
Date end; ISO8601d end;
if (task.has ("end")) if (task.has ("end"))
end = Date (task.get_date ("end")); end = ISO8601d (task.get_date ("end"));
time_t epoch = entry.startOfMonth ().toEpoch (); time_t epoch = entry.startOfMonth ().toEpoch ();
groups[epoch] = 0; groups[epoch] = 0;
@ -129,7 +128,7 @@ int CmdHistoryMonthly::execute (std::string& output)
totalCompleted += completedGroup [i.first]; totalCompleted += completedGroup [i.first];
totalDeleted += deletedGroup [i.first]; totalDeleted += deletedGroup [i.first];
Date dt (i.first); ISO8601d dt (i.first);
int m, d, y; int m, d, y;
dt.toMDY (m, d, y); dt.toMDY (m, d, y);
@ -234,11 +233,11 @@ int CmdHistoryAnnual::execute (std::string& output)
for (auto& task : filtered) for (auto& task : filtered)
{ {
Date entry (task.get_date ("entry")); ISO8601d entry (task.get_date ("entry"));
Date end; ISO8601d end;
if (task.has ("end")) if (task.has ("end"))
end = Date (task.get_date ("end")); end = ISO8601d (task.get_date ("end"));
time_t epoch = entry.startOfYear ().toEpoch (); time_t epoch = entry.startOfYear ().toEpoch ();
groups[epoch] = 0; groups[epoch] = 0;
@ -290,7 +289,7 @@ int CmdHistoryAnnual::execute (std::string& output)
totalCompleted += completedGroup [i.first]; totalCompleted += completedGroup [i.first];
totalDeleted += deletedGroup [i.first]; totalDeleted += deletedGroup [i.first];
Date dt (i.first); ISO8601d dt (i.first);
int m, d, y; int m, d, y;
dt.toMDY (m, d, y); dt.toMDY (m, d, y);
@ -393,11 +392,11 @@ int CmdGHistoryMonthly::execute (std::string& output)
for (auto& task : filtered) for (auto& task : filtered)
{ {
Date entry (task.get_date ("entry")); ISO8601d entry (task.get_date ("entry"));
Date end; ISO8601d end;
if (task.has ("end")) if (task.has ("end"))
end = Date (task.get_date ("end")); end = ISO8601d (task.get_date ("end"));
time_t epoch = entry.startOfMonth ().toEpoch (); time_t epoch = entry.startOfMonth ().toEpoch ();
groups[epoch] = 0; groups[epoch] = 0;
@ -470,7 +469,7 @@ int CmdGHistoryMonthly::execute (std::string& output)
totalCompleted += completedGroup[i.first]; totalCompleted += completedGroup[i.first];
totalDeleted += deletedGroup[i.first]; totalDeleted += deletedGroup[i.first];
Date dt (i.first); ISO8601d dt (i.first);
int m, d, y; int m, d, y;
dt.toMDY (m, d, y); dt.toMDY (m, d, y);
@ -593,11 +592,11 @@ int CmdGHistoryAnnual::execute (std::string& output)
for (auto& task : filtered) for (auto& task : filtered)
{ {
Date entry (task.get_date ("entry")); ISO8601d entry (task.get_date ("entry"));
Date end; ISO8601d end;
if (task.has ("end")) if (task.has ("end"))
end = Date (task.get_date ("end")); end = ISO8601d (task.get_date ("end"));
time_t epoch = entry.startOfYear ().toEpoch (); time_t epoch = entry.startOfYear ().toEpoch ();
groups[epoch] = 0; groups[epoch] = 0;
@ -669,7 +668,7 @@ int CmdGHistoryAnnual::execute (std::string& output)
totalCompleted += completedGroup[i.first]; totalCompleted += completedGroup[i.first];
totalDeleted += deletedGroup[i.first]; totalDeleted += deletedGroup[i.first];
Date dt (i.first); ISO8601d dt (i.first);
int m, d, y; int m, d, y;
dt.toMDY (m, d, y); dt.toMDY (m, d, y);