IO-2500 Courtesy Car Readiness

client/src/components/courtesy-car-fuel-select/courtesy-car-fuel-select.component.jsx

@@ -34,6 +34,32 @@ const CourtesyCarFuelComponent = (props, ref) => {
       step={null}
       style={{ marginLeft: "2rem", marginRight: "2rem" }}
       {...props}
+      tooltip={{
+        formatter: (value) => {
+          switch (value) {
+            case 0:
+              return t("courtesycars.labels.fuel.empty");
+            case 13:
+              return t("courtesycars.labels.fuel.18");
+            case 25:
+              return t("courtesycars.labels.fuel.14");
+            case 38:
+              return t("courtesycars.labels.fuel.38");
+            case 50:
+              return t("courtesycars.labels.fuel.12");
+            case 63:
+              return t("courtesycars.labels.fuel.58");
+            case 75:
+              return t("courtesycars.labels.fuel.34");
+            case 88:
+              return t("courtesycars.labels.fuel.78");
+            case 100:
+              return t("courtesycars.labels.fuel.full");
+            default:
+              return value;
+          }
+        },
+      }}
     />
   );
 };

client/src/components/production-list-columns/production-list-columns.add.component.jsx

@@ -1,7 +1,7 @@
-import { Button, Dropdown, Menu } from "antd";
 import React from "react";
-import { useTranslation } from "react-i18next";
+import { Button, Dropdown, Menu } from "antd";
 import dataSource from "./production-list-columns.data";
+import { useTranslation } from "react-i18next";
 
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -24,7 +24,6 @@ export function ProductionColumnsComponent({
   columnState,
   technician,
   bodyshop,
-  data,
   tableState,
 }) {
   const [columns, setColumns] = columnState;
@@ -37,7 +36,6 @@ export function ProductionColumnsComponent({
         bodyshop,
         technician,
         state: tableState,
-        data: data,
         activeStatuses: bodyshop.md_ro_statuses.active_statuses,
       }).filter((i) => i.key === e.key),
     ]);
