gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Bug Fix - #219

Browse Source 
- Fixed bug in timesheet report.  It was using color without regard
  to whether the output was to a TTY or not.  Thanks to John Florian.
This commit is contained in:
Paul Beckingham
2009-07-16 22:14:50 -04:00
parent 9100217da0
commit 6c2fc108b4
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/report.cpp
View File

@@ -1127,17 +1127,19 @@ std::string handleReportTimesheet ()
if (context.sequence.size () == 1) if (context.sequence.size () == 1)
quantity = context.sequence[0]; quantity = context.sequence[0];
bool color = context.config.get ("color", true) || context.config.get (std::string ("_forcecolor"), false);
std::stringstream out; std::stringstream out;
for (int week = 0; week < quantity; ++week) for (int week = 0; week < quantity; ++week)
{ {
Date endString (end); Date endString (end);
endString -= 86400; endString -= 86400;
out << std::endl out << std::endl
<< Text::colorize (Text::bold, Text::nocolor) << (color ? Text::colorize (Text::bold, Text::nocolor) : "")
<< start.toString (context.config.get ("dateformat", "m/d/Y")) << start.toString (context.config.get ("dateformat", "m/d/Y"))
<< " - " << " - "
<< endString.toString (context.config.get ("dateformat", "m/d/Y")) << endString.toString (context.config.get ("dateformat", "m/d/Y"))
<< Text::colorize () << (color ? Text::colorize () : "")
<< std::endl; << std::endl;
// Render the completed table. // Render the completed table.
@@ -1148,9 +1150,14 @@ std::string handleReportTimesheet ()
completed.addColumn ("Due"); completed.addColumn ("Due");
completed.addColumn ("Description"); completed.addColumn ("Description");
completed.setColumnUnderline (1); if (color && context.config.get (std::string ("fontunderline"), "true"))
completed.setColumnUnderline (2); {
completed.setColumnUnderline (3); completed.setColumnUnderline (1);
completed.setColumnUnderline (2);
completed.setColumnUnderline (3);
}
else
completed.setTableDashedUnderline ();
completed.setColumnWidth (0, Table::minimum); completed.setColumnWidth (0, Table::minimum);
completed.setColumnWidth (1, Table::minimum); completed.setColumnWidth (1, Table::minimum);
@@ -1175,7 +1182,7 @@ std::string handleReportTimesheet ()
completed.addCell (row, 2, getDueDate (*task)); completed.addCell (row, 2, getDueDate (*task));
completed.addCell (row, 3, getFullDescription (*task)); completed.addCell (row, 3, getFullDescription (*task));
if (context.config.get ("color", true) || context.config.get (std::string ("_forcecolor"), false)) if (color)
{ {
Text::color fg = Text::colorCode (task->get ("fg")); Text::color fg = Text::colorCode (task->get ("fg"));
Text::color bg = Text::colorCode (task->get ("bg")); Text::color bg = Text::colorCode (task->get ("bg"));
@@ -1228,7 +1235,7 @@ std::string handleReportTimesheet ()
started.addCell (row, 2, getDueDate (*task)); started.addCell (row, 2, getDueDate (*task));
started.addCell (row, 3, getFullDescription (*task)); started.addCell (row, 3, getFullDescription (*task));
if (context.config.get ("color", true) || context.config.get (std::string ("_forcecolor"), false)) if (color)
{ {
Text::color fg = Text::colorCode (task->get ("fg")); Text::color fg = Text::colorCode (task->get ("fg"));
Text::color bg = Text::colorCode (task->get ("bg")); Text::color bg = Text::colorCode (task->get ("bg"));