From f4428fde9f5480301ab3f105a4b4afe49150c8e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?WEB=E8=AE=B8=E4=BD=95=E5=93=B2=5Cxuhez?=
 <xuhezhe@jikimo.com>
Date: Wed, 16 Aug 2023 09:25:13 +0800
Subject: [PATCH] =?UTF-8?q?gantt=E5=9B=BE=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_plan/__manifest__.py                   |  1 +
 sf_plan/static/src/scss/gannt_change.scss |  3 ++
 sf_plan/views/view.xml                    | 63 ++++++++++++++++-------
 3 files changed, 47 insertions(+), 20 deletions(-)
 create mode 100644 sf_plan/static/src/scss/gannt_change.scss

diff --git a/sf_plan/__manifest__.py b/sf_plan/__manifest__.py
index 2c965850..80a9d5fb 100644
--- a/sf_plan/__manifest__.py
+++ b/sf_plan/__manifest__.py
@@ -24,6 +24,7 @@
         'web.assets_qweb': [
         ],
         'web.assets_backend': [
+            'sf_plan/static/src/scss/gannt_change.scss'
         ],
 
     },
diff --git a/sf_plan/static/src/scss/gannt_change.scss b/sf_plan/static/src/scss/gannt_change.scss
new file mode 100644
index 00000000..e9ffbc59
--- /dev/null
+++ b/sf_plan/static/src/scss/gannt_change.scss
@@ -0,0 +1,3 @@
+//.o_gantt_view .o_gantt_row_nogroup .o_gantt_pill {
+//  background-color: #6ec89b !important;
+//}
\ No newline at end of file
diff --git a/sf_plan/views/view.xml b/sf_plan/views/view.xml
index 9e82fd8a..3366ce49 100644
--- a/sf_plan/views/view.xml
+++ b/sf_plan/views/view.xml
@@ -66,12 +66,13 @@
             <field name="name">sf.pl.plan.gantt</field>
             <field name="model">sf.pl.plan</field>
             <field name="arch" type="xml">
-                <gantt class="o_mrp_workorder_gantt" date_stop="plan_end_time" date_start="plan_start_time" string="坯料预制计划" default_group_by="current_operation_name" create="0"
-                    delete="0" sample="1"
-                    display_unavailability="1"
-                    color="pl_name"
-                    progress_bar="pl_name"
-                    form_view_id="sf_pl_plan_form">
+                <gantt class="o_mrp_workorder_gantt" date_stop="plan_end_time" date_start="plan_start_time"
+                       string="坯料预制计划" default_group_by="current_operation_name" create="0"
+                       delete="0" sample="1"
+                       display_unavailability="1"
+                       color="state"
+                       progress_bar="pl_name"
+                       form_view_id="sf_pl_plan_form">
 
                     <field name="pl_no"/>
                     <field name="pl_name"/>
@@ -80,21 +81,43 @@
                     <field name="plan_end_time"/>
                     <field name="state"/>
                     <templates>
-                    <div t-name="gantt-popover" class="container-fluid">
-                        <div class="row g-0">
-                            <div class="col">
-                                <ul class="ps-1 mb-0 list-unstyled">
-                                    <li><strong>开始时间: </strong> <t t-out="userTimezoneStartDate.format('L LTS')"/></li>
-                                    <li><strong>结束时间: </strong> <t t-out="userTimezoneStopDate.format('L LTS')"/></li>
-                                    <li><strong>坯料编号: </strong> <t t-out="pl_no"/></li>
-                                    <li><strong>坯料名称: </strong> <t t-out="pl_name"/></li>
-                                    <li><strong>数量: </strong> <t t-out="quantity"/></li>
-                                    <li><strong>材质: </strong> <t t-out="material"/></li>
-                                </ul>
+                        <div t-name="gantt-popover" class="container-fluid">
+                            <div class="row g-0">
+                                <div class="col">
+                                    <ul class="ps-1 mb-0 list-unstyled">
+                                        <li>
+                                            <strong>开始时间:</strong>
+                                            <t t-out="userTimezoneStartDate.format('L LTS')"/>
+                                        </li>
+                                        <li>
+                                            <strong>结束时间:</strong>
+                                            <t t-out="userTimezoneStopDate.format('L LTS')"/>
+                                        </li>
+                                        <li>
+                                            <strong>坯料编号:</strong>
+                                            <t t-out="pl_no"/>
+                                        </li>
+                                        <li>
+                                            <strong>坯料名称:</strong>
+                                            <t t-out="pl_name"/>
+                                        </li>
+                                        <li>
+                                            <strong>数量:</strong>
+                                            <t t-out="quantity"/>
+                                        </li>
+                                        <li>
+                                            <strong>材质:</strong>
+                                            <t t-out="material"/>
+                                        </li>
+                                        <li>
+                                            <strong>状态:</strong>
+                                            <t t-out="state"/>
+                                        </li>
+                                    </ul>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                </templates>
+                    </templates>
                 </gantt>
             </field>
         </record>
@@ -113,6 +136,6 @@
                 parent="mrp_workorder.mrp_workorder_menu_planning"
                 sequence="10"
                 action="sf_pl_plan_action"
-                />
+        />
     </data>
 </odoo>