X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=todolist.py;h=e55a2c0b518fbea8108631a8eda67360107100ea;hb=3653e27800b8b5a25d63f0fc7152134ef0504c38;hp=a919d15822a9a130c20a786325d894b83f29a6fd;hpb=0be1c32c67902394207fbde3fa41b95e4476ca5b;p=OpenERP%2Ftodolist.git

diff --git a/todolist.py b/todolist.py
index a919d15..e55a2c0 100644
--- a/todolist.py
+++ b/todolist.py
@@ -9,36 +9,25 @@ class Container(osv.Model):
     """TODO List : Tasks container"""
 
 
-    def _get_nb_task(self, cr, uid, ids, field, arg, context=None):
+    def _get_nb_tasks(self, cr, uid, ids, field, arg, context=None):
         result = {}
         for container in self.browse(cr, uid, ids, context=context):
             result[container.id] = len(container.tasks)
         return result
 #        return dict((c.id, len(c.tasks)) for c in self.browse(cr, uid, ids, context=context))
 
-
-    def _task_progress(self, cr, uid, ids, field, arg, context=None):
-        result = {}
-        for container in self.browse(cr, uid, ids, context=context):
-            done = total = 0
-            for task in container.tasks.browse(cr, uid, ids, context=context):
-                total += 1
-                if task.state == "done":
-                    done += 1
-            result[container.id] = total and done/total or 0.
+    def _get_nb_tasks_done(self, cr, uid, ids, field, arg, context=None):
+        result={}
+        for c in self.browse(cr, uid, ids, context=context):
+            result[c.id] = len([t for t in c.tasks if t.state == "done"])
         return result
 
-
-    def _task_progress2(self, cr, uid, ids, field, arg, context=None):
+    def _tasks_progress(self, cr, uid, ids, field, arg, context=None):
         result = {}
-        for container in self.browse(cr, uid, ids, context=context):
-            tasks = container.tasks
-            total = len(tasks)
-            done = len([t for t in tasks if t.state == "done"])
-            result[container.id] = total and done/total or 0.
+        for c in self.browse(cr, uid, ids, context=context):
+            result[c.id] = c.number_tasks and c.number_tasks_done*100./c.number_tasks or 0.
         return result
 
-
     _name = "todolist.container"
 
     _status = [("draft", "Draft"), ("pending", "Pending"), ("done", "Done")]
@@ -52,8 +41,9 @@ class Container(osv.Model):
         "state": fields.selection(_status, string="State", select=True),
         "tasks": fields.one2many("todolist.task", "container_id", string="Tasks"),
         "topics_id": fields.many2many("todolist.topic", "todolist_container_topic_rel", "container_id", "topic_id", string="Topics", domain=[("activated", "=","Active")]),
-        "number_tasks": fields.function(_get_nb_task, type="integer", string="Number of tasks"),
-        "progress_tasks": fields.function(_task_progress2, type="float", string="Progression"),
+        "number_tasks": fields.function(_get_nb_tasks, type="integer", string="Number of tasks"),
+        "number_tasks_done": fields.function(_get_nb_tasks_done, type="integer", string="Number of tasks"),
+        "progress_tasks": fields.function(_tasks_progress, type="float", string="Progression"),
     }
 
     _defaults = {
@@ -160,6 +150,22 @@ class Topic(osv.Model):
         return result
 
 
+    def _get_number_tasks(self, cr, uid, ids, field, arg, context=None):
+        result = 0
+        for topic in self.browse(cr, uid, ids, context=context):
+            for container in self.browse(cr, uid, ids, context=context):
+                result += container.number_tasks
+        return result
+
+
+    def _get_number_tasks_done(self, cr, uid, ids, field, arg, context=None):
+        result = 0
+        for topic in self.browse(cr, uid, ids, context=context):
+            for container in self.browse(cr, uid, ids, context=context):
+                result += container.number_tasks_done
+        return result
+
+
     _name = "todolist.topic"
 
     _states = [("Active", "Active"), ("Inactive", "Inactive")]
@@ -170,6 +176,8 @@ class Topic(osv.Model):
         "activated": fields.selection(_states, string="State", select=True),
         "todolist_ids": fields.many2many("todolist.container", "todolist_container_topic_rel", "topic_id", "Container_id", string="TO DO Lists"),
         "nb_lists": fields.function(_get_nb_lists, type="integer", string="Number of lists"),
+        "number_tasks": fields.function(_get_number_tasks, type="integer", string="Number of lists"),
+        "number_tasks_done": fields.function(_get_number_tasks_done, type="integer", string="Number of lists"),
     }
 
     _defaults = {