@kenyaemr/esm-express-workflow-app 5.4.2-pre.2423 → 5.4.2-pre.2425

package/dist/routes.json

@@ -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":"accountingLeftPanelLink","name":"accounting-dashboard-link","slot":"express-workflow-left-panel-slot","order":10,"meta":{"name":"accounting","slot":"accounting-dashboard-slot","title":"Accounting"}},{"component":"accountingDashboard","name":"accounting-dashboard","slot":"accounting-dashboard-slot"},{"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":"consulationLeftPanelLink","name":"consulation-dashboard-link","slot":"express-workflow-left-panel-slot","order":3,"meta":{"name":"consulation","slot":"consulation-dashboard-slot","title":"Consulation"}},{"component":"consulationDashboard","name":"consulation-dashboard","slot":"consulation-dashboard-slot"},{"component":"facilityLeftPanelLink","name":"facility-dashboard-link","slot":"express-workflow-left-panel-slot","order":0,"meta":{"name":"dashboard","slot":"facility-dashboard-slot","title":"Dashboard"}},{"component":"facilityDashboard","name":"facility-dashboard","slot":"facility-dashboard-slot"},{"component":"laboratoryLeftPanelLink","name":"lab-dashboard-link","slot":"express-workflow-left-panel-slot","order":5,"meta":{"name":"lab","slot":"lab-dashboard-slot","title":"Lab"}},{"component":"labDashboard","name":"lab-dashboard","slot":"lab-dashboard-slot"},{"component":"mchLeftPanelLink","name":"mch-dashboard-link","slot":"express-workflow-left-panel-slot","order":4,"meta":{"name":"mch","slot":"mch-dashboard-slot","title":"MCH"}},{"component":"mchDashboard","name":"mch-dashboard","slot":"mch-dashboard-slot"},{"component":"pharmacyLeftPanelLink","name":"pharmacy-dashboard-link","slot":"express-workflow-left-panel-slot","order":7,"meta":{"name":"pharmacy","slot":"pharmacy-dashboard-slot","title":"Pharmacy"}},{"component":"pharmacyDashboard","name":"pharmacy-dashboard","slot":"pharmacy-dashboard-slot"},{"component":"proceduresLeftPanelLink","name":"procedures-dashboard-link","slot":"express-workflow-left-panel-slot","order":8,"meta":{"name":"procedures","slot":"procedures-dashboard-slot","title":"Procedures"}},{"component":"proceduresDashboard","name":"procedures-dashboard","slot":"procedures-dashboard-slot"},{"component":"radiologyLeftPanelLink","name":"radiology-dashboard-link","slot":"express-workflow-left-panel-slot","order":6,"meta":{"name":"radiology","slot":"radiology-dashboard-slot","title":"Radiology"}},{"component":"radiologyDashboard","name":"radiology-dashboard","slot":"radiology-dashboard-slot"},{"component":"registrationLeftPanelLink","name":"registration-dashboard-link","slot":"express-workflow-left-panel-slot","order":1,"meta":{"name":"registration","slot":"registration-dashboard-slot","title":"Registration"}},{"component":"registrationDashboard","name":"registration-dashboard","slot":"registration-dashboard-slot"},{"component":"reportsLeftPanelLink","name":"reports-dashboard-link","slot":"express-workflow-left-panel-slot","order":11,"meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"}},{"component":"reportsDashboard","name":"reports-dashboard","slot":"reports-dashboard-slot"},{"component":"triageLeftPanelLink","name":"triage-dashboard-link","slot":"express-workflow-left-panel-slot","order":2,"meta":{"name":"triage","slot":"triage-dashboard-slot","title":"Triage"}},{"component":"triageDashboard","name":"triage-dashboard","slot":"triage-dashboard-slot"},{"component":"visitFormBanner","name":"visit-form-banner","slot":"visit-form-header-slot","order":0}],"workspaces":[{"name":"express-workflow-workspace","component":"expressWorkflowWorkspace","title":"Express Workflow Workspace","type":"workspace","canMaximize":true,"canHide":true}],"modals":[],"workspaceGroups":[{"name":"express-workflow","members":["add-drug-order","order-basket","add-lab-order","express-workflow-workspace"]}],"version":"5.4.2-pre.2423"}
+{"$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":"accountingLeftPanelLink","name":"accounting-dashboard-link","slot":"express-workflow-left-panel-slot","order":10,"meta":{"name":"accounting","slot":"accounting-dashboard-slot","title":"Accounting"}},{"component":"accountingDashboard","name":"accounting-dashboard","slot":"accounting-dashboard-slot"},{"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":"express-workflow-left-panel-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":"express-workflow-left-panel-slot","order":0,"meta":{"name":"dashboard","slot":"facility-dashboard-slot","title":"Dashboard"}},{"component":"facilityDashboard","name":"facility-dashboard","slot":"facility-dashboard-slot"},{"component":"laboratoryLeftPanelLink","name":"lab-dashboard-link","slot":"express-workflow-left-panel-slot","order":5,"meta":{"name":"lab","slot":"lab-dashboard-slot","title":"Lab"}},{"component":"labDashboard","name":"lab-dashboard","slot":"lab-dashboard-slot"},{"component":"mchLeftPanelLink","name":"mch-dashboard-link","slot":"express-workflow-left-panel-slot","order":4,"meta":{"name":"mch","slot":"mch-dashboard-slot","title":"MCH"}},{"component":"mchDashboard","name":"mch-dashboard","slot":"mch-dashboard-slot"},{"component":"pharmacyLeftPanelLink","name":"pharmacy-dashboard-link","slot":"express-workflow-left-panel-slot","order":7,"meta":{"name":"pharmacy","slot":"pharmacy-dashboard-slot","title":"Pharmacy"}},{"component":"pharmacyDashboard","name":"pharmacy-dashboard","slot":"pharmacy-dashboard-slot"},{"component":"proceduresLeftPanelLink","name":"procedures-dashboard-link","slot":"express-workflow-left-panel-slot","order":8,"meta":{"name":"procedures","slot":"procedures-dashboard-slot","title":"Procedures"}},{"component":"proceduresDashboard","name":"procedures-dashboard","slot":"procedures-dashboard-slot"},{"component":"radiologyLeftPanelLink","name":"radiology-dashboard-link","slot":"express-workflow-left-panel-slot","order":6,"meta":{"name":"radiology","slot":"radiology-dashboard-slot","title":"Radiology"}},{"component":"radiologyDashboard","name":"radiology-dashboard","slot":"radiology-dashboard-slot"},{"component":"registrationLeftPanelLink","name":"registration-dashboard-link","slot":"express-workflow-left-panel-slot","order":1,"meta":{"name":"registration","slot":"registration-dashboard-slot","title":"Registration"}},{"component":"registrationDashboard","name":"registration-dashboard","slot":"registration-dashboard-slot"},{"component":"reportsLeftPanelLink","name":"reports-dashboard-link","slot":"express-workflow-left-panel-slot","order":11,"meta":{"name":"reports","slot":"reports-dashboard-slot","title":"Reports"}},{"component":"reportsDashboard","name":"reports-dashboard","slot":"reports-dashboard-slot"},{"component":"triageLeftPanelLink","name":"triage-dashboard-link","slot":"express-workflow-left-panel-slot","order":2,"meta":{"name":"triage","slot":"triage-dashboard-slot","title":"Triage"}},{"component":"triageDashboard","name":"triage-dashboard","slot":"triage-dashboard-slot"},{"component":"visitFormBanner","name":"visit-form-banner","slot":"visit-form-header-slot","order":0}],"workspaces":[{"name":"express-workflow-workspace","component":"expressWorkflowWorkspace","title":"Express Workflow Workspace","type":"workspace","canMaximize":true,"canHide":true}],"modals":[],"workspaceGroups":[{"name":"express-workflow","members":["add-drug-order","order-basket","add-lab-order","express-workflow-workspace"]}],"version":"5.4.2-pre.2425"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-express-workflow-app",
-  "version": "5.4.2-pre.2423",
+  "version": "5.4.2-pre.2425",
   "description": "Express workflow app for OpenMRS 3",
   "browser": "dist/kenyaemr-esm-express-workflow-app.js",
   "main": "src/index.ts",

