project_task_scheduling: Module for automatic task planning

project_task_assignment/__manifest__.py → project_task_employee/__manifest__.py

@@ -1,6 +1,6 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
-    "name": "Project task assigment",
+    "name": "Project task employee",
     "version": "11.0.1.0.0",
     "category": "Project Management",
     "author": "Tecnativa, "
@@ -13,6 +13,7 @@
     ],
     "data": [
         "views/project_view.xml",
+        "views/project_task_view.xml",
     ],
     "demo": [
         "demo/project_task.xml",

project_task_assignment/models/__init__.py → project_task_employee/models/__init__.py

@@ -1,2 +1,3 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 from . import project
+from . import project_task

project_task_employee/models/project.py

@@ -0,0 +1,11 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import fields, models
+
+
+class ProjectProject(models.Model):
+    _inherit = 'project.project'
+
+    employee_ids = fields.Many2many(
+        comodel_name='hr.employee',
+        string="Employees",
+    )

project_task_employee/models/project_task.py

@@ -0,0 +1,73 @@
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from odoo import api, fields, models
+
+
+class Task(models.Model):
+    _inherit = 'project.task'
+
+    employee_domain_ids = fields.Many2many(
+        compute='_compute_employee_domain_ids',
+        comodel_name='hr.employee',
+        string="Employees",
+    )
+    employee_scheduling_ids = fields.Many2many(
+        compute='_compute_employee_scheduling_ids',
+        comodel_name='hr.employee',
+        string="Employees",
+    )
+    employee_id = fields.Many2one(
+        comodel_name='hr.employee',
+        string="Assigned to employee",
+        domain="[('id', 'in', employee_domain_ids)]",
+        help="If the task is not scheduled (without ending date), the "
+             "automated scheduling will only assign the task to the employee "
+             "selected here.",
+    )
+    employee_category_id = fields.Many2one(
+        comodel_name='hr.employee.category',
+        string="Employee category",
+        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',
+                 'employee_category_id')
+    def _compute_employee_domain_ids(self):
+        for record in self:
+            emp = record.mapped('project_id.employee_ids')
+            task_skill = record.employee_category_id
+            if task_skill:
+                emp = emp.filtered(lambda r: task_skill in r.category_ids)
+            record.employee_domain_ids = emp.ids
+
+    @api.multi
+    @api.depends('project_id.employee_ids.category_ids',
+                 'employee_category_id')
+    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:
+            self.employee_id = False
+
+    @api.onchange('employee_id')
+    def _onchange_employee_id(self):
+        if self.user_id != self.employee_id.user_id:
+            self.user_id = self.employee_id.user_id

project_task_employee/readme/DESCRIPTION.rst

@@ -0,0 +1,3 @@
+This module extends the functionality of project to allow you to add employees
+to a project, to specify required skills (Employee category) to a task and to
+add an employee to a task.

project_task_assignment/tests/test_project_task.py → project_task_employee/tests/test_project_task.py

@@ -7,22 +7,22 @@ def setUp(self):
         super(TestProjectTask, self).setUp()
 
         self.task_3 = self.env['project.task'].browse(
-            self.ref("project_task_assignment.restricted_task_3"))
+            self.ref("project_task_employee.restricted_task_3"))
         self.task_2 = self.env['project.task'].browse(
-            self.ref("project_task_assignment.restricted_task_2"))
+            self.ref("project_task_employee.restricted_task_2"))
         self.task_7 = self.env['project.task'].browse(
-            self.ref("project_task_assignment.restricted_task_7"))
+            self.ref("project_task_employee.restricted_task_7"))
         self.task_1 = self.env['project.task'].browse(
-            self.ref("project_task_assignment.restricted_task_1"))
+            self.ref("project_task_employee.restricted_task_1"))
 
-    def test_get_employees(self):
+    def test_employee_domain_ids(self):
         jth = self.env['hr.employee'].browse(self.ref("hr.employee_jth"))
         root = self.env['hr.employee'].browse(self.ref("hr.employee_root"))
 
-        self.assertEqual(self.task_3.employee_ids, jth + root)
-        self.assertEqual(self.task_2.employee_ids, jth + root)
-        self.assertEqual(self.task_7.employee_ids, root)
-        self.assertEqual(self.task_1.employee_ids, jth)
+        self.assertEqual(self.task_3.employee_domain_ids, jth + root)
+        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_onchange_project_id_employee_id(self):
         onchange_result = self.task_3._onchange_project_id_employee_id()

project_task_assignment/views/project_view.xml → project_task_employee/views/project_task_view.xml

@@ -2,21 +2,6 @@
 <!--License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).-->
 <odoo>
 