@@ -48,7 +46,6 @@ export function ProductionColumnsComponent({
     technician,
     state: tableState,
     activeStatuses: bodyshop.md_ro_statuses.active_statuses,
-    data: data,
   });
   const menu = (
     <Menu

client/src/components/production-list-columns/production-list-columns.data.js

@@ -1,4 +1,4 @@
-import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
+import { PauseCircleOutlined, BranchesOutlined } from "@ant-design/icons";
 import { Space, Tooltip } from "antd";
 import i18n from "i18next";
 import moment from "moment";
@@ -6,7 +6,6 @@ import { Link } from "react-router-dom";
 import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { TimeFormatter } from "../../utils/DateFormatter";
 import PhoneFormatter from "../../utils/PhoneFormatter";
-import { onlyUnique } from "../../utils/arrayHelper";
 import { alphaSort, dateSort, statusSort } from "../../utils/sorters";
 import JobAltTransportChange from "../job-at-change/job-at-change.component";
 import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
@@ -26,7 +25,7 @@ import ProductionListColumnCategory from "./production-list-columns.status.categ
 import ProductionListColumnStatus from "./production-list-columns.status.component";
 import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component";
 
-const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
+const r = ({ technician, state, activeStatuses, bodyshop }) => {
   return [
     {
       title: i18n.t("jobs.actions.viewdetail"),
@@ -537,36 +536,6 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
         <JobPartsQueueCount parts={record.joblines_status} record={record} />
       ),
     },
-    {
-      title: i18n.t("jobs.labels.estimator"),
-      dataIndex: "estimator",
-      key: "estimator",
-      sorter: (a, b) =>
-        alphaSort(
-          `${a.est_ct_fn || ""} ${a.est_ct_ln || ""}`.trim(),
-          `${b.est_ct_fn || ""} ${b.est_ct_ln || ""}`.trim()
-        ),
-      sortOrder:
-        state.sortedInfo.columnKey === "estimator" && state.sortedInfo.order,
-      filters:
-        (data &&
-          data
-            .map((j) => `${j.est_ct_fn || ""} ${j.est_ct_ln || ""}`.trim())
-            .filter(onlyUnique)
-            .map((s) => {
-              return {
-                text: s || "N/A",
-                value: [s],
-              };
-            })) ||
-        [],
-      onFilter: (value, record) =>
-        value.includes(
-          `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim()
-        ),
-      render: (text, record) =>
-        `${record.est_ct_fn || ""} ${record.est_ct_ln || ""}`.trim(),
-    },
 
     //Added as a place holder for St Claude. Not implemented as it requires another join for a field used by only 1 client.
     // {

client/src/components/production-list-table/production-list-table-view-select.component.jsx

@@ -24,7 +24,6 @@ export function ProductionListTable({
   technician,
   currentUser,
   state,
-  data,
   setColumns,
   setState,
 }) {
@@ -42,7 +41,6 @@ export function ProductionListTable({
               bodyshop,
               technician,
               state,
-              data: data,
               activeStatuses: bodyshop.md_ro_statuses.active_statuses,
             }).find((e) => e.key === k.key),
             width: k.width,
@@ -97,7 +95,6 @@ export function ProductionListTable({
           ...ProductionListColumns({
             technician,
             state,
-            data: data,
             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
           }).find((e) => e.key === k.key),
           width: k.width,

client/src/components/production-list-table/production-list-table.component.jsx

@@ -10,7 +10,7 @@ import {
   Statistic,
   Table,
 } from "antd";
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useMemo, useState } from "react";
 import ReactDragListView from "react-drag-listview";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -79,7 +79,6 @@ export function ProductionListTable({
             bodyshop,
             technician,
             state,
-            data: data,
             activeStatuses: bodyshop.md_ro_statuses.active_statuses,
           }).find((e) => e.key === k.key),
           width: k.width ?? 100,
@@ -88,33 +87,6 @@ export function ProductionListTable({
       []
   );
 
-  useEffect(() => {
-    const newColumns =
-      (state &&
-        matchingColumnConfig &&
-        matchingColumnConfig.columns.columnKeys.map((k) => {
-          return {
-            ...ProductionListColumns({
-              bodyshop,
-              technician,
-              state,
-              data: data,
-              activeStatuses: bodyshop.md_ro_statuses.active_statuses,
-            }).find((e) => e.key === k.key),
-            width: k.width ?? 100,
-          };
-        })) ||
-      [];
-    setColumns(newColumns);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    //state,
-    matchingColumnConfig,
-    bodyshop,
-    technician,
-    data,
-  ]); //State removed from dependency array as it causes race condition when removing columns from table view and is not needed.
-
   const handleTableChange = (pagination, filters, sorter) => {
     setState({
       ...state,
@@ -132,8 +104,7 @@ export function ProductionListTable({
 
   const removeColumn = (e) => {
     const { key } = e;
-    const newColumns = columns.filter((i) => i.key !== key);
-    setColumns(newColumns);
+    setColumns(columns.filter((i) => i.key !== key));
   };
 
   const handleResize =
@@ -256,7 +227,6 @@ export function ProductionListTable({
             <ProductionListColumnsAdd
               columnState={[columns, setColumns]}
               tableState={state}
-              data={data}
             />
             <ProductionListSaveConfigButton
               columns={columns}
@@ -267,7 +237,6 @@ export function ProductionListTable({
               state={state}
               setState={setState}
               setColumns={setColumns}
-              data={data}
             />
 
             <Input

client/src/graphql/jobs.queries.js

@@ -364,8 +364,6 @@ export const QUERY_JOBS_IN_PRODUCTION = gql`
       employee_refinish
       employee_prep
       employee_csr
-      est_ct_fn
-      est_ct_ln
       suspended
       date_repairstarted
       joblines_status {