Merge lp:~gosteven/gtg/fix-816356 into lp:~gtg/gtg/old-trunk

[Steven You]

Fix bug #816356, when sorting the tasks by due date in tasksbrowser, it should compare the due date of the closest child tasks.

[Izidor Matušov (izidor)]

Thanks for a patch. However, your solution doesn't work for this scenario:

a (due next week)
b (due next month)
 - c (due tomorrow)

After applying your patch I would expect to have [when sorting by due date, close dates first]

b (due next month)
 -c (due tomorrow)
a (due next week)

(b's due date should be replaced by c's tomorrow)

review: Needs Fixing

[Izidor Matušov (izidor)]

Rejecting for inactivity. If you rework your patch, we will be glad to review it again.

review: Disapprove

Unmerged revisions

1151. By Steven You on 2012-04-06

Fix bug#816356, when sorting by due-date in taskbrowser, use the closest date of all children. Added a function in task.py: get_due_date_of_self_and_all_subtasks()

=== modified file 'GTG/core/task.py'
--- GTG/core/task.py	2012-03-30 12:58:10 +0000
+++ GTG/core/task.py	2012-04-06 13:04:21 +0000
@@ -266,6 +266,18 @@
 
         return zedate
 
+    #When sort by due date, we want to display the task with earliest due date(include subtasks) first
+    def get_due_date_of_self_and_all_subtasks(self):
+        zedate = self.due_date
+
+        for sub in self.get_subtasks():
+            subdate = sub.get_due_date()
+            if subdate and zedate > subdate:
+                zedate = subdate
+
+        return zedate
+
+
     def set_start_date(self, fulldate):
         self.start_date = Date(fulldate)
         self.sync()
 
=== modified file 'GTG/gtk/browser/treeview_factory.py'
--- GTG/gtk/browser/treeview_factory.py	2012-03-27 10:46:47 +0000
+++ GTG/gtk/browser/treeview_factory.py	2012-04-06 13:04:21 +0000
@@ -172,8 +172,8 @@
                 t1 = task1.get_start_date()
                 t2 = task2.get_start_date()
             elif para == 'due':
-                t1 = task1.get_due_date()
-                t2 = task2.get_due_date()
+                t1 = task1.get_due_date_of_self_and_all_subtasks()
+                t2 = task2.get_due_date_of_self_and_all_subtasks()
             elif para == 'closed':
                 t1 = task1.get_closed_date()
                 t2 = task2.get_closed_date()