From 936237251275d3c82f8355988ca36f273bde7228 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 21 Jul 2022 14:05:57 -0700 Subject: [PATCH 1/4] IO-1985 Add filtering for est ct on ready and active jobs screens. --- client/src/components/jobs-list/jobs-list.component.jsx | 6 ++++++ .../jobs-ready-list/jobs-ready-list.component.jsx | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx index 82620dd63..9848e7ee4 100644 --- a/client/src/components/jobs-list/jobs-list.component.jsx +++ b/client/src/components/jobs-list/jobs-list.component.jsx @@ -77,6 +77,12 @@ export function JobsList({ bodyshop }) { (j.v_model_desc || "") .toLowerCase() .includes(searchText.toLowerCase()) || + (j.est_ct_fn || "") + .toLowerCase() + .includes(searchText.toLowerCase()) || + (j.est_ct_ln || "") + .toLowerCase() + .includes(searchText.toLowerCase()) || (j.v_make_desc || "") .toLowerCase() .includes(searchText.toLowerCase()) diff --git a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx index 47fd2fc15..84e4912e0 100644 --- a/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx +++ b/client/src/components/jobs-ready-list/jobs-ready-list.component.jsx @@ -89,6 +89,12 @@ export function JobsReadyList({ bodyshop }) { (j.v_model_desc || "") .toLowerCase() .includes(searchText.toLowerCase()) || + (j.est_ct_fn || "") + .toLowerCase() + .includes(searchText.toLowerCase()) || + (j.est_ct_ln || "") + .toLowerCase() + .includes(searchText.toLowerCase()) || (j.v_make_desc || "") .toLowerCase() .includes(searchText.toLowerCase()) From 2438857cb759e7fb502a4974be8377b08a412b8d Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 21 Jul 2022 14:20:40 -0700 Subject: [PATCH 2/4] IO-1294 Refetch data after admin update. --- .../jobs-admin-dates/jobs-admin-dates.component.jsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx index 20aff8975..b0fc2f05c 100644 --- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx +++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx @@ -38,6 +38,8 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) { setLoading(true); const result = await updateJob({ variables: { jobId: job.id, job: values }, + refetchQueries: ['GET_JOB_BY_PK'], + awaitRefetchQueries:true }); const changedAuditFields = form.getFieldsValue( @@ -66,6 +68,8 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) { }), }); } + form.resetFields(); + form.resetFields(); setLoading(false); //Get the owner details, populate it all back into the job. }; From 14c40958b4fa66d5c96c333a637534de0fbdd9db Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 21 Jul 2022 14:53:06 -0700 Subject: [PATCH 3/4] IO-1957 Adjust scoreboard effiiency for edge case. --- .../scoreboard-timetickets.stats.component.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx index 439f63743..0b1b9b6bf 100644 --- a/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx +++ b/client/src/components/scoreboard-timetickets/scoreboard-timetickets.stats.component.jsx @@ -62,7 +62,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) { key: "efficiencyoverperiod", render: (text, record) => `${( - (record.totalOverPeriod / (record.actualTotalOverPeriod || 1)) * + (record.totalOverPeriod / (record.actualTotalOverPeriod || .1)) * 100 ).toFixed(1)} %`, }, From e0e88acb9e2388e2d3b906ac747d013006477977 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 21 Jul 2022 15:05:44 -0700 Subject: [PATCH 4/4] IO-1979 Clear vacation form on enter. --- .../shop-employees/shop-employees-add-vacation.component.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/components/shop-employees/shop-employees-add-vacation.component.jsx b/client/src/components/shop-employees/shop-employees-add-vacation.component.jsx index 0dd0a4fd9..d1bffeb91 100644 --- a/client/src/components/shop-employees/shop-employees-add-vacation.component.jsx +++ b/client/src/components/shop-employees/shop-employees-add-vacation.component.jsx @@ -46,6 +46,7 @@ export default function ShopEmployeeAddVacation({ employee }) { message: t("employees.successes.vacationadded"), }); } + form.resetFields(); setLoading(false); setVisibility(false); };