fix/O3-3983: Allow Same-Day Program Enrollment and Completion #2039
+83
−35
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@brandones, @denniskigen, @ibacher I kindly request your guidance to ensure that the form is submitted successfully. |
|
What's the status of this? |
jwnasambu
force-pushed
the
fix/O3-3983
branch
from
9ac0687 to
2d78f5a
Compare
|
@denniskigen, kindly help review my PR at your convenience time, please? |
const createProgramsFormSchema = (t: TFunction) =>
z.object({
selectedProgram: z.string().trim().min(1, t('programRequired', 'Program is required')),
enrollmentDate: z.date()
.max(new Date(), t('enrollmentDateFuture', 'Enrollment date cannot be in the future')),
completionDate: z.date().nullable(),
enrollmentLocation: z.string().
trim().min(1, t('locationRequired', 'Location is required')),
selectedProgramStatus: z.string(),
}); |
denniskigen
reviewed
Feb 3, 2025
packages/esm-patient-programs-app/src/programs/programs-form.workspace.tsx
Outdated
Show resolved
Hide resolved
added 3 commits
February 3, 2025 17:03
added 3 commits
February 5, 2025 17:06
| if (selectedDate.toDateString() === today.toDateString()) { | ||
| onChange(new Date()); | ||
| } else { | ||
| selectedDate.setUTCHours(23, 59, 59, 999); |
There was a problem hiding this comment.
selectedDate.setHours(23, 59, 59, 999);There was a problem hiding this comment.
@denniskigen correct me if I am wrong when we use selectedDate.setUTCHours(23, 59, 59, 999); we can observe its new day for us
| const updatedDateTime = new Date(date); | ||
| updatedDateTime.setHours(hours); | ||
| updatedDateTime.setMinutes(minutes); | ||
| control.setValue('enrollmentDate', updatedDateTime); |
There was a problem hiding this comment.
setValue('enrollmentDate', updatedDateTime);
Comment on lines
+243
to
+254
| render={({ field: { onChange, value } }) => { | ||
| const handleChange = ([date]) => { | ||
| if (!date) return; | ||
|
|
||
| const selectedDate = new Date(date); | ||
| const today = new Date(); | ||
| today.setHours(0, 0, 0, 0); | ||
|
|
||
| if (selectedDate.toDateString() === today.toDateString()) { | ||
| onChange(new Date()); | ||
| } else { | ||
| selectedDate.setUTCHours(23, 59, 59, 999); |
There was a problem hiding this comment.
handleChange should be moved outside of render to prevent it from being recreated on every render.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requirements
Summary
I fixed the minimum selectable date for the completion date in the date picker to equal to the enrollment date set to midnight preventing the selection of an invalid date range where a completion date could occur before the enrollment date. I also modified the schema to allow completionDate to be equal to enrollmentDate.
Screenshots
screencast.2025-02-03.3.AM-47-12.mp4
Related Issue
https://openmrs.atlassian.net/browse/O3-3983
Other