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

Merged in hotfix/2022-02-14 (pull request #393)

Browse Source 
Revert "Potential resolution to date time issues post 4pm."
This commit is contained in:
Patrick Fic
2022-02-15 17:13:36 +00:00
parent da51aeb135 2e7d8df781
commit a6f2cfba0f
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,21 +23,20 @@ export function FormDatePicker({
onChange, onChange,
onBlur, onBlur,
onlyFuture, onlyFuture,
isDateOnly = true,
...restProps ...restProps
}) { }) {
const ref = useRef(); const ref = useRef();
const handleChange = (newDate) => { const handleChange = (newDate) => {
if (value !== newDate && onChange) { if (value !== newDate && onChange) {
onChange(isDateOnly ? newDate && newDate.format("YYYY-MM-DD") : newDate); onChange(newDate);
} }
}; };
const handleKeyDown = (e) => { const handleKeyDown = (e) => {
if (e.key.toLowerCase() === "t") { if (e.key.toLowerCase() === "t") {
if (onChange) { if (onChange) {
onChange(isDateOnly ? moment().format("YYYY-MM-DD") : moment()); onChange(moment());
// if (ref.current && ref.current.blur) ref.current.blur(); // if (ref.current && ref.current.blur) ref.current.blur();
} }
} else if (e.key.toLowerCase() === "enter") { } else if (e.key.toLowerCase() === "enter") {
@@ -65,8 +64,7 @@ export function FormDatePicker({
}); });
} }
if (_a.isValid() && onChange) if (_a.isValid() && onChange) onChange(_a);
onChange(isDateOnly ? _a.format("YYYY-MM-DD") : _a);
}; };
return ( return (

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

@@ -26,7 +26,6 @@ const DateTimePicker = (
value={value} value={value}
onBlur={onBlur} onBlur={onBlur}
onChange={onChange} onChange={onChange}
isDateOnly={false}
/> />
<TimePicker <TimePicker