GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-31 17:03:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug Fix = #317, sorting

Browse source 
- Fixed bug #317 which colored tasks in the 'completed' report according to
  due dates, which are no longer relevant to a completed task (thanks to
  Cory Donnelly).
- Fixed bug that was causing the 'completed' report to sort incorrectly.
This commit is contained in:
Paul Beckingham 2009-11-29 08:21:33 -05:00
parent b5f65850f8
commit 8d784da0ae
4 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -9,6 +9,10 @@
to Juergen Daubert). to Juergen Daubert).
+ Fixed bug #327 that allowed the removal of a due date from a recurring + Fixed bug #327 that allowed the removal of a due date from a recurring
task. task.
+ Fixed bug #317 which colored tasks in the 'completed' report according to
due dates, which are no longer relevant to a completed task (thanks to
Cory Donnelly).
+ Fixed bug that was causing the 'completed' report to sort incorrectly.
------ old releases ------------------------------ ------ old releases ------------------------------

1
src/custom.cpp
View file

@ -461,6 +461,7 @@ int runCustomReport (
std::string column = sortColumn->substr (0, sortColumn->length () - 1); std::string column = sortColumn->substr (0, sortColumn->length () - 1);
char direction = (*sortColumn)[sortColumn->length () - 1]; char direction = (*sortColumn)[sortColumn->length () - 1];
// TODO This code should really be using Att::type.
if (column == "id") if (column == "id")
table.sortOn (columnIndex[column], table.sortOn (columnIndex[column],
(direction == '+' ? (direction == '+' ?

14
src/rules.cpp
View file

@ -91,6 +91,8 @@ void autoColorize (
// Note: fg, bg already contain colors specifically assigned via command. // Note: fg, bg already contain colors specifically assigned via command.
// Note: These rules form a hierarchy - the last rule is King. // Note: These rules form a hierarchy - the last rule is King.
Task::status status = task.getStatus ();
// Colorization of the tagged. // Colorization of the tagged.
if (gsFg["color.tagged"] != Text::nocolor || if (gsFg["color.tagged"] != Text::nocolor ||
gsBg["color.tagged"] != Text::nocolor) gsBg["color.tagged"] != Text::nocolor)
@ -146,9 +148,11 @@ void autoColorize (
} }
} }
// Colorization of the active. // Colorization of the active, if not completed/deleted.
if (gsFg["color.active"] != Text::nocolor || if ((gsFg["color.active"] != Text::nocolor ||
gsBg["color.active"] != Text::nocolor) gsBg["color.active"] != Text::nocolor) &&
status != Task::completed &&
status != Task::deleted)
{ {
if (task.has ("start")) if (task.has ("start"))
{ {
@ -202,7 +206,9 @@ void autoColorize (
} }
// Colorization of the due and overdue. // Colorization of the due and overdue.
if (task.has ("due")) if (task.has ("due") &&
status != Task::completed &&
status != Task::deleted)
{ {
std::string due = task.get ("due"); std::string due = task.get ("due");
switch (getDueState (due)) switch (getDueState (due))

10
src/tests/bug.bulk.t
View file

@ -28,7 +28,7 @@
use strict; use strict;
use warnings; use warnings;
use Test::More tests => 14; use Test::More tests => 15;
# Create the rc file. # Create the rc file.
if (open my $fh, '>', 'bulk.rc') if (open my $fh, '>', 'bulk.rc')
@ -49,13 +49,13 @@ qx{../task rc:bulk.rc add t4 due:thursday};
qx{../task rc:bulk.rc add t5 due:friday}; qx{../task rc:bulk.rc add t5 due:friday};
qx{../task rc:bulk.rc add t6 due:saturday}; qx{../task rc:bulk.rc add t6 due:saturday};
my $output = qx{yes|../task rc:bulk.rc pro:p1 pri:M 4 5 6}; my $output = qx{echo "quit"|../task rc:bulk.rc pro:p1 pri:M 4 5 6};
like ($output, qr/Modified 0 tasks/, '"quit" prevents any further modifications');
my $output = qx{echo "all"|../task rc:bulk.rc pro:p1 pri:M 4 5 6};
unlike ($output, qr/Task 4 "t4"\n - No changes were made/, 'Task 4 modified'); unlike ($output, qr/Task 4 "t4"\n - No changes were made/, 'Task 4 modified');
unlike ($output, qr/Task 5 "t5"\n - No changes were made/, 'Task 5 modified'); unlike ($output, qr/Task 5 "t5"\n - No changes were made/, 'Task 5 modified');
unlike ($output, qr/Task 6 "t6"\n - No changes were made/, 'Task 6 modified'); unlike ($output, qr/Task 6 "t6"\n - No changes were made/, 'Task 6 modified');
#diag ("---");
#diag ($output);
#diag ("---");
$output = qx{../task rc:bulk.rc info 4}; $output = qx{../task rc:bulk.rc info 4};
like ($output, qr/Project\s+p1/, 'project applied to 4'); like ($output, qr/Project\s+p1/, 'project applied to 4');