Revert "Revert "Revert "Revert "Fix issues with limits. (pull request #1097)"

Revert "Revert "Revert "Fix issues with limits.

client/src/components/courtesy-car-form/courtesy-car-form.component.jsx

@@ -228,8 +228,7 @@ export default function CourtesyCarCreateFormComponent({ form, saveLoading }) {
             {() => {
               const nextservicekm = form.getFieldValue("nextservicekm");
               const mileageOver =
-                nextservicekm <= form.getFieldValue("mileage");
-
+                nextservicekm && nextservicekm <= form.getFieldValue("mileage");
               if (mileageOver)
                 return (
                   <Space direction="vertical" style={{ color: "tomato" }}>

client/src/components/form-date-picker/form-date-picker.component.jsx

@@ -65,8 +65,17 @@ export function FormDatePicker({
       });
     }
 
-    if (_a.isValid() && onChange)
-      onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+    if (_a.isValid() && onChange) {
+      if (onlyFuture) {
+        if (moment().subtract(1, "day").isBefore(_a)) {
+          onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+        } else {
+          onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment());
+        }
+      } else {
+        onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
+      }
+    }
   };
 
   return (

client/src/components/form-date-time-picker/form-date-time-picker.component.jsx

@@ -1,9 +1,9 @@
 import React, { forwardRef } from "react";
 //import DatePicker from "react-datepicker";
 //import "react-datepicker/src/stylesheets/datepicker.scss";
-import FormDatePicker from "../form-date-picker/form-date-picker.component";
 import { TimePicker } from "antd";
 import moment from "moment";
+import FormDatePicker from "../form-date-picker/form-date-picker.component";
 //To be used as a form element only.
 
 const DateTimePicker = (
@@ -26,20 +26,21 @@ const DateTimePicker = (
         value={value}
         onBlur={onBlur}
         onChange={onChange}
+        onlyFuture={onlyFuture}
         isDateOnly={false}
       />
 
       <TimePicker
-      value={value ? moment(value) : null}
-      {...(onlyFuture && {
-        disabledDate: (d) => moment().isAfter(d),
-      })}
-      onChange={onChange}
-      showSecond={false}
-      minuteStep={15}
-      onBlur={onBlur}
-      format="hh:mm a"
-      {...restProps}
+        value={value ? moment(value) : null}
+        {...(onlyFuture && {
+          disabledDate: (d) => moment().isAfter(d),
+        })}
+        onChange={onChange}
+        showSecond={false}
+        minuteStep={15}
+        onBlur={onBlur}
+        format="hh:mm a"
+        {...restProps}
       />
     </div>
   );

client/src/components/jobs-available-table/jobs-available-supplement.estlines.util.js

@@ -1,6 +1,6 @@
-import { GET_ALL_JOBLINES_BY_PK } from "../../graphql/jobs-lines.queries";
 import { gql } from "@apollo/client";
 import _ from "lodash";
+import { GET_ALL_JOBLINES_BY_PK } from "../../graphql/jobs-lines.queries";
 
 export const GetSupplementDelta = async (client, jobId, newLines) => {
   const {
@@ -50,7 +50,7 @@ export const GetSupplementDelta = async (client, jobId, newLines) => {
     .reduce((acc, value, idx) => {
       return acc + generateRemoveQuery(value, idx);
     }, "");
-  console.log(insertQueries, updateQueries, removeQueries);
+  //console.log(insertQueries, updateQueries, removeQueries);
 
   if ((insertQueries + updateQueries + removeQueries).trim() === "") {
     return new Promise((resolve, reject) => {

client/src/components/jobs-available-table/jobs-available-supplement.headerfields.js

@@ -221,35 +221,14 @@ const headerFields = [
   "loc_phx",
   "loc_ea",
   //VEH
-  "impact_1",
-  "impact_2",
-  "dmg_memo",
-  "db_v_code",
   "plate_no",
   "plate_st",
   "v_vin",
-  "v_cond",
-  "v_prod_dt",
   "v_model_yr",
-  "v_makecode",
-  "v_makedesc",
-  "v_model",
-  "v_type",
-  "v_bstyle",
-  "v_trimcode",
-  "trim_color",
-  "v_mldgcode",
-  "v_engine",
-  "v_mileage",
+  "v_make_desc",
+  "v_model_desc",
   "v_options",
   "v_color",
-  "v_tone",
-  "v_stage",
-  "paint_cd1",
-  "paint_cd2",
-  "paint_cd3",
-  "v_memo",
-
 ];
 
 export default headerFields;

hasura/migrations/1701307239375_alter_table_public_courtesycars_alter_column_nextservicekm/down.sql

@@ -0,0 +1,2 @@
+alter table "public"."courtesycars" alter column "nextservicekm" set not null;
+alter table "public"."courtesycars" alter column "nextservicekm" set default '0';

hasura/migrations/1701307239375_alter_table_public_courtesycars_alter_column_nextservicekm/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE "public"."courtesycars" ALTER COLUMN "nextservicekm" drop default;
+alter table "public"."courtesycars" alter column "nextservicekm" drop not null;