add eid and tb programs

packages/esm-ugandaemr-app/src/dashboard.meta.tsx

@@ -17,6 +17,18 @@ export const hivPrevetionServicesboardDMeta = {
   isExpanded: false,
 };
 
+export const eidDashboardMeta = {
+  title: 'EID Program',
+  slotName: 'eid-slot',
+  isExpanded: false,
+};
+
+export const tbDashboardMeta = {
+  title: 'TB Program',
+  slotName: 'tb-slot',
+  isExpanded: false,
+};
+
 export const generalCounsellingDashboardMeta = {
   slot: 'general-counselling-summary-slot',
   columns: 1,
@@ -41,43 +53,58 @@ export const vmmcDashboardMeta = {
   layoutMode: 'anchored',
 };
 
-
 export const treatmentRegimenDashboardMeta = {
   slot: 'treatment-regimen-slot',
   columns: 1,
   title: 'Treatment Regimen',
   path: 'treatment-regimen',
-  layoutMode: 'anchored'
-}
+  layoutMode: 'anchored',
+};
 
 export const familyTrackingDashboardMeta = {
   slot: 'family-tracking-slot',
   columns: 1,
   title: 'Family Tracking',
-  path: "family-tracking",
-  layoutMode: "anchored"
-}
+  path: 'family-tracking',
+  layoutMode: 'anchored',
+};
 
 export const treatmentDashboardMeta = {
   slot: 'treatment-dashboard-slot',
   columns: 1,
   title: 'Treatment',
-  path: "treatment",
-  layoutmode: "anchored"
-}
+  path: 'treatment',
+  layoutmode: 'anchored',
+};
 
 export const patientTransfersDashboardMeta = {
   slot: 'patient-transfers-dashboard-slot',
   columns: 1,
   title: 'Patient Transfers',
-  path: "patient-transfers",
-  layoutmode: "anchored"
-}
+  path: 'patient-transfers',
+  layoutmode: 'anchored',
+};
 
 export const patientSummaryDashboardMeta = {
   slot: 'patient-summary-dashboard-slot',
   columns: 1,
   title: 'Patient Summary',
-  path : "patient-summary",
-  layoutmode: "anchored"
-}
+  path: 'patient-summary',
+  layoutmode: 'anchored',
+};
+
+export const drtbSummaryDashboardMeta = {
+  slot: 'drtb-summary-dashboard-slot',
+  columns: 1,
+  title: 'DR-TB',
+  path: 'dr-tb-summary',
+  layoutmode: 'anchored',
+};
+
+export const dstbSummaryDashboardMeta = {
+  slot: 'dstb-summary-dashboard-slot',
+  columns: 1,
+  title: 'DS-TB',
+  path: 'ds-tb-summary',
+  layoutmode: 'anchored',
+};

packages/esm-ugandaemr-app/src/index.ts

@@ -32,7 +32,22 @@ import {
   patientDSDM,
 } from './custom-expressions/custom-expressions';
 
-import { familyTrackingDashboardMeta, generalCounsellingDashboardMeta, hivCareAndTreatmentDashboardDMeta, hivPrevetionServicesboardDMeta, htsDashboardMeta, patientSummaryDashboardMeta, patientTransfersDashboardMeta, treatmentDashboardMeta, treatmentRegimenDashboardMeta, vmmcDashboardMeta } from './dashboard.meta';
+import {
+  drtbSummaryDashboardMeta,
+  dstbSummaryDashboardMeta,
+  eidDashboardMeta,
+  familyTrackingDashboardMeta,
+  generalCounsellingDashboardMeta,
+  hivCareAndTreatmentDashboardDMeta,
+  hivPrevetionServicesboardDMeta,
+  htsDashboardMeta,
+  patientSummaryDashboardMeta,
+  patientTransfersDashboardMeta,
+  tbDashboardMeta,
+  treatmentDashboardMeta,
+  treatmentRegimenDashboardMeta,
+  vmmcDashboardMeta,
+} from './dashboard.meta';
 import GeneralCounsellingSummary from './views/hiv/hct/general-counselling/general-counselling-summary.component';
 import TreatmentRegimen from './views/hiv/hct/treatment-regimen/treatment-regimen.component';
 import FamilyTrackingSummary from './views/hiv/hct/family-tracking/family-tracking-summary.component';
@@ -41,6 +56,8 @@ import PatientSummaryOverviewList from './views/hiv/hct/patient-summary/patient-
 import TreatmentSummary from './views/hiv/hct/treatment/treatment-summary.component';
 import HivTestingServices from './views/hiv/hps/hts/hiv-testing-services.component';
 import VmmcServices from './views/hiv/hps/vmmc/vmmc-services.component';
