From ef03a6cd423c213488adf9f5f743bfa56749888e Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 4 Feb 2021 18:15:00 -0800
Subject: [PATCH] Resolved issues on time ticket modal IO-563

---
 .../job-search-select.component.jsx                  |  8 +-------
 .../labor-allocations-table.component.jsx            |  4 ++--
 .../labor-allocations-table.utility.js               |  2 +-
 .../time-ticket-modal.component.jsx                  | 12 +++++++-----
 .../time-ticket-modal.container.jsx                  |  3 ++-
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/client/src/components/job-search-select/job-search-select.component.jsx b/client/src/components/job-search-select/job-search-select.component.jsx
index 728f82109..332c7eb4b 100644
--- a/client/src/components/job-search-select/job-search-select.component.jsx
+++ b/client/src/components/job-search-select/job-search-select.component.jsx
@@ -6,7 +6,7 @@ import React, { forwardRef, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
 import {
   SEARCH_JOBS_BY_ID_FOR_AUTOCOMPLETE,
-  SEARCH_JOBS_FOR_AUTOCOMPLETE
+  SEARCH_JOBS_FOR_AUTOCOMPLETE,
 } from "../../graphql/jobs.queries";
 import AlertComponent from "../alert/alert.component";
 const { Option } = Select;
@@ -61,12 +61,6 @@ const JobSearchSelect = (
     }
   }, [value, option, callIdSearch]);
 
-  // useEffect(() => {
-  //   if (value !== option && onChange) {
-  //     onChange(option);
-  //   }
-  // }, [value, option, onChange]);
-
   const handleSelect = (value) => {
     setOption(value);
     if (value !== option && onChange) {
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 127ad163a..a38194761 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
@@ -21,7 +21,6 @@ export function LaborAllocationsTable({
   adjustments,
 }) {
   const { t } = useTranslation();
-
   const [totals, setTotals] = useState([]);
   useEffect(() => {
     if (!!joblines && !!timetickets && !!bodyshop);
@@ -33,7 +32,8 @@ export function LaborAllocationsTable({
         adjustments
       )
     );
-  }, [joblines, timetickets, bodyshop, adjustments]);
+    if (!jobId) setTotals([]);
+  }, [joblines, timetickets, bodyshop, adjustments, jobId]);
 
   return (
     <div>
diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.utility.js b/client/src/components/labor-allocations-table/labor-allocations-table.utility.js
index feb65c50c..87f55c4c5 100644
--- a/client/src/components/labor-allocations-table/labor-allocations-table.utility.js
+++ b/client/src/components/labor-allocations-table/labor-allocations-table.utility.js
@@ -6,7 +6,7 @@ export const CalculateAllocationsTotals = (
 ) => {
   const jobCodes = joblines.map((item) => item.mod_lbr_ty);
   //.filter((value, index, self) => self.indexOf(value) === index && !!value);
-  const ticketCodes = timetickets.map((item) => item.cieca_code);
+  const ticketCodes = timetickets.map((item) => item.ciecacode);
   //.filter((value, index, self) => self.indexOf(value) === index && !!value);
   const allCodes = [...jobCodes, ...ticketCodes].filter(
     (value, index, self) => self.indexOf(value) === index && !!value
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index 75be0dea6..b37611336 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -138,11 +138,13 @@ export default function TimeTicketModalComponent({
         </Form.Item>
       </LayoutFormRow>
       <Form.Item shouldUpdate>
-        <LaborAllocationsTable
-          jobId={form.getFieldValue("jobid")}
-          joblines={lineTicketData.joblines}
-          timetickets={lineTicketData.timetickets}
-        />
+        {() => (
+          <LaborAllocationsTable
+            jobId={form.getFieldValue("jobid")}
+            joblines={lineTicketData.joblines}
+            timetickets={lineTicketData.timetickets}
+          />
+        )}
       </Form.Item>
     </div>
   );
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
index 84dc4ac90..e158da2c8 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -95,7 +95,8 @@ export function TimeTicketModalContainer({
     if (enterAgain) {
       //Capture the existing information and repopulate it.
 
-      const prev = form.getFieldsValue(["jobid", "employeeid", "date"]);
+      const prev = form.getFieldsValue(["date"]);
+
       form.resetFields();
       form.setFieldsValue(prev);
     } else {