Refactoring # 1

diff --git a/__openerp__.py b/__openerp__.py
index 430af22..5a575c1 100644 (file)
--- a/__openerp__.py
+++ b/__openerp__.py
@@ -2,9 +2,9 @@
     "name": "TodoList",
     "version": "1.0",
     "depends": ["base"],
-    "author": "Moi",
-    "category": "Category",
-    "description": """Liste des choses à faire.""",
+    "author": "Alicia FLOREZ & Sébastien CHAZALLET",
+    "category": "Tools",
+    "description": """Permet de gérer une 'todo list' personnelle.""",
     "data": [
         'security/todolist_security.xml',
         'security/ir.model.access.csv',

diff --git a/security/ir.model.access.csv b/security/ir.model.access.csv
index d1990c5..f201743 100644 (file)
--- a/security/ir.model.access.csv
+++ b/security/ir.model.access.csv
@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_theme_user,todolist.theme,model_todolist_theme,group_todolist_user,1,0,0,0
-access_theme_manager,todolist.theme.manager,model_todolist_theme,group_todolist_manager,1,1,1,1
-access_todolist_user,todolist.todolist,model_todolist_todolist,group_todolist_user,1,1,1,1
-access_action_user,todolist.action,model_todolist_action,group_todolist_user,1,1,1,1
+access_topic_user,todolist.topic,model_todolist_topic,group_todolist_user,1,0,0,0
+access_topic_manager,todolist.topic.manager,model_todolist_topic,group_todolist_manager,1,1,1,1
+access_container_user,todolist.container,model_todolist_container,group_todolist_user,1,1,1,1
+access_task_user,todolist.task,model_todolist_task,group_todolist_user,1,1,1,1

diff --git a/security/todolist_security.xml b/security/todolist_security.xml
index 80aa2f2..f32ae85 100644 (file)
--- a/security/todolist_security.xml
+++ b/security/todolist_security.xml
@@ -2,18 +2,18 @@
 <openerp>
     <data>
         <record id="category_todolist_groups" model="ir.module.category">
-            <field name="name">Todolist Category</field>
+            <field name="name">Todolist Permission</field>
         </record>
 
         <record id="group_todolist_user" model="res.groups">
             <field name="name">User</field>
             <field name="category_id" ref="category_todolist_groups"/>
-            <field name="comment">The user will be able to use ToDoList.</field>
+            <field name="comment">The user will be able to use To do lists.</field>
         </record>
 
         <record id="group_todolist_manager" model="res.groups">
             <field name="name">Manager</field>
-            <field name="comment">The user will be able to edit theme.</field>
+            <field name="comment">The user will be able to manage topics.</field>
             <field name="category_id" ref="category_todolist_groups"/>
             <field name="implied_ids" eval="[(4, ref('todolist.group_todolist_user'))]"/>
         </record>

diff --git a/todolist.py b/todolist.py
index a2e82e4..927dc15 100644 (file)
--- a/todolist.py
+++ b/todolist.py
@@ -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",
+    }

diff --git a/views/todolist.xml b/views/todolist.xml
index caf8fa3..9fd44fa 100644 (file)
--- a/views/todolist.xml
+++ b/views/todolist.xml
@@ -5,14 +5,13 @@
 
         <record model="ir.ui.view" id="todolist_form_view">
             <field name="name">todolist.form</field>
-            <field name="model">todolist.todolist</field>
+            <field name="model">todolist.container</field>
             <field name="arch" type="xml">
                 <form string="Todolist Form" version="7.0">
                     <header>
-                        <button string="Supprimer Description" type="object" name="vider_description" class="oe_highlight" />
-                        <button string="Commencer" type="object" name="action_start" states="draft" class="oe_highlight" />
-                        <button string="Terminer" type="object" name="action_stop" states="pending" class="oe_highlight" />
-                        <button string="Recommencer" type="object" name="action_restart" states="pending,done" class="oe_highlight" />
+                        <button string="Start" type="object" name="action_start" states="draft" class="oe_highlight" />
+                        <button string="Stop" type="object" name="action_stop" states="pending" class="oe_highlight" />
+                        <button string="Restart" type="object" name="action_restart" states="pending,done" class="oe_highlight" />
                         <field name="state" widget="statusbar" />
                     </header>
                     <sheet>
