Refactoring # 1
[OpenERP/todolist.git] / todolist.py
index a2e82e4..927dc15 100644 (file)
@@ -1,25 +1,26 @@
 #-*- coding: utf8 -*-
 
 from openerp.osv import osv, fields
-from reportlab.lib.xmllib import _Name
 
-class TodoList(osv.Model):
-    _name = "todolist.todolist"
 
-    _status = [('draft', 'Brouillon'), ('pending', 'En cours'), ('done', 'Termine')]
+
+
+class Container(osv.Model):
+    """TODO List : Tasks container"""
+
+    _name = "todolist.container"
+
+    _status = [("draft", "Draft"), ("pending", "Pending"), ("done", "Done")]
 
     _columns = {
-        "name": fields.char(string='Title', size=64, required=True),
+        "name": fields.char(string="Title", size=64, required=True),
         "description": fields.text(string="Description"),
-        "date_cible": fields.date(string='Cible'),
-        "date_jalon": fields.date(string='Jalon'),
-        "manday": fields.integer(string="Jours/homme"),
-        "valide": fields.boolean(string='Validé'),
-        "assigned": fields.many2one("res.partner", string="Assigné à", domain=[("is_company", "=", False)]),
+        "target": fields.date(string="Target", help="Target Date"),
+        "milestone": fields.date(string="Milestone", help="Due date"),
+        "manday": fields.float(string="Man-Days", digits=(6, 2)),
         "state": fields.selection(_status, string="State", select=True),
-        "actions": fields.one2many('todolist.action', 'todolist_id', string="Action"),
-        "themes_id": fields.many2many('todolist.theme', 'todolist_todolist_theme_rel', 'todolist_id', 'theme_id', string='Thèmes', domain=[("actif", "=", 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")]),
     }
 
     _defaults = {
@@ -28,55 +29,52 @@ class TodoList(osv.Model):
 
     _sql_constraints = [
         (
-            'nom_de_la_contrainte',
-            'CHECK(name <> description)',
-            'Le nom doit être différent de la description',
+            "name_different_from_description_constraint",
+            "CHECK(name <> description)",
+            "Fields name and description should be different",
         ),
         (
-            'cible_and_jalon_constraint',
-            'CHECK(date_cible < date_jalon)',
-            'La cible doit être inferieur au jalon',
+            "target_before_milestone_constraint",
+            "CHECK(target < milestone)",
+            "The target date should be previous milestone date",
         ),
     ]
 
-    def vider_description(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'description': ''}, context=context)
-        return self
-
     def action_start(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'pending'}, context=context)
+        self.write(cr, uid, ids, {"state": "pending"}, context=context)
         return self
 
 
     def action_stop(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'done'}, context=context)
+        self.write(cr, uid, ids, {"state": "done"}, context=context)
         return self
 
 
     def action_restart(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        self.write(cr, uid, ids, {"state": "draft"}, context=context)
         return self
 
 
 
-# ------------------- class Action ------------------- #
 
-class Action(osv.Model):
-    _name = "todolist.action"
+class Task(osv.Model):
+    """TODO List : A task (something to do in a to do list)"""
 
-    _priorities = [('utile', 'Utile'), ('necessary', 'Nécéssaire'), ('indispensable', 'Indispensable')]
+    _name = "todolist.task"
 
-    _states = [('draft', 'Brouillon'), ('proposal', 'Proposition'), ('valid', 'Validé'), ('begin', 'Débute'), ('done', 'Terminé')]
+    _priorities = [("useful", "Useful"), ("necessary", "Necessary"), ("essential", "Essential")]
+
+    _states = [("draft", "Draft"), ("proposal", "Proposal"), ("approved", "Approved"), ("started", "Started"), ("done", "Done")]
 
     _columns = {
-        "name": fields.char(string='Title', size=64, required=True),
-        "description": fields.text(string='Description'),
-        "deadline": fields.date(string='Jalon'),
-        "planned": fields.date(string='Planifié'),
-        "manday": fields.integer(string='Jours/homme'),
-        "priority": fields.selection(_priorities, string='Priorite', select=True),
-        "state": fields.selection(_states, string='State', select=True),
-        "todolist_id": fields.many2one('todolist.todolist', string="TodoList", required=True),
+        "name": fields.char(string="Title", size=64, required=True),
+        "description": fields.text(string="Description"),
+        "planned": fields.date(string="Planed"),
+        "milestone": fields.date(string="Milestone"),
+        "manday": fields.integer(string="Man-Days"),
+        "priority": fields.selection(_priorities, string="Priority", select=True),
+        "state": fields.selection(_states, string="State", select=True),
+        "container_id": fields.many2one("todolist.container", string="To do list", required=True),
     }
 
     _defaults = {
@@ -84,40 +82,42 @@ class Action(osv.Model):
     }
 
     def action_draft(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        self.write(cr, uid, ids, {"state": "draft"}, context=context)
         return self
 
     def action_propose(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'proposal'}, context=context)
+        self.write(cr, uid, ids, {"state": "proposal"}, context=context)
         return self
 
-    def action_validate(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'valid'}, context=context)
+    def action_approve(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {"state": "approved"}, context=context)
         return self
 
-    def action_begin(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'begin'}, context=context)
+    def action_start(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {"state": "started"}, context=context)
         return self
 
     def action_done(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'done'}, context=context)
+        self.write(cr, uid, ids, {"state": "done"}, context=context)
         return self
 
 
 # ------------------- class Theme ------------------- #
 
-class Theme(osv.Model):
-    _name = "todolist.theme"
+class Topic(osv.Model):
+    """TODO List : Container"s Topic"""
 
-    _states = [('Actif', 'Actif'), ('Inactif', 'Inactif')]
+    _name = "todolist.topic"
+
+    _states = [("Active", "Active"), ("Inactive", "Inactive")]
 
     _columns = {
-        "name": fields.char(string='Title', size=64, required=True),
-        "description": fields.text(string='Description'),
-        "actif": fields.selection(_states, string='Actif', select=True),
-        "todolist_ids": fields.many2many('todolist.todolist', 'todolist_todolist_theme_rel', 'theme_id', 'todolist_id', string='TODO Listes'),
+        "name": fields.char(string="Title", size=64, required=True),
+        "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"),
     }
 
     _defaults = {
-        'actif': 'actif'
-    }
\ No newline at end of file
+        "activated": "Active",
+    }