Merge lp:~parinporecha/gtg/bug_fix into lp:~gtg/gtg/old-trunk

[Parin Porecha]

Updated the patch for the Bug #1039651. The properties of all the files haven't changed and I've made all the changes Izidor requested

[Izidor Matušov (izidor)]

I found a bug in the code. Let have the following structure:

A (start:tomorrow due:tomorrow)
 B (start:2012-11-10 due:2012-11-11 marked as done)

Task A should be green but after applying your patch it is gray. You should ignore tasks marked as done when computing color.

review: Needs Fixing (code, run)

[lp:~parinporecha/gtg/bug_fix]

1266. By Parin Porecha on 2012-12-23

Updated Done/Dismissed tasks bug in the patch

[Parin Porecha (parinporecha)]

Thanks for finding the bug :)
I have fixed it.

Now, the tasks which are marked as Done or Dismissed will be ignored and only Active tasks will be considerd.

> I found a bug in the code. Let have the following structure:
>
> A (start:tomorrow due:tomorrow)
> B (start:2012-11-10 due:2012-11-11 marked as done)
>
> Task A should be green but after applying your patch it is gray. You should
> ignore tasks marked as done when computing color.

[Parin Porecha (parinporecha)]

Hey Izidor,

I have corrected the bug you showed.
The patch now works better !
plz check it

> I found a bug in the code. Let have the following structure:
>
> A (start:tomorrow due:tomorrow)
> B (start:2012-11-10 due:2012-11-11 marked as done)
>
> Task A should be green but after applying your patch it is gray. You should
> ignore tasks marked as done when computing color.

[Izidor Matušov (izidor)]

Thank you for your patch. I am sorry it took so long to review it (you know, Xmas holidays)

review: Approve (code, run)

=== modified file 'GTG/plugins/urgency_color/urgency_color.py'
--- GTG/plugins/urgency_color/urgency_color.py	2012-12-16 14:59:32 +0000
+++ GTG/plugins/urgency_color/urgency_color.py	2012-12-23 08:49:20 +0000
@@ -58,14 +58,15 @@
             return self._pref_data['color_overdue']
         else:
             return None
-
-    def bgcolor(self, node, standard_color):
+    
+    def get_node_bgcolor(self, node):
+        """ This method checks the background color of a node and returns the color """
         sdate = node.get_start_date()
         ddate = node.get_due_date()
         if (sdate != Date.no_date() != ddate):
             dayspan = (ddate - sdate).days
             daysleft = ddate.days_left()
-
+            
             redf = self._pref_data['reddays']
             reddays = int(ceil(redf*dayspan/100))
             color = 0
@@ -75,12 +76,36 @@
                 color = 2
             if daysleft < 0:
                 color = 3
+            
+            return color
+        else:
+            return None
+
+    def bgcolor(self, node, standard_color):
+        color = self.get_node_bgcolor(node)
+        
+        def __get_active_child_list(node):
+            """ This function recursively fetches a list
+            of all the children of a task which are active
+            (i.e - the subtasks which are not marked as 'Done' or 'Dismissed' """
+            child_list = []
+            for child_id in node.children:
+                child = node.req.get_task(child_id)
+                child_list += __get_active_child_list(child)
+                if child.get_status() in [child.STA_ACTIVE]:
+                    child_list.append(child_id)
+            return child_list
+
+        child_list = __get_active_child_list(node)
+
+        for child_id in child_list:
+            child = self.req.get_task(child_id)
+            color_of_child = self.get_node_bgcolor(child)
+            if color_of_child > color:
+                color = color_of_child
             # This list should be implemented in the settings
             #print "Giving color"
-            return self._get_color(color)
-        else:
-            # Return color for this node
-            return None
+        return self._get_color(color)
 
     def deactivate(self, plugin_api):
         """ Plugin is deactivated """
@@ -115,8 +140,7 @@
         self.spinbutton_reddays = self.builder.get_object('spinbutton_reddays')
 
         #   Colorbutton - OVERDUE
-        self.colorbutton_overdue = self.builder.get_object(
-                                                         'colorbutton_overdue')
+        self.colorbutton_overdue = self.builder.get_object('colorbutton_overdue')
 
         #   Colorbutton - HIGH
         self.colorbutton_high = self.builder.get_object('colorbutton_high')
@@ -188,7 +212,7 @@
         self.prefs_update_widgets()
 
     def prefs_load(self):
-        data = self._plugin_api.load_configuration_object(
+        data = self._plugin_api.load_configuration_object( \
             self.PLUGIN_NAME,
             'preferences')
         if not data or not isinstance(data, dict):
@@ -198,9 +222,9 @@
             # This is a dirty fix and thus should be removed in a
             # distant future, when nobody has "red", "yellow" or "green"
             # settings
-            namepairs = {'red': 'high', 'yellow': 'normal', 'green': 'low'}
-            for key, val in data.iteritems():
-                for oldname, newname in namepairs.iteritems():
+            namepairs = {'red':'high','yellow':'normal','green':'low'}
+            for key,val in data.iteritems():
+                for oldname,newname in namepairs.iteritems():
                     if key == "color_"+oldname:
                         data['color_'+newname] = data.pop(key)
             # Add new preferences where not present
@@ -209,8 +233,9 @@
                     data[setting] = self.DEFAULT_PREFS[setting]
             self._pref_data = dict(data)
 
+
     def prefs_store(self):
-        self._plugin_api.save_configuration_object(
+        self._plugin_api.save_configuration_object( \
             self.PLUGIN_NAME,
             'preferences',
             self._pref_data)