beescoop · remytms · Jun 20, 2022 · Jun 20, 2022 · Jun 20, 2022 · Jun 20, 2022
diff --git a/setup/shift_change/odoo/addons/shift_change b/setup/shift_change/odoo/addons/shift_change
@@ -0,0 +1 @@
+../../../../shift_change
diff --git a/setup/shift_change/setup.py b/setup/shift_change/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/setup/shift_change_portal/odoo/addons/shift_change_portal b/setup/shift_change_portal/odoo/addons/shift_change_portal
@@ -0,0 +1 @@
+../../../../shift_change_portal
diff --git a/setup/shift_change_portal/setup.py b/setup/shift_change_portal/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)
diff --git a/shift/models/cooperative_status.py b/shift/models/cooperative_status.py
@@ -25,7 +25,7 @@ class HistoryStatus(models.Model):
     _name = "cooperative.status.history"
     _description = "cooperative.status.history"
 
-    _order = "create_date desc"
+    _order = "create_date desc, id"
 
     status_id = fields.Many2one("cooperative.status")
     cooperator_id = fields.Many2one("res.partner")

diff --git a/shift/models/planning.py b/shift/models/planning.py
@@ -40,7 +40,7 @@ class ShiftDayNumber(models.Model):
     _name = "shift.daynumber"
     _description = "shift.daynumber"
 
