@kenyaemr/esm-facility-dashboard-app 5.4.2-pre.2735 → 5.4.2-pre.2745

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemrCharts":"^1.6.7"},"extensions":[{"component":"surveillanceDashboardLink","name":"surveillance-dashboard-link","slot":"facility-dashboard-left-panel-slot"},{"component":"aboveSiteDashboardLink","name":"above-site-dashboard-link","slot":"facility-dashboard-left-panel-slot"},{"component":"airDashboardLink","name":"air-dashboard-link","slot":"facility-dashboard-left-panel-slot"},{"component":"reportsboardLink","name":"reports-dashboard-link","slot":"facility-dashboard-left-panel-slot"}],"workspaces":[],"modals":[],"pages":[{"component":"root","route":"facility-dashboard"}],"version":"5.4.2-pre.2735"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"kenyaemrCharts":"^1.6.7"},"extensions":[{"component":"surveillanceDashboardLink","name":"surveillance-dashboard-link","slot":"facility-dashboard-left-panel-slot"},{"component":"aboveSiteDashboardLink","name":"above-site-dashboard-link","slot":"facility-dashboard-left-panel-slot"},{"component":"airDashboardLink","name":"air-dashboard-link","slot":"facility-dashboard-left-panel-slot"},{"component":"reportsboardLink","name":"reports-dashboard-link","slot":"facility-dashboard-left-panel-slot"}],"workspaces":[],"modals":[],"pages":[{"component":"root","route":"facility-dashboard"}],"version":"5.4.2-pre.2745"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenyaemr/esm-facility-dashboard-app",
-  "version": "5.4.2-pre.2735",
+  "version": "5.4.2-pre.2745",
   "description": "Facility dashboard app",
   "keywords": [
     "openmrs"

package/src/surveillance/charts/dna-pcr-pending-chart.component.tsx

@@ -30,27 +30,27 @@ const DNAPCRPendingCharts: React.FC<DNAPCRPendingChartsProps> = ({ startDate, en
       {
         group: 'Completed',
         value: getCompletedPercentage(
-          surveillanceSummary?.getHeiSixToEightWeeksWithoutPCRResults,
-          surveillanceSummary.getHeiSixToEightWeeksOld,
+          surveillanceSummary?.getHeiEightWeeksWithoutPCRResults,
+          surveillanceSummary.getHeiEightWeeksOld,
         ),
       },
       {
         group: 'Pending',
         value: getPendingPercentage(
-          surveillanceSummary?.getHeiSixToEightWeeksWithoutPCRResults,
-          surveillanceSummary.getHeiSixToEightWeeksOld,
+          surveillanceSummary?.getHeiEightWeeksWithoutPCRResults,
+          surveillanceSummary.getHeiEightWeeksOld,
         ),
       },
     ],
   };
 
   const thirtyDaysrunningData = getThirtydaysRunninPercentage(
-    surveillanceSummary?.getMonthlyHeiSixToEightWeeksOld.data,
+    surveillanceSummary?.getMonthlyHeiEightWeeksOld.data,
     surveillanceSummary?.getMonthlyHeiDNAPCRPending.data,
   );
 
   const lineGraphData = getThirtydaysRunninPendingPercentage(
-    surveillanceSummary?.getMonthlyHeiSixToEightWeeksOld.data,
+    surveillanceSummary?.getMonthlyHeiEightWeeksOld.data,
     surveillanceSummary?.getMonthlyHeiDNAPCRPending.data,
   );
 
@@ -66,8 +66,8 @@ const DNAPCRPendingCharts: React.FC<DNAPCRPendingChartsProps> = ({ startDate, en
         ) : lineGraphData.length > 0 ? (
           <BaseIndicatorTrendChart
             data={lineGraphData}
-            title={t('dnapcrPending', 'HEI (6-8 weeks) without DNA-PCR results')}
-            yAxisTitle={t('percentageOfPendingPCRDNAResults', '% HEI (6-8 weeks) without DNA-PCR results')}
+            title={t('dnapcrPending', 'HEI (8 weeks) without DNA-PCR results')}
+            yAxisTitle={t('percentageOfPendingPCRDNAResults', '% HEI (8 weeks) without DNA-PCR results')}
           />
         ) : (
           <EmptyState subTitle={t('noPendingPCRDNAResults', 'No pending PCR DNA results data to display')} />
@@ -78,14 +78,14 @@ const DNAPCRPendingCharts: React.FC<DNAPCRPendingChartsProps> = ({ startDate, en
           <BaseProgressTrackingChart
             data={thirtyDaysrunningData}
             stackTitle={t('progressInAddressingHEIPCRResults ', 'Progress in addressing  HEI PCR results')}
-            leftAxiTtitle={t('percentageHEIPCRResults', '% HEI (6-8 weeks) PCR result')}
+            leftAxiTtitle={t('percentageHEIPCRResults', '% HEI (8 weeks) PCR result')}
           />
         ) : (
           <EmptyState subTitle={t('noPendingPCRDNAResults', 'No pending PCR DNA results data to display')} />
         )}
       </div>
       <div className={styles.chart}>
-        {surveillanceSummary?.getHeiSixToEightWeeksOld > 0 ? (
+        {surveillanceSummary?.getHeiEightWeeksOld > 0 ? (
           <div className={styles.cumulativeChart}>
             <BaseCumulativeProgressTrackingChart
               data={cumulativeDnapcrPendingData}
@@ -94,7 +94,7 @@ const DNAPCRPendingCharts: React.FC<DNAPCRPendingChartsProps> = ({ startDate, en
           </div>
         ) : (
           <EmptyState
-            subTitle={t('noCumulativeDnapcrPending', 'No cumulative HEI (6-8 weeks) without DNA-PCR data to display')}
+            subTitle={t('noCumulativeDnapcrPending', 'No cumulative HEI (8 weeks) without DNA-PCR data to display')}
           />
         )}
       </div>

package/src/surveillance/summary-cards/surveillance-summary-cards.component.tsx

@@ -97,13 +97,13 @@ const SurveillanceSummaryCards: React.FC<SurveillanceSummaryCardsProps> = ({ sta
       <SummaryCard
         header={t('dnapcrPending', 'Pending DNA-PCR Results')}
         title={t('heiWithoutDNAPCR', 'HEI (6-8 WEEKS) without DNA PCR Results')}
-        value={`${surveillanceSummary?.getHeiSixToEightWeeksWithoutPCRResults}/${surveillanceSummary.getHeiSixToEightWeeksOld}`}
+        value={`${surveillanceSummary?.getHeiEightWeeksWithoutPCRResults}/${surveillanceSummary.getHeiEightWeeksOld}`}
         percentage={getPercentage(
-          surveillanceSummary?.getHeiSixToEightWeeksWithoutPCRResults,
-          surveillanceSummary.getHeiSixToEightWeeksOld,
+          surveillanceSummary?.getHeiEightWeeksWithoutPCRResults,
+          surveillanceSummary.getHeiEightWeeksOld,
         )}
         mode={
-          surveillanceSummary?.getHeiSixToEightWeeksWithoutPCRResults >= surveillanceSummary?.heiClinicalActionThreshold
+          surveillanceSummary?.getHeiEightWeeksWithoutPCRResults >= surveillanceSummary?.heiClinicalActionThreshold
             ? 'increasing'
             : 'decreasing'
         }

package/src/surveillance/surveillance-dashboard.component.tsx

@@ -54,7 +54,7 @@ const SurveillancelanceDashboard = () => {
               {currFilters.indicator === 'getVirallyUnsuppressedWithoutEAC' && (
                 <MissedOpportunityChart startDate={defaultStartDate} endDate={defaultEndDate} />
               )}
-              {currFilters.indicator === 'getHeiSixToEightWeeksWithoutPCRResults' && (
+              {currFilters.indicator === 'getHeiEightWeeksWithoutPCRResults' && (
                 <DNAPCRPendingCharts startDate={defaultStartDate} endDate={defaultEndDate} />
               )}
               {currFilters.indicator === 'getHei24MonthsWithoutDocumentedOutcome' && (

package/src/surveillance/surveillance-filters.component.tsx

@@ -20,7 +20,7 @@ const SurveillanceFilters: React.FC<Props> = ({ filters, onFiltersChange, tabSel
     { key: 'getPregnantPostpartumNotInPrep', label: 'High risk -ve PBFW not enrolled to PrEP' },
     { key: 'getEligibleForVlSampleNotTaken', label: 'Delayed EAC' },
     { key: 'getVirallyUnsuppressedWithoutEAC', label: 'Missed opportunity VL' },
-    { key: 'getHeiSixToEightWeeksWithoutPCRResults', label: 'DNA-PCR Pending' },
+    { key: 'getHeiEightWeeksWithoutPCRResults', label: 'DNA-PCR Pending' },
     { key: 'getHei24MonthsWithoutDocumentedOutcome', label: 'HEI Final Outcomes' },
   ];
   return (

package/src/types/index.ts

@@ -7,8 +7,8 @@ export type SurveillanceSummary = {
   getEligibleForVlSampleNotTaken: number;
   getVirallyUnsuppressed: number;
   getVirallyUnsuppressedWithoutEAC: number;
-  getHeiSixToEightWeeksOld: number;
-  getHeiSixToEightWeeksWithoutPCRResults: number;
+  getHeiEightWeeksOld: number;
+  getHeiEightWeeksWithoutPCRResults: number;
   getHei24MonthsOld: number;
   getHei24MonthsWithoutDocumentedOutcome: number;
   clinicalActionThreshold: number;
@@ -23,7 +23,7 @@ export type SurveillanceSummary = {
   getMonthlyVirallyUnsuppressedWithoutEAC: HivPositiveNotLinkedData;
   getMonthlyPatientsTestedHivPositive: HivPositiveNotLinkedData;
   getMonthlyPregnantOrPostpartumClients: HivPositiveNotLinkedData;
-  getMonthlyHeiSixToEightWeeksOld: HivPositiveNotLinkedData;
+  getMonthlyHeiEightWeeksOld: HivPositiveNotLinkedData;
   getMonthlyEligibleForVl: HivPositiveNotLinkedData;
   getMonthlyHei24MonthsOld: HivPositiveNotLinkedData;
   getMonthlyVirallyUnsuppressed: HivPositiveNotLinkedData;