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

Sorting: All dates now sort the same as 'due' dates

Browse source
This commit is contained in:
Paul Beckingham 2015-09-08 17:57:25 -04:00
parent f60b77ef79
commit 3c54c78e3a
2 changed files with 26 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/sort.cpp
View file

@ -131,26 +131,8 @@ static bool sort_compare (int left, int right)
} }
// Due Date. // Due Date.
else if (field == "due") else if (field == "due" ||
{ field == "end" ||
const std::string& left_string = (*global_data)[left].get_ref (field);
const std::string& right_string = (*global_data)[right].get_ref (field);
if (left_string != "" && right_string == "")
return true;
if (left_string == "" && right_string != "")
return false;
if (left_string == right_string)
continue;
return ascending ? (left_string < right_string)
: (left_string > right_string);
}
// Date.
else if (field == "end" ||
field == "entry" || field == "entry" ||
field == "start" || field == "start" ||
field == "until" || field == "until" ||
@ -161,6 +143,12 @@ static bool sort_compare (int left, int right)
const std::string& left_string = (*global_data)[left].get_ref (field); const std::string& left_string = (*global_data)[left].get_ref (field);
const std::string& right_string = (*global_data)[right].get_ref (field); const std::string& right_string = (*global_data)[right].get_ref (field);
if (left_string != "" && right_string == "")
return true;
if (left_string == "" && right_string != "")
return false;
if (left_string == right_string) if (left_string == right_string)
continue; continue;
@ -244,6 +232,12 @@ static bool sort_compare (int left, int right)
const std::string& left_string = (*global_data)[left].get_ref (field); const std::string& left_string = (*global_data)[left].get_ref (field);
const std::string& right_string = (*global_data)[right].get_ref (field); const std::string& right_string = (*global_data)[right].get_ref (field);
if (left_string != "" && right_string == "")
return true;
if (left_string == "" && right_string != "")
return false;
if (left_string == right_string) if (left_string == right_string)
continue; continue;

24
test/sorting.t
View file

@ -90,7 +90,7 @@ class TestSorting(TestCase):
('project-', ('(?:three.+four|four.+three).+two.+one.+zero',)), ('project-', ('(?:three.+four|four.+three).+two.+one.+zero',)),
('project+', ('zero.+one.+two.+(?:three.+four|four.+three)',)), ('project+', ('zero.+one.+two.+(?:three.+four|four.+three)',)),
('start-', ('one.+zero', 'one.+two', 'one.+three', 'one.+four',)), ('start-', ('one.+zero', 'one.+two', 'one.+three', 'one.+four',)),
('start+', ('zero.+one', 'two.+one', 'three.+one', 'four.+one',)), ('start+', ('one.+zero', 'one.+two', 'one.+three', 'one.+four',)),
('due-', ('three.+(?:two.+four|four.+two).+one.+zero',)), ('due-', ('three.+(?:two.+four|four.+two).+one.+zero',)),
('due+', ('one.+(?:two.+four|four.+two).+three.+zero',)), ('due+', ('one.+(?:two.+four|four.+two).+three.+zero',)),
('description-', ('zero.+two.+three.+one.+four',)), ('description-', ('zero.+two.+three.+one.+four',)),
@ -103,9 +103,9 @@ class TestSorting(TestCase):
('priority+,project+', ('zero.+three.+two.+one.+four',)), ('priority+,project+', ('zero.+three.+two.+one.+four',)),
('priority-,start-', ('one.+four.+two.+three.+zero',)), ('priority-,start-', ('one.+four.+two.+three.+zero',)),
('priority-,start+', ('four.+one.+two.+three.+zero',)), ('priority-,start+', ('one.+four.+two.+three.+zero',)),
('priority+,start-', ('zero.+three.+two.+one.+four',)), ('priority+,start-', ('zero.+three.+two.+one.+four',)),
('priority+,start+', ('zero.+three.+two.+four.+one',)), ('priority+,start+', ('zero.+three.+two.+one.+four',)),
('priority-,due-', ('four.+one.+two.+three.+zero',)), ('priority-,due-', ('four.+one.+two.+three.+zero',)),
('priority-,due+', ('one.+four.+two.+three.+zero',)), ('priority-,due+', ('one.+four.+two.+three.+zero',)),
@ -139,23 +139,23 @@ class TestSorting(TestCase):
('start-,priority-', ('one.+four.+two.+three.+zero',)), ('start-,priority-', ('one.+four.+two.+three.+zero',)),
('start-,priority+', ('one.+zero.+three.+two.+four',)), ('start-,priority+', ('one.+zero.+three.+two.+four',)),
('start+,priority-', ('four.+two.+three.+zero.+one',)), ('start+,priority-', ('one.+four.+two.+three.+zero',)),
('start+,priority+', ('zero.+three.+two.+four.+one',)), ('start+,priority+', ('one.+zero.+three.+two.+four',)),
('start-,project-', ('one.+(?:three.+four|four.+three).+two.+zero',)), ('start-,project-', ('one.+(?:three.+four|four.+three).+two.+zero',)),
('start-,project+', ('one.+zero.+two.+(?:three.+four|four.+three)',)), ('start-,project+', ('one.+zero.+two.+(?:three.+four|four.+three)',)),
('start+,project-', ('(?:three.+four|four.+three).+two.+zero.+one',)), ('start+,project-', ('one.+(?:three.+four|four.+three).+two.+zero',)),
('start+,project+', ('zero.+two.+(?:three.+four|four.+three).+one',)), ('start+,project+', ('one.+zero.+two.+(?:three.+four|four.+three)',)),
('start-,due-', ('one.+three.+(?:four.+two|two.+four).+zero',)), ('start-,due-', ('one.+three.+(?:four.+two|two.+four).+zero',)),
('start-,due+', ('one.+(?:four.+two|two.+four).+three.+zero',)), ('start-,due+', ('one.+(?:four.+two|two.+four).+three.+zero',)),
('start+,due-', ('three.+(?:four.+two|two.+four).+zero.+one',)), ('start+,due-', ('one.+three.+(?:four.+two|two.+four).+zero',)),
('start+,due+', ('(?:four.+two|two.+four).+three.+zero.+one',)), ('start+,due+', ('one.+(?:four.+two|two.+four).+three.+zero',)),
('start-,description-', ('one.+zero.+two.+three.+four',)), ('start-,description-', ('one.+zero.+two.+three.+four',)),
('start-,description+', ('one.+four.+three.+two.+zero',)), ('start-,description+', ('one.+four.+three.+two.+zero',)),
('start+,description-', ('zero.+two.+three.+four.+one',)), ('start+,description-', ('one.+zero.+two.+three.+four',)),
('start+,description+', ('four.+three.+two.+zero.+one',)), ('start+,description+', ('one.+four.+three.+two.+zero',)),
('due-,priority-', ('three.+four.+two.+one.+zero',)), ('due-,priority-', ('three.+four.+two.+one.+zero',)),
('due-,priority+', ('three.+two.+four.+one.+zero',)), ('due-,priority+', ('three.+two.+four.+one.+zero',)),
@ -198,7 +198,7 @@ class TestSorting(TestCase):
('description+,due+', ('four.+one.+three.+two.+zero',)), ('description+,due+', ('four.+one.+three.+two.+zero',)),
# Four sort columns. # Four sort columns.
('start+,project+,due+,priority+', ('zero.+two.+four.+three.+one',)), ('start+,project+,due+,priority+', ('one.+zero.+two.+four.+three',)),
('project+,due+,priority+,start+', ('zero.+one.+two.+four.+three',)), ('project+,due+,priority+,start+', ('zero.+one.+two.+four.+three',)),
) )