@@ -21,33 +20,27 @@
                             <field name="name" colspan="2" nolabel="1" />
                             <label for="description" colspan="1" />
                             <field name="description" colspan="2" nolabel="1" />
-                            <label for="assigned" colspan="1" />
-                            <field name="assigned" colspan="2" nolabel="1" />
                         </group>
                         <notebook colspan="4">
                             <page string="Dates">
                                 <group colspan="4" col="1">
-                                    <label for="date_cible" />
-                                    <field name="date_cible" nolabel="1" />
-                                    <label for="date_jalon" />
-                                    <field name="date_jalon" nolabel="1" />
+                                    <label for="target" />
+                                    <field name="target" nolabel="1" />
+                                    <label for="milestone" />
+                                    <field name="milestone" nolabel="1" />
+                                    <label for="manday" />
+                                    <field name="manday" nolabel="1" />
                                 </group>
                             </page>
-                            <page string="Paramétrages">
+                            <page string="Tasks">
                                 <group colspan="4" col="1">
-                                    <field name="manday" />
-                                    <field name="valide" />
-                                </group>
-                            </page>
-                            <page string="Actions">
-                                <group colspan="4" col="1">
-                                    <field name="actions" nolabel="1" mode="tree">
-                                        <tree string="Actions" editable="1" colors="red:priority=='indispensable';
+                                    <field name="tasks" nolabel="1" mode="tree">
+                                        <tree string="Tasks" editable="1" colors="red:priority=='essential';
                                                                                     #FF5800:priority=='necessary';
-                                                                                    black:priority=='utile'">
+                                                                                    black:priority=='useful'">
                                             <field name="name"/>
                                             <field name="description"/>
-                                            <field name="deadline"/>
+                                            <field name="milestone"/>
                                             <field name="planned"/>
                                             <field name="manday"/>
                                             <field name="priority"/>
@@ -55,9 +48,9 @@
                                     </field>
                                 </group>
                             </page>
-                            <page string="Thèmes">
+                            <page string="Topics">
                                 <group colspan="4" col="1">
-                                    <field name="themes_id"/>
+                                    <field name="topics_id"/>
                                 </group>
                             </page>
                         </notebook>
@@ -67,17 +60,17 @@
         </record>
 
 
-        <record model="ir.ui.view" id="theme_form_view">
-            <field name="name">theme.form</field>
-            <field name="model">todolist.theme</field>
+        <record model="ir.ui.view" id="topic_form_view">
+            <field name="name">topic.form</field>
+            <field name="model">todolist.topic</field>
             <field name="arch" type="xml">
-                <form string="Theme Form" version="7.0">
+                <form string="Topic Form" version="7.0">
                     <sheet>
                         <group colspan="4" col="4">
                             <label for="name" colspan="3"/>
-                            <label for="actif" colspan="1"/>
+                            <label for="activated" colspan="1"/>
                             <field name="name" nolabel="1" colspan="3"/>
-                            <field name="actif" nolabel="1" colspan="1"/>
+                            <field name="activated" nolabel="1" colspan="1"/>
                         </group>
                         <group col="1">
                             <label for="description"/>
@@ -89,11 +82,11 @@
         </record>
 
 
-        <record model="ir.ui.view" id="theme_kanban_view">
-            <field name="name">theme.kanban</field>
-            <field name="model">todolist.theme</field>
+        <record model="ir.ui.view" id="topic_kanban_view">
+            <field name="name">topic.kanban</field>
+            <field name="model">todolist.topic</field>
             <field name="arch" type="xml">
-                <kanban default_group_by="actif">
+                <kanban default_group_by="activated">
                     <templates>
                         <t t-name="kanban-box">
                             <div class="oe_kanban_card oe_semantic_html_override oe_kanban_global_click_edit">
@@ -119,28 +112,28 @@
         </record>
 
 
-        <record model="ir.ui.view" id="action_form_view">
-            <field name="name">todolist.form</field>
-            <field name="model">todolist.action</field>
+        <record model="ir.ui.view" id="task_form_view">
+            <field name="name">task.form</field>
+            <field name="model">todolist.task</field>
             <field name="arch" type="xml">
-                <form string="Todolist Form" version="7.0">
+                <form string="Task Form" version="7.0">
                     <header>
