From 42e519bd7ec3863afe4e54d6b93f8cfca1351a0d Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 16 Dec 2020 21:15:27 -0800
Subject: [PATCH] Removed unneccessary imports. Added production note to kanban
 and job detail. IO-459

---
 bodyshop_translations.babel                   | 28 ++++++++++++++++++-
 .../jobs-convert-button.component.jsx         |  5 +---
 .../jobs-detail-header.component.jsx          | 15 +++++++++-
 .../jobs-documents-gallery.component.jsx      |  2 +-
 .../jobs-notes/jobs.notes.component.jsx       |  4 +--
 ...production-board-kanban-card.component.jsx |  4 +++
 ...-list-columns.productionnote.component.jsx | 12 ++++----
 .../production-list-table.component.jsx       |  2 +-
 .../shop-info/shop-info.component.jsx         |  2 --
 .../vehicle-detail-form.component.jsx         |  4 +--
 .../vendors-form/vendors-form.component.jsx   |  3 +-
 client/src/graphql/jobs.queries.js            |  2 ++
 client/src/translations/en_us/common.json     |  3 ++
 client/src/translations/es/common.json        |  3 ++
 client/src/translations/fr/common.json        |  3 ++
 15 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 1233b3fb8..a877e68bb 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -15327,6 +15327,32 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <folder_node>
+                                        <name>production_vars</name>
+                                        <children>
+                                            <concept_node>
+                                                <name>note</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>
+                                        </children>
+                                    </folder_node>
                                     <concept_node>
                                         <name>rate_la1</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index 6348b40bc..a53e198ab 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -6,10 +6,7 @@ import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { CONVERT_JOB_TO_RO } from "../../graphql/jobs.queries";
 import { selectJobReadOnly } from "../../redux/application/application.selectors";
-import {
-  selectAuthLevel,
-  selectBodyshop,
-} from "../../redux/user/user.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 1bda5abed..677e32f07 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -1,5 +1,5 @@
 import { PrinterFilled } from "@ant-design/icons";
-import { Button, PageHeader, Tag } from "antd";
+import { Button, Divider, PageHeader, Tag } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -12,6 +12,7 @@ import JobsChangeStatus from "../jobs-change-status/jobs-change-status.component
 import JobsConvertButton from "../jobs-convert-button/jobs-convert-button.component";
 import JobsDetailHeaderActions from "../jobs-detail-header-actions/jobs-detail-header-actions.component";
 import OwnerTagPopoverComponent from "../owner-tag-popover/owner-tag-popover.component";
+import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleTagPopoverComponent from "../vehicle-tag-popover/vehicle-tag-popover.component";
 import "./jobs-detail-header.styles.scss";
 
