Merged in release/2022-07-22 (pull request #543)

Release/2022 07 22

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.
   };

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())

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())

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)} %`,
     },

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