From f9dbded4b37fe2ae0f90cd8a752afc5a9ba563c6 Mon Sep 17 00:00:00 2001
From: MatteoLdx <com.mldx@ik.me>
Date: Thu, 28 Apr 2022 14:39:29 +0200
Subject: [PATCH 1/4] [ADD] b_website_shift: ability for irregualar workers to
 unsubscribe to a shift

---
 beesdoo_shift/models/task.py                  | 15 +++++
 beesdoo_website_shift/controllers/main.py     | 10 ++++
 .../data/res_config_data.xml                  |  4 ++
 .../views/my_shift_website_templates.xml      | 59 ++++++++++++++++++-
 4 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/beesdoo_shift/models/task.py b/beesdoo_shift/models/task.py
index 419da3227..37bf133cc 100644
--- a/beesdoo_shift/models/task.py
+++ b/beesdoo_shift/models/task.py
@@ -82,6 +82,7 @@ def _get_final_state(self):
     )
     revert_info = fields.Text(copy=False)
     working_mode = fields.Selection(related="worker_id.working_mode")
+    can_unsubscribe = fields.Boolean(compute="_compute_can_unsubscribe")
 
     def _expand_states(self, states, domain, order):
         return [key for key, val in self._fields["state"].selection(self)]
@@ -91,6 +92,20 @@ def _compute_color(self):
         for rec in self:
             rec.color = self._get_color_mapping(rec.state)
 
+    def _compute_can_unsubscribe(self):
+        now = datetime.now()
+        ICP = self.env["ir.config_parameter"].sudo()
+        max_hours = int(
+            ICP.get_param("beesdoo_website_shift.max_hours_to_unsubscribe", 2)
+        )
+        for rec in self:
+            if now > rec.start_time or rec.state != "open":
+                rec.can_unsubscribe = False
+            else:
+                delta = rec.start_time - now
+                delta = delta.seconds / 3600.0 + delta.days * 24
+                rec.can_unsubscribe = delta >= max_hours
+
     @api.constrains("state")
     def _lock_future_task(self):
         if datetime.now() < self.start_time:
diff --git a/beesdoo_website_shift/controllers/main.py b/beesdoo_website_shift/controllers/main.py
index c9f622110..d6eeec775 100644
--- a/beesdoo_website_shift/controllers/main.py
+++ b/beesdoo_website_shift/controllers/main.py
@@ -8,6 +8,7 @@
 from itertools import groupby
 
 from pytz import timezone, utc
+from werkzeug.exceptions import Forbidden
 
 from odoo import http
 from odoo.fields import Datetime
@@ -204,6 +205,15 @@ def public_shift_template_regular_worker(self, **kw):
             {"task_tpls_data": task_tpls_data, "float_to_time": float_to_time},
         )
 
