@kenyaemr/esm-express-workflow-app 5.4.2-pre.2575 → 5.4.2-pre.2580

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":"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"}
+{"$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.2580"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-express-workflow-app",
-  "version": "5.4.2-pre.2575",
+  "version": "5.4.2-pre.2580",
   "description": "Express workflow app for OpenMRS 3",
   "keywords": [
     "openmrs",

package/src/components/mch/mch.triage.component.tsx

@@ -37,8 +37,11 @@ const MCHTriage: React.FC = () => {
       queues={triageQueues}
       navigatePath="mch"
       cards={[
-        // { title: t('patientInWaiting', 'Patient in waiting'), value: awaitingCount.toString() },
-        { title: t('patientAttended', 'Patient attended'), value: finishedQueueEntries?.length?.toString() },
+        // { title: t('cilentsPatientInWaiting', 'Cilents/Patient in waiting'), value: awaitingCount.toString() },
+        {
+          title: t('clientsPatientAttended', 'Clients/Patient attended to'),
+          value: finishedQueueEntries?.length?.toString(),
+        },
       ]}
       onTabChanged={setCurrentQueue}
     />

package/src/components/mch/programs/program.workspace.tsx

@@ -52,7 +52,7 @@ const ProgramForm: FC<ProgramFormProps> = ({ patientUuid, program, enrollment, c
       showSnackbar({
         kind: 'success',
         title: 'Success',
-        subtitle: t('programEnrollmentSuccessfull', 'Program enrollment successfull'),
+        subtitle: t('programEnrollmentSuccessful', 'Program enrollment successful'),
       });
 
       closeWorkspace();

package/src/shared/patient-chart/patient-chart.component.tsx

@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
 
 import { useInitialize } from './useInitialize';
 import styles from './patient-chart.scss';
-import { usePatientchartTabs } from './patient-chart.resources';
+import { usePatientChartTabs } from './patient-chart.resources';
 
 type PatientChartProps = {
   navigationPath: string;
@@ -21,7 +21,7 @@ const PatientChart: React.FC<PatientChartProps> = ({ navigationPath }) => {
     isLoading,
     error,
   } = useSWR(patientUuid ? ['patient', patientUuid] : null, () => fetchCurrentPatient(patientUuid!, {}));
-  const patientChartTabsExtensionSlotConfig = usePatientchartTabs(navigationPath, patientUuid, patient);
+  const patientChartTabsExtensionSlotConfig = usePatientChartTabs(navigationPath, patientUuid, patient);
 
   const state = useMemo(() => ({ patient, patientUuid }), [patient, patientUuid]);
 
@@ -53,12 +53,6 @@ const PatientChart: React.FC<PatientChartProps> = ({ navigationPath }) => {
             ))}
           </TabPanels>
         </Tabs>
-        <WorkspaceContainer
-          showSiderailAndBottomNav
-          key="express-workflow"
-          contextKey={`home/${navigationPath}/${patientUuid}`}
-          additionalWorkspaceProps={state}
-        />
       </div>
     </div>
   );

package/src/shared/patient-chart/patient-chart.resources.ts

@@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { AssignedExtension, useAssignedExtensions, useConfig } from '@openmrs/esm-framework';
 import { ExpressWorkflowConfig } from '../../config-schema';
 
-export const usePatientchartTabs = (navigationPath: string, patientUuid: string, patient?: fhir.Patient) => {
+export const usePatientChartTabs = (navigationPath: string, patientUuid: string, patient?: fhir.Patient) => {
   const { t } = useTranslation();
   const { patientChartConfig } = useConfig<ExpressWorkflowConfig>();
   const extensions = useAssignedExtensions('patient-chart-dashboard-slot');

package/src/shared/queue/queue-tab.component.tsx

@@ -61,7 +61,10 @@ const QueueTab: React.FC<QueueTabProps> = ({ queues, cards, navigatePath, onTabC
   return (
     <div className={styles.queueTab}>
       <div className={styles.cards}>
-        <Card title={t('patientInWaiting', 'Patient in waiting')} value={memoizedQueueEntries.length.toString()} />
+        <Card
+          title={t('clientsPatientInWaiting', 'Clients/Patient in waiting')}
+          value={memoizedQueueEntries.length.toString()}
+        />
         {cards?.map((card) => (
           <Card key={card.title} title={card.title} value={card.value} />
         ))}

package/translations/am.json

@@ -18,6 +18,8 @@
   "checkingEligibility": "",
   "checkInPatientWorkspaceTitle": "Check in patient",
   "chooseIdentifierType": "Choose identifier type",
+  "cilentsPatientAttended": "Cilents/Patient attended to",
+  "cilentsPatientInWaiting": "Cilents/Patient in waiting",
   "clearAll": "Clear All",
   "clientRegistry": "Client registry verification",
   "clinicalEncounter": "Clinical Encounter",
@@ -77,8 +79,6 @@
   "otpVerification": "OTP Verification",
   "otpVerificationError": "Error Verifying OTP",
   "pastMedications": "Past Medications",
-  "patientAttended": "Patient attended",
-  "patientInWaiting": "Patient in waiting",
   "patientSummary": "Patient Summary",
   "phoneNumber": "Phone number",
   "previousPage": "Previous page",

package/translations/en.json

@@ -18,6 +18,8 @@
   "checkingEligibility": "",
   "checkInPatientWorkspaceTitle": "Check in patient",
   "chooseIdentifierType": "Choose identifier type",
+  "cilentsPatientAttended": "Cilents/Patient attended to",
+  "cilentsPatientInWaiting": "Cilents/Patient in waiting",
   "clearAll": "Clear All",
   "clientRegistry": "Client registry verification",
   "clinicalEncounter": "Clinical Encounter",
@@ -77,8 +79,6 @@
   "otpVerification": "OTP Verification",
   "otpVerificationError": "Error Verifying OTP",
   "pastMedications": "Past Medications",
-  "patientAttended": "Patient attended",
-  "patientInWaiting": "Patient in waiting",
   "patientSummary": "Patient Summary",
   "phoneNumber": "Phone number",
   "previousPage": "Previous page",

package/translations/sw.json

@@ -18,6 +18,8 @@
   "checkingEligibility": "",
   "checkInPatientWorkspaceTitle": "Check in patient",
   "chooseIdentifierType": "Choose identifier type",
+  "cilentsPatientAttended": "Cilents/Patient attended to",
+  "cilentsPatientInWaiting": "Cilents/Patient in waiting",
   "clearAll": "Clear All",
   "clientRegistry": "Client registry verification",
   "clinicalEncounter": "Clinical Encounter",
@@ -77,8 +79,6 @@
   "otpVerification": "OTP Verification",
   "otpVerificationError": "Error Verifying OTP",
   "pastMedications": "Past Medications",
-  "patientAttended": "Patient attended",
-  "patientInWaiting": "Patient in waiting",
   "patientSummary": "Patient Summary",
   "phoneNumber": "Phone number",
   "previousPage": "Previous page",