IO-2557 New CC Contract Warnings

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

client/src/components/contract-form/contract-form.component.jsx

@@ -68,6 +68,30 @@ export default function ContractFormComponent({
             <FormDateTimePicker />
           </Form.Item>
         )}
+        {create && (
+          <Form.Item
+            shouldUpdate={(p, c) => p.scheduledreturn !== c.scheduledreturn}
+          >
+            {() => {
+              const insuranceOver =
+                selectedCar &&
+                selectedCar.insuranceexpires &&
+                moment(selectedCar.insuranceexpires)
+                  .endOf("day")
+                  .isBefore(moment(form.getFieldValue("scheduledreturn")));
+              if (insuranceOver)
+                return (
+                  <Space direction="vertical" style={{ color: "tomato" }}>
+                    <span>
+                      <WarningFilled style={{ marginRight: ".3rem" }} />
+                      {t("contracts.labels.insuranceexpired")}
+                    </span>
+                  </Space>
+                );
+              return <></>;
+            }}
+          </Form.Item>
+        )}
       </LayoutFormRow>
       <LayoutFormRow grow>
         <Form.Item
@@ -90,16 +114,17 @@ export default function ContractFormComponent({
           >
             {() => {
               const mileageOver =
-                selectedCar &&
+                selectedCar && selectedCar.nextservicekm
-                selectedCar.nextservicekm <= form.getFieldValue("kmstart");
+                  ? selectedCar.nextservicekm <= form.getFieldValue("kmstart")
-
+                  : false;
               const dueForService =
                 selectedCar &&
                 selectedCar.nextservicedate &&
-                moment(selectedCar.nextservicedate).isBefore(
+                moment(selectedCar.nextservicedate)
-                  moment(form.getFieldValue("scheduledreturn"))
+                  .endOf("day")
-                );
+                  .isSameOrBefore(
-
+                    moment(form.getFieldValue("scheduledreturn"))
+                  );
               if (mileageOver || dueForService)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>
@@ -117,7 +142,6 @@ export default function ContractFormComponent({
                     </span>
                   </Space>
                 );
-
               return <></>;
             }}
           </Form.Item>

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

@@ -72,7 +72,8 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
       sortOrder:
         state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
       render: (text, record) => {
-        const { nextservicedate, nextservicekm, mileage } = record;
+        const { nextservicedate, nextservicekm, mileage, insuranceexpires } =
+          record;
 
         const mileageOver = nextservicekm ? nextservicekm <= mileage : false;
 
@@ -80,10 +81,14 @@ export default function CourtesyCarsList({ loading, courtesycars, refetch }) {
           nextservicedate &&
           moment(nextservicedate).endOf("day").isSameOrBefore(moment());
 
+        const insuranceOver =
+          insuranceexpires &&
+          moment(insuranceexpires).endOf("day").isBefore(moment());
+
         return (
           <Space>
             {t(record.status)}
-            {(mileageOver || dueForService) && (
+            {(mileageOver || dueForService || insuranceOver) && (
               <Tooltip title={t("contracts.labels.cardueforservice")}>
                 <WarningFilled style={{ color: "tomato" }} />
               </Tooltip>

client/src/graphql/courtesy-car.queries.js

@@ -29,6 +29,7 @@ export const QUERY_AVAILABLE_CC = gql`
       fleetnumber
       fuel
       id
+      insuranceexpires
       make
       mileage
       model

client/src/translations/en_us/common.json

@@ -747,6 +747,7 @@
 				"driverinformation": "Driver's Information",
 				"findcontract": "Find Contract",
 				"findermodal": "Contract Finder",
+				"insuranceexpired": "The courtesy car insurance expires before the car is expected to return.",
 				"noteconvertedfrom": "R.O. created from converted Courtesy Car Contract {{agreementnumber}}.",
 				"populatefromjob": "Populate from Job",
 				"rates": "Contract Rates",

client/src/translations/es/common.json

@@ -747,6 +747,7 @@
 				"driverinformation": "",
 				"findcontract": "",
 				"findermodal": "",
+				"insuranceexpired": "",
 				"noteconvertedfrom": "",
 				"populatefromjob": "",
 				"rates": "",

client/src/translations/fr/common.json

@@ -747,6 +747,7 @@
 				"driverinformation": "",
 				"findcontract": "",
 				"findermodal": "",
+				"insuranceexpired": "",
 				"noteconvertedfrom": "",
 				"populatefromjob": "",
 				"rates": "",