(feat) O3-3250: Add in-patient notes workspace #1238

usamaidrsk · 2024-07-18T13:47:16Z

Requirements

This PR has a title that briefly describes the work done including the ticket number. If there is a ticket, make sure your PR title includes a conventional commit label. See existing PR titles for inspiration.
My work conforms to the OpenMRS 3.0 Styleguide and design documentation.
My work includes tests or is validated by existing tests.

Summary

This PR adds in-patient notes workspace

Screenshots

patient-note.mp4

Related Issue

Other

O3-3250

mogoodrich

This generally looks good to me, but I am going to defer to @chibongho and @brandones who has been working with this code longer.

One thing I'm missing... where is the code that handles saving the notes?

Also fyi looks like there are some failing tests.

usamaidrsk · 2024-07-18T17:59:07Z

One thing I'm missing... where is the code that handles saving the notes?

This is handled in the esm-patient-notes-app and the work is done in this PR. For the failing tests there is some parallel work in progress on the esm-core too, that I am completing.
cc @mogoodrich

mogoodrich · 2024-07-18T18:19:55Z

This is handled in the esm-patient-notes-app and the work is done in this PR. For the failing tests there is some parallel work in progress on the esm-core too, that I am completing.

Ah, okay, so basically this rendered the existing visit note within the Ward context?

usamaidrsk · 2024-07-18T18:34:58Z

Ah, okay, so basically this rendered the existing visit note within the Ward context?

I created a separate form for the ward in-patient note.

packages/esm-ward-app/src/ward-patient-card/ward-patient-card.tsx

mogoodrich

Generally looks great @usamaidrsk , but we should fetch the configuration from the "configuration" endpoint instead of setting up a new notes config, see my comments... sorry, I should have mentioned that before, didn't think of it.

I also flagged Ian and Dennis for a few years, but this is close, thanks, I'm excited to see this working!

__mocks__/patient-note-config.mock.ts

packages/esm-ward-app/src/config-schema.ts

packages/esm-ward-app/src/types/index.ts

mogoodrich · 2024-07-23T14:20:53Z

packages/esm-ward-app/src/ward-workspace/patient-banner/patient-banner.component.tsx