+import DSTBSummary from './views/tb/ds/ds-tb-summary.component';
+import DRTBSummary from './views/tb/dr/dr-tb-summary.component';
 
 export const importTranslation = require.context('../translations', false, /.json$/, 'lazy');
 
@@ -129,6 +146,9 @@ export const patientChartHIVPreventionServicesDashboard = getSyncLifecycle(
   options,
 );
 
+export const patientChartEIDDashboard = getSyncLifecycle(createDashboardGroup(eidDashboardMeta), options);
+export const patientChartTBDashboard = getSyncLifecycle(createDashboardGroup(tbDashboardMeta), options);
+
 export const generalCounsellingDashboardLink = getSyncLifecycle(
   createDashboardLink({ ...generalCounsellingDashboardMeta, moduleName }),
   options,
@@ -139,10 +159,7 @@ export const generalCounsellingDashboard = getSyncLifecycle(GeneralCounsellingSu
   moduleName,
 });
 
-export const vmmcDashboardLink = getSyncLifecycle(
-  createDashboardLink({ ...vmmcDashboardMeta, moduleName }),
-  options,
-);
+export const vmmcDashboardLink = getSyncLifecycle(createDashboardLink({ ...vmmcDashboardMeta, moduleName }), options);
 
 export const vmmcDashboard = getSyncLifecycle(VmmcServices, {
   featureName: 'vmmc-services',
@@ -156,28 +173,66 @@ export const htsDashboard = getSyncLifecycle(HivTestingServices, {
   moduleName,
 });
 
+export const treatmentRegimenDashboardLink = getSyncLifecycle(
+  createDashboardLink({ ...treatmentRegimenDashboardMeta, moduleName }),
+  options,
+);
 
-export const treatmentRegimenDashboardLink = getSyncLifecycle(createDashboardLink({ ...treatmentRegimenDashboardMeta, moduleName }), options)
+export const treatmentRegimenDashboard = getSyncLifecycle(TreatmentRegimen, {
+  featureName: 'treatment-regimen',
+  moduleName,
+});
 
-export const treatmentRegimenDashboard = getSyncLifecycle(TreatmentRegimen, { featureName: 'treatment-regimen', moduleName })
+export const familyTrackingDashboardLink = getSyncLifecycle(
+  createDashboardLink({ ...familyTrackingDashboardMeta, moduleName }),
+  options,
+);
 
+export const familyTrackingDashboard = getSyncLifecycle(FamilyTrackingSummary, {
+  featureName: 'family-tracking',
+  moduleName,
+});
 
-export const familyTrackingDashboardLink = getSyncLifecycle(createDashboardLink({ ...familyTrackingDashboardMeta, moduleName }), options)
+export const treatmentDashboardLink = getSyncLifecycle(
+  createDashboardLink({ ...treatmentDashboardMeta, moduleName }),
+  options,
+);
 
-export const familyTrackingDashboard = getSyncLifecycle(FamilyTrackingSummary, { featureName: 'family-tracking', moduleName })
+export const treatmentDashboard = getSyncLifecycle(TreatmentSummary, { featureName: 'treatment-regimen', moduleName });
 
+export const patientTranfersDashboardLink = getSyncLifecycle(
+  createDashboardLink({ ...patientTransfersDashboardMeta, moduleName }),
+  options,
+);
 
-export const treatmentDashboardLink =  getSyncLifecycle(createDashboardLink({...treatmentDashboardMeta,moduleName}),options)
+export const patientTransfersDashboard = getSyncLifecycle(PatientTransfersSummary, {
+  featureName: 'patient-transfers',
+  moduleName,
+});
 
-export const treatmentDashboard =  getSyncLifecycle(TreatmentSummary,{featureName:'treatment-regimen',moduleName})
+export const patientSummaryDashboardLink = getSyncLifecycle(
+  createDashboardLink({ ...patientSummaryDashboardMeta, moduleName }),
+  options,
+);
 
-export const patientTranfersDashboardLink = getSyncLifecycle(createDashboardLink({...patientTransfersDashboardMeta,moduleName}),options)
+export const patientSummaryDashboard = getSyncLifecycle(PatientSummaryOverviewList, {
+  featureName: 'patient-summary',
+  moduleName,
+});
+
+export const dstbSummaryDashboardLink = getSyncLifecycle(
+  createDashboardLink({ ...dstbSummaryDashboardMeta, moduleName }),
+  options,
+);
 
-export const patientTransfersDashboard = getSyncLifecycle(PatientTransfersSummary,{featureName:'patient-transfers',moduleName})
+export const dstbSummaryDashboard = getSyncLifecycle(DSTBSummary, { featureName: 'ds-tb', moduleName });
 
-export const patientSummaryDashboardLink = getSyncLifecycle(createDashboardLink({...patientSummaryDashboardMeta,moduleName}),options)
+export const drtbSummaryDashboardLink = getSyncLifecycle(
+  createDashboardLink({ ...drtbSummaryDashboardMeta, moduleName }),
+  options,
+);
 
-export const patientSummaryDashboard = getSyncLifecycle(PatientSummaryOverviewList,{featureName:'patient-summary',moduleName})
+export const drtbSummaryDashboard = getSyncLifecycle(DRTBSummary, { featureName: 'dr-tb', moduleName });
 
 export const clinicalPatientSummary = getSyncLifecycle(ClinicalPatientSummary, options);
 

packages/esm-ugandaemr-app/src/routes.json

@@ -32,6 +32,18 @@
             "slot": "patient-chart-dashboard-slot",
             "component": "patientChartHIVPreventionServicesDashboard",
             "order": 22
+        },
+         {
+            "name": "eid-program",
+            "slot": "patient-chart-dashboard-slot",
+            "component": "patientChartEIDDashboard",
+            "order": 23
+        },
+         {
+            "name": "tb-program",
+            "slot": "patient-chart-dashboard-slot",
+            "component": "patientChartTBDashboard",
+            "order": 24
         },
         {
             "name": "general-counselling-summary",
@@ -162,6 +174,39 @@
             "slot": "vmmc-services-slot",
             "component": "vmmcDashboard"
         },
+        {
+            "name": "dr-tb-services",
+            "slot": "tb-slot",
+            "component": "drtbSummaryDashboardLink",
+            "meta": {
+                "slot": "drtb-summary-dashboard-slot",
+                "columns": 1,
+                "path": "dr-tb-summary",
+                "layoutMode": "anchored"
+            }
+        },
+        {
+            "name": "dr-tb-summary-ext",
+            "slot": "drtb-summary-dashboard-slot",
+            "component": "drtbSummaryDashboard"
+        },
+
+         {
+            "name": "ds-tb-services",
+            "slot": "tb-slot",
+            "component": "dstbSummaryDashboardLink",
+            "meta": {
+                "slot": "dstb-summary-dashboard-slot",
+                "columns": 1,
+                "path": "ds-tb-summary",
+                "layoutMode": "anchored"
+            }
+        },
+        {
+            "name": "ds-tb-summary-ext",
+            "slot": "dstb-summary-dashboard-slot",
+            "component": "dstbSummaryDashboard"
+        },
         {
             "name": "retrieve-facility-code-modal",
             "component": "retrieveFacilityCodeModal"

packages/esm-ugandaemr-app/src/views/hiv/hct/family-tracking/family-tracking-summary.component.tsx

@@ -24,4 +24,4 @@ const FamilyTrackingSummary: React.FC<OverviewListProps> = ({ patientUuid }) =>
   );
 };
 
