project_task_scheduling: Module for automatic task planning

project_task_employee/models/project_task.py

@@ -29,11 +29,6 @@ class Task(models.Model):
         help="Only employee selected on the project belonging to the task "
              "that have the categories selected here can do the task.",
     )
-    scheduled = fields.Boolean(
-        compute='_compute_scheduled',
-        readonly=True,
-        store=True,
-    )
 
     @api.multi
     @api.depends('project_id.employee_ids.category_ids',
@@ -47,21 +42,14 @@ def _compute_employee_domain_ids(self):
             record.employee_domain_ids = emp.ids
 
     @api.multi
-    @api.depends('project_id.employee_ids.category_ids',
-                 'employee_category_id')
+    @api.depends('date_end', 'employee_id', 'employee_domain_ids')
     def _compute_employee_scheduling_ids(self):
         for record in self:
             employees = record.employee_id
             if record.date_end or not record.employee_id:
                 employees = record.employee_domain_ids
             record.employee_scheduling_ids = employees
 
-    @api.multi
-    @api.depends('employee_id', 'date_start', 'date_end')
-    def _compute_scheduled(self):
-        for record in self:
-            record.scheduled = record.date_end
-
     @api.onchange('employee_domain_ids')
     def _onchange_employee_domain_ids(self):
         if self.employee_id not in self.employee_domain_ids:

project_task_employee/tests/test_project_task.py

@@ -23,3 +23,23 @@ def test_employee_domain_ids(self):
         self.assertEqual(self.task_2.employee_domain_ids, jth + root)
         self.assertEqual(self.task_7.employee_domain_ids, root)
         self.assertEqual(self.task_1.employee_domain_ids, jth)
+
+    def test_change_employee_domain_ids_and_employee_id(self):
+        with self.env.do_in_onchange():
+
+            self.task_3.user_id = False
+            self.assertFalse(self.task_3.user_id)
+
+            self.task_3.employee_id = self.env.ref("hr.employee_root")
+            self.task_3._onchange_employee_id()
+            user = self.env.ref("base.user_root")
+            self.assertEqual(self.task_3.user_id, user)
+
+            category_5 = self.env.ref("hr.employee_category_5")
+            self.task_3.employee_category_id = category_5
+            self.task_3._onchange_employee_domain_ids()
+            self.assertFalse(self.task_3.employee_id)
+
+            self.assertEqual(self.task_3.user_id, user)
+            self.task_3._onchange_employee_id()
+            self.assertFalse(self.task_3.user_id)

project_task_scheduling/__init__.py

@@ -1,3 +1,4 @@
+# Copyright 2018 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from . import models
 from . import wizards

project_task_scheduling/__manifest__.py

@@ -1,3 +1,4 @@
+# Copyright 2018 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Automating Project Task Scheduling",

project_task_scheduling/models/__init__.py

@@ -1,3 +1,4 @@
+# Copyright 2018 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from . import project
 from . import project_task_scheduling

project_task_scheduling/models/project.py

@@ -1,3 +1,4 @@
+# Copyright 2018 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from odoo import fields, models
 
@@ -7,4 +8,5 @@ class Task(models.Model):
 
     closed = fields.Boolean(
         related='stage_id.closed',
+        store=True,
     )

project_task_scheduling/models/project_task_scheduling.py

@@ -1,4 +1,5 @@
-# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+# Copyright 2018 Tecnativa - Ernesto Tejeda
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from odoo import api, fields, models
 
 
@@ -44,7 +45,7 @@ def _compute_delayed(self):
                 rec.delayed = date_deadline < datetime_stop.date()
 
     @api.multi
-    def action_set_assignation(self):
+    def set_assignation(self):
         for record in self:
             record.task_id.write({
                 'employee_id': record.employee_id.id,

project_task_scheduling/models/project_task_scheduling_proposal.py

@@ -1,3 +1,4 @@
+# Copyright 2018 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from datetime import datetime, time
 from odoo import api, fields, models, _
@@ -18,7 +19,7 @@ class ProjectTaskScheduling(models.TransientModel):
     duration = fields.Float(
         compute='_compute_end'
     )
-    delayed_tasks = fields.Float(
+    delayed_tasks = fields.Integer(
         compute='_compute_delayed_tasks'
     )
     evaluation = fields.Float(
@@ -35,6 +36,14 @@ class ProjectTaskScheduling(models.TransientModel):
         string="Not scheduled tasks",
         readonly=True,
     )
+    state = fields.Selection(
+        selection=[
+            ('proposed', 'Proposed'),
+            ('approved', 'Approved'),
+            ('rejected', 'Rejected'),
+        ],
+        default='proposed',
+    )
 
     @api.multi
     @api.depends('task_scheduling_ids.datetime_stop', 'date_start')
@@ -73,9 +82,15 @@ def action_timeline_scheduling(self):
         }
 
     @api.multi
-    def action_set_scheduling(self):
+    def action_approve(self):
         self.ensure_one()
-        self.task_scheduling_ids.action_set_assignation()
+        self.task_scheduling_ids.set_assignation()
+        self.search([('id', '!=', self.id)]).action_reject()
+        self.state = 'approved'
+
+    @api.multi
+    def action_reject(self):
+        self.write({'state': 'rejected'})
 
     @api.multi
     def action_recompute(self):
@@ -102,3 +117,10 @@ def action_recompute(self):
         hours_dy += max_hours_delayed
         evaluation = task_dy_count * max_hours_delayed * 2 + hours_dy
         self.evaluation = round(evaluation, 10)
+
+    @api.multi
+    def copy(self, default=None):
+        if self.search([('state', '=', 'approved')]):
+            raise ValidationError(_("You can't duplicate a proposal if there "
+                                    "is a proposal approved "))
+        return super(ProjectTaskScheduling, self).copy(default=default)

project_task_scheduling/readme/USAGE.rst

@@ -6,4 +6,4 @@ To use this module, you need to:
 #. Go to Project > Automation > Project task scheduler
 #. Choose a task option (Not finished, Not Scheduled, Customized), a Date Start and Calculation Speed (Slow, Middle, Fast)
 #. Click on Accept button
-#. You will see a list of proposals of scheduling. For each proposal you can see a time line view for all task grouped by employee. You can also click on one item to see all data of the scheduling in a form view and set it as a definitive scheduling.
+#. You will see a list of proposals of scheduling. For each proposal you can see a time line view for all task grouped by employee. You can also click on one item to see all data of the scheduling in a form view and approve or reject this proposal.

project_task_scheduling/tests/__init__.py

@@ -1,3 +1,4 @@
+# Copyright 2018 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from . import common
 from . import test_scheduling_wizard

project_task_scheduling/tests/common.py

@@ -1,3 +1,4 @@
+# Copyright 2018 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from datetime import date, datetime, time
 from odoo.tests.common import TransactionCase

project_task_scheduling/tests/test_scheduling_proposal.py

@@ -1,4 +1,7 @@
+# Copyright 2018 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo.exceptions import ValidationError
+
 from odoo.addons.project_task_scheduling.tests.common import \
     TestSchedulingCommon
 
@@ -29,11 +32,13 @@ def test_computed_fields(self):
         self.assertEqual(duration, best_proposal.duration)
         self.assertEqual(delayed_tasks, best_proposal.delayed_tasks)
 
-    def test_action_set_scheduling(self):
+    def test_action_approve(self):
         self.wizard.action_accept()
         proposals = self.env['project.task.scheduling.proposal'].search([])
         proposals[-1].action_timeline_scheduling()
-        proposals[-1].action_set_scheduling()
+        proposals[-1].action_approve()
+
+        self.assertTrue(proposals[-1].state == 'approved')
 
         self.assertTrue(self.task_2.employee_id)
         self.assertTrue(self.task_2.date_start)
@@ -50,3 +55,17 @@ def test_action_set_scheduling(self):
         self.assertTrue(self.task_1.employee_id)
         self.assertTrue(self.task_1.date_start)
         self.assertTrue(self.task_1.date_end)
+
+    def test_action_reject(self):
+        self.wizard.action_accept()
+        proposals = self.env['project.task.scheduling.proposal'].search([])
+        proposals[-1].action_reject()
+        self.assertTrue(proposals[-1].state == 'rejected')
+
+    def test_copy(self):
+        self.wizard.action_accept()
+        proposals = self.env['project.task.scheduling.proposal'].search([])
+        proposals[-1].copy()
+        proposals[-1].action_approve()
+        with self.assertRaises(ValidationError):
+            proposals[-1].copy()

project_task_scheduling/tests/test_scheduling_wizard.py

@@ -1,3 +1,4 @@
+# Copyright 2018 Tecnativa - Ernesto Tejeda
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from collections import namedtuple
 from datetime import date, datetime, time, timedelta
@@ -140,12 +141,12 @@ def test_get_init_state(self):
             self.assertEqual(assigment.end_datetime, data_check[1])
             self.assertEqual(assigment.data['employee'], data_check[2])
 
-    def test_obj_func(self):
+    def test_evaluation_function(self):
         max_hours_delayed = self.wizard._MAX_HOURS_DELAYED
 
         # evaluate initial state
         init_state = self.wizard._get_init_state()
-        evaluation = self.wizard._obj_func(init_state)
+        evaluation = self.wizard._evaluation_function(init_state)
 
         # two tasks are scheduled after their date_deadline
         # (self.task_7 and self.task_1) see test_get_init_state_1 method
@@ -165,14 +166,14 @@ def test_obj_func(self):
 
         self.assertEqual(evaluation, expected_eval)
 
-    def test_obj_func_fail(self):
+    def test_evaluation_function_fail(self):
         date_start = fields.Datetime.from_string(self.wizard.date_start)
         date_deadline = date_start + timedelta(days=50000)
         self.task_2.write({'date_deadline': date_deadline})
 
         state = self.wizard._get_init_state()
         with self.assertRaises(ValidationError):
-            self.wizard._obj_func(state)
+            self.wizard._evaluation_function(state)
 
     def test_generate_neighbor_false(self):
         init_st = self.wizard._get_init_state()
@@ -218,20 +219,22 @@ def test_generate_neighbor_pos_arg_1(self):
 
     def test_generate_neighbor_pos_arg_1_is_better_than_start_state(self):
         init_st = self.wizard._get_init_state()
-        eval_init_st = round(self.wizard._obj_func(init_st), 10)
+        eval_init_st = round(self.wizard._evaluation_function(init_st), 10)
 
         neighbor_st = self.wizard._generate_neighbor(init_st, pos_arg=1)
-        eval_neighbor_st = round(self.wizard._obj_func(neighbor_st), 10)
+        eval_neighbor_st = self.wizard._evaluation_function(neighbor_st)
+        eval_neighbor_st = round(eval_neighbor_st, 10)
 
         self.assertLess(eval_neighbor_st, eval_init_st)
 
     def test_simulated_annealing_can_improve_initial_state(self):
         init_state = self.wizard._get_init_state()
-        eval_init_st = round(self.wizard._obj_func(init_state), 10)
+        eval_init_st = round(self.wizard._evaluation_function(init_state), 10)
 
         cooling_ratio = float(self.wizard.cooling_ratio)
         sa_state = self.wizard.simulated_annealing(cooling_ratio=cooling_ratio)
-        eval_sa_state = round(self.wizard._obj_func(sa_state[-1]), 10)
+        eval_sa_state = self.wizard._evaluation_function(sa_state[-1])
+        eval_sa_state = round(eval_sa_state, 10)
 
         self.assertLessEqual(eval_sa_state, eval_init_st)
 

project_task_scheduling/views/project_task_scheduling_menu_views.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).-->
+<!-- Copyright 2018 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 <odoo>
 
     <menuitem id="project_task_scheduling_menu"

project_task_scheduling/views/project_task_scheduling_proposal_views.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).-->
+<!-- Copyright 2018 Tecnativa - Ernesto Tejeda
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
 <odoo>
 
     <record id="project_task_scheduling_proposal_view_form" model="ir.ui.view">
@@ -8,57 +9,63 @@
         <field name="arch" type="xml">
             <form>
                 <header>
-                    <button name="action_recompute"
+                    <button name="action_approve"
                             type="object"
-                            string="Re-compute evaluation"
-                            icon="fa-check"/>
+                            string="Approve"
+                            states="proposed"
+                            class="oe_highlight"
+                            confirm="Are you sure you want to approve this proposal?"/>
+                    <button name="action_reject"
+                            type="object"
+                            string="Reject"
+                            states="proposed"
+                            confirm="Are you sure you want to reject this proposal?"/>
+                    <field name="state" widget="statusbar"/>
                 </header>
                 <sheet>
                     <div class="oe_button_box" name="button_box">
                         <button name="action_timeline_scheduling"
                                 type="object"
                                 string="View scheduling"
                                 icon="fa-clock-o"/>
-                        <button name="action_set_scheduling"
+                        <button name="action_recompute"
                                 type="object"
-                                string="Set scheduling"
-                                icon="fa-check"
-                                confirm="Are you sure you want to set this proposal as definitive?"/>
+                                string="Re-compute evaluation"
+                                icon="fa-gears"
+                                attrs="{'invisible': [('state', 'not in', 'proposed')]}"
+                        />
                     </div>
                     <div class="oe_title">
                         <h1>
-                            <field name="description" placeholder="Short description..."/>
+                            <field name="description"
+                                   placeholder="Short description..."
+                                   attrs="{'readonly': [('state', 'not in', 'proposed')]}"/>
                         </h1>
                     </div>
                     <group col="4">
-                        <field name="date_start"/>
-                        <field name="date_end"/>
-                        <field name="duration"/>
-                        <field name="delayed_tasks"/>
-                        <field name="evaluation"/>
+                        <field name="date_start" attrs="{'readonly': [('state', 'not in', 'proposed')]}"/>
+                        <field name="date_end" attrs="{'readonly': [('state', 'not in', 'proposed')]}"/>
+                        <field name="duration" attrs="{'readonly': [('state', 'not in', 'proposed')]}"/>
+                        <field name="delayed_tasks" attrs="{'readonly': [('state', 'not in', 'proposed')]}"/>
+                        <field name="evaluation" attrs="{'readonly': [('state', 'not in', 'proposed')]}"/>
                     </group>
                     <notebook>
                         <page string="Scheduling" name="scheduling">
                             <group>
-                                <field name="task_scheduling_ids" nolabel="1">
+                                <field name="task_scheduling_ids" nolabel="1" attrs="{'readonly': [('state', 'not in', 'proposed')]}">
                                     <tree>
                                         <field name="employee_id"/>
                                         <field name="task_id"/>
                                         <field name="datetime_start"/>
                                         <field name="datetime_stop"/>
                                         <field name="delayed"/>
-                                        <button name="action_set_assignation"
-                                                type="object"
-                                                string="Set assignation"
-                                                icon="fa-check"
-                                                confirm="Are you sure you want to set this assignation as definitive?"/>
                                     </tree>
                                 </field>
                             </group>
                         </page>
                         <page string="Not scheduled tasks" name="not_scheduled_task">
                             <group>
-                                <field name="not_scheduled_task_ids" nolabel="1"/>
+                                <field name="not_scheduled_task_ids" nolabel="1" attrs="{'readonly': [('state', 'not in', 'proposed')]}"/>
                             </group>
                         </page>
                     </notebook>
@@ -71,13 +78,17 @@
         <field name="name">project.task.scheduling.proposal.tree</field>
         <field name="model">project.task.scheduling.proposal</field>
         <field name="arch" type="xml">
-            <tree>
+            <tree decoration-success="state == 'approved'"
+                  decoration-bf="state == 'approved'"
+                  decoration-muted="state == 'rejected'"
+                  create="false" >
                 <field name="description"/>
                 <field name="date_start"/>
                 <field name="date_end"/>
                 <field name="duration"/>
                 <field name="delayed_tasks"/>
                 <field name="evaluation"/>
+                <field name="state"/>
                 <button name="action_timeline_scheduling" type="object"
                         string="View scheduling" icon="fa-clock-o"/>
             </tree>