Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

(feat) - O3-4044 - Ward App - add support for vertical tiling of cards #1331

Merged
merged 1 commit into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion packages/esm-ward-app/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,13 @@ export function startupApp() {

registerFeatureFlag(
'bedmanagement-module',
'Bed Management Module',
'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.',
);
}
29 changes: 15 additions & 14 deletions packages/esm-ward-app/src/ward-view/ward-view.component.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
import { InlineNotification } from '@carbon/react';
import {
useAppContext,
useDefineAppContext,
WorkspaceContainer
} from '@openmrs/esm-framework';
import { useAppContext, useDefineAppContext, useFeatureFlag, WorkspaceContainer } from '@openmrs/esm-framework';
import React, { useEffect, useRef } from 'react';
import { useTranslation } from 'react-i18next';
import EmptyBedSkeleton from '../beds/empty-bed-skeleton';
Expand All @@ -15,6 +11,7 @@ import WardViewHeader from '../ward-view-header/ward-view-header.component';
import WardBed from './ward-bed.component';
import { bedLayoutToBed } from './ward-view.resource';
import styles from './ward-view.scss';
import classNames from 'classnames';

const WardView = () => {
const response = useWardLocation();
Expand All @@ -23,6 +20,7 @@ const WardView = () => {

const wardPatientsGroupDetails = useWardPatientGrouping();
useDefineAppContext<WardPatientGroupDetails>('ward-patients-group', wardPatientsGroupDetails);
const isVertical = useFeatureFlag('ward-view-vertical-tiling');

if (isLoadingLocation) {
return <></>;
Expand All @@ -33,27 +31,30 @@ const WardView = () => {
}

return (
<div className={styles.wardView}>
<WardViewHeader />
<WardViewMain />
<>
<div className={classNames(styles.wardView, { [styles.verticalTiling]: isVertical })}>
<WardViewHeader />
<WardViewMain />
</div>
<WorkspaceContainer overlay contextKey="ward" />
</div>
</>
);
};

const WardViewMain = () => {
const { location } = useWardLocation();
const { t } = useTranslation();
const isVertical = useFeatureFlag('ward-view-vertical-tiling');

const wardPatientsGrouping = useAppContext<WardPatientGroupDetails>('ward-patients-group');
const { bedLayouts, wardAdmittedPatientsWithBed, wardUnassignedPatientsList } = wardPatientsGrouping ?? {};
const { isLoading: isLoadingAdmissionLocation, error: errorLoadingAdmissionLocation } =
wardPatientsGrouping?.admissionLocationResponse ?? {};
const {
isLoading: isLoadingInpatientAdmissions,
error: errorLoadingInpatientAdmissions,
hasMore: hasMoreInpatientAdmissions,
loadMore: loadMoreInpatientAdmissions
isLoading: isLoadingInpatientAdmissions,
error: errorLoadingInpatientAdmissions,
hasMore: hasMoreInpatientAdmissions,
loadMore: loadMoreInpatientAdmissions,
} = wardPatientsGrouping?.inpatientAdmissionResponse ?? {};

const scrollToLoadMoreTrigger = useRef<HTMLDivElement>(null);
Expand Down Expand Up @@ -124,7 +125,7 @@ const WardViewMain = () => {
});

return (
<div className={styles.wardViewMain}>
<div className={classNames(styles.wardViewMain, { [styles.verticalTiling]: isVertical })}>
{wardBeds}
{bedLayouts?.length == 0 && (
<InlineNotification
Expand Down
16 changes: 16 additions & 0 deletions packages/esm-ward-app/src/ward-view/ward-view.scss
Original file line number Diff line number Diff line change
@@ -1,15 +1,31 @@
@use '@carbon/layout';
@import '~@openmrs/esm-styleguide/src/vars';

.wardView {
background-color: #e4e4e4;
display: flex;
flex-direction: column;
padding: 0 layout.$spacing-05;

&.verticalTiling {
height: calc(100vh - var(--omrs-topnav-height));
}
}

.wardViewMain {
background-color: #e4e4e4;
grid-template-columns: repeat(auto-fill, minmax(280px, 1fr));
display: grid;
gap: layout.$spacing-05;

&.verticalTiling {
display: block;
column-width: 280px;
overflow-x: auto;

> div {
break-inside: avoid;
margin-bottom: 10px;
}
}
}
Loading