package/src/components/consultation/consultation.component.tsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useQueues } from '../../hooks/useServiceQueues';
+import { InlineLoading } from '@carbon/react';
+import { HomePictogram, PageHeader } from '@openmrs/esm-framework';
+import styles from './consultation.scss';
+import Card from '../../shared/cards/card.component';
+import capitalize from 'lodash-es/capitalize';
+import QueueTab from '../../shared/queue/queue-tab.component';
+type ConsultationProps = {
+  dashboardTitle: string;
+};
+
+const Consultation: React.FC<ConsultationProps> = ({ dashboardTitle }) => {
+  const { t } = useTranslation();
+  const { queues, isLoading, error } = useQueues();
+  const consultationQueues = queues.filter((queue) => queue.name.toLowerCase().includes('consultation'));
+
+  if (isLoading) {
+    return <InlineLoading description={t('loadingQueues', 'Loading queues...')} />;
+  }
+  return (
+    <div>
+      <PageHeader className={styles.pageHeader} title={capitalize(dashboardTitle)} illustration={<HomePictogram />} />
+      <div>
+        <div className={styles.cards}>
+          <Card title={t('awaitingConsultation', 'Awaiting consultation')} value={'20'} />
+          <Card title={t('awaitingInvestigation', 'Awaiting Investigation')} value={'5'} />
+          <Card title={t('investigationComplete', 'Investigation complete')} value={'7'} />
+          <Card title={t('visitComplete', 'Visit complete')} value={'4'} />
+        </div>
+        <QueueTab queues={consultationQueues} />
+      </div>
+    </div>
+  );
+};
+
+export default Consultation;