+    @http.route("/shift/<int:shift_id>/unsubscribe", auth="user", website=True)
+    def unsubscribe_to_shift(self, shift_id=-1, **kw):
+        shift = request.env["beesdoo.shift.shift"].sudo().browse(shift_id)
+        # Get current user
+        if request.env.user.partner_id != shift.worker_id or not shift.can_unsubscribe:
+            raise Forbidden()
+        shift.worker_id = False
+        return request.redirect(kw["nexturl"])
+
     def my_shift_irregular_worker(self, nexturl=""):
         """
         Return template variables for
diff --git a/beesdoo_website_shift/data/res_config_data.xml b/beesdoo_website_shift/data/res_config_data.xml
index c4cff7c43..ae5ba2584 100644
--- a/beesdoo_website_shift/data/res_config_data.xml
+++ b/beesdoo_website_shift/data/res_config_data.xml
@@ -9,5 +9,9 @@
             <field name="key">beesdoo_website_shift.shift_period</field>
             <field name="value">28</field>
         </record>
+        <record id="max_hours_to_unsubscribe" model="ir.config_parameter">
+            <field name="key">beesdoo_website_shift.max_hours_to_unsubscribe</field>
+            <field name="value">2</field>
+        </record>
     </data>
 </odoo>
diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml
index b7590c88b..5a160cd0a 100644
--- a/beesdoo_website_shift/views/my_shift_website_templates.xml
+++ b/beesdoo_website_shift/views/my_shift_website_templates.xml
@@ -157,7 +157,17 @@
                     </t>
                 </div>
                 <div class="card-body clearfix">
-                    <t t-esc="shift.task_type_id.name" />
+                    <t t-esc="shift.task_template_id.name or shift.task_type_id.name" />
+                    <button
+                        type="button"
+                        class="btn btn-danger btn-sm pull-right"
+                        data-toggle="modal"
+                        t-att-data-target="'#unsubscribe-shift-%s' % shift.id"
+                        t-if="shift.can_unsubscribe"
+                    >
+                        <span class="fa fa-user-plus" aria-hidden="true" />
+                        Unsubscribe
+                    </button>
                     <button
                         type="button"
                         class="btn btn-default btn-sm pull-right"
@@ -220,6 +230,53 @@
                     </div>
                 </div>
             </div>
+            <t t-foreach="subscribed_shifts" t-as="shift">
+                <div
+                    class="modal fade"
+                    t-att-id="'unsubscribe-shift-%s' % shift.id"
+                    tabindex="-1"
+                    role="dialog"
+                    t-att-aria-labelledby="'unsubscribe-shift-%s-label' % shift.id"
+                >
+                    <div class="modal-dialog" role="document">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <h4
+                                    class="modal-title"
+                                    t-att-id="'subscribe-shift-%s-label' % shift.id"
+                                >
+                                    Please confirm unsubscriptions
+                                </h4>
+                            </div>
+                            <div class="modal-body">
+                                <span t-field="shift.start_time" />
+                                -
+                                <span
+                                    t-field="shift.end_time"
+                                    t-options='{"format": "HH:mm"}'
+                                />
+                                <br />
+                                <t t-esc="shift.task_type_id.name" />
+                            </div>
+                            <div class="modal-footer">
+                                <button
+                                    type="button"
+                                    class="btn btn-default"
+                                    data-dismiss="modal"
+                                >Close
+                                </button>
+                                <a
+                                    class="btn btn-primary"
+                                    t-if="irregular_enable_sign_up"
+                                    t-att-href="'/shift/%s/unsubscribe?nexturl=%s' % (shift.id, nexturl)"
+                                >
+                                    Unsubscribe
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </t>
         </t>
 
         <div class="alert alert-warning" t-if="not subscribed_shifts">

From 899f8408e964228c552fc7b31026ad76d4649f6d Mon Sep 17 00:00:00 2001
From: MatteoLdx <com.mldx@ik.me>
Date: Fri, 29 Apr 2022 09:31:55 +0200
Subject: [PATCH 2/4] [IMP] b_website_shift: add success alert when
 unsubscribing

---
 beesdoo_website_shift/controllers/main.py                 | 7 +++++++
 .../views/my_shift_website_templates.xml                  | 8 ++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/beesdoo_website_shift/controllers/main.py b/beesdoo_website_shift/controllers/main.py
index d6eeec775..46b3f57c9 100644
--- a/beesdoo_website_shift/controllers/main.py
+++ b/beesdoo_website_shift/controllers/main.py
@@ -212,6 +212,7 @@ def unsubscribe_to_shift(self, shift_id=-1, **kw):
         if request.env.user.partner_id != shift.worker_id or not shift.can_unsubscribe:
             raise Forbidden()
         shift.worker_id = False
+        request.session["unsubscribe_success"] = True
         return request.redirect(kw["nexturl"])
 
     def my_shift_irregular_worker(self, nexturl=""):
@@ -240,6 +241,12 @@ def my_shift_irregular_worker(self, nexturl=""):
             template_context["back_from_subscription"] = True
             template_context["success"] = request.session.get("success")
             del request.session["success"]
+        if "unsubscribe_success" in request.session:
+            template_context["back_from_subscription"] = True
+            template_context["unsubscribe_success"] = request.session.get(
+                "unsubscribe_success"
+            )
+            del request.session["unsubscribe_success"]
 
         # Add setting for subscription allowed time
         # TODO: move this to the attendance_sheet module
diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml
index 5a160cd0a..f4ac4b0b3 100644
--- a/beesdoo_website_shift/views/my_shift_website_templates.xml
+++ b/beesdoo_website_shift/views/my_shift_website_templates.xml
@@ -894,7 +894,7 @@
                         <div
                             t-if="back_from_subscription"
                             role="alert"
-                            t-att-class="'alert alert-%s alert-dismissible' % ('success' if success else 'danger',)"
+                            t-att-class="'alert alert-%s alert-dismissible' % ('success' if (success or unsubscribe_success) else 'danger',)"
                         >
                             <button
                                 type="button"
@@ -908,7 +908,11 @@
                                 <strong>Success!</strong>
                                 Your subscription has succeded.
                             </t>
-                            <t t-if="not success">
+                            <t t-elif="unsubscribe_success">
+                                <strong>Success!</strong>
+                                You have been successfully unsubscribed.
+                            </t>
+                            <t t-else="">
                                 <strong>Failed!</strong>
                                 Your subscription has failed. Someone
                                 subscribed before you or the shift was deleted.

From 82b6df8b0e537a9f4ded5978d6ea74593f2a69d0 Mon Sep 17 00:00:00 2001
From: MatteoLdx <com.mldx@ik.me>
Date: Tue, 24 May 2022 13:43:55 +0200
Subject: [PATCH 3/4] [ADD] b_shift,b_website_shift: unsubscribe from a
 compensation shift

---
 beesdoo_shift/models/task.py                        | 13 ++++++++++---
 beesdoo_website_shift/controllers/main.py           |  2 +-
 .../views/my_shift_website_templates.xml            |  7 +++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/beesdoo_shift/models/task.py b/beesdoo_shift/models/task.py
index 37bf133cc..d90422281 100644
--- a/beesdoo_shift/models/task.py
+++ b/beesdoo_shift/models/task.py
@@ -99,12 +99,19 @@ def _compute_can_unsubscribe(self):
             ICP.get_param("beesdoo_website_shift.max_hours_to_unsubscribe", 2)
         )
         for rec in self:
-            if now > rec.start_time or rec.state != "open":
-                rec.can_unsubscribe = False
-            else:
+            if (
+                rec.start_time > now
+                and rec.state == "open"
+                and (
+                    (rec.worker_id and rec.worker_id.working_mode == "irregular")
+                    or rec.is_compensation
+                )
+            ):
                 delta = rec.start_time - now
                 delta = delta.seconds / 3600.0 + delta.days * 24
                 rec.can_unsubscribe = delta >= max_hours
+            else:
+                rec.can_unsubscribe = False
 
     @api.constrains("state")
     def _lock_future_task(self):
diff --git a/beesdoo_website_shift/controllers/main.py b/beesdoo_website_shift/controllers/main.py
index 46b3f57c9..eee30fb32 100644
--- a/beesdoo_website_shift/controllers/main.py
+++ b/beesdoo_website_shift/controllers/main.py
@@ -211,7 +211,7 @@ def unsubscribe_to_shift(self, shift_id=-1, **kw):
         # Get current user
         if request.env.user.partner_id != shift.worker_id or not shift.can_unsubscribe:
             raise Forbidden()
-        shift.worker_id = False
+        shift.write({"is_regular": False, "is_compensation": False, "worker_id": False})
         request.session["unsubscribe_success"] = True
         return request.redirect(kw["nexturl"])
 
diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml
index f4ac4b0b3..173a8af1b 100644
--- a/beesdoo_website_shift/views/my_shift_website_templates.xml
+++ b/beesdoo_website_shift/views/my_shift_website_templates.xml
@@ -157,7 +157,7 @@
                     </t>
                 </div>
                 <div class="card-body clearfix">
-                    <t t-esc="shift.task_template_id.name or shift.task_type_id.name" />
+                    <t t-esc="shift.task_type_id.name" />
                     <button
                         type="button"
                         class="btn btn-danger btn-sm pull-right"
@@ -245,7 +245,7 @@
                                     class="modal-title"
                                     t-att-id="'subscribe-shift-%s-label' % shift.id"
                                 >
-                                    Please confirm unsubscriptions
+                                    Please confirm unsubscription
                                 </h4>
                             </div>
                             <div class="modal-body">
@@ -267,8 +267,7 @@
                                 </button>
                                 <a
                                     class="btn btn-primary"
-                                    t-if="irregular_enable_sign_up"
-                                    t-att-href="'/shift/%s/unsubscribe?nexturl=%s' % (shift.id, nexturl)"
+                                    t-att-href="'/shift/%s/unsubscribe?nexturl=%s' % (shift.id, nexturl or '/my/shift')"
                                 >
                                     Unsubscribe
                                 </a>

From 0b7b1a1b37b8156a28cdf57e9e392f66581a80ad Mon Sep 17 00:00:00 2001
From: MatteoLdx <com.mldx@ik.me>
Date: Tue, 31 May 2022 10:12:25 +0200
Subject: [PATCH 4/4] [IMP] b_website_shift: add parameters to disable
 unsubscriptions

---
 beesdoo_shift/data/system_parameter.xml       |  4 ++
 beesdoo_shift/models/task.py                  |  6 +-
 beesdoo_website_shift/controllers/main.py     | 15 ++++-
 .../data/res_config_data.xml                  |  4 --
 beesdoo_website_shift/models/res_config.py    |  6 ++
 beesdoo_website_shift/models/website.py       |  7 +++
 .../views/my_shift_website_templates.xml      |  2 +-
 .../views/res_config_views.xml                | 55 +++++++++++++++----
 8 files changed, 78 insertions(+), 21 deletions(-)

diff --git a/beesdoo_shift/data/system_parameter.xml b/beesdoo_shift/data/system_parameter.xml
index 576beac53..a01e6307b 100644
--- a/beesdoo_shift/data/system_parameter.xml
+++ b/beesdoo_shift/data/system_parameter.xml
@@ -31,4 +31,8 @@
         <field name="key">regular_counter_to_unsubscribe</field>
         <field name="value">-4</field>
     </record>
+    <record id="min_hours_to_unsubscribe" model="ir.config_parameter">
+        <field name="key">min_hours_to_unsubscribe</field>
+        <field name="value">2</field>
+    </record>
 </odoo>
diff --git a/beesdoo_shift/models/task.py b/beesdoo_shift/models/task.py
index d90422281..57f14aa41 100644
--- a/beesdoo_shift/models/task.py
+++ b/beesdoo_shift/models/task.py
@@ -95,9 +95,7 @@ def _compute_color(self):
     def _compute_can_unsubscribe(self):
         now = datetime.now()
         ICP = self.env["ir.config_parameter"].sudo()
-        max_hours = int(
-            ICP.get_param("beesdoo_website_shift.max_hours_to_unsubscribe", 2)
-        )
+        min_hours = int(ICP.get_param("min_hours_to_unsubscribe", 2))
         for rec in self:
             if (
                 rec.start_time > now
@@ -109,7 +107,7 @@ def _compute_can_unsubscribe(self):
             ):
                 delta = rec.start_time - now
                 delta = delta.seconds / 3600.0 + delta.days * 24
-                rec.can_unsubscribe = delta >= max_hours
+                rec.can_unsubscribe = delta >= min_hours
             else:
                 rec.can_unsubscribe = False
 
diff --git a/beesdoo_website_shift/controllers/main.py b/beesdoo_website_shift/controllers/main.py
index eee30fb32..2ea0e3f5c 100644
--- a/beesdoo_website_shift/controllers/main.py
+++ b/beesdoo_website_shift/controllers/main.py
@@ -208,8 +208,19 @@ def public_shift_template_regular_worker(self, **kw):
     @http.route("/shift/<int:shift_id>/unsubscribe", auth="user", website=True)
     def unsubscribe_to_shift(self, shift_id=-1, **kw):
         shift = request.env["beesdoo.shift.shift"].sudo().browse(shift_id)
-        # Get current user
-        if request.env.user.partner_id != shift.worker_id or not shift.can_unsubscribe:
+        cur_user = request.env["res.users"].browse(request.uid)
+        if (
+            cur_user.partner_id != shift.worker_id
+            or not shift.can_unsubscribe
+            or (
+                shift.is_compensation
+                and not request.website.enable_unsubscribe_compensation
+            )
+            or (
+                cur_user.partner_id.working_mode == "irregular"
+                and not request.website.irregular_enable_unsubscribe
+            )
+        ):
             raise Forbidden()
         shift.write({"is_regular": False, "is_compensation": False, "worker_id": False})
         request.session["unsubscribe_success"] = True
diff --git a/beesdoo_website_shift/data/res_config_data.xml b/beesdoo_website_shift/data/res_config_data.xml
index ae5ba2584..c4cff7c43 100644
--- a/beesdoo_website_shift/data/res_config_data.xml
+++ b/beesdoo_website_shift/data/res_config_data.xml
@@ -9,9 +9,5 @@
             <field name="key">beesdoo_website_shift.shift_period</field>
             <field name="value">28</field>
         </record>
-        <record id="max_hours_to_unsubscribe" model="ir.config_parameter">
-            <field name="key">beesdoo_website_shift.max_hours_to_unsubscribe</field>
-            <field name="value">2</field>
-        </record>
     </data>
 </odoo>
diff --git a/beesdoo_website_shift/models/res_config.py b/beesdoo_website_shift/models/res_config.py
index 06b2503c5..27bf53c43 100644
--- a/beesdoo_website_shift/models/res_config.py
+++ b/beesdoo_website_shift/models/res_config.py
@@ -18,6 +18,9 @@ class WebsiteShiftConfigSettings(models.TransientModel):
     irregular_past_shift_limit = fields.Integer(
         related="website_id.irregular_past_shift_limit", readonly=False
     )
+    irregular_enable_unsubscribe = fields.Boolean(
+        related="website_id.irregular_enable_unsubscribe", readonly=False
+    )
 
     # Regular worker settings
     regular_past_shift_limit = fields.Integer(
@@ -29,3 +32,6 @@ class WebsiteShiftConfigSettings(models.TransientModel):
     regular_highlight_rule = fields.Integer(
         related="website_id.regular_highlight_rule", readonly=False
     )
+    enable_unsubscribe_compensation = fields.Boolean(
+        related="website_id.enable_unsubscribe_compensation", readonly=False
+    )
diff --git a/beesdoo_website_shift/models/website.py b/beesdoo_website_shift/models/website.py
index cee4a8886..a3e177068 100644
--- a/beesdoo_website_shift/models/website.py
+++ b/beesdoo_website_shift/models/website.py
@@ -27,6 +27,9 @@ class Website(models.Model):
         default=10,
         help="Maximum past shift that will be shown for irregular worker",
     )
+    irregular_enable_unsubscribe = fields.Boolean(
+        default=True, help="Enable irregular workers to unsubscribe from their shifts"
+    )
 
     # Regular worker settings
     regular_past_shift_limit = fields.Integer(
@@ -41,3 +44,7 @@ class Website(models.Model):
         help="Treshold (in %) of available space in a shift that trigger the "
         "the highlight of a shift template.",
     )
+    enable_unsubscribe_compensation = fields.Boolean(
+        default=True,
+        help="Enable regular workers to unsubscribe from compensation shifts",
+    )
diff --git a/beesdoo_website_shift/views/my_shift_website_templates.xml b/beesdoo_website_shift/views/my_shift_website_templates.xml
index 173a8af1b..eded8ed75 100644
--- a/beesdoo_website_shift/views/my_shift_website_templates.xml
+++ b/beesdoo_website_shift/views/my_shift_website_templates.xml
@@ -163,7 +163,7 @@
                         class="btn btn-danger btn-sm pull-right"
                         data-toggle="modal"
                         t-att-data-target="'#unsubscribe-shift-%s' % shift.id"
-                        t-if="shift.can_unsubscribe"
+                        t-if="shift.can_unsubscribe and ((shift.is_compensation and request.website.enable_unsubscribe_compensation) or (not shift.is_compensation and request.website.irregular_enable_unsubscribe))"
                     >
                         <span class="fa fa-user-plus" aria-hidden="true" />
                         Unsubscribe
diff --git a/beesdoo_website_shift/views/res_config_views.xml b/beesdoo_website_shift/views/res_config_views.xml
index 00b13866e..4d4f19854 100644
--- a/beesdoo_website_shift/views/res_config_views.xml
+++ b/beesdoo_website_shift/views/res_config_views.xml
@@ -45,19 +45,38 @@
                         </div>
                     </div>
                     <div
-                        id="irregular_enable_sign_up_settings"
+                        id="irregular_enable_sign_up_unsubscribe_settings"
                         class="col-12 col-md-6 o_setting_box"
                     >
-                        <div class="o_setting_left_pane">
-                            <field name="irregular_enable_sign_up" />
+                        <div class="row">
+                            <div class="col-12">
+                                <div class="o_setting_left_pane">
+                                    <field name="irregular_enable_sign_up" />
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="irregular_enable_sign_up" />
+                                    <span
+                                        class="fa fa-lg fa-globe"
+                                        title="Values set here are website-specific."
+                                        groups="website.group_multi_website"
+                                    />
+                                </div>
+                            </div>
                         </div>
-                        <div class="o_setting_right_pane">
-                            <label for="irregular_enable_sign_up" />
-                            <span
-                                class="fa fa-lg fa-globe"
-                                title="Values set here are website-specific."
-                                groups="website.group_multi_website"
-                            />
+                        <div class="row">
+                            <div class="col-12">
+                                <div class="o_setting_left_pane">
+                                    <field name="irregular_enable_unsubscribe" />
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label for="irregular_enable_unsubscribe" />
+                                    <span
+                                        class="fa fa-lg fa-globe"
+                                        title="Values set here are website-specific."
+                                        groups="website.group_multi_website"
+                                    />
+                                </div>
+                            </div>
                         </div>
                     </div>
                     <div
@@ -127,6 +146,22 @@
                             </div>
                         </div>
                     </div>
+                    <div
+                        id="regular_enable_unsubscribe_compensation_settings"
+                        class="col-12 col-md-6 o_setting_box"
+                    >
+                        <div class="o_setting_left_pane">
+                            <field name="enable_unsubscribe_compensation" />
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <label for="enable_unsubscribe_compensation" />
+                            <span
+                                class="fa fa-lg fa-globe"
+                                title="Values set here are website-specific."
+                                groups="website.group_multi_website"
+                            />
+                        </div>
+                    </div>
                 </div>
             </div>
         </field>