IO-2698 Fuel Level & Sorter

Signed-off-by: Allan Carr <allan.carr@thinkimex.com>

client/src/components/courtesy-cars-list/courtesy-cars-list.component.jsx

@@ -178,7 +178,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       title: t("courtesycars.fields.fuel"),
       dataIndex: "fuel",
       key: "fuel",
-      sorter: (a, b) => alphaSort(a.fuel, b.fuel),
+      sorter: (a, b) => a.fuel - b.fuel,
       sortOrder:
         state.sortedInfo.columnKey === "fuel" && state.sortedInfo.order,
       render: (text, record) => {
@@ -187,12 +187,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
             return t("courtesycars.labels.fuel.full");
           case 88:
             return t("courtesycars.labels.fuel.78");
+          case 75:
+            return t("courtesycars.labels.fuel.34");
           case 63:
             return t("courtesycars.labels.fuel.58");
           case 50:
             return t("courtesycars.labels.fuel.12");
           case 38:
-            return t("courtesycars.labels.fuel.34");
+            return t("courtesycars.labels.fuel.38");
           case 25:
             return t("courtesycars.labels.fuel.14");
           case 13:

client/src/components/job-employee-assignments/job-employee-assignments.component.jsx

@@ -23,6 +23,7 @@ export function JobEmployeeAssignments({
   jobRO,
   body,
   refinish,
+
   prep,
   csr,
   handleAdd,
@@ -77,7 +78,7 @@ export function JobEmployeeAssignments({
               setVisibility(false);
             }}
           >
-            {t("allocations.actions.assign")}
+            Assign
           </Button>
           <Button onClick={() => setVisibility(false)}>Close</Button>
         </Space>

client/src/components/job-employee-assignments/job-employee-assignments.container.jsx

@@ -43,13 +43,13 @@ export function JobEmployeeAssignmentsContainer({
     });
     if (refetch) refetch();
 
-    if (!!!result.errors) {
-      insertAuditTrail({
-        jobid: job.id,
-        operation: AuditTrailMapping.jobassignmentchange(operation, name),
-        type: "jobassignmentchange",
-      });
-    } else {
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobassignmentchange(operation, name),
+      type: "jobassignmentchange",
+    });
+
+    if (!!result.errors) {
       notification["error"]({
         message: t("jobs.errors.assigning", {
           message: JSON.stringify(result.errors),
@@ -67,19 +67,18 @@ export function JobEmployeeAssignmentsContainer({
       variables: { jobId: job.id, job: { [empAssignment]: null } },
     });
 
-    if (!!!result.errors) {
-      insertAuditTrail({
-        jobid: job.id,
-        operation: AuditTrailMapping.jobassignmentremoved(operation),
-        type: "jobassignmentremoved",
-      });
-    } else {
+    if (!!result.errors) {
       notification["error"]({
         message: t("jobs.errors.assigning", {
           message: JSON.stringify(result.errors),
         }),
       });
     }
+    insertAuditTrail({
+      jobid: job.id,
+      operation: AuditTrailMapping.jobassignmentremoved(operation),
+      type: "jobassignmentremoved",
+    });
     setLoading(false);
   };