+import type { PatientCardElementType, WardPatientCardProps } from '../../types';
+import styles from './style.scss';
+
+const WardPatientWorkspaceBanner = ({ bed, patient, visit }: WardPatientCardProps) => {


Will defer to @chibongho when he gets back on this part...

@chibongho I hope you can now take a look at this. Thanks

packages/esm-ward-app/src/ward-workspace/ward-patient-notes/notes-config-schema.ts

mogoodrich · 2024-07-23T14:24:09Z

Oh, and also, looks like some merge errors...

mogoodrich

@usamaidrsk I made a few small requests for changes, but generally LGTM, I approved.
Would be still be good to get a review from @chibongho Thanks!

packages/esm-ward-app/src/types/index.ts

packages/esm-ward-app/src/ward-patient-card/ward-patient-card.tsx

__mocks__/emr-api-config.mock.ts

packages/esm-ward-app/src/index.ts

packages/esm-ward-app/src/routes.json

packages/esm-ward-app/src/types/index.ts

packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.test.tsx

packages/esm-ward-app/src/ward-workspace/ward-patient-notes/notes-action-button.extension.tsx

packages/esm-ward-app/src/ward-workspace/ward-patient-notes/notes.style.scss

vasharma05 · 2024-08-01T13:50:20Z

Hi @usamaidrsk!
I have some suggestions for improving the code structure before merging the PR.

@mogoodrich, I have some suggestions which should go in before the changes are merged.
Thanks!

mogoodrich · 2024-08-01T14:18:14Z

@mogoodrich, I have some suggestions which should go in before the changes are merged.
Thanks!

Thanks @vasharma05 ! Defer to you when this is ready to be merged.

vasharma05

A few more changes. Great work @usamaidrsk!

One thing I'm wondering, the notes form is in the same app as of the Extension slot where it is being rendered, why aren't we directly importing it into the workspace?
Cc: @mogoodrich @chibongho

packages/esm-ward-app/src/index.ts

packages/esm-ward-app/src/ward-patient-workspace/ward-patient.workspace.tsx

packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.component.tsx

packages/esm-ward-app/src/ward-workspace/ward-patient-notes/form/notes-form.test.tsx

packages/esm-ward-app/src/index.ts

vasharma05

LGTM, thanks @usamaidrsk!

mogoodrich · 2024-08-02T16:39:26Z

Thanks @usamaidrsk ! Just waiting for all the checks to pass, then I will merge.

usamaidrsk requested review from chibongho, brandones, mogoodrich and vasharma05 July 18, 2024 13:47

usamaidrsk force-pushed the ft-ward-patient-notes branch from f4522e8 to 7d24c56 Compare July 18, 2024 14:29

mogoodrich reviewed Jul 18, 2024

View reviewed changes

usamaidrsk requested a review from mogoodrich July 18, 2024 18:35

usamaidrsk force-pushed the ft-ward-patient-notes branch 2 times, most recently from 81dfc38 to 372e66e Compare July 18, 2024 21:22

mogoodrich reviewed Jul 19, 2024

View reviewed changes

packages/esm-ward-app/src/ward-patient-card/ward-patient-card.tsx Outdated Show resolved Hide resolved

usamaidrsk requested a review from mogoodrich July 23, 2024 12:35

usamaidrsk marked this pull request as ready for review July 23, 2024 12:35

usamaidrsk force-pushed the ft-ward-patient-notes branch 2 times, most recently from fd340b4 to 0935272 Compare July 23, 2024 13:24

mogoodrich requested changes Jul 23, 2024

View reviewed changes

usamaidrsk force-pushed the ft-ward-patient-notes branch from 0935272 to 5e2854a Compare July 30, 2024 13:22

usamaidrsk requested a review from mogoodrich July 30, 2024 13:23

mogoodrich approved these changes Jul 30, 2024

View reviewed changes

packages/esm-ward-app/src/types/index.ts Outdated Show resolved Hide resolved

packages/esm-ward-app/src/ward-patient-card/ward-patient-card.tsx Outdated Show resolved Hide resolved

usamaidrsk force-pushed the ft-ward-patient-notes branch from be62ffe to 8b5656a Compare August 1, 2024 13:20

vasharma05 requested changes Aug 1, 2024

View reviewed changes

usamaidrsk requested a review from vasharma05 August 1, 2024 14:56

usamaidrsk added 3 commits August 2, 2024 14:09

feat create patient notes workspace

ea8b504

fix subscribe to store updates

6d43804

feat: add create patients form

5e6e4b8

usamaidrsk added 10 commits August 2, 2024 14:11

chore: translations

aba5a94

fix: fix tests

896d13e

fix: use emr configuration

276a29b

feat: add notification when config is not loaded

6c077c7

fix: fix tests

91f91a0

"rename PatientNotePayload to EncounterPayload"

2e3a826

fix: fix failing tests

d4829db

fix: code cleanup

5a35785

fix: remove irrelevate workspace styles

bdd517d

fix: add workspace typing on launchWorkspace

4c355f6

usamaidrsk force-pushed the ft-ward-patient-notes branch from 184dfb3 to 4c355f6 Compare August 2, 2024 11:16

vasharma05 reviewed Aug 2, 2024

View reviewed changes

packages/esm-ward-app/src/index.ts Show resolved Hide resolved

usamaidrsk added 2 commits August 2, 2024 15:42

fix: move workspace types to types files and use notes form directly

5bccc89

fix: fix tests

4b9b5f7

usamaidrsk requested a review from vasharma05 August 2, 2024 12:49

vasharma05 approved these changes Aug 2, 2024

View reviewed changes

Merge branch 'main' into ft-ward-patient-notes

8dd98c6

mogoodrich merged commit 020cde3 into openmrs:main Aug 2, 2024
6 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(feat) O3-3250: Add in-patient notes workspace #1238

(feat) O3-3250: Add in-patient notes workspace #1238

usamaidrsk commented Jul 18, 2024 •

edited

Loading

mogoodrich left a comment

usamaidrsk commented Jul 18, 2024 •

edited

Loading

mogoodrich commented Jul 18, 2024

usamaidrsk commented Jul 18, 2024 •

edited

Loading

mogoodrich left a comment

mogoodrich Jul 23, 2024

usamaidrsk Jul 30, 2024

mogoodrich commented Jul 23, 2024

mogoodrich left a comment

vasharma05 commented Aug 1, 2024 •

edited

Loading

mogoodrich commented Aug 1, 2024

vasharma05 left a comment

vasharma05 left a comment

mogoodrich commented Aug 2, 2024

(feat) O3-3250: Add in-patient notes workspace #1238

(feat) O3-3250: Add in-patient notes workspace #1238

Conversation

usamaidrsk commented Jul 18, 2024 • edited Loading

Requirements

Summary

Screenshots

Related Issue

Other

mogoodrich left a comment

Choose a reason for hiding this comment

usamaidrsk commented Jul 18, 2024 • edited Loading

mogoodrich commented Jul 18, 2024

usamaidrsk commented Jul 18, 2024 • edited Loading

mogoodrich left a comment

Choose a reason for hiding this comment

mogoodrich Jul 23, 2024

Choose a reason for hiding this comment

usamaidrsk Jul 30, 2024

Choose a reason for hiding this comment

mogoodrich commented Jul 23, 2024

mogoodrich left a comment

Choose a reason for hiding this comment

vasharma05 commented Aug 1, 2024 • edited Loading

mogoodrich commented Aug 1, 2024

vasharma05 left a comment

Choose a reason for hiding this comment

vasharma05 left a comment

Choose a reason for hiding this comment

mogoodrich commented Aug 2, 2024

usamaidrsk commented Jul 18, 2024 •

edited

Loading

usamaidrsk commented Jul 18, 2024 •

edited

Loading

usamaidrsk commented Jul 18, 2024 •

edited

Loading

vasharma05 commented Aug 1, 2024 •

edited

Loading