(fix) O3-3661: Admission Requests List should include both Admission and Transfer requests #1255
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
…and Transfer requests
mogoodrich
commented
Jul 26, 2024
| @@ -6,7 +6,10 @@ import useWardLocation from './useWardLocation'; | |||
| const defaultRep = | |||
| 'custom:(dispositionLocation,dispositionType,disposition,dispositionEncounter:full,patient:default,dispositionObsGroup,visit)'; | |||
|
|
|||
| export function useInpatientRequest(dispositionType: Array<DispositionType> = ['ADMIT'], rep: string = defaultRep) { | |||
| export function useInpatientRequest( | |||
| dispositionType: Array<DispositionType> = ['ADMIT', 'TRANSFER'], | |||
There was a problem hiding this comment.
technically I didn't need to change the default value, but if we are going to have a default value seemed to make sense to have it equal to the only value we are currently passing in.
| import { Loading } from '@carbon/react'; | ||
| import { InlineNotification } from '@carbon/react'; | ||
| import { useTranslation } from 'react-i18next'; | ||
|
|
||
| const AdmissionRequestsWorkspace: React.FC<DefaultWorkspaceProps> = () => { | ||
| const { t } = useTranslation(); | ||
| const { inpatientRequests, isLoading, error } = useInpatientRequest(); | ||
| const admissionRequests = inpatientRequests?.filter((request) => request.dispositionType == 'ADMIT'); |
There was a problem hiding this comment.
We shouldn't have to filter here if we are only fetching types we want?
|
Size Change: +23 B (0%) Total Size: 6.13 MB ℹ️ View Unchanged
|
|
Hi @mogoodrich , please don't delete the PR template. Could you please add a screenshot or video? It's hard to evaluate the work without that. |
|
Sorry about deleting the PR template @brandones . RE: screenshot, I realized after I made the changes that this won't be fully testable (and therefore demoable) until we implement https://openmrs.atlassian.net/issues/O3-3247?filter=10648 , but I just added a screenshot to the PR showing what this PR should change. |
denniskigen
reviewed
Jul 30, 2024
| @@ -29,7 +27,7 @@ const AdmissionRequestsWorkspace: React.FC<DefaultWorkspaceProps> = () => { | |||
|
|
|||
| return ( | |||
| <div className={styles.admissionRequestsWorkspace}> | |||
| {admissionRequests.map((admissionRequest, indx) => ( | |||
| {inpatientRequests.map((admissionRequest, indx) => ( | |||
| <AdmissionRequestCard key={indx} patient={admissionRequest.patient} /> | |||
There was a problem hiding this comment.
Is there something in the response we could use as a key here?
There was a problem hiding this comment.
Or just like inpatient-request-workspace-card-${indx}.
@vasharma05 sorry we didn't catch this in the original PR with this change, but you can't just use an integer as a React key; it is very easy to wind up with duplicate keys that way. Duplicate keys can cause really bizarre and confusing bugs.
There was a problem hiding this comment.
Suggested change
| <AdmissionRequestCard key={indx} patient={admissionRequest.patient} /> | |
| <AdmissionRequestCard key={`inpatient-request-workspace-card-${indx}`} patient={admissionRequest.patient} /> |
denniskigen
changed the title
mogoodrich
added a commit
that referenced
this pull request
Aug 2, 2024
…and Transfer requests (#1255) (follow-on update after merging)
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.
https://openmrs.atlassian.net/browse/O3-3661
The terminology is a little confusing, but according to @Fiona Anderson the admissions request list should should those awaiting admission to the ward, and those awaiting transfer into the ward from another ward.
There isn't a currently a way to set up transfer questions on our demo server (that will come with https://openmrs.atlassian.net/issues/O3-3247?filter=10648, so this won't be fully testable until then) but this PR expands the admission request view to dsplay both admission and transfer requests for the current ward in the following view.