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 
- Eliminatd helpers.cpp, and the redundant getFullDescription function
  therein.
- The timesheet report now uses standard description formatting.
This commit is contained in:
Paul Beckingham 2012-03-03 16:08:21 -05:00
parent a300dba2df
commit 761ef296ad
4 changed files with 27 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/commands/CmdTimesheet.cpp
View file

@ -127,7 +127,20 @@ int CmdTimesheet::execute (std::string& output)
completed.set (row, 2, dt.toString (format));
}
completed.set (row, 3, getFullDescription (*task, "timesheet"), c);
std::string description = task->get ("description");
int indent = context.config.getInteger ("indent.annotation");
std::map <std::string, std::string> annotations;
task->getAnnotations (annotations);
std::map <std::string, std::string>::iterator ann;
for (ann = annotations.begin (); ann != annotations.end (); ++ann)
description += "\n"
+ std::string (indent, ' ')
+ Date (ann->first.substr (11)).toString (context.config.get ("dateformat"))
+ " "
+ ann->second;
completed.set (row, 3, description, c);
}
}
}
@ -171,8 +184,20 @@ int CmdTimesheet::execute (std::string& output)
started.set (row, 2, dt.toString (format));
}
started.set (row, 3, getFullDescription (*task, "timesheet"), c);
std::string description = task->get ("description");
int indent = context.config.getInteger ("indent.annotation");
std::map <std::string, std::string> annotations;
task->getAnnotations (annotations);
std::map <std::string, std::string>::iterator ann;
for (ann = annotations.begin (); ann != annotations.end (); ++ann)
description += "\n"
+ std::string (indent, ' ')
+ Date (ann->first.substr (11)).toString (context.config.get ("dateformat"))
+ " "
+ ann->second;
started.set (row, 3, description, c);
}
}
}