Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added date-field reusable component; Migrated old DateFormFields to new UI components #10049

Merged
merged 17 commits into from
Jan 24, 2025
Merged

Added date-field reusable component; Migrated old DateFormFields to new UI components #10049

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
cdc745e
Upgrading old UI components with new ones
Jan 19, 2025
b4a49ef
Add disabled feature in DatePicker
Jan 19, 2025
78c2c51
datefield component added
Jan 20, 2025
18776b1
Fix dateValue formatting in render
Jan 20, 2025
e6dd9c6
Datefield is fixed
NikhilA8606 Jan 22, 2025
839bf4f
DateField component is fixed
NikhilA8606 Jan 23, 2025
d91187b
DateField component is fixed
NikhilA8606 Jan 23, 2025
33fd7e8
TextAreaFormField is replaced with TextArea ui component
NikhilA8606 Jan 23, 2025
063e8b6
Merge remote-tracking branch 'upstream/develop' into issues/#10048/Up…
NikhilA8606 Jan 23, 2025
cca7bc0
The minimum year is added
NikhilA8606 Jan 23, 2025
d7309af
removed @type/cypress
NikhilA8606 Jan 23, 2025
52ab7b6
Date validity check resolved
NikhilA8606 Jan 23, 2025
d0722f8
padStart changes
NikhilA8606 Jan 23, 2025
7368634
removed additional padStart
NikhilA8606 Jan 23, 2025
90df87a
useEffect hook is added
NikhilA8606 Jan 24, 2025
460f709
make id optional
rithviknishad Jan 24, 2025
bdac89f
add data-cy attributes
rithviknishad Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix dateValue formatting in render
  • Loading branch information
root authored and root committed Jan 20, 2025
commit 18776b14c1771a9dffa9a0fa34962e868ef8d2d4
16 changes: 7 additions & 9 deletions src/pages/PublicAppointments/PatientRegistration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { toast } from "sonner";
import { z } from "zod";

import { Button } from "@/components/ui/button";
import { DatePicker } from "@/components/ui/date-picker";
import DateField from "@/components/ui/datefield";
import {
Form,
FormControl,
Expand Down Expand Up @@ -319,15 +319,13 @@ export function PatientRegistration(props: PatientRegistrationProps) {
<FormItem className="flex flex-col">
<FormLabel required>{t("date_of_birth")}</FormLabel>
<FormControl>
<DatePicker
date={
field.value ? new Date(field.value) : undefined
}
onChange={(date) => field.onChange(date)}
disabled={(date) =>
date <= new Date("1900-01-01") ||
date >= new Date()
<DateField
value={
typeof field.value === "string"
? field.value
: field.value?.toISOString().split("T")[0]
}
onChange={field.onChange}
/>
</FormControl>
<FormMessage />
Expand Down
Loading