From 2e99a2eee2b1a436e7d0f879fa944c8f3f41fcae Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Wed, 16 Sep 2020 12:36:31 -0700
Subject: [PATCH] Various samll bugfixes.

---
 bodyshop_translations.babel                   | 23 ++++++++++-
 .../job-checklist-template-item.component.jsx |  5 ++-
 .../jobs-available-new.component.jsx          | 32 ++++++++++------
 .../jobs-close-lines.component.jsx            |  9 ++++-
 .../labor-allocations-table.component.jsx     |  5 ++-
 .../owner-tag-popover.component.jsx           | 38 ++++++++++---------
 client/src/graphql/available-jobs.queries.js  |  1 +
 .../jobs-intake.page.container.jsx            |  5 ++-
 client/src/translations/en_us/common.json     |  3 +-
 client/src/translations/es/common.json        |  3 +-
 client/src/translations/fr/common.json        |  3 +-
 11 files changed, 89 insertions(+), 38 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index bda94d8f7..45d742116 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
@@ -10961,6 +10961,27 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>PAM</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>PAN</name>
                                                 <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/job-checklist/components/job-checklist-template-item/job-checklist-template-item.component.jsx b/client/src/components/job-checklist/components/job-checklist-template-item/job-checklist-template-item.component.jsx
index 01590e8dc..bf6d9470a 100644
--- a/client/src/components/job-checklist/components/job-checklist-template-item/job-checklist-template-item.component.jsx
+++ b/client/src/components/job-checklist/components/job-checklist-template-item/job-checklist-template-item.component.jsx
@@ -1,12 +1,15 @@
 import React from "react";
 import { PrinterFilled } from "@ant-design/icons";