@@ -95,6 +96,18 @@ export function JobsDetailHeader({
       extra={menuExtra}
     >
       <div style={{ display: "flex", justifyContent: "flex-end" }}>
+        {job.inproduction && (
+          <>
+            <div style={{ display: "flex", flex: 1 }}>
+              <div style={{ width: "20%" }}>
+                {t("jobs.fields.production_vars.note")}
+              </div>
+              <ProductionListColumnProductionNote record={job} />
+            </div>
+            <Divider type="vertical" />
+          </>
+        )}
+
         <JobEmployeeAssignments job={job} />
       </div>
     </PageHeader>
diff --git a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
index 3812a267c..76d1ed424 100644
--- a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
@@ -1,4 +1,4 @@
-import { Collapse, Space, Card } from "antd";
+import { Card, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import Gallery from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
diff --git a/client/src/components/jobs-notes/jobs.notes.component.jsx b/client/src/components/jobs-notes/jobs.notes.component.jsx
index 6c9300742..b20c53d8d 100644
--- a/client/src/components/jobs-notes/jobs.notes.component.jsx
+++ b/client/src/components/jobs-notes/jobs.notes.component.jsx
@@ -2,7 +2,7 @@ import {
   DeleteFilled,
   EditFilled,
   EyeInvisibleFilled,
-  WarningFilled
+  WarningFilled,
 } from "@ant-design/icons";
 import { Button, Table } from "antd";
 import React from "react";
@@ -118,7 +118,7 @@ export function JobNotesComponent({
       <Table
         loading={loading}
         pagination={{ position: "bottom" }}
-        columns={columns.map((item) => ({ ...item }))}
+        columns={columns}
         rowKey="id"
         dataSource={data}
       />
diff --git a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
index bcc93ce3e..b00e4fb4b 100644
--- a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
+++ b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx
@@ -8,6 +8,7 @@ import "./production-board-card.styles.scss";
 import ProductionRemoveButton from "../production-remove-button/production-remove-button.component";
 import { useTranslation } from "react-i18next";
 import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
+import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 
 export default function ProductionBoardCard(card) {
   const { t } = useTranslation();
@@ -79,6 +80,9 @@ export default function ProductionBoardCard(card) {
             <div>{card.alt_transport || ""}</div>
           </Col>
         </Row>
+        <div>
+          <ProductionListColumnProductionNote record={card} />
+        </div>
         <div className="imex-flex-row imex-flex-row__flex-space-around">
           <ProductionAlert record={card} key="alert" />
           <ProductionSubletsManageComponent subletJobLines={card.subletLines} />
diff --git a/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx b/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
index ac4b8e80c..7dfc510b2 100644
--- a/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.productionnote.component.jsx
@@ -1,10 +1,11 @@
+import Icon from "@ant-design/icons";
 import { useMutation } from "@apollo/react-hooks";
 import { Button, Input, Popover } from "antd";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
-import { UPDATE_JOB } from "../../graphql/jobs.queries";
+import { FaRegStickyNote } from "react-icons/fa";
 import { logImEXEvent } from "../../firebase/firebase.utils";
-
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 export default function ProductionListColumnProductionNote({ record }) {
   const { t } = useTranslation();
 
@@ -41,7 +42,6 @@ export default function ProductionListColumnProductionNote({ record }) {
   };
 
   const handleVisibleChange = (flag) => {
-  
     setVisible(flag);
     if (flag)
       setNote((record.production_vars && record.production_vars.note) || "");
@@ -68,8 +68,10 @@ export default function ProductionListColumnProductionNote({ record }) {
           </div>
         </div>
       }
-      trigger={["contextMenu"]}>
-      <div style={{ width: "100%", height: "19px" }}>
+      trigger={["click"]}
+    >
+      <div style={{ width: "100%", height: "19px", cursor: "pointer" }}>
+        <Icon component={FaRegStickyNote} style={{ marginRight: ".2rem" }} />
         {(record.production_vars && record.production_vars.note) || " "}
       </div>
     </Popover>
diff --git a/client/src/components/production-list-table/production-list-table.component.jsx b/client/src/components/production-list-table/production-list-table.component.jsx
index 8cb53a75b..93d838f82 100644
--- a/client/src/components/production-list-table/production-list-table.component.jsx
+++ b/client/src/components/production-list-table/production-list-table.component.jsx
@@ -31,7 +31,7 @@ export function ProductionListTable({
     }
   );
   const { t } = useTranslation();
-  const Now = new Date();
+
   const handleTableChange = (pagination, filters, sorter) => {
     setState({
       ...state,
diff --git a/client/src/components/shop-info/shop-info.component.jsx b/client/src/components/shop-info/shop-info.component.jsx
index 111120f4f..fc9d98c37 100644
--- a/client/src/components/shop-info/shop-info.component.jsx
+++ b/client/src/components/shop-info/shop-info.component.jsx
@@ -11,7 +11,6 @@ import {
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
 import PhoneFormItem, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
@@ -508,7 +507,6 @@ export default function ShopInfoComponent({ form, saveLoading }) {
             }}
           </Form.List>
           <LayoutFormRow>
-            
             <Form.Item
               name={["md_classes"]}
               label={t("bodyshop.fields.md_classes")}
diff --git a/client/src/components/vehicle-detail-form/vehicle-detail-form.component.jsx b/client/src/components/vehicle-detail-form/vehicle-detail-form.component.jsx
index 448351185..4f65e318d 100644
--- a/client/src/components/vehicle-detail-form/vehicle-detail-form.component.jsx
+++ b/client/src/components/vehicle-detail-form/vehicle-detail-form.component.jsx
@@ -1,4 +1,4 @@
-import { Button, Form, Input, InputNumber } from "antd";
+import { Button, Form, Input } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import FormDatePicker from "../form-date-picker/form-date-picker.component";
@@ -138,7 +138,7 @@ export default function VehicleDetailFormComponent({ form, loading }) {
         {
           //TODO Add handling for paint code json
           //Removed as a part of IO-446.
-          //No values have been captured in this field as of yet. 
+          //No values have been captured in this field as of yet.
           // <Form.Item
           //   label={t("vehicles.fields.v_paint_codes")}
           //   name="v_paint_codes"
diff --git a/client/src/components/vendors-form/vendors-form.component.jsx b/client/src/components/vendors-form/vendors-form.component.jsx
index 407b88e9d..0c6c3d0cd 100644
--- a/client/src/components/vendors-form/vendors-form.component.jsx
+++ b/client/src/components/vendors-form/vendors-form.component.jsx
@@ -10,13 +10,12 @@ import {
 } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
-import InputNumberCalculator from "../form-input-number-calculator/form-input-number-calculator.component";
+import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 import FormItemEmail from "../form-items-formatted/email-form-item.component";
 import PhoneFormItem, {
   PhoneItemFormatterValidation,
 } from "../form-items-formatted/phone-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import FormFieldsChanged from "../form-fields-changed-alert/form-fields-changed-alert.component";
 export default function VendorsFormComponent({
   form,
   formLoading,
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index aa8addc04..bd8b84eaa 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -412,6 +412,7 @@ export const GET_JOB_BY_PK = gql`
       ownr_zip
       ownr_ctry
       ownr_ph1
+      production_vars
       ca_gst_registrant
       owner {
         id
@@ -705,6 +706,7 @@ export const UPDATE_JOB = gql`
         status
         alt_transport
         ro_number
+        production_vars
       }
     }
   }
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 05708155c..8dfd770b0 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -958,6 +958,9 @@
 				"phoneshort": "PH",
 				"policy_no": "Policy #",
 				"ponumber": "PO Number",
+				"production_vars": {
+					"note": "Production Note:"
+				},
 				"rate_la1": "LA1",
 				"rate_la2": "LA2",
 				"rate_la3": "LA3",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index fc6ad1df3..84b973399 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -958,6 +958,9 @@
 				"phoneshort": "PH",
 				"policy_no": "Política #",
 				"ponumber": "numero postal",
+				"production_vars": {
+					"note": ""
+				},
 				"rate_la1": "Tarifa LA1",
 				"rate_la2": "Tarifa LA2",
 				"rate_la3": "Tarifa LA3",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index d18c96c66..19548c7d7 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -958,6 +958,9 @@
 				"phoneshort": "PH",
 				"policy_no": "Politique #",
 				"ponumber": "Numéro de bon de commande",
+				"production_vars": {
+					"note": ""
+				},
 				"rate_la1": "Taux LA1",
 				"rate_la2": "Taux LA2",
 				"rate_la3": "Taux LA3",