admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix IO-2533

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-01-08 14:11:49 -05:00
parent 6e377f98a7
commit 213a02d5f2
1 changed files with 91 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
client/src/components/form-date-picker/form-date-picker.component.jsx
View File

@@ -1,20 +1,21 @@
import { DatePicker } from "antd"; import {DatePicker} from "antd";
import dayjs from "../../utils/day"; import dayjs from "../../utils/day";
import React, { useRef } from "react"; import React, {useRef} from "react";
import {connect} from "react-redux";
import {createStructuredSelector} from "reselect";
import {selectBodyshop} from "../../redux/user/user.selectors";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
}); });
const mapDispatchToProps = (dispatch) => ({}); const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export default connect(mapStateToProps, mapDispatchToProps)(FormDatePicker); export default connect(mapStateToProps, mapDispatchToProps)(FormDatePicker);
const dateFormat = "MM/DD/YYYY"; const dateFormat = "MM/DD/YYYY";
// TODO, this is causing a dirty change when it should not (click the picker, click off the picker)
export function FormDatePicker({ export function FormDatePicker({
bodyshop, bodyshop,
value, value,
@@ -46,12 +47,16 @@ export function FormDatePicker({
const v = e.target.value; const v = e.target.value;
if (!v) return; if (!v) return;
const _a = dayjs( const formats = ["MMDDYY", "MMDDYYYY", "MMDD", "MM/DD/YY", "MM/DD/YYYY"];
v, let _a;
["MMDDYY", "MMDDYYYY", "MMDD", "MM/DD/YY"],
"en", // Iterate through formats to find the correct one
false for (let format of formats) {
); _a = dayjs(v, format);
if (v === _a.format(format)) {
break;
}
}
if ( if (
_a.isValid() _a.isValid()