-    <record id="edit_project" model="ir.ui.view">
-        <field name="name">project.project.form.inherit.scheduling</field>
-        <field name="model">project.project</field>
-        <field name="inherit_id" ref="project.edit_project"/>
-        <field name="arch" type="xml">
-            <notebook>
-                <page string="Employees">
-                    <group>
-                         <field name="employee_ids" nolabel="1"/>
-                    </group>
-                </page>
-            </notebook>
-        </field>
-    </record>
-
     <record id="view_task_form2_inherit_schedule" model="ir.ui.view">
         <field name="name">project.task.form.inherit.schedule</field>
         <field name="model">project.task</field>
@@ -26,6 +11,7 @@
                 <attribute name="string">Assigned to user</attribute>
             </field>
             <field name="user_id" position="after">
+                <field name="employee_domain_ids" invisible="1"/>
                 <field name="employee_id"/>
             </field>
             <field name="tag_ids" position="after">

project_task_employee/views/project_view.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).-->
+<odoo>
+
+    <record id="edit_project" model="ir.ui.view">
+        <field name="name">project.project.form.inherit.scheduling</field>
+        <field name="model">project.project</field>
+        <field name="inherit_id" ref="project.edit_project"/>
+        <field name="arch" type="xml">
+            <notebook>
+                <page string="Employees">
+                    <group>
+                         <field name="employee_ids" nolabel="1"/>
+                    </group>
+                </page>
+            </notebook>
+        </field>
+    </record>
+
+</odoo>

project_task_scheduling/__manifest__.py

@@ -11,7 +11,7 @@
         "hr",
         "hr_timesheet",
         "project",
-        "project_task_assignment",
+        "project_task_employee",
         "project_task_dependency",
         "project_timeline",
         "project_stage_closed",

project_task_scheduling/models/project_task_scheduling.py

@@ -48,7 +48,7 @@ def action_set_assignation(self):
         for record in self:
             record.task_id.write({
                 'employee_id': record.employee_id.id,
-                'user_id': record.employee_id.user_id.id or self.env.user.id,
+                'user_id': record.employee_id.user_id.id,
                 'date_start': record.datetime_start,
                 'date_end': record.datetime_stop,
             })

project_task_scheduling/readme/DESCRIPTION.rst

@@ -1 +1,5 @@
 This module allow you to execute an automated project task scheduling.
+
+References:
+
+* Demeulemeester, E., Herroelen W./ PROJECT SCHEDULING A Research Handbook

project_task_scheduling/readme/USAGE.rst

@@ -1,6 +1,9 @@
 To use this module, you need to:
 
-#. Go to Project / Automation / Project task scheduler
-#. Set the parameters to compute the proposals of scheduling. List of task to be scheduled, The date to start the scheduling and The cooling ratio
+#. Create employees with skills (Categories) and set working hours (calendar).
+#. Create Project and choose employees belongs to the project.
+#. Add Tasks to the project. For each task, set deadline, employee category required by task, Initially planned hours, and dependencies on other tasks. If you set starting date but not ending date, starting date is considered as the earliest date-time required for the assignation during automatic scheduling of the task. If you set employee but not ending date, it will be the only employee required for the assignation during automatic scheduling of the task.
+#. 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 of that or click on one item to see all data of the scheduling in a form view or set the scheduling as definitive
+#. 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.

project_task_scheduling/tests/common.py

@@ -8,7 +8,7 @@ def setUp(self):
         super(TestSchedulingCommon, self).setUp()
 
         self.restricted_project = self.env['project.project'].browse(
-            self.ref("project_task_assignment.restricted_project"))
+            self.ref("project_task_employee.restricted_project"))
 
         employee_obj = self.env['hr.employee']
         # these are all employees of the self.restricted_project
@@ -19,13 +19,13 @@ def setUp(self):
 
         # these are all tasks of the self.restricted_project
         self.task_2 = self.env['project.task'].browse(
-            self.ref("project_task_assignment.restricted_task_2"))
+            self.ref("project_task_employee.restricted_task_2"))
         self.task_3 = self.env['project.task'].browse(
-            self.ref("project_task_assignment.restricted_task_3"))
+            self.ref("project_task_employee.restricted_task_3"))
         self.task_7 = self.env['project.task'].browse(
-            self.ref("project_task_assignment.restricted_task_7"))
+            self.ref("project_task_employee.restricted_task_7"))
         self.task_1 = self.env['project.task'].browse(
-            self.ref("project_task_assignment.restricted_task_1"))
+            self.ref("project_task_employee.restricted_task_1"))
         # set task dependency
         self.task_1.dependency_task_ids = [(6, 0, [self.task_7.id])]
 
@@ -50,5 +50,3 @@ def setUp(self):
         # set tz 'UTC'
         self.root_emp.resource_id.user_id.tz = 'UTC'
         self.env.user.tz = 'UTC'
-
-        self.wizard.init_accum_inter()