admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved issues on time ticket modal IO-563

Browse Source
This commit is contained in:
Patrick Fic
2021-02-04 18:15:00 -08:00
parent 9993d76709
commit ef03a6cd42
5 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/job-search-select/job-search-select.component.jsx
View File

@@ -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) {

4
client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
View File

@@ -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>

2
client/src/components/labor-allocations-table/labor-allocations-table.utility.js
View File

@@ -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

12
client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
View File

@@ -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>
);

3
client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
View File

@@ -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 {