From 325730a9da597bb1bd28afbe8e555a3929220b50 Mon Sep 17 00:00:00 2001 From: april Date: Mon, 15 Jan 2024 12:54:42 -0600 Subject: [PATCH] Fix validation and spacing in new flight form --- web/app/ui/form/flight-form.tsx | 14 ++++++++++++++ web/app/ui/form/image-upload.tsx | 3 +++ 2 files changed, 17 insertions(+) diff --git a/web/app/ui/form/flight-form.tsx b/web/app/ui/form/flight-form.tsx index 32930b0..59bd0dd 100644 --- a/web/app/ui/form/flight-form.tsx +++ b/web/app/ui/form/flight-form.tsx @@ -60,6 +60,11 @@ export default function FlightForm({ cancelFunc?: () => void; autofillHobbs?: boolean; }) { + const validate_time = (value) => { + if (value > 2359) return "Time must be between 0000 and 2359"; + if (value % 100 > 59) return "Minutes must not exceed 59"; + }; + const form = useForm({ initialValues: initialValues ?? { date: dayjs(), @@ -106,6 +111,14 @@ export default function FlightForm({ images: [], }, + validate: { + aircraft: (value) => + value?.length ?? 0 > 0 ? null : "Please select an aircraft", + time_start: (value) => validate_time(value), + time_off: (value) => validate_time(value), + time_down: (value) => validate_time(value), + time_stop: (value) => validate_time(value), + }, }); const [aircraftOpened, { open: openAircraft, close: closeAircraft }] = @@ -498,6 +511,7 @@ export default function FlightForm({ /> { if (value === null) { @@ -41,6 +43,7 @@ export default function ImageUpload({ label={label} placeholder={placeholder} multiple + mt={mt} accept="image/*" valueComponent={ValueComponent} rightSectionPointerEvents="none"