package/src/components/consultation/consultation.scss

@@ -0,0 +1,11 @@
+@use '@carbon/colors';
+@use '@carbon/type';
+
+.pageHeader {
+  border-bottom: 1px solid colors.$gray-20;
+}
+
+.cards {
+  display: flex;
+  flex-direction: row;
+}

package/src/components/consultation/dashboard.component.tsx

@@ -0,0 +1,22 @@
+import React from 'react';
+import { BrowserRouter, Routes, Route } from 'react-router-dom';
+import { spaBasePath } from '../../constants';
+import PatientChart from '../../shared/patient-chart/patient-chart.component';
+import Consultation from './consultation.component';
+
+type ConsultationDashboardProps = {
+  dashboardTitle: string;
+};
+
+const ConsultationDashboard: React.FC<ConsultationDashboardProps> = ({ dashboardTitle }) => {
+  return (
+    <BrowserRouter basename={`${spaBasePath}/consultation`}>
+      <Routes>
+        <Route path="/" element={<Consultation dashboardTitle={dashboardTitle} />} />
+        <Route path="/:patientUuid" element={<PatientChart />} />
+      </Routes>
+    </BrowserRouter>
+  );
+};
+
+export default ConsultationDashboard;

package/src/components/{consulation → consultation}/index.ts

@@ -1,19 +1,19 @@
 import { getSyncLifecycle } from '@openmrs/esm-framework';
 
 import { moduleName } from '../../constants';
-import Consulation from './consulation.component';
 import { createDashboardLink } from '@openmrs/esm-patient-common-lib';
+import ConsultationDashboard from './dashboard.component';
 
 const options = {
   featureName: 'express-workflow',
   moduleName,
 };
 
