(fix) O3-4294: Fix incorrect visit date validation in edit mode in the visit form #2165
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
|
Size Change: +7 B (0%) Total Size: 16.1 MB ℹ️ View Unchanged
|
denniskigen
commented
Dec 19, 2024
| @@ -157,7 +156,8 @@ const StartVisitForm: React.FC<StartVisitFormProps> = ({ | |||
| (value) => { | |||
| const today = dayjs(); | |||
| const startDate = dayjs(value); | |||
| return displayVisitStopDateTimeFields ? true : startDate.isSameOrBefore(today, 'day'); | |||
There was a problem hiding this comment.
This is the actual fix. The rest of the diff just reorganizes imports.
denniskigen
changed the title
denniskigen
requested review from
ibacher,
vasharma05,
samuelmale,
jayasanka-sack and
brandones
brandones
previously requested changes
Jan 3, 2025
Removes a condition that was incorrectly bypassing start date validation when `displayVisitStopDateTimeFields` is true. Start dates should always be validated to be on or before the current date, regardless of whether stop date fields are displayed.
AFAICT, there are already multiple safeguards that prevent users from selecting future visit start dates:
visitStartDate: z.date().refine(
(value) => {
const today = dayjs();
const startDate = dayjs(value);
return startDate.isSameOrBefore(today, 'day');
},
t('invalidVisitStartDate', 'Start date needs to be on or before {{firstEncounterDatetime}}', {
firstEncounterDatetime: formatDatetime(new Date()),
interpolation: {
escapeValue: false,
},
}),
),
const validateStartTime = (data: z.infer<typeof visitFormSchema>) => {
const [visitStartHours, visitStartMinutes] = convertTime12to24(data.visitStartTime, data.visitStartTimeFormat);
const visitStartDatetime = new Date(data.visitStartDate).setHours(visitStartHours, visitStartMinutes);
return new Date(visitStartDatetime) <= new Date();
};Regarding the specific logic for
So the logic as-is should not allow selecting a future visit start date. |
denniskigen
force-pushed
the
fix/visit-start-date-validation
branch
from
41405c1 to
e2ea2e8
Compare
|
@brandones, I've grokked the issue after reading your comment again and looking through the code with Vineet. In as much as we have the validation logic in place, |
|
So, I two things:
Otherwise, LGTM. |
ibacher
approved these changes
Jan 10, 2025
ibacher
dismissed
brandones’s stale review
Thanks @brandones. I think we've covered the use-case here. See the additional explanations.
denniskigen
added a commit
that referenced
this pull request
Jan 14, 2025
…e visit form (#2165) * (fix) visit-form: Fix incorrect visit date validation Removes a condition that was incorrectly bypassing start date validation when `displayVisitStopDateTimeFields` is true. Start dates should always be validated to be on or before the current date, regardless of whether stop date fields are displayed. * Rename variable * `maxVisitStartDatetime` should default to the current date
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
This PR fixes a bug in the visit form that allows users to set future start dates when editing visits. This happens because the start date validation was getting bypassed when the
displayVisitStopDateTimeFieldswas true (which is the case when editing an existing visit).Start dates should always be validated to be on or before the current date, regardless of whether stop date fields are displayed. This fix ensures that that is the case.
Screenshots
Visit start date validation not taking effect when editing an existing visit
visit-start-time-validation-bug.mp4
Fix
start-date-validation-fix.mp4
Related Issue
https://openmrs.atlassian.net/browse/O3-4294
Other