From b1e67df7a7741afac2a3d5cf4d28ea2f5ecf8992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <pengyuthon@user.noreply.gitee.com>
Date: Thu, 26 Dec 2024 11:10:06 +0800
Subject: [PATCH] =?UTF-8?q?ljm=20=E4=BF=AE=E6=94=B9=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/js/planning_gantt_renderer.js  | 25 +++++++++++++------
 .../inherit_planning_slot_template_views.xml  |  4 +--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/planning_gantt/static/src/js/planning_gantt_renderer.js b/planning_gantt/static/src/js/planning_gantt_renderer.js
index 9604dfb8a..57f6ff880 100644
--- a/planning_gantt/static/src/js/planning_gantt_renderer.js
+++ b/planning_gantt/static/src/js/planning_gantt_renderer.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
-import { patch } from "@web/core/utils/patch";
-import { PlanningGanttRenderer } from "@planning/views/planning_gantt/planning_gantt_renderer";
+import {patch} from "@web/core/utils/patch";
+import {PlanningGanttRenderer} from "@planning/views/planning_gantt/planning_gantt_renderer";
 
 
 PlanningGanttRenderer.headerTemplate = "planning.PlanningGanttRenderer.Header";
@@ -25,7 +25,7 @@ function floatToTime(floatTime) {
 patch(PlanningGanttRenderer.prototype, {
     computeDerivedParams() {
         super.computeDerivedParams();
-        const { displayTotalRow } = this.model.metaData;
+        const {displayTotalRow} = this.model.metaData;
 
         if (displayTotalRow) {
             const prePills = this.getPills();
@@ -92,7 +92,7 @@ patch(PlanningGanttRenderer.prototype, {
                 col, // 当前列编号
                 pills: [], // 当前分组中的 pills 数组
                 aggregateValue: 0, // 分组的汇总值
-                grid: { column: [col, 1] }, // 分组的网格位置（列信息）
+                grid: {column: [col, 1]}, // 分组的网格位置（列信息）
             };
         }
 
@@ -156,12 +156,14 @@ patch(PlanningGanttRenderer.prototype, {
             method: "POST",
             dataType: 'json',
             async: false,  // 设置为同步请求
-            beforeSend: (xhr) => {xhr.setRequestHeader('Content-Type', 'application/json');},
-            data : JSON.stringify(jsonData),
+            beforeSend: (xhr) => {
+                xhr.setRequestHeader('Content-Type', 'application/json');
+            },
+            data: JSON.stringify(jsonData),
             success: (result) => {
                 slotTemplateData = result?.result?.records || [];
             },
-            error: function(xhr, status, error) {
+            error: function (xhr, status, error) {
                 // 请求失败的处理逻辑
                 console.error("Error:", error);
             }
@@ -186,7 +188,14 @@ patch(PlanningGanttRenderer.prototype, {
             group.end_time2 = groupSlotTemplate?.end_time2 || 0;
             group.day2 = groupSlotTemplate?.day2 || '';
             // 拼接显示信息
-            group.ganttLegend = `${groupSlotTemplate.display_name} : ${floatToTime(group.start_time)} - ${floatToTime(group.day2)} ${floatToTime(group.end_time2)}`;
+            // 拼接显示信息，根据 day2 是否有值来决定显示内容
+            if (group.day2) {
+                // 如果 day2 有值，显示 day2 的时间
+                group.ganttLegend = `${groupSlotTemplate.display_name} : ${floatToTime(group.start_time)} - ${floatToTime(group.day2)} ${floatToTime(group.end_time2)}`;
+            } else {
+                // 如果 day2 没有值，正常显示
+                group.ganttLegend = `${groupSlotTemplate.display_name} : ${floatToTime(group.start_time)} - ${floatToTime(group.end_time)}`;
+            }
         });
     },
 
diff --git a/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml b/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
index 5cf2b1b99..0cf34557e 100644
--- a/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
+++ b/yuthon_hr_attendance/views/inherit_planning_slot_template_views.xml
@@ -9,7 +9,7 @@
             </xpath>
             <xpath expr="//field[@name='role_id']" position="after">
                 <field name="department_id"/>
-                <field name="end_time2"/>
+                <field name="end_time2" widget="float_time"/>
                 <field name="day2"/>
                 <field name="color"  widget="color_picker" optional="show"/>
             </xpath>
@@ -22,7 +22,7 @@
         <field name="arch" type="xml">
             <xpath expr="//field[@name='role_id']" position="after">
                 <field name="department_id"/>
-                <field name="end_time2"/>
+                <field name="end_time2" widget="float_time"/>
                 <field name="day2"/>
                 <field name="color" widget="color_picker" optional="show"/>
             </xpath>