-export const consulationDashboard = getSyncLifecycle(Consulation, options);
-export const consulationLeftPanelLink = getSyncLifecycle(
+export const consultationDashboard = getSyncLifecycle(ConsultationDashboard, options);
+export const consultationLeftPanelLink = getSyncLifecycle(
   createDashboardLink({
-    title: 'Consulation',
-    path: 'consulation',
+    title: 'Consultation',
+    path: 'consultation',
     icon: 'omrs-icon-user-avatar',
   }),
   options,

package/src/index.ts

@@ -17,7 +17,7 @@ export * from './components/facility-dashboard';
 export * from './components/registration';
 export * from './components/triage';
 export * from './components/accounting';
-export * from './components/consulation';
+export * from './components/consultation';
 export * from './components/admissions';
 export * from './components/lab';
 export * from './components/mch';

package/src/root.component.tsx

@@ -14,6 +14,7 @@ const Root: React.FC = () => {
         <Routes>
           <Route path="/:dashboard/*" element={<DashboardContainer />} />
         </Routes>
+        <WorkspaceContainer contextKey="express-workflow" />
       </main>
       <WorkspaceContainer contextKey="express-workflow" />
     </BrowserRouter>

package/src/routes.json

@@ -44,20 +44,20 @@
       "slot": "admissions-dashboard-slot"
     },
     {
-      "component": "consulationLeftPanelLink",
-      "name": "consulation-dashboard-link",
+      "component": "consultationLeftPanelLink",
+      "name": "consultation-dashboard-link",
       "slot": "express-workflow-left-panel-slot",
       "order": 3,
       "meta": {
-        "name": "consulation",
-        "slot": "consulation-dashboard-slot",
-        "title": "Consulation"
+        "name": "consultation",
+        "slot": "consultation-dashboard-slot",
+        "title": "Consultation"
       }
     },
     {
-      "component": "consulationDashboard",
-      "name": "consulation-dashboard",
-      "slot": "consulation-dashboard-slot"
+      "component": "consultationDashboard",
+      "name": "consultation-dashboard",
+      "slot": "consultation-dashboard-slot"
     },
     {
       "component": "facilityLeftPanelLink",

package/translations/am.json

@@ -1,16 +1,11 @@
 {
   "age": "Age",
-  "chooseIdentifierType": "Choose identifier type",
-  "clearAll": "Clear All",
-  "clientRegistry": "Client registry verification",
-  "emergencyRegistration": "Emergency registration",
-  "enterIdentifierNumber": "Enter identifier number",
-  "error": "Error",
+  "awaitingConsultation": "Awaiting consultation",
+  "awaitingInvestigation": "Awaiting Investigation",
   "errorLoadingPatient": "Error loading patient",
   "gender": "Gender",
-  "identificationType": "Identification Type",
   "identifier": "Identifier",
-  "identifierNumber": "Identifier number*",
+  "investigationComplete": "Investigation complete",
   "loadingPatient": "Loading patient...",
   "loadingQueues": "Loading queues...",
   "name": "Name",
@@ -21,14 +16,8 @@
   "previousPage": "Previous page",
   "priority": "Priority",
   "programManagement": "Program Management",
-  "pullFromHIE": "Pulling from registry...",
   "queueEntries": "Queue Entries",
-  "registration": "Registration",
-  "searchFailed": "Failed to search for patient. Please try again.",
-  "searchPatients": "Search for Patient(s)",
-  "selectIdentifierAndNumber": "Please select an identifier type and enter an identifier number",
-  "validationError": "Validation Error",
-  "visitFormBanner": "Visit Form Banner",
+  "visitComplete": "Visit complete",
   "visitTime": "Visit Time",
   "vitalsAndAnthropometrics": "Vitals and Anthropometrics"
 }

package/translations/en.json

@@ -1,16 +1,11 @@
 {
   "age": "Age",
-  "chooseIdentifierType": "Choose identifier type",
-  "clearAll": "Clear All",
-  "clientRegistry": "Client registry verification",
-  "emergencyRegistration": "Emergency registration",
-  "enterIdentifierNumber": "Enter identifier number",
-  "error": "Error",
+  "awaitingConsultation": "Awaiting consultation",
+  "awaitingInvestigation": "Awaiting Investigation",
   "errorLoadingPatient": "Error loading patient",
   "gender": "Gender",
-  "identificationType": "Identification Type",
   "identifier": "Identifier",
-  "identifierNumber": "Identifier number*",
+  "investigationComplete": "Investigation complete",
   "loadingPatient": "Loading patient...",
   "loadingQueues": "Loading queues...",
   "name": "Name",
@@ -21,14 +16,8 @@
   "previousPage": "Previous page",
   "priority": "Priority",
   "programManagement": "Program Management",
-  "pullFromHIE": "Pulling from registry...",
   "queueEntries": "Queue Entries",
-  "registration": "Registration",
-  "searchFailed": "Failed to search for patient. Please try again.",
-  "searchPatients": "Search for Patient(s)",
-  "selectIdentifierAndNumber": "Please select an identifier type and enter an identifier number",
-  "validationError": "Validation Error",
-  "visitFormBanner": "Visit Form Banner",
+  "visitComplete": "Visit complete",
   "visitTime": "Visit Time",
   "vitalsAndAnthropometrics": "Vitals and Anthropometrics"
 }

package/translations/sw.json

@@ -1,16 +1,11 @@
 {
   "age": "Age",
-  "chooseIdentifierType": "Choose identifier type",
-  "clearAll": "Clear All",
-  "clientRegistry": "Client registry verification",
-  "emergencyRegistration": "Emergency registration",
-  "enterIdentifierNumber": "Enter identifier number",
-  "error": "Error",
+  "awaitingConsultation": "Awaiting consultation",
+  "awaitingInvestigation": "Awaiting Investigation",
   "errorLoadingPatient": "Error loading patient",
   "gender": "Gender",
-  "identificationType": "Identification Type",
   "identifier": "Identifier",
-  "identifierNumber": "Identifier number*",
+  "investigationComplete": "Investigation complete",
   "loadingPatient": "Loading patient...",
   "loadingQueues": "Loading queues...",
   "name": "Name",
@@ -21,14 +16,8 @@
   "previousPage": "Previous page",
   "priority": "Priority",
   "programManagement": "Program Management",
-  "pullFromHIE": "Pulling from registry...",
   "queueEntries": "Queue Entries",
-  "registration": "Registration",
-  "searchFailed": "Failed to search for patient. Please try again.",
-  "searchPatients": "Search for Patient(s)",
-  "selectIdentifierAndNumber": "Please select an identifier type and enter an identifier number",
-  "validationError": "Validation Error",
-  "visitFormBanner": "Visit Form Banner",
+  "visitComplete": "Visit complete",
   "visitTime": "Visit Time",
   "vitalsAndAnthropometrics": "Vitals and Anthropometrics"
 }