-export default FamilyTrackingSummary;
+export default FamilyTrackingSummary;

packages/esm-ugandaemr-app/src/views/hiv/hct/patient-summary/patient-summary-summary.component.tsx

@@ -1,41 +1,43 @@
-import { EncounterTile, EncounterTileColumn, getEncounterTileColumns } from "@ohri/openmrs-esm-ohri-commons-lib";
-import { useConfig } from "@openmrs/esm-framework";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import characteristicsColumnConfigSchema from "./patient-summary-baseline-information-config.json"
-import hivMonitoringColumnsConfigSchema from "./patient-summary-hiv-monitoring-config.json"
-import tptColumnsConfigSchema from "./patient-summary-tpt-config.json"
-import lastVisitColumnsConfigSchema from "./patient-summary-visit-config.json"
-
+import { EncounterTile, EncounterTileColumn, getEncounterTileColumns } from '@ohri/openmrs-esm-ohri-commons-lib';
+import { useConfig } from '@openmrs/esm-framework';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import characteristicsColumnConfigSchema from './patient-summary-baseline-information-config.json';
+import hivMonitoringColumnsConfigSchema from './patient-summary-hiv-monitoring-config.json';
+import tptColumnsConfigSchema from './patient-summary-tpt-config.json';
+import lastVisitColumnsConfigSchema from './patient-summary-visit-config.json';
 
 interface OverviewListProps {
-    patientUuid: string;
+  patientUuid: string;
 }
 const PatientSummaryOverviewList: React.FC<OverviewListProps> = ({ patientUuid }) => {
-    const { t } = useTranslation();
-    const config = useConfig();
+  const { t } = useTranslation();
+  const config = useConfig();
 
-    const headerCharacteristics = t('characteristicsTitle', 'Characteristics');
-    const headerHIVMonitoring = t('hivMonitoring', 'HIV Monitoring');
-    const headerTPT = t('tpt', 'TPT');
-    const headerLastVisitDetails = t('lastVisitDetails', 'Last Visit Details');
+  const headerCharacteristics = t('characteristicsTitle', 'Characteristics');
+  const headerHIVMonitoring = t('hivMonitoring', 'HIV Monitoring');
+  const headerTPT = t('tpt', 'TPT');
+  const headerLastVisitDetails = t('lastVisitDetails', 'Last Visit Details');
 
-    const columnsCharacteristics: EncounterTileColumn[] = getEncounterTileColumns(characteristicsColumnConfigSchema, config);
+  const columnsCharacteristics: EncounterTileColumn[] = getEncounterTileColumns(
+    characteristicsColumnConfigSchema,
+    config,
+  );
 
-    // const columnsHIVMonitoring: EncounterTileColumn[] = getEncounterTileColumns(hivMonitoringColumnsConfigSchema, config);
+  // const columnsHIVMonitoring: EncounterTileColumn[] = getEncounterTileColumns(hivMonitoringColumnsConfigSchema, config);
 
-    const columnsTPT: EncounterTileColumn[] = getEncounterTileColumns(tptColumnsConfigSchema, config);
+  const columnsTPT: EncounterTileColumn[] = getEncounterTileColumns(tptColumnsConfigSchema, config);
 
-    const columnsLastVisitDetails: EncounterTileColumn[] = getEncounterTileColumns(lastVisitColumnsConfigSchema, config);
+  const columnsLastVisitDetails: EncounterTileColumn[] = getEncounterTileColumns(lastVisitColumnsConfigSchema, config);
 
-    return (
-        <>
-            <EncounterTile patientUuid={patientUuid} columns={columnsCharacteristics} headerTitle={headerCharacteristics} />
-            {/* <EncounterTile patientUuid={patientUuid} columns={columnsHIVMonitoring} headerTitle={headerHIVMonitoring} /> */}
-            {/* <EncounterTile patientUuid={patientUuid} columns={columnsTPT} headerTitle={headerTPT} /> */}
-            <EncounterTile patientUuid={patientUuid} columns={columnsLastVisitDetails} headerTitle={headerLastVisitDetails} />
-        </>
-    );
+  return (
+    <>
+      <EncounterTile patientUuid={patientUuid} columns={columnsCharacteristics} headerTitle={headerCharacteristics} />
+      {/* <EncounterTile patientUuid={patientUuid} columns={columnsHIVMonitoring} headerTitle={headerHIVMonitoring} /> */}
+      {/* <EncounterTile patientUuid={patientUuid} columns={columnsTPT} headerTitle={headerTPT} /> */}
+      <EncounterTile patientUuid={patientUuid} columns={columnsLastVisitDetails} headerTitle={headerLastVisitDetails} />
+    </>
+  );
 };
 
-export default PatientSummaryOverviewList;
+export default PatientSummaryOverviewList;

packages/esm-ugandaemr-app/src/views/hiv/hct/treatment-regimen/treatment-regimen.component.tsx

@@ -1,7 +1,7 @@
-import { EncounterListTabsComponent } from "@ohri/openmrs-esm-ohri-commons-lib";
-import { useConfig } from "@openmrs/esm-framework";
-import React from "react";
-import treatmentRegimenConfigSchema from "./treatment-regimen-config.json"
+import { EncounterListTabsComponent } from '@ohri/openmrs-esm-ohri-commons-lib';
+import { useConfig } from '@openmrs/esm-framework';
+import React from 'react';
+import treatmentRegimenConfigSchema from './treatment-regimen-config.json';
 
 interface OverviewListProps {
   patientUuid: string;
@@ -24,4 +24,4 @@ const TreatmentRegimen: React.FC<OverviewListProps> = ({ patientUuid }) => {
   );
 };
 
-export default TreatmentRegimen;
+export default TreatmentRegimen;