-                        <button string="Brouillon" type="object" name="action_draft" states="proposal,valid,begin" class="oe_highlight" />
-                        <button string="Proposition" type="object" name="action_propose" states="draft, valid, begin" class="oe_highlight" />
-                        <button string="Validé" type="object" name="action_validate" states="draft,proposal" class="oe_highlight" />
-                        <button string="Débute" type="object" name="action_begin" states="draft,valid" class="oe_highlight" />
-                        <button string="Terminé" type="object" name="action_done" states="begin" class="oe_highlight" />
+                        <button string="Reset" type="object" name="action_draft" states="proposal,approved,started" class="oe_highlight" />
+                        <button string="Propose" type="object" name="action_propose" states="draft,approved,started" class="oe_highlight" />
+                        <button string="Approve" type="object" name="action_approve" states="draft,proposal" class="oe_highlight" />
+                        <button string="Start" type="object" name="action_start" states="draft,approved" class="oe_highlight" />
+                        <button string="Stop" type="object" name="action_done" states="started" class="oe_highlight" />
                         <field name="state" widget="statusbar" />
                     </header>
                     <sheet>
                         <group>
                             <field name="name"/>
                             <field name="description" />
-                            <field name="deadline" />
+                            <field name="milestone" />
                             <field name="planned" />
                             <field name="manday" />
                             <field name="priority" />
-                            <field name="todolist_id" />
+                            <field name="container_id" />
                         </group>
                     </sheet>
                  </form>
@@ -149,44 +142,48 @@
 
 
         <record model="ir.actions.act_window" id="todolist_list_action">
-            <field name="name">Todolists</field>
-            <field name="res_model">todolist.todolist</field>
+            <field name="name">list of to do lists</field>
+            <field name="res_model">todolist.container</field>
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
-                <p class="oe_view_nocontent_create">Créer votre première todolist</p>
+                <p class="oe_view_nocontent_create">Create your first to do list</p>
             </field>
         </record>
 
 
-        <record model="ir.actions.act_window" id="theme_list_action">
-            <field name="name">Liste des thèmes</field>
-            <field name="res_model">todolist.theme</field>
+        <record model="ir.actions.act_window" id="topic_list_action">
+            <field name="name">List of topics</field>
+            <field name="res_model">todolist.topic</field>
             <field name="view_mode">kanban,tree,form</field>
             <field name="help" type="html">
-                <p class="oe_view_nocontent_create">Créer votre premier thème</p>
+                <p class="oe_view_nocontent_create">Créer your first topic</p>
             </field>
         </record>
 
 
-        <record model="ir.actions.act_window" id="action_list_action">
-            <field name="name">Liste des actions</field>
-            <field name="res_model">todolist.action</field>
+        <record model="ir.actions.act_window" id="task_list_action">
+            <field name="name">List of tasks</field>
+            <field name="res_model">todolist.task</field>
             <field name="view_mode">tree,form</field>
             <field name="help" type="html">
-                <p class="oe_view_nocontent_create">Créer votre première action</p>
+                <p class="oe_view_nocontent_create">Create your first task</p>
             </field>
         </record>
 
 
-        <menuitem id="main_todolist_menu" name="TODO List" />
+        <menuitem id="main_minitools_menu" name="Mini Tools" />
+
+        <menuitem id="mt_todolist_menu" name="To do list" parent="main_minitools_menu" groups="group_todolist_user" />
+
+        <menuitem id="mt_todolist_container_menu" name="Lists" parent="mt_todolist_menu" action="todolist_list_action"/>
+
+        <menuitem id="mt_todolist_task_menu" name="Tasks" parent="mt_todolist_menu" action="task_list_action" />
 
-        <menuitem id="todolist_menu" name="TO DO List" parent="main_todolist_menu" groups="group_todolist_user" />
+        <menuitem id="mt_settings_menu" name="Settings" parent="main_minitools_menu" groups="group_todolist_manager" />
 
-        <menuitem id="todo_menu" name="TODO" parent="todolist_menu" action="todolist_list_action"/>
+        <menuitem id="mt_todolist_topic_menu" name="Topics" parent="mt_settings_menu" action="topic_list_action" />
 
-        <menuitem id="todo_theme_menu" name="Themes" parent="todolist_menu" action="theme_list_action" />
 
-        <menuitem id="todo_action_menu" name="Actions" parent="todolist_menu" action="action_list_action" />
 
     </data>
 </openerp>
\ No newline at end of file