@kenyaemr/esm-express-workflow-app 5.4.2-pre.2563 → 5.4.2-pre.2575
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.turbo/turbo-build.log +4 -4
- package/dist/127.js +1 -1
- package/dist/166.js +1 -1
- package/dist/166.js.map +1 -1
- package/dist/40.js +1 -1
- package/dist/916.js +1 -1
- package/dist/kenyaemr-esm-express-workflow-app.js.buildmanifest.json +15 -15
- package/dist/main.js +28 -28
- package/dist/main.js.map +1 -1
- package/dist/routes.json +1 -1
- package/package.json +1 -1
- package/src/components/consultation/consultation.component.tsx +8 -5
- package/src/components/consultation/consultation.scss +8 -1
- package/src/components/facility-dashboard/components/header/home-header.component.tsx +13 -4
- package/src/components/facility-dashboard/components/header/home-header.scss +2 -0
- package/src/components/mch/mch.component.tsx +9 -6
- package/src/components/mch/mch.scss +9 -2
- package/src/components/registration/registration.component.tsx +2 -1
- package/src/components/reports/reports.component.tsx +7 -3
- package/src/components/reports/reports.scss +8 -1
- package/src/components/triage/triage.component.tsx +7 -3
- package/src/components/triage/triage.scss +8 -2
- package/translations/am.json +2 -0
- package/translations/en.json +2 -0
- package/translations/sw.json +2 -0
package/dist/routes.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"pages":[{"component":"root","route":"express-workflow"}],"extensions":[{"component":"admissionsLeftPanelLink","name":"admissions-dashboard-link","slot":"express-workflow-left-panel-slot","order":9,"meta":{"name":"admissions","slot":"admissions-dashboard-slot","title":"Admissions"}},{"component":"admissionsDashboard","name":"admissions-dashboard","slot":"admissions-dashboard-slot"},{"component":"consultationLeftPanelLink","name":"consultation-dashboard-link","slot":"homepage-dashboard-slot","order":3,"meta":{"name":"consultation","slot":"consultation-dashboard-slot","title":"Consultation"}},{"component":"consultationDashboard","name":"consultation-dashboard","slot":"consultation-dashboard-slot"},{"component":"facilityLeftPanelLink","name":"facility-dashboard-link","slot":"homepage-dashboard-slot","order":0,"meta":{"name":"dashboard","slot":"facility-dashboard-slot","title":"Dashboard"}},{"component":"facilityDashboard","name":"facility-dashboard","slot":"facility-dashboard-slot"},{"component":"mchLeftPanelLink","name":"mch-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"mch","slot":"mch-dashboard-slot","title":"MCH"}},{"component":"mchDashboard","name":"mch-dashboard","slot":"mch-dashboard-slot"},{"component":"registrationLeftPanelLink","name":"registration-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"registration","slot":"registration-dashboard-slot","title":"Registration"}},{"component":"registrationDashboard","name":"registration-dashboard","slot":"registration-dashboard-slot"},{"component":"triageLeftPanelLink","name":"triage-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"triage","slot":"triage-dashboard-slot","title":"Triage"}},{"component":"triageDashboard","name":"triage-dashboard","slot":"triage-dashboard-slot"},{"component":"reportsDashboardLink","name":"reports-homepage-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"reports","slot":"reports-homepage-dashboard-slot","title":"Reports"}},{"component":"reportsDashboard","name":"reports-dashboard","slot":"reports-homepage-dashboard-slot"},{"name":"pharmacy-homepage-dashboard-link","component":"pharmacyLink","slot":"homepage-dashboard-slot","meta":{"name":"pharmacy","title":"Pharmacy","path":"pharmacy","slot":"pharmacy-homepage-dashboard-slot"}},{"name":"pharmacy-homepage-dashboard","component":"pharmacy","slot":"pharmacy-homepage-dashboard-slot","online":true,"offline":false},{"name":"patient-summary-dashboard","component":"patientSummaryDashboard","slot":"patient-chart-summary-dashboard-slot"},{"name":"ewf-clinical-encounter-link","component":"clinicalEncounterLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-clinical-encounter","title":"Clinical Encounter","slot":"ewf-patient-chart-clinical-encounter-slot","path":"clinical-encounter","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-clinical-encounter-dashboard","component":"clinicalEncounter","slot":"ewf-patient-chart-clinical-encounter-slot","online":true,"offline":false},{"name":"ewf-laboratory-dashboard-link","component":"laboratoryLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-laboratory","title":"Laboratory","path":"laboratory","slot":"ewf-patient-chart-laboratory-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-laboratory-dashboard","component":"laboratoryDashboard","slot":"ewf-patient-chart-laboratory-dashboard-slot","online":true,"offline":false},{"name":"ewf-radiology-and-imaging-dashboard-link","component":"radiologyAndImagingLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-radiology-and-imaging","title":"Radiology and Imaging","path":"radiology-and-imaging","slot":"ewf-patient-chart-radiology-and-imaging-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-radiology-and-imaging-dashboard","component":"radiologyAndImagingDashboard","slot":"ewf-patient-chart-radiology-and-imaging-dashboard-slot","online":true,"offline":false},{"name":"ewf-procedures-dashboard-link","component":"proceduresLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-procedures","title":"Procedures","path":"procedures","slot":"ewf-patient-chart-procedures-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-procedures-dashboard","component":"proceduresDashboard","slot":"ewf-patient-chart-procedures-dashboard-slot","online":true,"offline":false},{"name":"ewf-pharmacy-dashboard-link","component":"pharmacyPatientChartDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-pharmacy","title":"Pharmacy","path":"pharmacy","slot":"ewf-patient-chart-pharmacy-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-pharmacy-dashboard","component":"pharmacyTabs","slot":"ewf-patient-chart-pharmacy-dashboard-slot","online":true,"offline":false},{"name":"ewf-admissions-dashboard-link","component":"admissionsDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-admissions","title":"Admissions","path":"admissions","slot":"ewf-patient-chart-admissions-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-admissions-dashboard","component":"admissionsDashboard","slot":"ewf-patient-chart-admissions-dashboard-slot","online":true,"offline":false},{"name":"ewf-homepage-dashboard-link","component":"homepageDashboardLink","slot":"patient-chart-dashboard-slot","order":0},{"name":"mch-program-management","component":"mchProgramManagement","slot":"mch-program-management-slot","order":0}],"workspaces":[{"name":"express-workflow-workspace","component":"expressWorkflowWorkspace","title":"Express Workflow Workspace","type":"workspace","canMaximize":true,"canHide":true},{"name":"mch-program-form-workspace","component":"mchProgramForm","title":"Program Form","type":"workspace"}],"modals":[{"component":"otpVerificationModal","name":"otp-verification-modal"},{"component":"facilityDashboardAuthorizationModal","name":"facility-dashboard-authorization-form-modal"}],"workspaceGroups":[{"name":"express-workflow","members":["add-drug-order","order-basket","add-lab-order","express-workflow-workspace","start-visit-workspace-form"]}],"version":"5.4.2-pre.
|
|
1
|
+
{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":"^2.24.0"},"pages":[{"component":"root","route":"express-workflow"}],"extensions":[{"component":"admissionsLeftPanelLink","name":"admissions-dashboard-link","slot":"express-workflow-left-panel-slot","order":9,"meta":{"name":"admissions","slot":"admissions-dashboard-slot","title":"Admissions"}},{"component":"admissionsDashboard","name":"admissions-dashboard","slot":"admissions-dashboard-slot"},{"component":"consultationLeftPanelLink","name":"consultation-dashboard-link","slot":"homepage-dashboard-slot","order":3,"meta":{"name":"consultation","slot":"consultation-dashboard-slot","title":"Consultation"}},{"component":"consultationDashboard","name":"consultation-dashboard","slot":"consultation-dashboard-slot"},{"component":"facilityLeftPanelLink","name":"facility-dashboard-link","slot":"homepage-dashboard-slot","order":0,"meta":{"name":"dashboard","slot":"facility-dashboard-slot","title":"Dashboard"}},{"component":"facilityDashboard","name":"facility-dashboard","slot":"facility-dashboard-slot"},{"component":"mchLeftPanelLink","name":"mch-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"mch","slot":"mch-dashboard-slot","title":"MCH"}},{"component":"mchDashboard","name":"mch-dashboard","slot":"mch-dashboard-slot"},{"component":"registrationLeftPanelLink","name":"registration-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"registration","slot":"registration-dashboard-slot","title":"Registration"}},{"component":"registrationDashboard","name":"registration-dashboard","slot":"registration-dashboard-slot"},{"component":"triageLeftPanelLink","name":"triage-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"triage","slot":"triage-dashboard-slot","title":"Triage"}},{"component":"triageDashboard","name":"triage-dashboard","slot":"triage-dashboard-slot"},{"component":"reportsDashboardLink","name":"reports-homepage-dashboard-link","slot":"homepage-dashboard-slot","meta":{"name":"reports","slot":"reports-homepage-dashboard-slot","title":"Reports"}},{"component":"reportsDashboard","name":"reports-dashboard","slot":"reports-homepage-dashboard-slot"},{"name":"pharmacy-homepage-dashboard-link","component":"pharmacyLink","slot":"homepage-dashboard-slot","meta":{"name":"pharmacy","title":"Pharmacy","path":"pharmacy","slot":"pharmacy-homepage-dashboard-slot"}},{"name":"pharmacy-homepage-dashboard","component":"pharmacy","slot":"pharmacy-homepage-dashboard-slot","online":true,"offline":false},{"name":"patient-summary-dashboard","component":"patientSummaryDashboard","slot":"patient-chart-summary-dashboard-slot"},{"name":"ewf-clinical-encounter-link","component":"clinicalEncounterLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-clinical-encounter","title":"Clinical Encounter","slot":"ewf-patient-chart-clinical-encounter-slot","path":"clinical-encounter","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-clinical-encounter-dashboard","component":"clinicalEncounter","slot":"ewf-patient-chart-clinical-encounter-slot","online":true,"offline":false},{"name":"ewf-laboratory-dashboard-link","component":"laboratoryLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-laboratory","title":"Laboratory","path":"laboratory","slot":"ewf-patient-chart-laboratory-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-laboratory-dashboard","component":"laboratoryDashboard","slot":"ewf-patient-chart-laboratory-dashboard-slot","online":true,"offline":false},{"name":"ewf-radiology-and-imaging-dashboard-link","component":"radiologyAndImagingLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-radiology-and-imaging","title":"Radiology and Imaging","path":"radiology-and-imaging","slot":"ewf-patient-chart-radiology-and-imaging-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-radiology-and-imaging-dashboard","component":"radiologyAndImagingDashboard","slot":"ewf-patient-chart-radiology-and-imaging-dashboard-slot","online":true,"offline":false},{"name":"ewf-procedures-dashboard-link","component":"proceduresLeftPanelLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-procedures","title":"Procedures","path":"procedures","slot":"ewf-patient-chart-procedures-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-procedures-dashboard","component":"proceduresDashboard","slot":"ewf-patient-chart-procedures-dashboard-slot","online":true,"offline":false},{"name":"ewf-pharmacy-dashboard-link","component":"pharmacyPatientChartDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-pharmacy","title":"Pharmacy","path":"pharmacy","slot":"ewf-patient-chart-pharmacy-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-pharmacy-dashboard","component":"pharmacyTabs","slot":"ewf-patient-chart-pharmacy-dashboard-slot","online":true,"offline":false},{"name":"ewf-admissions-dashboard-link","component":"admissionsDashboardLink","slot":"patient-chart-dashboard-slot","meta":{"name":"ewf-admissions","title":"Admissions","path":"admissions","slot":"ewf-patient-chart-admissions-dashboard-slot","layoutMode":"anchored","hideDashboardTitle":true}},{"name":"ewf-admissions-dashboard","component":"admissionsDashboard","slot":"ewf-patient-chart-admissions-dashboard-slot","online":true,"offline":false},{"name":"ewf-homepage-dashboard-link","component":"homepageDashboardLink","slot":"patient-chart-dashboard-slot","order":0},{"name":"mch-program-management","component":"mchProgramManagement","slot":"mch-program-management-slot","order":0}],"workspaces":[{"name":"express-workflow-workspace","component":"expressWorkflowWorkspace","title":"Express Workflow Workspace","type":"workspace","canMaximize":true,"canHide":true},{"name":"mch-program-form-workspace","component":"mchProgramForm","title":"Program Form","type":"workspace"}],"modals":[{"component":"otpVerificationModal","name":"otp-verification-modal"},{"component":"facilityDashboardAuthorizationModal","name":"facility-dashboard-authorization-form-modal"}],"workspaceGroups":[{"name":"express-workflow","members":["add-drug-order","order-basket","add-lab-order","express-workflow-workspace","start-visit-workspace-form"]}],"version":"5.4.2-pre.2575"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { InlineLoading } from '@carbon/react';
|
|
2
|
-
import { HomePictogram, PageHeader } from '@openmrs/esm-framework';
|
|
2
|
+
import { ExtensionSlot, HomePictogram, PageHeader, PageHeaderContent } from '@openmrs/esm-framework';
|
|
3
|
+
import styles from './consultation.scss';
|
|
3
4
|
import capitalize from 'lodash-es/capitalize';
|
|
4
5
|
import React from 'react';
|
|
5
6
|
import { useTranslation } from 'react-i18next';
|
|
6
7
|
import { useQueues } from '../../hooks/useServiceQueues';
|
|
7
8
|
import QueueTab from '../../shared/queue/queue-tab.component';
|
|
8
|
-
import styles from './consultation.scss';
|
|
9
9
|
type ConsultationProps = {
|
|
10
10
|
dashboardTitle: string;
|
|
11
11
|
};
|
|
@@ -19,7 +19,7 @@ const Consultation: React.FC<ConsultationProps> = ({ dashboardTitle }) => {
|
|
|
19
19
|
// TODO: Add actually get the values from the queues
|
|
20
20
|
const cards = [
|
|
21
21
|
{ title: t('awaitingConsultation', 'Awaiting consultation'), value: '20' },
|
|
22
|
-
{ title: t('awaitingInvestigation', 'Awaiting Investigation'), value: '
|
|
22
|
+
{ title: t('awaitingInvestigation', 'Awaiting Investigation'), value: '15' },
|
|
23
23
|
{ title: t('investigationComplete', 'Investigation complete'), value: '7' },
|
|
24
24
|
{ title: t('visitComplete', 'Visit complete'), value: '4' },
|
|
25
25
|
];
|
|
@@ -28,8 +28,11 @@ const Consultation: React.FC<ConsultationProps> = ({ dashboardTitle }) => {
|
|
|
28
28
|
return <InlineLoading description={t('loadingQueues', 'Loading queues...')} />;
|
|
29
29
|
}
|
|
30
30
|
return (
|
|
31
|
-
<div>
|
|
32
|
-
<PageHeader className={styles.pageHeader}
|
|
31
|
+
<div className={`omrs-main-content`}>
|
|
32
|
+
<PageHeader className={styles.pageHeader}>
|
|
33
|
+
<PageHeaderContent title={capitalize(dashboardTitle)} illustration={<HomePictogram />} />
|
|
34
|
+
<ExtensionSlot name="provider-banner-info-slot" />
|
|
35
|
+
</PageHeader>
|
|
33
36
|
<QueueTab
|
|
34
37
|
queues={consultationQueues}
|
|
35
38
|
cards={cards}
|
|
@@ -1,7 +1,14 @@
|
|
|
1
|
-
@use '@carbon/
|
|
1
|
+
@use '@carbon/layout';
|
|
2
2
|
@use '@carbon/type';
|
|
3
|
+
@use '@carbon/colors';
|
|
3
4
|
|
|
4
5
|
.pageHeader {
|
|
6
|
+
@include type.type-style('body-compact-02');
|
|
7
|
+
height: layout.$spacing-12;
|
|
8
|
+
display: flex;
|
|
9
|
+
justify-content: space-between;
|
|
10
|
+
padding: layout.$spacing-05;
|
|
11
|
+
background: colors.$white-0;
|
|
5
12
|
border-bottom: 1px solid colors.$gray-20;
|
|
6
13
|
}
|
|
7
14
|
|
|
@@ -2,7 +2,13 @@ import React, { useCallback, useMemo } from 'react';
|
|
|
2
2
|
import dayjs from 'dayjs';
|
|
3
3
|
import { useTranslation } from 'react-i18next';
|
|
4
4
|
import { MultiSelect } from '@carbon/react';
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
PageHeader,
|
|
7
|
+
PageHeaderContent,
|
|
8
|
+
AppointmentsPictogram,
|
|
9
|
+
OpenmrsDatePicker,
|
|
10
|
+
ExtensionSlot,
|
|
11
|
+
} from '@openmrs/esm-framework';
|
|
6
12
|
import styles from './home-header.scss';
|
|
7
13
|
|
|
8
14
|
interface HomeHeaderProps {
|
|
@@ -27,8 +33,11 @@ const HomeHeader: React.FC<HomeHeaderProps> = ({ title, onDateChange }) => {
|
|
|
27
33
|
};
|
|
28
34
|
|
|
29
35
|
return (
|
|
30
|
-
|
|
31
|
-
<
|
|
36
|
+
<>
|
|
37
|
+
<PageHeader className={styles.header} data-testid="home-header">
|
|
38
|
+
<PageHeaderContent illustration={<AppointmentsPictogram />} title={title} />
|
|
39
|
+
<ExtensionSlot name="provider-banner-info-slot" />
|
|
40
|
+
</PageHeader>
|
|
32
41
|
<div className={styles.dateFilters}>
|
|
33
42
|
<div className={styles.dateInput}>
|
|
34
43
|
<OpenmrsDatePicker
|
|
@@ -51,7 +60,7 @@ const HomeHeader: React.FC<HomeHeaderProps> = ({ title, onDateChange }) => {
|
|
|
51
60
|
/>
|
|
52
61
|
</div>
|
|
53
62
|
</div>
|
|
54
|
-
|
|
63
|
+
</>
|
|
55
64
|
);
|
|
56
65
|
};
|
|
57
66
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import Triage from '../triage/triage.component';
|
|
3
|
-
import { HomePictogram, PageHeader } from '@openmrs/esm-framework';
|
|
3
|
+
import { ExtensionSlot, HomePictogram, PageHeader, PageHeaderContent } from '@openmrs/esm-framework';
|
|
4
4
|
import capitalize from 'lodash-es/capitalize';
|
|
5
5
|
import styles from './mch.scss';
|
|
6
6
|
import { Tab, TabList, TabPanel, TabPanels, Tabs } from '@carbon/react';
|
|
@@ -16,11 +16,14 @@ const MCH: React.FC<MchProps> = ({ dashboardTitle }) => {
|
|
|
16
16
|
const [selectedIndex, setSelectedIndex] = React.useState(0);
|
|
17
17
|
return (
|
|
18
18
|
<div>
|
|
19
|
-
<PageHeader
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
19
|
+
<PageHeader className={styles.pageHeader}>
|
|
20
|
+
<PageHeaderContent
|
|
21
|
+
title={`${toUpper(dashboardTitle)} ${selectedIndex === 0 ? 'Triage' : 'Consultation'}`}
|
|
22
|
+
illustration={<HomePictogram />}
|
|
23
|
+
/>
|
|
24
|
+
|
|
25
|
+
<ExtensionSlot name="provider-banner-info-slot" />
|
|
26
|
+
</PageHeader>
|
|
24
27
|
<Tabs
|
|
25
28
|
onChange={({ selectedIndex }) => {
|
|
26
29
|
setSelectedIndex(selectedIndex);
|
|
@@ -1,8 +1,15 @@
|
|
|
1
|
-
@use '@carbon/colors';
|
|
2
|
-
@use '@carbon/type';
|
|
3
1
|
@use '@carbon/layout';
|
|
2
|
+
@use '@carbon/type';
|
|
3
|
+
@use '@carbon/colors';
|
|
4
|
+
|
|
4
5
|
|
|
5
6
|
.pageHeader {
|
|
7
|
+
@include type.type-style('body-compact-02');
|
|
8
|
+
height: layout.$spacing-12;
|
|
9
|
+
display: flex;
|
|
10
|
+
justify-content: space-between;
|
|
11
|
+
padding: layout.$spacing-05;
|
|
12
|
+
background: colors.$white-0;
|
|
6
13
|
border-bottom: 1px solid colors.$gray-20;
|
|
7
14
|
margin-bottom: layout.$spacing-05;
|
|
8
15
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import styles from './registration.scss';
|
|
3
|
-
import { PageHeader, PageHeaderContent } from '@openmrs/esm-framework';
|
|
3
|
+
import { ExtensionSlot, PageHeader, PageHeaderContent } from '@openmrs/esm-framework';
|
|
4
4
|
import { useTranslation } from 'react-i18next';
|
|
5
5
|
import SearchBar from './search-bar/search-bar.component';
|
|
6
6
|
import IllustrationSvg from './illustration-svg/illustration.component';
|
|
@@ -12,6 +12,7 @@ const Registration: React.FC = () => {
|
|
|
12
12
|
<div className={`omrs-main-content`}>
|
|
13
13
|
<PageHeader className={styles.header} data-testid="patient-queue-header">
|
|
14
14
|
<PageHeaderContent title={t('registration', 'Registration')} illustration={<IllustrationSvg />} />
|
|
15
|
+
<ExtensionSlot name="provider-banner-info-slot" />
|
|
15
16
|
</PageHeader>
|
|
16
17
|
<SearchBar />
|
|
17
18
|
</div>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import capitalize from 'lodash-es/capitalize';
|
|
3
|
-
import { PageHeader, HomePictogram } from '@openmrs/esm-framework';
|
|
3
|
+
import { PageHeader, HomePictogram, ExtensionSlot, PageHeaderContent } from '@openmrs/esm-framework';
|
|
4
4
|
|
|
5
5
|
import styles from './reports.scss';
|
|
6
6
|
|
|
@@ -10,8 +10,12 @@ type ReportsProps = {
|
|
|
10
10
|
|
|
11
11
|
const Reports: React.FC<ReportsProps> = ({ dashboardTitle }) => {
|
|
12
12
|
return (
|
|
13
|
-
<div>
|
|
14
|
-
<PageHeader className={styles.pageHeader}
|
|
13
|
+
<div className={`omrs-main-content`}>
|
|
14
|
+
<PageHeader className={styles.pageHeader}>
|
|
15
|
+
<PageHeaderContent title={capitalize(dashboardTitle)} illustration={<HomePictogram />} />
|
|
16
|
+
|
|
17
|
+
<ExtensionSlot name="provider-banner-info-slot" />
|
|
18
|
+
</PageHeader>
|
|
15
19
|
</div>
|
|
16
20
|
);
|
|
17
21
|
};
|
|
@@ -1,6 +1,13 @@
|
|
|
1
|
-
@use '@carbon/
|
|
1
|
+
@use '@carbon/layout';
|
|
2
2
|
@use '@carbon/type';
|
|
3
|
+
@use '@carbon/colors';
|
|
3
4
|
|
|
4
5
|
.pageHeader {
|
|
6
|
+
@include type.type-style('body-compact-02');
|
|
7
|
+
height: layout.$spacing-12;
|
|
8
|
+
display: flex;
|
|
9
|
+
justify-content: space-between;
|
|
10
|
+
padding: layout.$spacing-05;
|
|
11
|
+
background: colors.$white-0;
|
|
5
12
|
border-bottom: 1px solid colors.$gray-20;
|
|
6
13
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import capitalize from 'lodash-es/capitalize';
|
|
3
3
|
import { useTranslation } from 'react-i18next';
|
|
4
|
-
import { PageHeader, HomePictogram, ErrorState } from '@openmrs/esm-framework';
|
|
4
|
+
import { PageHeader, HomePictogram, ErrorState, PageHeaderContent, ExtensionSlot } from '@openmrs/esm-framework';
|
|
5
5
|
import { InlineLoading } from '@carbon/react';
|
|
6
6
|
|
|
7
7
|
import { useQueues } from '../../hooks/useServiceQueues';
|
|
@@ -29,8 +29,12 @@ const Triage: React.FC<TriageProps> = ({ dashboardTitle }) => {
|
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
return (
|
|
32
|
-
<div>
|
|
33
|
-
<PageHeader className={styles.pageHeader}
|
|
32
|
+
<div className={`omrs-main-content`}>
|
|
33
|
+
<PageHeader className={styles.pageHeader}>
|
|
34
|
+
<PageHeaderContent title={capitalize(dashboardTitle)} illustration={<HomePictogram />} />
|
|
35
|
+
|
|
36
|
+
<ExtensionSlot name="provider-banner-info-slot" />
|
|
37
|
+
</PageHeader>
|
|
34
38
|
<QueueTab queues={triageQueues} navigatePath="triage" usePatientChart />
|
|
35
39
|
</div>
|
|
36
40
|
);
|
|
@@ -1,6 +1,12 @@
|
|
|
1
|
-
@use '@carbon/
|
|
1
|
+
@use '@carbon/layout';
|
|
2
2
|
@use '@carbon/type';
|
|
3
|
-
|
|
3
|
+
@use '@carbon/colors';
|
|
4
4
|
.pageHeader {
|
|
5
|
+
@include type.type-style('body-compact-02');
|
|
6
|
+
height: layout.$spacing-12;
|
|
7
|
+
display: flex;
|
|
8
|
+
justify-content: space-between;
|
|
9
|
+
padding: layout.$spacing-05;
|
|
10
|
+
background: colors.$white-0;
|
|
5
11
|
border-bottom: 1px solid colors.$gray-20;
|
|
6
12
|
}
|
package/translations/am.json
CHANGED
|
@@ -46,6 +46,8 @@
|
|
|
46
46
|
"identifier": "Identifier",
|
|
47
47
|
"identifierNumber": "Identifier number*",
|
|
48
48
|
"identifiers": "Identifiers",
|
|
49
|
+
"invalidPhoneNumber": "Please enter a valid phone number",
|
|
50
|
+
"investigationComplete": "Investigation complete",
|
|
49
51
|
"immunizations": "Immunizations",
|
|
50
52
|
"invalidPhoneNumber": "Please enter a valid phone number",
|
|
51
53
|
"investigationComplete": "Investigation complete",
|
package/translations/en.json
CHANGED
|
@@ -46,6 +46,8 @@
|
|
|
46
46
|
"identifier": "Identifier",
|
|
47
47
|
"identifierNumber": "Identifier number*",
|
|
48
48
|
"identifiers": "Identifiers",
|
|
49
|
+
"invalidPhoneNumber": "Please enter a valid phone number",
|
|
50
|
+
"investigationComplete": "Investigation complete",
|
|
49
51
|
"immunizations": "Immunizations",
|
|
50
52
|
"invalidPhoneNumber": "Please enter a valid phone number",
|
|
51
53
|
"investigationComplete": "Investigation complete",
|
package/translations/sw.json
CHANGED
|
@@ -46,6 +46,8 @@
|
|
|
46
46
|
"identifier": "Identifier",
|
|
47
47
|
"identifierNumber": "Identifier number*",
|
|
48
48
|
"identifiers": "Identifiers",
|
|
49
|
+
"invalidPhoneNumber": "Please enter a valid phone number",
|
|
50
|
+
"investigationComplete": "Investigation complete",
|
|
49
51
|
"immunizations": "Immunizations",
|
|
50
52
|
"invalidPhoneNumber": "Please enter a valid phone number",
|
|
51
53
|
"investigationComplete": "Investigation complete",
|