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

ColUDA: Converted from ISO8601 to Datetime/Duration

Browse source
This commit is contained in:
Paul Beckingham 2016-12-11 22:23:53 -05:00
parent 4c2fff1b39
commit c8bdfab4b4
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/columns/ColUDA.cpp
View file

@ -27,7 +27,8 @@
#include <cmake.h> #include <cmake.h>
#include <ColUDA.h> #include <ColUDA.h>
#include <Context.h> #include <Context.h>
#include <ISO8601.h> #include <Datetime.h>
#include <Duration.h>
#include <shared.h> #include <shared.h>
#include <format.h> #include <format.h>
#include <utf8.h> #include <utf8.h>
@ -265,14 +266,14 @@ void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& ma
// rc.report.<report>.dateformat // rc.report.<report>.dateformat
// rc.dateformat.report // rc.dateformat.report
// rc.dateformat // rc.dateformat
ISO8601d date ((time_t) strtol (value.c_str (), NULL, 10)); Datetime date ((time_t) strtol (value.c_str (), NULL, 10));
std::string format = context.config.get ("report." + _report + ".dateformat"); std::string format = context.config.get ("report." + _report + ".dateformat");
if (format == "") if (format == "")
format = context.config.get ("dateformat.report"); format = context.config.get ("dateformat.report");
if (format == "") if (format == "")
format = context.config.get ("dateformat"); format = context.config.get ("dateformat");
minimum = maximum = ISO8601d::length (format); minimum = maximum = Datetime::length (format);
} }
} }
else if (_style == "indicator") else if (_style == "indicator")
@ -318,7 +319,7 @@ void ColumnUDADate::render (
format = context.config.get ("dateformat"); format = context.config.get ("dateformat");
} }
renderStringLeft (lines, width, color, ISO8601d ((time_t) strtol (value.c_str (), NULL, 10)).toString (format)); renderStringLeft (lines, width, color, Datetime ((time_t) strtol (value.c_str (), NULL, 10)).toString (format));
} }
else if (_style == "indicator") else if (_style == "indicator")
{ {
@ -374,7 +375,7 @@ void ColumnUDADuration::measure (Task& task, unsigned int& minimum, unsigned int
{ {
std::string value = task.get (_name); std::string value = task.get (_name);
if (value != "") if (value != "")
minimum = maximum = ISO8601p (value).format ().length (); minimum = maximum = Duration (value).formatISO ().length ();
} }
else if (_style == "indicator") else if (_style == "indicator")
{ {
@ -406,7 +407,7 @@ void ColumnUDADuration::render (
if (_style == "default") if (_style == "default")
{ {
std::string value = task.get (_name); std::string value = task.get (_name);
renderStringRight (lines, width, color, ISO8601p (value).format ()); renderStringRight (lines, width, color, Duration (value).formatISO ());
} }
else if (_style == "indicator") else if (_style == "indicator")
{ {