(chore) Refactor ward patient card #1273
Merged
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
mogoodrich
approved these changes
Aug 9, 2024
There was a problem hiding this comment.
@chibongho generally looks good to me.
I didn't review it with a fine-toothed comb :) but the new WardPatient definition totally makes sense to me, and it looks like most of the other changes were simplifying other props/elements using the new WardPatient type? Great!
| * The admission detail. This object is only set if the patient has been | ||
| * admitted to the ward | ||
| */ | ||
| inpatientAdmission: InpatientAdmission; |
There was a problem hiding this comment.
Doesn't this need a question mark? Or are you enforcing that it is explicitly set to null?
There was a problem hiding this comment.
Yeah, I'd rather explicitly set these to null. (In fact, let me remove the ? from the bed field)
| * The admission request. The object is only set if the patient has a | ||
| * pending admission / transfer request. | ||
| */ | ||
| inpatientRequest: InpatientRequest; |
| <div>{getPatientName(patient)} </div> | ||
| <div className={styles.headerPatientDetail}>· {patient.gender}</div> | ||
| <div className={styles.headerPatientDetail}>· {age(patient.birthDate)}</div> | ||
| <div>{patient.person.display} </div> |
There was a problem hiding this comment.
Are we swtiching back to display here because it applies the name template formatting and getPatientName does not?
There was a problem hiding this comment.
I changed this workspace to not use usePatient() because we already have the Patient object and don't need another fetch. usePatient() actually returns fhir.Patient, so I need to rework some of this since the fields are a bit different between those 2 types. Patient.display should respect the name template formatting defined server-side, and getPatientName is only used for fhir.Patient.
usamaidrsk
reviewed
Aug 9, 2024
There was a problem hiding this comment.
Hi @chibongho,
Thank you for your work on this. Could you please add some screenshots or screen recordings to help illustrate the changes?
Thanks again!
@usamaidrsk there should be no UI changes. Here're some screenshots to verify that the exisiting UI is still behaving correctly:
|
usamaidrsk
approved these changes
Aug 9, 2024
|
Size Change: -8.12 kB (-0.14%) Total Size: 5.9 MB ℹ️ View Unchanged
|
chibongho
changed the title
# for free
to join this conversation on GitHub.
Already have an account?
# 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 refactors the
WardPatienttype to have values populated from theinpatientAdmission,inpatientRequestandadmissionLocationendpoints wrapped in their own fields. It also conslidates a few prop types separated defined for the WardPatientCard, AdissionRequestCard, and workspace PatientBanner into a common type.Testing done:
Manually verified the follow loads correctly:
Screenshots
Related Issue
Other