+import { useTranslation } from "react-i18next";
+
 export default function JobChecklistTemplateItem({
   templateKey,
   renderTemplate,
 }) {
+  const { t } = useTranslation();
   return (
     <div>
-      {templateKey}
+      {t(`printcenter.jobs.${templateKey}`)}
       <PrinterFilled onClick={() => renderTemplate(templateKey)} />
     </div>
   );
diff --git a/client/src/components/jobs-available-new/jobs-available-new.component.jsx b/client/src/components/jobs-available-new/jobs-available-new.component.jsx
index b81cb9add..3a09e3f56 100644
--- a/client/src/components/jobs-available-new/jobs-available-new.component.jsx
+++ b/client/src/components/jobs-available-new/jobs-available-new.component.jsx
@@ -38,17 +38,17 @@ export default function JobsAvailableComponent({
   };
 
   const columns = [
-    {
-      title: t("jobs.fields.cieca_id"),
-      dataIndex: "cieca_id",
-      key: "cieca_id",
-      //width: "8%",
-      // onFilter: (value, record) => record.ro_number.includes(value),
-      // filteredValue: state.filteredInfo.text || null,
-      sorter: (a, b) => alphaSort(a, b),
-      sortOrder:
-        state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order,
-    },
+    // {
+    //   title: t("jobs.fields.cieca_id"),
+    //   dataIndex: "cieca_id",
+    //   key: "cieca_id",
+    //   //width: "8%",
+    //   // onFilter: (value, record) => record.ro_number.includes(value),
+    //   // filteredValue: state.filteredInfo.text || null,
+    //   sorter: (a, b) => alphaSort(a, b),
+    //   sortOrder:
+    //     state.sortedInfo.columnKey === "cieca_id" && state.sortedInfo.order,
+    // },
     {
       title: t("jobs.fields.owner"),
       dataIndex: "ownr_name",
@@ -78,6 +78,16 @@ export default function JobsAvailableComponent({
       //width: "12%",
       //ellipsis: true
     },
+    {
+      title: t("jobs.fields.ins_co_nm"),
+      dataIndex: "ins_co_nm",
+      key: "ins_co_nm",
+      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
+      sortOrder:
+        state.sortedInfo.columnKey === "ins_co_nm" && state.sortedInfo.order,
+      //width: "12%",
+      //ellipsis: true
+    },
     {
       title: t("jobs.fields.clm_total"),
       dataIndex: "clm_amt",
diff --git a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
index 13be564b4..51e7835c8 100644
--- a/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
+++ b/client/src/components/jobs-close-lines/jobs-close-lines.component.jsx
@@ -50,7 +50,14 @@ export function JobsCloseLines({ bodyshop, joblines }) {
                     >
                       <ReadOnlyFormItem type="currency" />
                     </Form.Item>
-
+                    <Form.Item
+                      span={2}
+                      label={t("joblines.fields.op_code_desc")}
+                      key={`${index}op_code_desc`}
+                      name={[field.name, "op_code_desc"]}
+                    >
+                      <ReadOnlyFormItem />
+                    </Form.Item>
                     <Form.Item
                       span={2}
                       label={t("joblines.fields.mod_lbr_ty")}
diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
index 8599e61a2..26be7de24 100644
--- a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
+++ b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
@@ -52,8 +52,9 @@ export function LaborAllocationsTable({ joblines, timetickets, bodyshop }) {
           <Col span={6}>
             <strong
               style={{
-                color: Math.round(t.total - t.claimed) > 0 ? "green" : "red",
-              }}>
+                color: t.total - t.claimed > 0 ? "green" : "red",
+              }}
+            >
               {(t.total - t.claimed).toFixed(2)}
             </strong>
           </Col>
diff --git a/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx b/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
index f6784744f..2e9b7bd75 100644
--- a/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
+++ b/client/src/components/owner-tag-popover/owner-tag-popover.component.jsx
@@ -11,20 +11,21 @@ export default function OwnerTagPopoverComponent({ job }) {
         <Col span={12}>
           <Descriptions
             title={t("owners.labels.fromclaim")}
-            size='small'
-            column={1}>
-            <Descriptions.Item key='1' label={t("jobs.fields.owner")}>{`${
+            size="small"
+            column={1}
+          >
+            <Descriptions.Item key="1" label={t("jobs.fields.owner")}>{`${
               job.ownr_fn || ""
             } ${job.ownr_ln || ""} ${job.ownr_co_nm || ""}`}</Descriptions.Item>
-            <Descriptions.Item key='2' label={t("jobs.fields.ownr_ph1")}>
+            <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
               <PhoneFormatter>{job.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
-            <Descriptions.Item key='3' label={t("owners.fields.address")}>
+            <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.ownr_addr1 || ""} ${job.ownr_addr2 || ""} ${
                 job.ownr_city || ""
               } ${job.ownr_st || ""} ${job.ownr_zip || ""}`}
             </Descriptions.Item>
-            <Descriptions.Item key='4' label={t("owners.fields.ownr_ea")}>
+            <Descriptions.Item key="4" label={t("owners.fields.ownr_ea")}>
               {job.ownr_ea || ""}
               {
                 //TODO Should add an email formatter.
@@ -35,24 +36,25 @@ export default function OwnerTagPopoverComponent({ job }) {
         <Col span={12}>
           <Descriptions
             title={t("owners.labels.fromowner")}
-            size='small'
-            column={1}>
-            <Descriptions.Item key='1' label={t("jobs.fields.owner")}>{`${
+            size="small"
+            column={1}
+          >
+            <Descriptions.Item key="1" label={t("jobs.fields.owner")}>{`${
               job.owner.ownr_fn || ""
             } ${job.owner.ownr_ln || ""} ${
               job.owner.ownr_co_nm || ""
             }`}</Descriptions.Item>
-            <Descriptions.Item key='2' label={t("jobs.fields.ownr_ph1")}>
+            <Descriptions.Item key="2" label={t("jobs.fields.ownr_ph1")}>
               <PhoneFormatter>{job.owner.ownr_ph1 || ""}</PhoneFormatter>
             </Descriptions.Item>
-            <Descriptions.Item key='3' label={t("owners.fields.address")}>
+            <Descriptions.Item key="3" label={t("owners.fields.address")}>
               {`${job.owner.ownr_addr1 || ""} ${job.owner.ownr_addr2 || ""} ${
                 job.owner.ownr_city || ""
               } ${job.owner.ownr_st || ""} ${job.owner.ownr_zip || ""} ${
                 job.owner.ownr_ctry || ""
               } `}
             </Descriptions.Item>
-            <Descriptions.Item key='4' label={t("owners.fields.ownr_ea")}>
+            <Descriptions.Item key="4" label={t("owners.fields.ownr_ea")}>
               {job.owner.ownr_ea || ""}
               {
                 //TODO Should add an email formatter.
@@ -68,11 +70,13 @@ export default function OwnerTagPopoverComponent({ job }) {
   );
 
   return (
-    <Popover placement='bottom' content={content}>
-      <Tag color='cyan'>
-        {job.owner
-          ? `${job.ownr_co_nm || ""}${job.ownr_fn || ""} ${job.ownr_ln || ""}`
-          : t("jobs.errors.noowner")}
+    <Popover placement="bottom" content={content}>
+      <Tag color="cyan">
+        <Link to={`/manage/owners/${job.owner.id}`}>
+          {job.owner
+            ? `${job.ownr_co_nm || ""}${job.ownr_fn || ""} ${job.ownr_ln || ""}`
+            : t("jobs.errors.noowner")}
+        </Link>
       </Tag>
     </Popover>
   );
diff --git a/client/src/graphql/available-jobs.queries.js b/client/src/graphql/available-jobs.queries.js
index bbaaf7afc..f9a6db9ed 100644
--- a/client/src/graphql/available-jobs.queries.js
+++ b/client/src/graphql/available-jobs.queries.js
@@ -41,6 +41,7 @@ export const QUERY_AVAILABLE_SUPPLEMENT_JOBS = gql`
       uploaded_by
       vehicle_info
       job {
+        id
         ro_number
       }
     }
diff --git a/client/src/pages/jobs-intake/jobs-intake.page.container.jsx b/client/src/pages/jobs-intake/jobs-intake.page.container.jsx
index 5ef7e2f26..313695375 100644
--- a/client/src/pages/jobs-intake/jobs-intake.page.container.jsx
+++ b/client/src/pages/jobs-intake/jobs-intake.page.container.jsx
@@ -45,8 +45,9 @@ export function JobsIntakeContainer({
         link: `/manage/jobs/${jobId}`,
         label: t("titles.bc.jobs-detail", {
           number:
-            (data && data.jobs_by_pk && data.jobs_by_pk.ro_number) ||
-            data.jobs_by_pk.est_number,
+            data &&
+            ((data.jobs_by_pk && data.jobs_by_pk.ro_number) ||
+              data.jobs_by_pk.est_number),
         }),
       },
       {
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 69afdcf50..2be2ecff1 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -721,6 +721,7 @@
 					"PAA": "Aftermarket",
 					"PAE": "Existing",
 					"PAL": "LKQ",
+					"PAM": "Remanufactured",
 					"PAN": "New/OEM",
 					"PAS": "Sublet",
 					"PASL": "Sublet"
@@ -902,7 +903,7 @@
 				"rate_lam": "Mechanical",
 				"rate_lar": "Refinish",
 				"rate_las": "Sublet",
-				"rate_lau": "Aluminum (USER)",
+				"rate_lau": "Aluminum",
 				"rate_ma2s": "2 Stage Paint",
 				"rate_ma3s": "3 Stage Paint",
 				"rate_mabl": "MABL??",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 93ded7d72..6bd363408 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -721,6 +721,7 @@
 					"PAA": "",
 					"PAE": "",
 					"PAL": "",
+					"PAM": "",
 					"PAN": "",
 					"PAS": "",
 					"PASL": ""
@@ -902,7 +903,7 @@
 				"rate_lam": "Tasa mecánica",
 				"rate_lar": "Tasa de acabado",
 				"rate_las": "Tasa de subarriendo",
-				"rate_lau": "Tasa de aluminio  (USER)",
+				"rate_lau": "Tasa de aluminio",
 				"rate_ma2s": "Velocidad de pintura de 2 etapas",
 				"rate_ma3s": "Tasa de pintura de 3 etapas",
 				"rate_mabl": "MABL ??",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 5dfc24669..6972f3259 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -721,6 +721,7 @@
 					"PAA": "",
 					"PAE": "",
 					"PAL": "",
+					"PAM": "",
 					"PAN": "",
 					"PAS": "",
 					"PASL": ""
@@ -902,7 +903,7 @@
 				"rate_lam": "Taux mécanique",
 				"rate_lar": "Taux de finition",
 				"rate_las": "Taux de sous-location",
-				"rate_lau": "Taux d'aluminium  (USER)",
+				"rate_lau": "Taux d'aluminium",
 				"rate_ma2s": "Taux de peinture en 2 étapes",
 				"rate_ma3s": "Taux de peinture en 3 étapes",
 				"rate_mabl": "MABL ??",