IO-2719 Missing CC Filter

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

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

@@ -61,6 +61,10 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           text: t("courtesycars.status.in"),
           value: "courtesycars.status.in",
         },
+        {
+          text: t("courtesycars.status.inservice"),
+          value: "courtesycars.status.inservice",
+        },
         {
           text: t("courtesycars.status.out"),
           value: "courtesycars.status.out",
@@ -74,7 +78,7 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           value: "courtesycars.status.leasereturn",
         },
       ],
-      onFilter: (value, record) => value.includes(record.status),
+      onFilter: (value, record) => record.status === value,
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => {

client/src/components/jobs-detail-header/jobs-detail-header.component.jsx

@@ -5,7 +5,6 @@ import {
   WarningFilled,
 } from "@ant-design/icons";
 import { Card, Col, Divider, Row, Space, Tag, Tooltip } from "antd";
-import moment from "moment";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -27,6 +26,7 @@ import ProductionListColumnComment from "../production-list-columns/production-l
 import ProductionListColumnProductionNote from "../production-list-columns/production-list-columns.productionnote.component";
 import VehicleVinDisplay from "../vehicle-vin-display/vehicle-vin-display.component";
 import "./jobs-detail-header.styles.scss";
+import moment from "moment";
 
 const mapStateToProps = createStructuredSelector({
   jobRO: selectJobReadOnly,
@@ -101,11 +101,7 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.status === bodyshop.md_ro_statuses.default_scheduled &&
                 job.scheduled_in ? (
                   <Tag>
-                    <Link
-                      to={`/manage/schedule?date=${moment(
-                        job.scheduled_in
-                      ).format("YYYY-MM-DD")}`}
-                    >
+                    <Link to={`/manage/schedule?date=${moment(job.scheduled_in).format('YYYY-MM-DD')}`}>
                       <DateTimeFormatter>{job.scheduled_in}</DateTimeFormatter>
                     </Link>
                   </Tag>
@@ -225,12 +221,6 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
                 {job.owner?.tax_number || ""}
               </DataLabel>
             )}
-            <DataLabel
-              label={t("owners.fields.note")}
-              valueStyle={{ overflow: "hidden", textOverflow: "ellipsis" }}
-            >
-              {job.owner?.note || ""}
-            </DataLabel>
           </div>
         </Card>
       </Col>

client/src/graphql/jobs.queries.js

@@ -704,7 +704,6 @@ export const GET_JOB_BY_PK = gql`
       other_amount_payable
       owner {
         id
-        note
         ownr_fn
         ownr_ln
         ownr_co_nm