IO-3315 CDK InService Date

Signed-off-by: Allan Carr <allan@imexsystems.ca>

client/src/components/dms-post-form/dms-post-form.component.jsx

@@ -14,7 +14,6 @@ import {
   Typography
 } from "antd";
 import Dinero from "dinero.js";
-import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -24,14 +23,14 @@ import i18n from "../../translations/i18n";
 import dayjs from "../../utils/day";
 import DmsCdkMakes from "../dms-cdk-makes/dms-cdk-makes.component";
 import DmsCdkMakesRefetch from "../dms-cdk-makes/dms-cdk-makes.refetch.component";
+import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 import CurrencyInput from "../form-items-formatted/currency-form-item.component";
 import LayoutFormRow from "../layout-form-row/layout-form-row.component";
-import DateTimePicker from "../form-date-time-picker/form-date-time-picker.component.jsx";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = () => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(DmsPostForm);
@@ -93,7 +92,9 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
                 })
               : ""
           }`.slice(0, 239),
-          inservicedate: dayjs("2019-01-01")
+          inservicedate: dayjs(
+            `${(job.v_model_yr && (job.v_model_yr < 100 ? (job.v_model_yr >= (dayjs().year() + 1) % 100 ? 1900 + parseInt(job.v_model_yr) : 2000 + parseInt(job.v_model_yr)) : job.v_model_yr)) || 2019}-01-01`
+          )
         }}
       >
         <LayoutFormRow grow>

client/src/components/form-items-formatted/labor-type-form-item.component.jsx

@@ -1,7 +1,7 @@
-import { forwardRef } from "react";
+import React, { forwardRef } from "react";
 import { useTranslation } from "react-i18next";
 
-const LaborTypeFormItem = ({ value }) => {
+const LaborTypeFormItem = ({ value, onChange }, ref) => {
   const { t } = useTranslation();
 
   if (!value) return null;

client/src/components/form-items-formatted/part-type-form-item.component.jsx

@@ -1,13 +1,11 @@
-import { forwardRef } from "react";
+import React, { forwardRef } from "react";
 import { useTranslation } from "react-i18next";
 
-const PartTypeFormItem = ({ value }) => {
+const PartTypeFormItem = ({ value, onChange }, ref) => {
   const { t } = useTranslation();
 
   if (!value) return null;
 
-  return (
-    <div style={{ wordWrap: "break-word", overflowWrap: "break-word" }}>{t(`joblines.fields.part_types.${value}`)}</div>
-  );
+  return <div>{t(`joblines.fields.part_types.${value}`)}</div>;
 };
 export default forwardRef(PartTypeFormItem);

client/src/components/form-items-formatted/read-only-form-item.component.jsx

@@ -1,5 +1,6 @@
 import Dinero from "dinero.js";
-import { forwardRef } from "react";
+import React, { forwardRef } from "react";
+
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
 import { selectBodyshop } from "../../redux/user/user.selectors";
@@ -7,24 +8,23 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop
 });
-const mapDispatchToProps = () => ({
+const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
-const ReadOnlyFormItem = ({ bodyshop, value, type = "text" }) => {
+const ReadOnlyFormItem = ({ bodyshop, value, type = "text", onChange }, ref) => {
   if (!value) return null;
   switch (type) {
-    case "employee": {
+    case "employee":
       const emp = bodyshop.employees.find((e) => e.id === value);
       return `${emp?.first_name} ${emp?.last_name}`;
-    }
 
     case "text":
-      return <div style={{ wordWrap: "break-word", overflowWrap: "break-word" }}>{value}</div>;
+      return <div>{value}</div>;
     case "currency":
       return <div>{Dinero({ amount: Math.round(value * 100) }).toFormat()}</div>;
     default:
-      return <div style={{ wordWrap: "break-word", overflowWrap: "break-word" }}>{value}</div>;
+      return <div>{value}</div>;
   }
 };
 

client/src/components/jobs-close-lines/jobs-close-lines.component.jsx

@@ -1,5 +1,5 @@
-import { WarningOutlined } from "@ant-design/icons";
 import { Form, Select, Space, Tooltip } from "antd";
+import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
@@ -8,13 +8,14 @@ import { selectBodyshop } from "../../redux/user/user.selectors";
 import LaborTypeFormItem from "../form-items-formatted/labor-type-form-item.component";
 import PartTypeFormItem from "../form-items-formatted/part-type-form-item.component";
 import ReadOnlyFormItem from "../form-items-formatted/read-only-form-item.component";
+import { WarningOutlined } from "@ant-design/icons";
 import "./jobs-close-lines.styles.scss";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
   jobRO: selectJobReadOnly
 });
-const mapDispatchToProps = () => ({
+const mapDispatchToProps = (dispatch) => ({
   //setUserLanguage: language => dispatch(setUserLanguage(language))
 });
 
@@ -23,7 +24,7 @@ export function JobsCloseLines({ bodyshop, job, jobRO }) {
   return (
     <div>
       <Form.List name={["joblines"]}>
-        {(fields) => {
+        {(fields, { add, remove, move }) => {
           return (
             <table className="jobs-close-table">
               <thead>

client/src/pages/jobs-close/jobs-close.component.jsx

@@ -271,7 +271,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
               {
                 required: true
               },
-              () => ({
+              ({ getFieldValue }) => ({
                 validator(_, value) {
                   if (!bodyshop.cdk_dealerid) return Promise.resolve();
                   if (!value || dayjs(value).isSameOrAfter(dayjs(), "day")) {
@@ -280,7 +280,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                   return Promise.reject(new Error(t("jobs.labels.dms.invoicedatefuture")));
                 }
               }),
-              () => ({
+              ({ getFieldValue }) => ({
                 validator(_, value) {
                   if (ClosingPeriod.treatment === "on" && bodyshop.accountingconfig.ClosingPeriod) {
                     if (
@@ -369,8 +369,8 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                 <Form.List
                   name={["qb_multiple_payers"]}
                   rules={[
-                    () => ({
-                      validator() {
+                    ({ getFieldValue }) => ({
+                      validator(_, value) {
                         let totalAllocated = Dinero();
 
                         const payers = form.getFieldValue("qb_multiple_payers");
@@ -492,7 +492,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, set
                         <Statistic
                           title={t("jobs.labels.pimraryamountpayable")}
                           valueStyle={{
-                            color: discrep.getAmount() >= 0 ? "green" : "red"
+                            color: discrep.getAmount() > 0 ? "green" : "red"
                           }}
                           value={discrep.toFormat()}
                         />