Merged in feature/IO-2575-Production-Special-Coverage (pull request #1318)

IO-2575 Special Coverage and Sorters & Filters

Approved-by: Dave Richer

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

@@ -1,4 +1,9 @@
-import { BranchesOutlined, PauseCircleOutlined } from "@ant-design/icons";
+import {
+  BorderOutlined,
+  BranchesOutlined,
+  CheckSquareOutlined,
+  PauseCircleOutlined,
+} from "@ant-design/icons";
 import { Space, Tooltip } from "antd";
 import i18n from "i18next";
 import moment from "moment";
@@ -10,7 +15,9 @@ 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";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 import ProductionSubletsManageComponent from "../production-sublets-manage/production-sublets-manage.component";
 import ProductionListColumnAlert from "./production-list-columns.alert.component";
 import ProductionListColumnBodyPriority from "./production-list-columns.bodypriority.component";
@@ -84,7 +91,8 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
             <OwnerNameDisplay ownerObject={record} />
           </Link>
         ),
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder:
         state.sortedInfo.columnKey === "ownr" && state.sortedInfo.order,
     },
@@ -95,8 +103,10 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       ellipsis: true,
       sorter: (a, b) =>
         alphaSort(
-          a.v_make_desc + a.v_model_desc,
-          b.v_make_desc + b.v_model_desc
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
         ),
       sortOrder:
         state.sortedInfo.columnKey === "vehicle" && state.sortedInfo.order,
@@ -291,6 +301,23 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       dataIndex: "special_coverage_policy",
       key: "special_coverage_policy",
       ellipsis: true,
+      sorter: (a, b) =>
+        Number(a.special_coverage_policy) - Number(b.special_coverage_policy),
+      sortOrder:
+        state.sortedInfo.columnKey === "special_coverage_policy" &&
+        state.sortedInfo.order,
+      filters: [
+        { text: "True", value: true },
+        { text: "False", value: false },
+      ],
+      onFilter: (value, record) =>
+        value.includes(record.special_coverage_policy),
+      render: (text, record) =>
+        record.special_coverage_policy === true ? (
+          <CheckSquareOutlined />
+        ) : (
+          <BorderOutlined />
+        ),
     },
 
     {
@@ -302,6 +329,16 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       sortOrder:
         state.sortedInfo.columnKey === "alt_transport" &&
         state.sortedInfo.order,
+      filters:
+        (bodyshop &&
+          bodyshop.appt_alt_transport.map((s) => {
+            return {
+              text: s,
+              value: [s],
+            };
+          })) ||
+        [],
+      onFilter: (value, record) => value.includes(record.alt_transport),
       render: (text, record) => (
         <div>
           {record.alt_transport}
@@ -382,7 +419,11 @@ const r = ({ technician, state, activeStatuses, data, bodyshop }) => {
       title: i18n.t("production.labels.alert"),
       dataIndex: "alert",
       key: "alert",
-
+      sorter: (a, b) =>
+        Number(a.production_vars?.alert || false) -
+        Number(b.production_vars?.alert || false),
+      sortOrder:
+        state.sortedInfo.columnKey === "alert" && state.sortedInfo.order,
       render: (text, record) => <ProductionListColumnAlert record={record} />,
     },
     {