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

Bug #1056

Browse source 
- Fix #1056: the 'projects' command now outputs abstract parents
  and reduces repetition by not printing parent names in front of
  children names.
- Project name indentation is not affected by the first character
  being a period and/or the last character being a period.
- Unit tests for above.
This commit is contained in:
Scott Kostyshak 2012-09-21 16:29:32 -04:00 • committed by Paul Beckingham
parent a3242f7b5b
commit be5dc8ab90
6 changed files with 147 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/commands/CmdProjects.cpp
View file

@ -27,6 +27,7 @@
#define L10N // Localization complete.
#include <algorithm>
#include <sstream>
#include <Context.h>
#include <ViewText.h>
@ -119,9 +120,22 @@ int CmdProjects::execute (std::string& output)
view.add (Column::factory ("string.right", STRING_CMD_PROJECTS_PRI_M));
view.add (Column::factory ("string.right", STRING_CMD_PROJECTS_PRI_H));
std::vector <std::string> processed;
std::map <std::string, int>::iterator project;
for (project = unique.begin (); project != unique.end (); ++project)
{
const std::vector <std::string> parents = extractParents (project->first);
std::vector <std::string>::const_iterator parent;
for (parent = parents.begin (); parent != parents.end (); parent++)
{
if (std::find (processed.begin (), processed.end (), *parent)
== processed.end ())
{
int row = view.addRow ();
view.set (row, 0, indentProject (*parent));
processed.push_back (*parent);
}
}
int row = view.addRow ();
view.set (row, 0, (project->first == ""
? STRING_CMD_PROJECTS_NONE
@ -131,6 +145,7 @@ int CmdProjects::execute (std::string& output)
view.set (row, 3, low[project->first]);
view.set (row, 4, medium[project->first]);
view.set (row, 5, high[project->first]);
processed.push_back (project->first);
}
int number_projects = unique.size ();