(fix) O3-3211: Fix calculations for Patients and Capacity in Ward Metrics #1307
Conversation
…ns (openmrs#1294) This PR refactors the registration form's cancel modal to match new modal naming and registration conventions. Modals are now registered in the routes registry file under the `modals`. The naming convention has also changed - modals now use the `*.modal.tsx` suffix. I've also amended the modal to use Carbon's ModalBody, ModalHeader, and ModalFooter components instead of using divs with custom classes. Finally, I've amended the modal title and content to align with other confirmation modals in O3.
| @@ -86,5 +97,6 @@ export function createAndGetWardPatientGrouping( | |||
| wardPatientPendingCount, | |||
| bedLayouts, | |||
| wardUnassignedPatientsList, | |||
| totalPatientsCount: wardAdmittedPatientsWithBed.size + wardUnadmittedPatientsWithBed.size, | |||
There was a problem hiding this comment.
There's also another group here: admitted patients without beds... @chibongho may potentially know how to get this metric, I'd have to dig deeper into the code to refresh my memory.
There was a problem hiding this comment.
Oh k i will connect @chibongho . I think it might be the wardUnassignedPatientsList ,but i will confirm with @chibongho once.
There was a problem hiding this comment.
I think the safest way to calculate this would be to take the union of:
- all patients assigned to bed, which can be taken from
bedLayout[]); and - all patients admitted to location, which can be taken from
InpatientAdmission[]
Note that those 2 groups can have overlapping patients, so be careful not to double-count.
| return { | ||
| patients: wardPatientGroup.totalPatientsCount.toString(), | ||
| freeBeds: freeBeds.toString(), | ||
| capacity: capacity.toString() + '%', |
There was a problem hiding this comment.
This should be localized so that it appears correctly in e.g. Arabic, where the percent sign is affixed to the left side.
There was a problem hiding this comment.
Yeah sure @brandones , i will make the changes. Thanks.
|
Mind fixing the conflicts, @kb019? |
|
|
||
| interface WardMetricProps { | ||
| metricName: string; | ||
| metricValue: string; | ||
| isLoading: boolean; | ||
| } | ||
| const WardMetric: React.FC<WardMetricProps> = ({ metricName, metricValue, isLoading }) => { | ||
| const { i18n } = useTranslation(); |
There was a problem hiding this comment.
Usually, this is done as a interpolated translation string, like this:
There was a problem hiding this comment.
Hi @chibongho , removed i18n here , seems the direction automatically handeled in the document. Thanks
Hi @denniskigen , i merged the conflicts . Thank you. |
|
All the e2e tests pass in my local.I think the failure is not related to ward app. |
Requirements
Summary
https://openmrs.atlassian.net/browse/O3-3211
This ticket is for fixing the calulations of Patients and bed Capacity displayed in ward metrics which is described in ticket above.
Screenshots