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

Code Cleanup

Browse source 
- Eliminated redundant getDueDate helper function.
This commit is contained in:
Paul Beckingham 2012-03-03 14:40:35 -05:00
parent 0f4bcefcff
commit facb795f88
5 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/commands/CmdInfo.cpp
View file

@ -219,7 +219,8 @@ int CmdInfo::execute (std::string& output)
if (format == "")
format = context.config.get ("dateformat");
view.set (row, 1, getDueDate (*task, format));
Date dt (task->get_date ("due"));
view.set (row, 1, dt.toString (context.config.get ("dateformat")));
}
// wait

2
src/commands/CmdShow.cpp
View file

@ -374,7 +374,7 @@ int CmdShow::execute (std::string& output)
#endif
// Check for bad values in rc.annotations.
// TODO Reconsider this.
// TODO Deprecated.
std::string annotations = context.config.get ("annotations");
if (annotations != "full" &&
annotations != "sparse" &&

16
src/commands/CmdTimesheet.cpp
View file

@ -120,7 +120,13 @@ int CmdTimesheet::execute (std::string& output)
if (format == "")
format = context.config.get ("dateformat");
completed.set (row, 1, task->get ("project"), c);
completed.set (row, 2, getDueDate (*task, format), c);
if(task->has ("due"))
{
Date dt (task->get_date ("due"));
completed.set (row, 2, dt.toString (format));
}
completed.set (row, 3, getFullDescription (*task, "timesheet"), c);
}
}
@ -158,7 +164,13 @@ int CmdTimesheet::execute (std::string& output)
if (format == "")
format = context.config.get ("dateformat");
started.set (row, 1, task->get ("project"), c);
started.set (row, 2, getDueDate (*task, format), c);
if(task->has ("due"))
{
Date dt (task->get_date ("due"));
started.set (row, 2, dt.toString (format));
}
started.set (row, 3, getFullDescription (*task, "timesheet"), c);
}

13
src/helpers.cpp
View file

@ -106,17 +106,4 @@ std::string getFullDescription (Task& task, const std::string& report)
return desc;
}
///////////////////////////////////////////////////////////////////////////////
std::string getDueDate (Task& task, const std::string& format)
{
std::string due = task.get ("due");
if (due.length ())
{
Date d (atoi (due.c_str ()));
due = d.toString (format);
}
return due;
}
////////////////////////////////////////////////////////////////////////////////

1
src/main.h
View file

@ -50,7 +50,6 @@ bool nag (Task&);
// helpers.cpp
std::string getFullDescription (Task&, const std::string&);
std::string getDueDate (Task&, const std::string&);
// rules.cpp
void initializeColorRules ();