- Checkpoint

Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-08-21 20:49:50 -04:00
parent 63f1e0f07c
commit 7d6aa8489d

View File

@@ -51,25 +51,20 @@ const DateTimePicker = ({ value, onChange, onBlur, id, onlyFuture, onlyToday, is
if (!v) return; if (!v) return;
const upperV = normalizeDateTimeString(v); const upperV = normalizeDateTimeString(v);
console.log(upperV); let parsedDate;
let _a;
let formatTemp;
for (const format of isDateOnly ? dateFormats : dateTimeFormats) { for (const format of isDateOnly ? dateFormats : dateTimeFormats) {
_a = dayjs(upperV, format); parsedDate = dayjs(upperV, format);
formatTemp = format; if (parsedDate.isValid()) break;
if (_a.isValid()) break;
} }
console.log("HIT FORMAT");
console.log(formatTemp);
if (_a && _a.isValid()) { if (parsedDate && parsedDate.isValid()) {
if (isDateOnly) { if (isDateOnly) {
_a = _a.startOf("day"); parsedDate = parsedDate.startOf("day");
} }
if (value && value.isValid && value.isValid()) { if (value && value.isValid && value.isValid()) {
_a.set({ parsedDate = parsedDate.set({
hours: value.hours(), hours: value.hours(),
minutes: value.minutes(), minutes: value.minutes(),
seconds: value.seconds(), seconds: value.seconds(),
@@ -78,13 +73,13 @@ const DateTimePicker = ({ value, onChange, onBlur, id, onlyFuture, onlyToday, is
} }
if (onlyFuture) { if (onlyFuture) {
if (dayjs().subtract(1, "day").isBefore(_a)) { if (dayjs().subtract(1, "day").isBefore(parsedDate)) {
onChange(_a); onChange(parsedDate);
} else { } else {
onChange(dayjs().startOf("day")); onChange(dayjs().startOf("day"));
} }
} else { } else {
onChange(_a); onChange(parsedDate);
} }
} }
}, },
@@ -96,9 +91,11 @@ const DateTimePicker = ({ value, onChange, onBlur, id, onlyFuture, onlyToday, is
setIsManualInput(true); setIsManualInput(true);
if (e.key.toLowerCase() === "t" && onChange) { if (e.key.toLowerCase() === "t" && onChange) {
e.preventDefault();
setIsManualInput(false); setIsManualInput(false);
onChange(dayjs()); onChange(dayjs());
} else if (e.key.toLowerCase() === "enter") { } else if (e.key.toLowerCase() === "enter") {
e.preventDefault();
handleBlur(e); handleBlur(e);
} }
}, },