GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-27 19:17:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ISO8601: Migrated more Date instances to ISO8601d

Browse source
This commit is contained in:
Paul Beckingham 2015-09-26 23:20:08 -04:00
parent 68c6afbdd4
commit 244a80f799
6 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Config.cpp
View file

@ -33,7 +33,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h> #include <stdlib.h>
#include <Date.h> #include <ISO8601.h>
#include <FS.h> #include <FS.h>
#include <Timer.h> #include <Timer.h>
#include <JSON.h> #include <JSON.h>
@ -574,7 +574,7 @@ void Config::createDefaultRC (const std::string& rc, const std::string& data)
auto loc = _defaults.find ("data.location=~/.task"); auto loc = _defaults.find ("data.location=~/.task");
// loc+0^ +14^ +21^ // loc+0^ +14^ +21^
Date now; ISO8601d now;
std::stringstream contents; std::stringstream contents;
contents << "# [Created by " contents << "# [Created by "
<< PACKAGE_STRING << PACKAGE_STRING

2
src/columns/ColDate.cpp
View file

@ -89,7 +89,7 @@ void ColumnDate::measure (Task& task, unsigned int& minimum, unsigned int& maxim
if (format == "") if (format == "")
format = context.config.get ("dateformat"); format = context.config.get ("dateformat");
minimum = maximum = Date::length (format); minimum = maximum = ISO8601d::length (format);
} }
else if (_style == "countdown") else if (_style == "countdown")
{ {

12
src/columns/ColDescription.cpp
View file

@ -27,7 +27,7 @@
#include <cmake.h> #include <cmake.h>
#include <stdlib.h> #include <stdlib.h>
#include <Context.h> #include <Context.h>
#include <Date.h> #include <ISO8601.h>
#include <ColDescription.h> #include <ColDescription.h>
#include <text.h> #include <text.h>
#include <utf8.h> #include <utf8.h>
@ -55,7 +55,7 @@ ColumnDescription::ColumnDescription ()
if (_dateformat == "") if (_dateformat == "")
_dateformat = context.config.get ("dateformat"); _dateformat = context.config.get ("dateformat");
std::string t = Date ().toString (_dateformat); std::string t = ISO8601d ().toString (_dateformat);
std::string d = STRING_COLUMN_EXAMPLES_DESC; std::string d = STRING_COLUMN_EXAMPLES_DESC;
std::string a1 = STRING_COLUMN_EXAMPLES_ANNO1; std::string a1 = STRING_COLUMN_EXAMPLES_ANNO1;
std::string a2 = STRING_COLUMN_EXAMPLES_ANNO2; std::string a2 = STRING_COLUMN_EXAMPLES_ANNO2;
@ -102,7 +102,7 @@ void ColumnDescription::measure (Task& task, unsigned int& minimum, unsigned int
if (task.annotation_count) if (task.annotation_count)
{ {
unsigned int min_anno = _indent + Date::length (_dateformat); unsigned int min_anno = _indent + ISO8601d::length (_dateformat);
if (min_anno > minimum) if (min_anno > minimum)
minimum = min_anno; minimum = min_anno;
@ -132,7 +132,7 @@ void ColumnDescription::measure (Task& task, unsigned int& minimum, unsigned int
if (task.annotation_count) if (task.annotation_count)
{ {
auto min_anno = Date::length (_dateformat); auto min_anno = ISO8601d::length (_dateformat);
std::map <std::string, std::string> annos; std::map <std::string, std::string> annos;
task.getAnnotations (annos); task.getAnnotations (annos);
for (auto& i : annos) for (auto& i : annos)
@ -187,7 +187,7 @@ void ColumnDescription::render (
{ {
for (auto& i : annos) for (auto& i : annos)
{ {
Date dt (strtol (i.first.substr (11).c_str (), NULL, 10)); ISO8601d dt (strtol (i.first.substr (11).c_str (), NULL, 10));
description += "\n" + std::string (_indent, ' ') + dt.toString (_dateformat) + " " + i.second; description += "\n" + std::string (_indent, ' ') + dt.toString (_dateformat) + " " + i.second;
} }
} }
@ -218,7 +218,7 @@ void ColumnDescription::render (
{ {
for (auto& i : annos) for (auto& i : annos)
{ {
Date dt (atoi (i.first.substr (11).c_str ())); ISO8601d dt (strtol (i.first.substr (11).c_str (), NULL, 10));
description += " " + dt.toString (_dateformat) + " " + i.second; description += " " + dt.toString (_dateformat) + " " + i.second;
} }
} }

2
src/commands/CmdBurndown.cpp
View file

@ -744,7 +744,7 @@ void Chart::generateBars ()
{ {
case 'D': // month/day case 'D': // month/day
{ {
std::string month = Date::monthName (cursor.month ()); std::string month = ISO8601d::monthName (cursor.month ());
bar._major_label = month.substr (0, 3); bar._major_label = month.substr (0, 3);
sprintf (str, "%02d", cursor.day ()); sprintf (str, "%02d", cursor.day ());

2
src/commands/CmdHistory.cpp
View file

@ -478,7 +478,7 @@ int CmdGHistoryMonthly::execute (std::string& output)
view.set (row, 0, y); view.set (row, 0, y);
priorYear = y; priorYear = y;
} }
view.set (row, 1, Date::monthName(m)); view.set (row, 1, ISO8601d::monthName(m));
unsigned int addedBar = (widthOfBar * addedGroup[i.first]) / maxLine; unsigned int addedBar = (widthOfBar * addedGroup[i.first]) / maxLine;
unsigned int completedBar = (widthOfBar * completedGroup[i.first]) / maxLine; unsigned int completedBar = (widthOfBar * completedGroup[i.first]) / maxLine;

3
src/commands/CmdTimesheet.cpp
View file

@ -30,6 +30,7 @@
#include <Context.h> #include <Context.h>
#include <Filter.h> #include <Filter.h>
#include <ViewText.h> #include <ViewText.h>
#include <ISO8601.h>
#include <Date.h> #include <Date.h>
#include <main.h> #include <main.h>
#include <i18n.h> #include <i18n.h>
@ -64,7 +65,7 @@ int CmdTimesheet::execute (std::string& output)
std::vector <Task> all = context.tdb2.all_tasks (); std::vector <Task> all = context.tdb2.all_tasks ();
// What day of the week does the user consider the first? // What day of the week does the user consider the first?
int weekStart = Date::dayOfWeek (context.config.get ("weekstart")); int weekStart = ISO8601d::dayOfWeek (context.config.get ("weekstart"));
if (weekStart != 0 && weekStart != 1) if (weekStart != 0 && weekStart != 1)
throw std::string (STRING_DATE_BAD_WEEKSTART); throw std::string (STRING_DATE_BAD_WEEKSTART);