From 12c87ed68953297d7a4c8ce124079b9b98d902b3 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Wed, 23 Apr 2025 18:48:35 -0700 Subject: [PATCH] IO-3217 OTSL Labor Type Signed-off-by: Allan Carr --- .../jobs-available-table.container.jsx | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/client/src/components/jobs-available-table/jobs-available-table.container.jsx b/client/src/components/jobs-available-table/jobs-available-table.container.jsx index 0e41c3997..c27423821 100644 --- a/client/src/components/jobs-available-table/jobs-available-table.container.jsx +++ b/client/src/components/jobs-available-table/jobs-available-table.container.jsx @@ -4,11 +4,12 @@ import { Col, Row } from "antd"; import Axios from "axios"; import _ from "lodash"; import queryString from "query-string"; -import React, { useCallback, useEffect, useState } from "react"; +import { useCallback, useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { useLocation, useNavigate } from "react-router-dom"; import { createStructuredSelector } from "reselect"; +import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; import { logImEXEvent } from "../../firebase/firebase.utils"; import { DELETE_AVAILABLE_JOB, @@ -33,7 +34,6 @@ import OwnerFindModalContainer from "../owner-find-modal/owner-find-modal.contai import { GetSupplementDelta } from "./jobs-available-supplement.estlines.util"; import HeaderFields from "./jobs-available-supplement.headerfields"; import JobsAvailableTableComponent from "./jobs-available-table.component"; -import { useNotification } from "../../contexts/Notifications/notificationContext.jsx"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -195,7 +195,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail await deleteJob({ variables: { id: estData.id } - }).then((r) => { + }).then(() => { refetch(); setInsertLoading(false); }); @@ -315,7 +315,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail deleteJob({ variables: { id: estData.id } - }).then((r) => { + }).then(() => { refetch(); setInsertLoading(false); }); @@ -372,7 +372,7 @@ export function JobsAvailableContainer({ bodyshop, currentUser, insertAuditTrail loadEstData({ variables: { id: record.id } }); modalSearchState[1](record.clm_no); setJobModalVisible(true); - // eslint-disable-next-line react-hooks/exhaustive-deps + // eslint-disable-next-line }, []); useEffect(() => { @@ -456,7 +456,7 @@ function replaceEmpty(someObj, replaceValue = null) { return JSON.parse(temp); } -async function CheckTaxRatesUSA(estData, bodyshop) { +async function CheckTaxRatesUSA(estData) { if (!estData.parts_tax_rates?.PAM) { estData.parts_tax_rates.PAM = estData.parts_tax_rates.PAC; } @@ -568,7 +568,7 @@ async function CheckTaxRates(estData, bodyshop) { }); //} } -function ResolveCCCLineIssues(estData, bodyshop) { +function ResolveCCCLineIssues(estData) { //Find all misc amounts, populate them to the act price. //This needs to be done before cleansing unq_seq since some misc prices could move over. estData.joblines.data.forEach((line) => { @@ -585,6 +585,9 @@ function ResolveCCCLineIssues(estData, bodyshop) { // line.notes += ` | ET/UT Update (prev = ${line.mod_lbr_ty})`; line.mod_lbr_ty = "LAR"; } + if (line.mod_lbr_ty === "OTSL") { + line.mod_lbr_ty = line.mod_lbr_hrs === 0 ? null : "LAB"; + } } }); });