Add birth time input to AddChildPage form and update date handling logic

This commit is contained in:
Philip
2025-04-13 09:07:43 +02:00
parent fe790945fc
commit e8d609d7b3
2 changed files with 102 additions and 9 deletions

1
.gitignore vendored
View File

@@ -39,3 +39,4 @@ yarn-error.log*
# typescript # typescript
*.tsbuildinfo *.tsbuildinfo
next-env.d.ts next-env.d.ts
.cursor/mcp.json

View File

@@ -40,6 +40,7 @@ const formSchema = z.object({
birthDate: z.date({ birthDate: z.date({
required_error: "Bitte wähle ein Geburtsdatum", required_error: "Bitte wähle ein Geburtsdatum",
}), }),
birthTime: z.string().regex(/^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/, "Ungültiges Zeitformat (HH:MM)").optional(),
gender: z.enum(["male", "female"], { gender: z.enum(["male", "female"], {
required_error: "Bitte wähle das Geschlecht", required_error: "Bitte wähle das Geschlecht",
}), }),
@@ -50,12 +51,14 @@ type FormValues = z.infer<typeof formSchema>;
export default function AddChildPage() { export default function AddChildPage() {
const router = useRouter(); const router = useRouter();
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [dateInputValue, setDateInputValue] = useState("");
const form = useForm<FormValues>({ const form = useForm<FormValues>({
resolver: zodResolver(formSchema), resolver: zodResolver(formSchema),
defaultValues: { defaultValues: {
name: "", name: "",
gender: "male", gender: "male",
birthTime: "",
}, },
}); });
@@ -78,9 +81,34 @@ export default function AddChildPage() {
function onSubmit(values: FormValues) { function onSubmit(values: FormValues) {
setIsLoading(true); setIsLoading(true);
// Create a date with the selected time or default to noon
let birthDateTime = values.birthDate;
if (values.birthTime) {
const [hours, minutes] = values.birthTime.split(':').map(Number);
birthDateTime = new Date(Date.UTC(
values.birthDate.getUTCFullYear(),
values.birthDate.getUTCMonth(),
values.birthDate.getUTCDate(),
hours,
minutes,
0
));
} else {
// Default to noon if no time is specified
birthDateTime = new Date(Date.UTC(
values.birthDate.getUTCFullYear(),
values.birthDate.getUTCMonth(),
values.birthDate.getUTCDate(),
12,
0,
0
));
}
addChild.mutate({ addChild.mutate({
name: values.name, name: values.name,
birthDate: values.birthDate.toISOString(), birthDate: birthDateTime.toISOString(),
gender: values.gender, gender: values.gender,
}); });
} }
@@ -119,20 +147,58 @@ export default function AddChildPage() {
<Popover> <Popover>
<PopoverTrigger asChild> <PopoverTrigger asChild>
<FormControl> <FormControl>
<div className="flex h-9 w-full rounded-md border bg-white px-3 py-1 text-sm shadow-xs transition-[color,box-shadow] focus-within:border-ring focus-within:ring-ring/50 focus-within:ring-[3px]"> <div className="flex h-9 w-full items-center rounded-md border bg-white px-3 py-1 text-sm shadow-xs transition-[color,box-shadow] focus-within:border-ring focus-within:ring-ring/50 focus-within:ring-[3px]">
<Input <Input
type="text" type="text"
className="border-0 bg-transparent p-0 focus-visible:ring-0 focus-visible:ring-offset-0" className="border-0 bg-transparent p-0 focus-visible:ring-0 focus-visible:ring-offset-0 flex-1"
placeholder="TT.MM.JJJJ" placeholder="TT.MM.JJJJ"
value={field.value ? format(field.value, "dd.MM.yyyy") : ""} value={dateInputValue}
onChange={(e) => { onChange={(e) => {
const date = new Date(e.target.value); setDateInputValue(e.target.value);
if (!isNaN(date.getTime())) { }}
field.onChange(date); onBlur={(e) => {
const inputValue = e.target.value;
// Allow empty input
if (!inputValue) {
field.onChange(null);
return;
}
// Check if the input matches the expected format (DD.MM.YYYY)
const dateRegex = /^(\d{1,2})\.(\d{1,2})\.(\d{4})$/;
const match = inputValue.match(dateRegex);
if (match) {
const day = parseInt(match[1], 10);
const month = parseInt(match[2], 10) - 1; // JavaScript months are 0-indexed
const year = parseInt(match[3], 10);
// Create a date object and validate it
// Set the time to noon UTC to avoid timezone issues
const date = new Date(Date.UTC(year, month, day, 12, 0, 0));
// Check if the date is valid (e.g., not February 30th)
if (
date.getUTCDate() === day &&
date.getUTCMonth() === month &&
date.getUTCFullYear() === year &&
date <= new Date() &&
date >= new Date("1900-01-01")
) {
field.onChange(date);
setDateInputValue(format(date, "dd.MM.yyyy"));
} else {
// If invalid, reset to the last valid value
setDateInputValue(field.value ? format(field.value, "dd.MM.yyyy") : "");
}
} else {
// If format is wrong, reset to the last valid value
setDateInputValue(field.value ? format(field.value, "dd.MM.yyyy") : "");
} }
}} }}
/> />
<CalendarIcon className="ml-auto h-4 w-4 opacity-50" /> <CalendarIcon className="h-4 w-4 opacity-50" />
</div> </div>
</FormControl> </FormControl>
</PopoverTrigger> </PopoverTrigger>
@@ -140,7 +206,14 @@ export default function AddChildPage() {
<Calendar <Calendar
mode="single" mode="single"
selected={field.value} selected={field.value}
onSelect={field.onChange} onSelect={(date) => {
field.onChange(date);
if (date) {
setDateInputValue(format(date, "dd.MM.yyyy"));
} else {
setDateInputValue("");
}
}}
disabled={(date) => disabled={(date) =>
date > new Date() || date < new Date("1900-01-01") date > new Date() || date < new Date("1900-01-01")
} }
@@ -153,6 +226,25 @@ export default function AddChildPage() {
)} )}
/> />
<FormField
control={form.control}
name="birthTime"
render={({ field }) => (
<FormItem>
<FormLabel>Geburtszeit (optional)</FormLabel>
<FormControl>
<Input
type="time"
className="bg-white"
placeholder="HH:MM"
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
<FormField <FormField
control={form.control} control={form.control}
name="gender" name="gender"