(feat) O3-4443 Add ability to create a visit that ended in the past #2240
Conversation
This file contains hidden or 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: -4.08 MB (-19.31%) 👏 Total Size: 17 MB
ℹ️ View Unchanged
|
mogoodrich
reviewed
Feb 12, 2025
packages/esm-patient-chart-app/src/visit/visit-form/visit-date-time.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-chart-app/src/visit/visit-form/visit-date-time.component.tsx
Show resolved
Hide resolved
packages/esm-patient-chart-app/src/visit/visit-form/visit-date-time.component.tsx
Outdated
Show resolved
Hide resolved
packages/esm-patient-chart-app/src/visit/visit-form/visit-date-time.component.tsx
Show resolved
Hide resolved
packages/esm-patient-chart-app/src/visit/visit-form/visit-form.workspace.tsx
Show resolved
Hide resolved
packages/esm-patient-chart-app/src/visit/visit-form/visit-form.workspace.tsx
Show resolved
Hide resolved
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
samuelmale
reviewed
Mar 17, 2025
| } | ||
|
|
||
| const abortController = new AbortController(); |
There was a problem hiding this comment.
Are we dispatching an abort signal incase the component unmounts?
There was a problem hiding this comment.
I'm just keeping the existing implementation. I believe the proper way to implement this is to use useAbortController() instead of creating a new AbortController(). This is a pattern that's in a lot of places, and we should probably address it in a separate PR.
packages/esm-patient-chart-app/src/visit/visit-form/visit-form.resource.ts
Outdated
Show resolved
Hide resolved
|
Could you fix up the conflicts, @chibongho? |
|
Fixed the conflict. One E2E test ( |
|
Yeah, the allergies failure spec is unrelated to your changes - I'm trying to figure out why it's happening. |
ibacher
reviewed
Mar 27, 2025
| ], | ||
| }); | ||
|
|
||
| const hasStopTime = 'past' == visitStatus; |
There was a problem hiding this comment.
Suggested change
| const hasStopTime = 'past' == visitStatus; | |
| const hasStopTime = 'past' === visitStatus; |
There was a problem hiding this comment.
And in general a few other places.
Comment on lines
43
to
45
| // await expect(chartPage.page.getByRole('textbox', { name: /start date/i })).toBeVisible(); | ||
| // await expect(chartPage.page.getByRole('textbox', { name: /start time/i })).toBeVisible(); | ||
| // await expect(chartPage.page.getByLabel(/start time format/i)).toBeVisible(); |
There was a problem hiding this comment.
We should probably just remove these?
|
I tried starting an ongoing visit with a past date and the submission failed (with
|
denniskigen
reviewed
Mar 27, 2025
Comment on lines
13
to
16
| import classNames from 'classnames'; | ||
| import React, { useMemo } from 'react'; | ||
| import { useTranslation } from 'react-i18next'; | ||
| import { mapEncounters, type Encounter, type Note, type Order, type OrderItem } from '../visit.resource'; |
There was a problem hiding this comment.
nit (style): the typical preferred import order is what we had before where the React import is first, followed by other external dependencies, internal dependencies, and then components and functions, with the stylesheet import coming last. We've not enforced this yet via an ESLint plugin, but it's something that's on the horizon.
That might be tricky because whether or not overlapping visits are allowed is controlled by a GP, and we'd have to have all of the patient's visits (or at least their start and end dates) in context to be able to do the check (on the backend, we just create a SQL query to look for any overlap). That said, we definitely need to handle this error more gracefully than that! |
FWIW, here's what we do in O2: Screencast.from.2025-03-27.10-17-19.webm |
"New" hides the start date/time pickers altogether, and leaves the
|
4 tasks
|
New snackbar to show error message better:
|
ibacher
approved these changes
Apr 1, 2025
denniskigen
approved these changes
Apr 1, 2025
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