[ADD] verdigado#95 show which holiday time came from overlaps

fixes verdigado#95
hbrunn · Jan 29, 2024 · b9358d5 · b9358d5
1 parent 5c28cb9
commit b9358d5
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 0 deletions.
diff --git a/verdigado_attendance/models/hr_leave_type.py b/verdigado_attendance/models/hr_leave_type.py
@@ -34,6 +34,17 @@ def _get_days_request(self):
             result[1]["virtual_remaining_leaves_formatted"] = result[1][
                 "virtual_usable_leaves_formatted"
             ]
+        overlap_ids = []
+        overlap_time = 0.0
+        for overlap1, overlap2, time in self._get_overlap(
+            self._get_contextual_employee_id()
+        ):
+            overlap_ids += overlap1.ids + overlap2.ids
+            overlap_time += time
+        result[1]["overlap"] = {
+            "time": overlap_time,
+            "ids": overlap_ids,
+        }
         return result
 
     @api.model

diff --git a/verdigado_attendance/static/src/js/time_off_calendar.js b/verdigado_attendance/static/src/js/time_off_calendar.js
@@ -41,4 +41,23 @@ odoo.define("verdigado_attendance.time_off_calendar", function (require) {
             });
         },
     });
+    var Controller = viewRegistry.get("time_off_calendar_all").prototype.config
+        .Controller;
+    Controller.include({
+        events: _.extend({}, Controller.prototype.events, {
+            "click .overlap": "_onOverlap",
+        }),
+        _onOverlap: function (e) {
+            return this.do_action({
+                type: "ir.actions.act_window",
+                res_model: "hr.leave",
+                views: [
+                    [false, "list"],
+                    [false, "form"],
+                ],
+                target: "current",
+                domain: [["id", "in", jQuery(e.currentTarget).data("ids")]],
+            });
+        },
+    });
 });
diff --git a/verdigado_attendance/static/src/xml/hr_holidays.xml b/verdigado_attendance/static/src/xml/hr_holidays.xml
@@ -87,5 +87,56 @@
                 position="move"
             />
         </xpath>
+        <xpath expr="(//div[hasclass('mt-1')]/t)[1]" position="inside">
+            <span t-if="timeoff[1]['overlap']['time'] > 0">
+                <br />
+                (incl.
+                <t t-out="timeoff[1]['overlap']['time']" />
+                from
+                <!-- prettier-ignore-start -->
+                <a
+                    href="#"
+                    class="overlap"
+                    t-att-data-ids="JSON.stringify(timeoff[1]['overlap']['ids'])"
+                >
+                    overlaps
+                </a>)
+                <!-- prettier-ignore-end -->
+            </span>
+        </xpath>
+        <xpath expr="(//div[hasclass('mt-1')]/t)[2]" position="inside">
+            <span t-if="timeoff[1]['overlap']['time'] > 0">
+                <br />
+                (incl.
+                <t t-out="timeoff[1]['overlap']['time']" />
+                from
+                <!-- prettier-ignore-start -->
+                <a
+                    href="#"
+                    class="overlap"
+                    t-att-data-ids="JSON.stringify(timeoff[1]['overlap']['ids'])"
+                >
+                    overlaps
+                </a>)
+                <!-- prettier-ignore-end -->
+            </span>
+        </xpath>
+        <xpath expr="(//div[hasclass('mt-1')]/t)[3]" position="inside">
+            <span t-if="timeoff[1]['overlap']['time'] > 0">
+                <br />
+                (incl.
+                <t t-out="timeoff[1]['overlap']['time']" />
+                from
+                <!-- prettier-ignore-start -->
+                <a
+                    href="#"
+                    class="overlap"
+                    t-att-data-ids="JSON.stringify(timeoff[1]['overlap']['ids'])"
+                >
+                    overlaps
+                </a>)
+                <!-- prettier-ignore-end -->
+            </span>
+        </xpath>
     </t>
 </templates>