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

CmdCustom: 'rc.report.<report>.sort:none' now retains UUID order only

Browse Source
This commit is contained in:
Paul Beckingham
2015-08-28 07:36:04 -04:00
parent ec0728ff8e
commit 6c643d66dd
1 changed files with 7 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/commands/CmdCustom.cpp
View File

@@ -101,31 +101,14 @@ int CmdCustom::execute (std::string& output)
if (sortOrder.size () && if (sortOrder.size () &&
sortOrder[0] == "none") sortOrder[0] == "none")
{ {
// If context.cli2._id_ranges is [4,3,5], yield [1,0,2], which is the sort // Assemble a sequence vector that represents the tasks listed in
// order of the filtereed list, which will contain [3,4,5]. // context.cli2._uuid_ranges, in the order in which they appear. This
// equates to no sorting, just a specified order.
sortOrder.clear (); sortOrder.clear ();
for (auto& i : context.cli2._id_ranges) for (auto& i : context.cli2._uuid_list)
{ for (unsigned int t = 0; t < filtered.size (); ++t)
int first = strtol (i.first.c_str (), NULL, 10); if (filtered[t].get ("uuid") == i)
int second = strtol (i.second.c_str (), NULL, 10); sequence.push_back (t);
if (first == second)
{
//sequence.push_back (first - 1);
for (unsigned int t = 0; t < filtered.size (); ++t)
if (filtered[t].id == first)
sequence.push_back (t);
}
else
{
for (int id = first; id <= second; id++)
//sequence.push_back (id - 1);
for (unsigned int t = 0; t < filtered.size (); ++t)
if (filtered[t].id == id)
sequence.push_back (t);
}
}
} }
else else
{ {