From 5d0faa3ce48302b7302f4617181c14e049104dcc Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 8 Feb 2021 10:20:29 -0800
Subject: [PATCH] Production list add d/p and fix display issues IO-473

---
 bodyshop_translations.babel                   | 65 ++++++++++++++++++-
 client/src/App/App.styles.scss                |  4 ++
 ...on-list-columns.bodypriority.component.jsx |  4 +-
 .../production-list-columns.data.js           | 14 +++-
 ...production-list-columns.date.component.jsx | 12 +++-
 ...-list-columns.detailpriority.component.jsx | 56 ++++++++++++++++
 ...n-list-columns.paintpriority.component.jsx | 12 ++--
 client/src/translations/en_us/common.json     |  3 +
 client/src/translations/es/common.json        |  3 +
 client/src/translations/fr/common.json        |  3 +
 10 files changed, 165 insertions(+), 11 deletions(-)
 create mode 100644 client/src/components/production-list-columns/production-list-columns.detailpriority.component.jsx

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index bd7e180c7..80b7631c0 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -23945,6 +23945,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>detailpriority-clear</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                    <concept_node>
+                                        <name>detailpriority-set</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>paintpriority-clear</name>
                                         <definition_loaded>false</definition_loaded>
@@ -24228,6 +24270,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>detailpriority</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>employeesearch</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/App/App.styles.scss b/client/src/App/App.styles.scss
index 74fae7505..ae83aa89f 100644
--- a/client/src/App/App.styles.scss
+++ b/client/src/App/App.styles.scss
@@ -119,3 +119,7 @@
   cursor: col-resize;
   z-index: 1;
 }
