Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

(feat) O3-3848 Enable Admission request bar to always be displayed. #1364

Merged
merged 3 commits into from
Nov 8, 2024
Merged

(feat) O3-3848 Enable Admission request bar to always be displayed. #1364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8d94a14
Enable Admission request bar to always be displayed
suubi-joshua Nov 8, 2024
b9288a4
Clean up
suubi-joshua Nov 8, 2024
0d19a69
Merge branch 'main' into O3-3848
suubi-joshua Nov 8, 2024
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
6 changes: 4 additions & 2 deletions packages/esm-ward-app/src/ward-view-header/admission-requests-bar.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ wardPending
const { t } = useTranslation();
const layout = useLayoutType();

if (isLoading || !inpatientRequests?.length) {
if (isLoading || !inpatientRequests) {
return null;
}

Expand All @@ -31,7 +31,9 @@ const AdmissionRequestsBar: React.FC<AdmissionRequestsBarProps> = ({ wardPending
}

return (
<div className={styles.admissionRequestsContainer}>
<div className={`${styles.admissionRequestsContainer} ${
inpatientRequests?.length ? styles.blackBackground : styles.lightBlueBackground
}`}>
<Movement className={styles.movementIcon} size="24" />
<span className={styles.content}>
{t('admissionRequestsCount', '{{count}} admission request', {
Expand Down
12 changes: 11 additions & 1 deletion packages/esm-ward-app/src/ward-view-header/admission-requests.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,18 @@
margin-right: layout.$spacing-03;
}

.blackBackground {
background-color: black;
color: white;
}

.lightBlueBackground {
background-color: white;
border-left:4px solid $color-blue-60-2;
color: black;
}

.content {
@include type.type-style('heading-compact-01');
color: $ui-02;
margin-right: layout.$spacing-03;
}
Loading