(feat) O3-4443 Add ability to create a visit that ended in the past #2240
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
chibongho
requested review from
mseaton,
mogoodrich,
denniskigen,
samuelmale,
vasharma05 and
ibacher
|
Size Change: -26.5 kB (-0.16%) Total Size: 16.4 MB
ℹ️ View Unchanged
|
mogoodrich
reviewed
Feb 12, 2025
| ], | ||
| }); | ||
|
|
||
| const hasStartTime = ['ongoing', 'past'].includes(visitStatus); |
There was a problem hiding this comment.
A "new" visit status is just an ongoing visit that has not be saved?
There was a problem hiding this comment.
A new visit is one where the start time defaults to now onSubmit, and we don't need to show the DatePicker / TimePicker for the start time.
I guess I don't actually need this boolean because we return an empty component when visitStatus == 'new'
| )} | ||
| </section> | ||
| ); | ||
| }; |
There was a problem hiding this comment.
Tangential rabbit-hole... are we validating start and end times so that you can't have overlapping visitings at the same visit location? (We need to figure this out but this could be a separate ticket).
There was a problem hiding this comment.
No, we are not validating that currently. Looks like zod support asynchronous validation, so it shouldn't be difficult. Filed ticket: https://openmrs.atlassian.net/browse/O3-4447.
| disabled={disabled} | ||
| > | ||
| <SelectItem value="AM" text="AM" /> | ||
| <SelectItem value="PM" text="PM" /> |
There was a problem hiding this comment.
We should localize these display strings, I think. Also, we will need to (eventually) have a configuration parameter to switch between a 12-hour AM/PM selector and a 24 hour selector (could be a follow-on ticket)
| interface DateTimeFieldProps { | ||
| dateField: Field; | ||
| timeField: Field; | ||
| timeFormatField: Field; |
There was a problem hiding this comment.
It's for the VisitDateTimeField component below. I'll rename it VisitDateTimeFieldProps.
There was a problem hiding this comment.
Not a big deal, re: the name, I was more just wondering how it worked!
|
|
||
| interface StartVisitFormProps extends DefaultPatientWorkspaceProps { | ||
| interface VisitFormProps extends DefaultPatientWorkspaceProps { |
| return defaultValues; | ||
| }, [visitToEdit, defaultVisitLocation, emrConfiguration]); | ||
| const { visitFormSchema, defaultValues, firstEncounterDateTime, lastEncounterDateTime } = | ||
| useVisitFormSchemaAndDefaultValues(visitToEdit); |
There was a problem hiding this comment.
Great to clean this up and get it out of the form.
chibongho
force-pushed
the
visit-form
branch
from
0eda32e to
5994e50
Compare
chibongho
force-pushed
the
visit-form
branch
from
5cf3101 to
a0c2424
Compare
3 tasks
3 tasks
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
Currently, when creating a visit, the visit form only has fields for start date / time, and it is not possible to create a RDE visit with an end time. (We can’t work around it by first creating an RDE visit with no end time and edit it later, because it overlaps with any visits that's after it). This PR adds the ability to create a ended RDE visit.
Additional Refactoring:
onSubmiton the start / end time fields. This PR combines theonSubmitvalidation logic into the zod form schemavisit-form.resources.tsDatePicker,TimePickerand a AM/PM Dropdown for inputting the datetime of the visit start and visit end. We store the value of those inputs respectively asDate(with hours and minutes set to 0),hh:mmstring, and"AM" / "PM"string. I found that confusing and changed theDatePickervalue to aYYYY-MM-DDstring instead. In hindsight, I don't feel as good about it as I hoped. It does make some things (like zod validation) simpler, but it also adds a transformation layer to get the value from / to the carbonDatePickerDatePickerandTimePicker. One of the existing tests was disabled because of that. I managed to get that one test working, but when I tried adding more tests around date / time field validation I couldn't get those to work. I gave up and added unit tests around the zod form schema instead.Screenshots
When creating a visit:
When editing a visit:
Video:
https://github.com/user-attachments/assets/96fe2dfd-71a2-499b-ad16-e91784f0e522
Related Issue
https://openmrs.atlassian.net/browse/O3-4443
Other