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

Jump to bottom

(chore) O3-3996 - Ward app - workspace styling changes #1384

Merged
merged 2 commits into from
Nov 22, 2024
Merged

(chore) O3-3996 - Ward app - workspace styling changes #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
768a2f1
(chore) O3-3996 - Ward app - workspace styling changes
chibongho Nov 21, 2024
985c87f
fix workspace action menu icons
chibongho Nov 19, 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
2 changes: 1 addition & 1 deletion ...ages/esm-ward-app/src/action-menu-buttons/clinical-forms-workspace-siderail.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const ClinicalFormsWorkspaceSideRailIcon: React.FC = () => {
label={t('clinicalForms', 'Clinical forms')}
iconDescription={t('clinicalForms', 'Clinical forms')}
handler={launchPatientWorkspaceCb}
type="ward-patient-clinical-form"
type="ward-patient-clinical-forms"
/>
);
};
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-ward-app/src/action-menu-buttons/discharge-workspace-siderail.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function PatientDischargeSideRailIcon() {
label={t('discharge', 'Discharge')}
iconDescription={t('discharge', 'Discharge')}
handler={handler}
type="patient-discharge-workspace"
type="ward-patient-discharge"
/>
);
}
12 changes: 12 additions & 0 deletions packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,19 @@
min-height: var(--desktop-workspace-window-height);
}

.patientWorkspace {
display: flex;
height: 100%;
flex-direction: column;
}

.headerPatientDetail {
@include type.type-style('body-compact-02');
margin: 0 layout.$spacing-02;
}

.patientWorkspaceContentSlot {
display: flex;
flex: 1;
flex-direction: column;
}
15 changes: 8 additions & 7 deletions packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.workspace.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { type WardPatientWorkspaceProps } from '../../types';
import WardPatientWorkspaceBanner from '../patient-banner/patient-banner.component';
import styles from './ward-patient.style.scss';
import { type WardConfigObject } from '../../config-schema';
import classNames from 'classnames';

attach('ward-patient-workspace-header-slot', 'patient-vitals-info');

Expand All @@ -15,14 +16,14 @@ export default function WardPatientWorkspace({ wardPatient }: WardPatientWorkspa
return (
<>
{wardPatient && (
<div className={styles.workspaceContainer}>
<div className={classNames(styles.workspaceContainer, styles.patientWorkspace)}>
<WardPatientWorkspaceBanner {...{ wardPatient }} />
<div>
<ExtensionSlot name="ward-patient-workspace-header-slot" state={extensionSlotState} />
</div>
<div>
<ExtensionSlot name="ward-patient-workspace-content-slot" state={extensionSlotState} />
</div>
<ExtensionSlot name="ward-patient-workspace-header-slot" state={extensionSlotState} />
<ExtensionSlot
name="ward-patient-workspace-content-slot"
state={extensionSlotState}
className={styles.patientWorkspaceContentSlot}
/>
</div>
)}
</>
Expand Down
Loading