@ampath/esm-reports-app 1.0.0-next.37 → 1.0.0-next.39

package/dist/ampath-esm-reports-app.js.buildmanifest.json

@@ -70,9 +70,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 1220945,
+      "size": 1223778,
       "sizes": {
-        "javascript": 1220945
+        "javascript": 1223778
       },
       "names": [],
       "idHints": [],
@@ -86,7 +86,7 @@
       "auxiliaryFiles": [
         "110.js.map"
       ],
-      "hash": "8ef29abd45d68283",
+      "hash": "915431fff70a251d",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"extensions":[{"name":"ampath-reports-dashboard-link","component":"reportsDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"reports","slot":"ampath-reports-dashboard-slot","title":"Reports"},"online":true,"offline":true},{"component":"root","name":"ampath-reports-dashboard-root","slot":"ampath-reports-dashboard-slot"}],"pages":[],"version":"1.0.0-next.37"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"extensions":[{"name":"ampath-reports-dashboard-link","component":"reportsDashboardLink","slot":"homepage-dashboard-slot","privileges":["O3 View Reports Dashboard"],"meta":{"name":"reports","slot":"ampath-reports-dashboard-slot","title":"Reports"},"online":true,"offline":true},{"component":"root","name":"ampath-reports-dashboard-root","slot":"ampath-reports-dashboard-slot","privileges":["O3 View Reports Dashboard"]}],"pages":[],"version":"1.0.0-next.39"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ampath/esm-reports-app",
-  "version": "1.0.0-next.37",
+  "version": "1.0.0-next.39",
   "license": "MPL-2.0",
   "description": "An AMPATH application for M&E reports",
   "browser": "dist/ampath-esm-reports-app.js",

package/src/reports/moh-710/moh-710.component.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import ReportFiltersComponent from '../../common/report-filters/report-filters.component';
 
@@ -11,12 +11,31 @@ import { type ReportFilters } from '../moh-705a/type';
 
 const Moh710Report: React.FC = () => {
   let errorMessage: string = '';
-  const [moh710Data, setMoh710Data] = useState<any>([]);
+  const [moh710Data, setMoh710Data] = useState<any>(() => {
+    const saved = sessionStorage.getItem('moh710Data');
+    return saved ? JSON.parse(saved) : [];
+  });
   const [isLoading, setIsLoading] = useState<boolean>(false);
   const navigate = useNavigate();
 
-  const [startDate, setStartDate] = useState<string>('');
-  const [endDate, setEndDate] = useState<string>('');
+  const [startDate, setStartDate] = useState<string>(() => {
+    return sessionStorage.getItem('moh710StartDate') || '';
+  });
+
+  const [endDate, setEndDate] = useState<string>(() => {
+    return sessionStorage.getItem('moh710EndDate') || '';
+  });
+  useEffect(() => {
+    sessionStorage.setItem('moh710Data', JSON.stringify(moh710Data));
+  }, [moh710Data]);
+
+  useEffect(() => {
+    sessionStorage.setItem('moh710StartDate', startDate);
+  }, [startDate]);
+
+  useEffect(() => {
+    sessionStorage.setItem('moh710EndDate', endDate);
+  }, [endDate]);
 
   const session = useSession();
   const locationUuids = session?.sessionLocation?.uuid;

package/src/reports/moh-711/moh-711.component.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import ReportFiltersComponent from '../../common/report-filters/report-filters.component';
 
 import styles from './moh711.scss';
@@ -24,10 +24,29 @@ import { type ReportFilters } from '../moh-705a/type';
 
 const Moh711Report: React.FC = () => {
   let errorMessage: string = '';
-  const [moh711Data, setMoh711Data] = useState<any>([]);
+  const [moh711Data, setMoh711Data] = useState<any>(() => {
+    const saved = sessionStorage.getItem('moh711Data');
+    return saved ? JSON.parse(saved) : [];
+  });
   const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [startDate, setStartDate] = useState<string>('');
-  const [endDate, setEndDate] = useState<string>('');
+  const [startDate, setStartDate] = useState<string>(() => {
+    return sessionStorage.getItem('moh711StartDate') || '';
+  });
+
+  const [endDate, setEndDate] = useState<string>(() => {
+    return sessionStorage.getItem('moh711EndDate') || '';
+  });
+  useEffect(() => {
+    sessionStorage.setItem('moh711Data', JSON.stringify(moh711Data));
+  }, [moh711Data]);
+
+  useEffect(() => {
+    sessionStorage.setItem('moh711StartDate', startDate);
+  }, [startDate]);
+
+  useEffect(() => {
+    sessionStorage.setItem('moh711EndDate', endDate);
+  }, [endDate]);
 
   const session = useSession();
   const locationUuid = session?.sessionLocation?.uuid;

package/src/reports/moh-717/moh-717.component.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import ReportFiltersComponent from '../../common/report-filters/report-filters.component';
 
 import styles from './moh717.scss';
@@ -21,10 +21,29 @@ import { type ReportFilters } from '../moh-705a/type';
 
 const Moh717Report: React.FC = () => {
   let errorMessage: string = '';
-  const [moh717ReportData, setMoh717ReportData] = useState<any>([]);
+  const [moh717ReportData, setMoh717ReportData] = useState<any>(() => {
+    const saved = sessionStorage.getItem('moh717ReportData');
+    return saved ? JSON.parse(saved) : [];
+  });
   const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [startDate, setStartDate] = useState<string>('');
-  const [endDate, setEndDate] = useState<string>('');
+  const [startDate, setStartDate] = useState<string>(() => {
+    return sessionStorage.getItem('moh717StartDate') || '';
+  });
+
+  const [endDate, setEndDate] = useState<string>(() => {
+    return sessionStorage.getItem('moh717EndDate') || '';
+  });
+  useEffect(() => {
+    sessionStorage.setItem('moh717ReportData', JSON.stringify(moh717ReportData));
+  }, [moh717ReportData]);
+
+  useEffect(() => {
+    sessionStorage.setItem('moh717StartDate', startDate);
+  }, [startDate]);
+
+  useEffect(() => {
+    sessionStorage.setItem('moh717EndDate', endDate);
+  }, [endDate]);
 
   const session = useSession();
   const locationUuid = session?.sessionLocation?.uuid;

package/src/reports/moh-731/moh-731.component.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import styles from './moh-731.scss';
 import ReportFiltersComponent from '../../common/report-filters/report-filters.component';
@@ -15,10 +15,29 @@ import { Loading } from '@carbon/react';
 interface Moh731Props {}
 
 const Moh731Report: React.FC<Moh731Props> = () => {
-  const [moh731Data, setMoh731Data] = useState<any>([]);
+  const [moh731Data, setMoh731Data] = useState<any>(() => {
+    const saved = sessionStorage.getItem('moh731Data');
+    return saved ? JSON.parse(saved) : [];
+  });
   const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [startDate, setStartDate] = useState<string>('');
-  const [endDate, setEndDate] = useState<string>('');
+  const [startDate, setStartDate] = useState<string>(() => {
+    return sessionStorage.getItem('moh731StartDate') || '';
+  });
+
+  const [endDate, setEndDate] = useState<string>(() => {
+    return sessionStorage.getItem('moh731EndDate') || '';
+  });
+  useEffect(() => {
+    sessionStorage.setItem('moh731Data', JSON.stringify(moh731Data));
+  }, [moh731Data]);
+
+  useEffect(() => {
+    sessionStorage.setItem('moh731StartDate', startDate);
+  }, [startDate]);
+
+  useEffect(() => {
+    sessionStorage.setItem('moh731EndDate', endDate);
+  }, [endDate]);
   const [errorMessage, setErrorMessage] = useState<any>();
 
   const session = useSession();

package/src/reports/moh-731/registers/moh-366.component.tsx

@@ -236,7 +236,7 @@ const Moh366Register: React.FC<Moh366RegisterProps> = () => {
                 <td rowSpan={2}>{a + 1}</td>
 
                 <td colSpan={2} rowSpan={2}>
-                  {data.date}
+                  {new Date(data.date).toLocaleDateString('en-GB')}
                 </td>
 
                 <td colSpan={2} rowSpan={2}>

package/src/reports/moh-731/sections/pmtct.component.tsx

@@ -42,8 +42,8 @@ const PmtctComponent: React.FC<PmtctComponentProps> = ({ MOH731Data, startDate,
               </tr>
               <tr>
                 <td></td>
-                <td>Initial</td>
-                <td style={{ paddingLeft: '60px' }}>Retest</td>
+                <td style={{ fontWeight: 'bold' }}>Initial</td>
+                <td style={{ paddingLeft: '60px', fontWeight: 'bold' }}>Retest</td>
               </tr>
               <tr>
                 <td>Tested at ANC</td>

package/src/resources/moh-731.resource.ts

@@ -67,7 +67,7 @@ export async function getMoh366PatientList(params: Moh745Params): Promise<any> {
 
 export async function getPrepPatientList(params: Moh745Params): Promise<any> {
   const etlBaseUrl = await getEtlBaseUrl();
-  const url = `http://localhost:8002/prep-patient-list`;
+  const url = `${etlBaseUrl}/prep-patient-list`;
   const queryparams = {
     locationUuids: params.locationUuids || '',
     startDate: params.startDate || '',

package/src/routes.json

@@ -9,6 +9,7 @@
       "name": "ampath-reports-dashboard-link",
       "component": "reportsDashboardLink",
       "slot": "homepage-dashboard-slot",
+      "privileges": ["O3 View Reports Dashboard"],
       "meta": {
         "name": "reports",
         "slot": "ampath-reports-dashboard-slot",
@@ -20,7 +21,8 @@
     {
       "component": "root",
       "name": "ampath-reports-dashboard-root",
-      "slot": "ampath-reports-dashboard-slot"
+      "slot": "ampath-reports-dashboard-slot",
+      "privileges": ["O3 View Reports Dashboard"]
     }
   ],
   "pages": []