From 3fb0d21cd347bae9318acc5ddbc846e466487aed Mon Sep 17 00:00:00 2001 From: chibongho Date: Thu, 21 Nov 2024 09:05:37 -0500 Subject: [PATCH] (feat) O3-4044 Ward App - use vertical tiling for ward patient cards (#1377) --- packages/esm-ward-app/src/index.ts | 6 ------ .../esm-ward-app/src/ward-view/ward-view.component.tsx | 3 +-- packages/esm-ward-app/src/ward-view/ward.component.tsx | 9 ++++----- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/packages/esm-ward-app/src/index.ts b/packages/esm-ward-app/src/index.ts index 66bd2816d..7d43e89a5 100644 --- a/packages/esm-ward-app/src/index.ts +++ b/packages/esm-ward-app/src/index.ts @@ -117,10 +117,4 @@ export function startupApp() { 'Bed management module', 'Enables features related to bed management / assignment. Requires the backend bed management module to be installed.', ); - - registerFeatureFlag( - 'ward-view-vertical-tiling', - 'Ward view vertical tiling', - 'Enable tiling of bed cards vertically in the ward view.', - ); } diff --git a/packages/esm-ward-app/src/ward-view/ward-view.component.tsx b/packages/esm-ward-app/src/ward-view/ward-view.component.tsx index 609f6f4f3..2f70bc36c 100644 --- a/packages/esm-ward-app/src/ward-view/ward-view.component.tsx +++ b/packages/esm-ward-app/src/ward-view/ward-view.component.tsx @@ -13,7 +13,6 @@ const WardView: React.FC<{}> = () => { const { t } = useTranslation(); const locationUuid = location?.uuid; - const isVertical = useFeatureFlag('ward-view-vertical-tiling'); const wardConfig = useWardConfig(locationUuid); if (isLoadingLocation) { @@ -27,7 +26,7 @@ const WardView: React.FC<{}> = () => { const wardId = wardConfig.id; return ( -
+
); diff --git a/packages/esm-ward-app/src/ward-view/ward.component.tsx b/packages/esm-ward-app/src/ward-view/ward.component.tsx index 99b572ef4..4c8b4fda6 100644 --- a/packages/esm-ward-app/src/ward-view/ward.component.tsx +++ b/packages/esm-ward-app/src/ward-view/ward.component.tsx @@ -11,12 +11,11 @@ import styles from './ward-view.scss'; const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardUnassignedPatients: ReactNode }) => { const { location } = useWardLocation(); const { t } = useTranslation(); - const isVertical = useFeatureFlag('ward-view-vertical-tiling'); - const {wardPatientGroupDetails} = useAppContext('ward-view-context') ?? {}; + const { wardPatientGroupDetails } = useAppContext('ward-view-context') ?? {}; const { bedLayouts } = wardPatientGroupDetails ?? {}; const { isLoading: isLoadingAdmissionLocation, error: errorLoadingAdmissionLocation } = - wardPatientGroupDetails?.admissionLocationResponse ?? {}; + wardPatientGroupDetails?.admissionLocationResponse ?? {}; const { isLoading: isLoadingInpatientAdmissions, error: errorLoadingInpatientAdmissions, @@ -56,7 +55,7 @@ const Ward = ({ wardBeds, wardUnassignedPatients }: { wardBeds: ReactNode; wardU if (!wardPatientGroupDetails) return <>; return ( -
+
{wardBeds} {bedLayouts?.length == 0 && isBedManagementModuleInstalled && ( { ); }; -export default Ward; \ No newline at end of file +export default Ward;