+
+.production-list-min-height {
+  min-height: 19px;
+}
diff --git a/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx b/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx
index 603c7e333..d8363e965 100644
--- a/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.bodypriority.component.jsx
@@ -12,7 +12,7 @@ export default function ProductionListColumnBodyPriority({ record }) {
 
   const handleSetBodyPriority = (e) => {
     logImEXEvent("production_set_body_priority");
-    e.stopPropagation();
+    //  e.stopPropagation();
     const { key } = e;
     updateAlert({
       variables: {
@@ -46,7 +46,7 @@ export default function ProductionListColumnBodyPriority({ record }) {
           </Menu.SubMenu>
         </Menu>
       }
-      trigger={["contextMenu"]}
+      trigger={["click"]}
     >
       <div style={{ width: "100%", height: "19px" }}>
         {record.production_vars && record.production_vars.bodypriority}
diff --git a/client/src/components/production-list-columns/production-list-columns.data.js b/client/src/components/production-list-columns/production-list-columns.data.js
index 943069111..fe5b44d08 100644
--- a/client/src/components/production-list-columns/production-list-columns.data.js
+++ b/client/src/components/production-list-columns/production-list-columns.data.js
@@ -13,7 +13,7 @@ import ProductionListColumnPaintPriority from "./production-list-columns.paintpr
 import ProductionListColumnNote from "./production-list-columns.productionnote.component";
 import ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
-
+import ProductionListColumnDetailPriority from "./production-list-columns.detailpriority.component";
 const r = [
   {
     title: i18n.t("jobs.actions.viewdetail"),
@@ -222,6 +222,18 @@ const r = [
       <ProductionListColumnPaintPriority record={record} />
     ),
   },
+  {
+    title: i18n.t("production.labels.detailpriority"),
+    dataIndex: "detailpriority",
+    key: "detailpriority",
+
+    sorter: (a, b) =>
+      ((a.production_vars && a.production_vars.detailpriority) || 11) -
+      ((b.production_vars && b.production_vars.detailpriority) || 11),
+    render: (text, record) => (
+      <ProductionListColumnDetailPriority record={record} />
+    ),
+  },
   {
     title: i18n.t("production.labels.sublets"),
     dataIndex: "sublets",
diff --git a/client/src/components/production-list-columns/production-list-columns.date.component.jsx b/client/src/components/production-list-columns/production-list-columns.date.component.jsx
index f4fe88cfd..fe3d5063f 100644
--- a/client/src/components/production-list-columns/production-list-columns.date.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.date.component.jsx
@@ -14,6 +14,7 @@ export default function ProductionListDate({ record, field }) {
 
   const handleChange = (date) => {
     logImEXEvent("production_toggle_alert");
+    console.log("change");
     //e.stopPropagation();
     updateAlert({
       variables: {
@@ -32,17 +33,24 @@ export default function ProductionListDate({ record, field }) {
     <div>
       <Dropdown
         trigger={["click"]}
+        style={{
+          height: "19px",
+        }}
         overlay={
           <div onClick={(e) => e.stopPropagation()}>
             <DatePicker
               onClick={(e) => e.stopPropagation()}
-              value={moment(record[field]) || null}
+              value={(record[field] && moment(record[field])) || null}
               onChange={handleChange}
             />
           </div>
         }
       >
-        <div>
+        <div
+          style={{
+            height: "19px",
+          }}
+        >
           <DateFormatter
             bordered={false}
             className={
diff --git a/client/src/components/production-list-columns/production-list-columns.detailpriority.component.jsx b/client/src/components/production-list-columns/production-list-columns.detailpriority.component.jsx
new file mode 100644
index 000000000..42dca4ddd
--- /dev/null
+++ b/client/src/components/production-list-columns/production-list-columns.detailpriority.component.jsx
@@ -0,0 +1,56 @@
+import { useMutation } from "@apollo/react-hooks";
+import { Dropdown, Menu } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { logImEXEvent } from "../../firebase/firebase.utils";
+
+export default function ProductionListColumnDetailPriority({ record }) {
+  const { t } = useTranslation();
+
+  const [updateAlert] = useMutation(UPDATE_JOB);
+
+  const handleSetDetailPriority = (e) => {
+    logImEXEvent("production_set_detail_priority");
+    // e.stopPropagation();
+    const { key } = e;
+    updateAlert({
+      variables: {
+        jobId: record.id,
+        job: {
+          production_vars: {
+            ...record.production_vars,
+            detailpriority: key === "clearDetailPriority" ? null : key,
+          },
+        },
+      },
+    }).then(() => {
+      if (record.refetch) record.refetch();
+    });
+  };
+
+  return (
+    <Dropdown
+      overlay={
+        <Menu onClick={handleSetDetailPriority}>
+          <Menu.Item key="clearDetailPriority">
+            {t("production.actions.detailpriority-clear")}
+          </Menu.Item>
+          <Menu.SubMenu
+            key="set"
+            title={t("production.actions.detailpriority-set")}
+          >
+            {new Array(9).fill().map((value, index) => (
+              <Menu.Item key={index + 1}>{index + 1}</Menu.Item>
+            ))}
+          </Menu.SubMenu>
+        </Menu>
+      }
+      trigger={["click"]}
+    >
+      <div style={{ width: "100%", height: "19px" }}>
+        {record.production_vars && record.production_vars.detailpriority}
+      </div>
+    </Dropdown>
+  );
+}
diff --git a/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx b/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx
index 1379ca6c4..e70798d69 100644
--- a/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.paintpriority.component.jsx
@@ -12,7 +12,7 @@ export default function ProductionListColumnPaintPriority({ record }) {
 
   const handleSetPaintPriority = (e) => {
     logImEXEvent("production_set_paint_priority");
-    e.stopPropagation();
+    //  e.stopPropagation();
     const { key } = e;
     updateAlert({
       variables: {
@@ -33,19 +33,21 @@ export default function ProductionListColumnPaintPriority({ record }) {
     <Dropdown
       overlay={
         <Menu onClick={handleSetPaintPriority}>
-          <Menu.Item key='clearPaintPriority'>
+          <Menu.Item key="clearPaintPriority">
             {t("production.actions.paintpriority-clear")}
           </Menu.Item>
           <Menu.SubMenu
-            key='set'
-            title={t("production.actions.paintpriority-set")}>
+            key="set"
+            title={t("production.actions.paintpriority-set")}
+          >
             {new Array(9).fill().map((value, index) => (
               <Menu.Item key={index + 1}>{index + 1}</Menu.Item>
             ))}
           </Menu.SubMenu>
         </Menu>
       }
-      trigger={["contextMenu"]}>
+      trigger={["click"]}
+    >
       <div style={{ width: "100%", height: "19px" }}>
         {record.production_vars && record.production_vars.paintpriority}
       </div>
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 698fa3b80..71b72f3f7 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -1460,6 +1460,8 @@
 				"addcolumns": "Add Columns",
 				"bodypriority-clear": "Clear Body Priority",
 				"bodypriority-set": "Set Body Priority",
+				"detailpriority-clear": "Clear Detail Priority",
+				"detailpriority-set": "Set Detail Priority",
 				"paintpriority-clear": "Clear Paint Priority",
 				"paintpriority-set": "Set Paint Priority",
 				"remove": "Remove from Production",
@@ -1477,6 +1479,7 @@
 				"bodyhours": "B",
 				"bodypriority": "B/P",
 				"cycletime": "C/T",
+				"detailpriority": "D/P",
 				"employeesearch": "Employee Search",
 				"jobdetail": "Job Details",
 				"note": "Production Note",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 3a492066e..f4f7cdbea 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -1460,6 +1460,8 @@
 				"addcolumns": "",
 				"bodypriority-clear": "",
 				"bodypriority-set": "",
+				"detailpriority-clear": "",
+				"detailpriority-set": "",
 				"paintpriority-clear": "",
 				"paintpriority-set": "",
 				"remove": "",
@@ -1477,6 +1479,7 @@
 				"bodyhours": "",
 				"bodypriority": "",
 				"cycletime": "",
+				"detailpriority": "",
 				"employeesearch": "",
 				"jobdetail": "",
 				"note": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index d6ad84b29..b89f0ca04 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -1460,6 +1460,8 @@
 				"addcolumns": "",
 				"bodypriority-clear": "",
 				"bodypriority-set": "",
+				"detailpriority-clear": "",
+				"detailpriority-set": "",
 				"paintpriority-clear": "",
 				"paintpriority-set": "",
 				"remove": "",
@@ -1477,6 +1479,7 @@
 				"bodyhours": "",
 				"bodypriority": "",
 				"cycletime": "",
+				"detailpriority": "",
 				"employeesearch": "",
 				"jobdetail": "",
 				"note": "",