Ajout champs fonction pour nb de taches par topics

[OpenERP/todolist.git] / todolist.py

diff --git a/todolist.py b/todolist.py
index 5a40890..3c81f5e 100644 (file)
--- 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 = {
@@ -90,6 +80,11 @@ class Container(osv.Model):
         return self
 
 
+    def search(self, cr, user, args=[], offset=0, limit=None, order=None, context=None, count=False):
+        args.append(("create_uid", "=", user))
+        if len(args) != 1:
+            args.insert(0, "&")
+        return osv.Model.search(self, cr, user, args, offset, limit, order, context, count)
 
 
 class Task(osv.Model):
@@ -136,12 +131,33 @@ class Task(osv.Model):
         self.write(cr, uid, ids, {"state": "done"}, context=context)
         return self
 
+    def search(self, cr, user, args=[], offset=0, limit=None, order=None, context=None, count=False):
+        args.append(("create_uid", "=", user))
+        if len(args) != 1:
+            args.insert(0, "&")
+        return osv.Model.search(self, cr, user, args, offset, limit, order, context, count)
+
+
 
-# ------------------- class Theme ------------------- #
 
 class Topic(osv.Model):
     """TODO List : Container"s Topic"""
 
+    def _get_nb_lists(self, cr, uid, ids, field, arg, context=None):
+        result = {}
+        for topic in self.browse(cr, uid, ids, context=context):
+            result[topic.id] = len(topic.todolist_ids)
+        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
+
+
     _name = "todolist.topic"
 
     _states = [("Active", "Active"), ("Inactive", "Inactive")]
@@ -151,6 +167,8 @@ class Topic(osv.Model):
         "description": fields.text(string="Description"),
         "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"),
     }
 
     _defaults = {