From a182ea0869d4f2ab88411d91dcf167d1187ce2e7 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Tue, 29 Jul 2025 10:04:13 -0700 Subject: [PATCH] IO-3315 CDK InService Date Signed-off-by: Allan Carr --- .../components/dms-post-form/dms-post-form.component.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/src/components/dms-post-form/dms-post-form.component.jsx b/client/src/components/dms-post-form/dms-post-form.component.jsx index 533a611bb..1097cec54 100644 --- a/client/src/components/dms-post-form/dms-post-form.component.jsx +++ b/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` + ) }} >