-    _order = "number asc"
+    _order = "number asc, id"
 
     name = fields.Char()
     number = fields.Integer(
@@ -55,7 +55,7 @@ class ShiftDayNumber(models.Model):
 class ShiftPlanning(models.Model):
     _name = "shift.planning"
     _description = "shift.planning"
-    _order = "sequence asc"
+    _order = "sequence asc, id"
 
     sequence = fields.Integer()
     name = fields.Char()
@@ -198,7 +198,7 @@ def get_future_shifts(
 class ShiftTemplate(models.Model):
     _name = "shift.template"
     _description = "shift.template"
-    _order = "start_time"
+    _order = "planning_id, task_type_id, start_time, id"
 
     name = fields.Char(required=True)
     planning_id = fields.Many2one("shift.planning", required=True)

diff --git a/shift/models/shift_shift.py b/shift/models/shift_shift.py
@@ -11,7 +11,7 @@ class ShiftShift(models.Model):
     _name = "shift.shift"
     _description = "shift.shift"
     _inherit = ["mail.thread"]
-    _order = "start_time asc"
+    _order = "start_time asc, task_template_id, task_type_id, worker_id, id"
 
     ##################################
     # Method to override             #
@@ -143,6 +143,41 @@ def _add_follower(self, vals):
             worker = self.env["res.partner"].browse(vals["worker_id"])
             self.message_subscribe(partner_ids=worker.ids)
 
+    @api.model
+    def _aggregate_sibling_shifts(self, domain):
+        """Several shifts are siblings because they belong to the same
+        shfit template, the same day at the same our and for the same
+        task.
+        These represent the shift of all the poeple that will work
+        together.
+        This function aggregate shifts by task_template, start_time and
+        task_type for the given domain.
+        E.g. content of the list:
+        ((task_template_id, start_time, task_type_id), shifts)
+        """
+        all_shifts = self.env["shift.shift"].search(
+            domain,
+            # ensure shift are ordered for groupby
+            order="task_template_id, start_time, task_type_id",
+        )
+        all_shifts_groupby = itertools.groupby(
+            all_shifts,
+            lambda s: (s.task_template_id, s.start_time, s.task_type_id),
+        )
+        aggregated_shifts = []
+        for keys, grouped_shifts in all_shifts_groupby:
+            # Get back a shift recordset
+            shifts = self
+            for shift in grouped_shifts:
+                shifts |= shift
+            aggregated_shifts.append(
+                (
+                    keys,
+                    shifts,
+                )
+            )
+        return aggregated_shifts
+
     # TODO button to replace someone
     @api.model
     def unsubscribe_from_today(

diff --git a/shift_beneficiary/controllers/main.py b/shift_beneficiary/controllers/main.py
@@ -25,12 +25,10 @@ def get_selected_beneficiary(self):
 
     def available_shift_irregular_worker(
         self,
-        irregular_enable_sign_up=False,
-        nexturl="",
+        *args,
+        **kwargs,
     ):
-        res = super().available_shift_irregular_worker(
-            irregular_enable_sign_up, nexturl
-        )
+        res = super().available_shift_irregular_worker(*args, **kwargs)
         beneficiary_list = (
             request.env["res.partner"].sudo().search([("is_beneficiary", "=", True)])
         )

diff --git a/shift_change/README.rst b/shift_change/README.rst
@@ -0,0 +1,69 @@
+============
+Shift Change
+============
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:3bc799017041fe0a23c0121f2311b7f7de77b1ed7d56d502433fc392b3edcfc2
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-beescoop%2FObeesdoo-lightgray.png?logo=github
+    :target: https://github.com/beescoop/Obeesdoo/tree/16.0/shift_change
+    :alt: beescoop/Obeesdoo
+
+|badge1| |badge2| |badge3|
+
+Let regular worker change their future shifts.
+
+Changing a shift means unsubscribe from a specific shift and register to
+another one.
+
+Change does not affect subscription to a shift template.
+
+Changes can be done only between shifts already generated.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/beescoop/Obeesdoo/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/beescoop/Obeesdoo/issues/new?body=module:%20shift_change%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Coop IT Easy SC
+
+Contributors
+~~~~~~~~~~~~
+
+* `Coop IT Easy SC <https://coopiteasy.be>`_:
+
+  * Rémy Taymans
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `beescoop/Obeesdoo <https://github.com/beescoop/Obeesdoo/tree/16.0/shift_change>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/shift_change/__init__.py b/shift_change/__init__.py
@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: 2026 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from . import models
+from . import wizard
diff --git a/shift_change/__manifest__.py b/shift_change/__manifest__.py
@@ -0,0 +1,28 @@
+# SPDX-FileCopyrightText: 2026 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+{
+    "name": "Shift Change",
+    "summary": """
+        Let regular workers change their shift.
+    """,
+    "author": "Coop IT Easy SC",
+    "website": "https://github.com/beescoop/Obeesdoo",
+    "category": "Cooperative Management",
+    "version": "16.0.1.0.0",
+    "depends": [
+        "shift",
+    ],
+    "data": [
+        "data/system_parameter.xml",
+        "security/ir.model.access.csv",
+        "views/shift_change.xml",
+        "views/shift_change_menu.xml",
+        "views/res_config_setting_view.xml",
+        "views/res_partner.xml",
+        "wizard/shift_change_create_wizard.xml",
+    ],
+    "demo": [],
+    "license": "AGPL-3",
+}
diff --git a/shift_change/data/system_parameter.xml b/shift_change/data/system_parameter.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+SPDX-FileCopyrightText: 2026 Coop IT Easy SC
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<odoo noupdate="1">
+    <record id="old_shift_hour_limit_change" model="ir.config_parameter">
+        <field name="key">shift_change.old_shift_hour_limit_change</field>
+        <field name="value">24</field>
+    </record>
+    <record id="new_shift_hour_limit_change" model="ir.config_parameter">
+        <field name="key">shift_change.new_shift_hour_limit_change</field>
+        <field name="value">24</field>
+    </record>
+    <record id="same_shift_change_max" model="ir.config_parameter">
+        <field name="key">shift_change.same_shift_change_max</field>
+        <field name="value">3</field>
+    </record>
+</odoo>
diff --git a/shift_change/demo/demo.xml b/shift_change/demo/demo.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+SPDX-FileCopyrightText: 2026 Coop IT Easy SC
+
+SPDX-License-Identifier: AGPL-3.0-or-later
+-->
+<odoo>
+
+  <!-- Worker -->
+  <record id="shift.res_partner_worker_1_demo" model="res.partner">
+      <field
+            name="cooperative_status_ids"
+            eval="[(6, 0, [ref('shift.cooperative_status_1_demo')])]"
+        />
+  </record>
+
+  <record id="shift.res_partner_worker_2_demo" model="res.partner">
+      <field
+            name="cooperative_status_ids"
+            eval="[(6, 0, [ref('shift.cooperative_status_2_demo')])]"
+        />
+  </record>
+
+  <record id="shift.res_partner_worker_3_demo" model="res.partner">
+      <field
+            name="cooperative_status_ids"
+            eval="[(6, 0, [ref('shift.cooperative_status_3_demo')])]"
+        />
+  </record>
+
+  <!-- Task Template -->
+  <record id="task_template_1_demo" model="shift.template">
+      <field name="name">A_TUE-10:00-12:00</field>
+      <field name="planning_id" ref="shift.shift_planning_1_demo" />
+      <field name="day_nb_id" ref="shift.shift_daynumber_2_demo" />
+      <field name="task_type_id" ref="shift.shift_task_type_3_demo" />
+      <field name="start_time">10.0</field>
+      <field name="end_time">12.0</field>
+      <field name="duration">2</field>
+      <field name="worker_nb">5</field>
+      <field name="worker_ids" eval="[(6, 0, [])]" />
+      <field name="remaining_worker">5</field>
+  </record>
+
+  <record id="task_template_2_demo" model="shift.template">
+      <field name="name">A_WED-10:00-12:00</field>
+      <field name="planning_id" ref="shift.shift_planning_1_demo" />
+      <field name="day_nb_id" ref="shift.shift_daynumber_3_demo" />
+      <field name="task_type_id" ref="shift.shift_task_type_3_demo" />
+      <field name="start_time">10.0</field>
+      <field name="end_time">12.0</field>
+      <field name="duration">2</field>
+      <field name="worker_nb">5</field>
+      <field
+            name="worker_ids"
+            eval="[(6, 0, [ref('shift.res_partner_worker_1_demo'), ref('shift.res_partner_worker_2_demo')])]"
+        />
+      <field name="remaining_worker">4</field>
+  </record>
+
+  <record id="task_template_3_demo" model="shift.template">
+      <field name="name">A_THU-10:00-12:00</field>
+      <field name="planning_id" ref="shift.shift_planning_1_demo" />
+      <field name="day_nb_id" ref="shift.shift_daynumber_4_demo" />
+      <field name="task_type_id" ref="shift.shift_task_type_3_demo" />
+      <field name="start_time">10.0</field>
+      <field name="end_time">12.0</field>
+      <field name="duration">2</field>
+      <field name="worker_nb">1</field>
+      <field
+            name="worker_ids"
+            eval="[(6, 0, [ref('shift.res_partner_worker_1_demo')])]"
+        />
+      <field name="remaining_worker">0</field>
+  </record>
+
+</odoo>
diff --git a/shift_change/migrations/16.0.1.0.0/post-migrate.py b/shift_change/migrations/16.0.1.0.0/post-migrate.py
@@ -0,0 +1,7 @@
+from openupgradelib import openupgrade
+
+
+@openupgrade.migrate()
+def migrate(env, version):
+    # TODO:
+    pass
diff --git a/shift_change/models/__init__.py b/shift_change/models/__init__.py
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: 2026 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from . import shift_change
+from . import res_config_settings
+from . import res_partner
diff --git a/shift_change/models/res_config_settings.py b/shift_change/models/res_config_settings.py
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2026 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from odoo import fields, models
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = "res.config.settings"
+
+    old_shift_hour_limit_change = fields.Integer(
+        config_parameter="shift_change.hour_limit_change",
+    )
+    new_shift_hour_limit_change = fields.Integer(
+        config_parameter="shift_change.hour_limit_change",
+    )
+    same_shift_change_max = fields.Integer(
+        config_parameter="shift_change.same_shift_change_max",
+    )
diff --git a/shift_change/models/res_partner.py b/shift_change/models/res_partner.py
@@ -0,0 +1,19 @@
+# SPDX-FileCopyrightText: 2026 Coop IT Easy SC
+#
+# SPDX-License-Identifier: AGPL-3.0-or-later
+
+from odoo import _, models
+
+
+class ResPartner(models.Model):
+    _inherit = "res.partner"
+
+    def button_change_shift(self):
+        return {
+            "name": _("Change a shift"),
+            "type": "ir.actions.act_window",
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "shift.change.create.wizard",
+            "target": "new",
+        }