@ampath/esm-reports-app 1.0.0-next.70 → 1.0.0-next.72

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

@@ -112,12 +112,38 @@ export async function getMoh333PatientList(params: PatientListParams): Promise<P
   }
 }
 
-export async function getMoh510PatientList(params: PatientListParams): Promise<PatientListPage> {
-  const url = await buildEtlUrl('moh-510-patient-list', {
+// export async function getMoh510PatientList(params: PatientListParams): Promise<PatientListPage> {
+//   const url = await buildEtlUrl('moh-510-patient-list', {
+//     locationUuids: params.locationUuids || '',
+//     startDate: params.startDate || '',
+//     endDate: params.endDate || '',
+//     indicator: Array.isArray(params.indicator) ? params.indicator.join(',') : params.indicator || '',
+//     ...pageParams(params),
+//     reportName: params.reportName || '',
+//   });
+//   try {
+//     const response = await openmrsFetch(url);
+
+//     if (!response.ok) {
+//       const errorText = await response.text();
+//       throw new Error(`Failed to fetch patient list: ${response.status} - ${errorText}`);
+//     }
+
+//     const data = await response.json();
+
+//     return toPatientListPage(data, params.startIndex ?? 0, params.limit ?? PAGE_SIZE);
+//   } catch (error: any) {
+//     throw new Error(`An error occurred while fetching the MOH-705 patient list: ${error.message}`);
+//   }
+// }
+
+export async function getMoh511PatientList(params: PatientListParams): Promise<PatientListPage> {
+  const url = await buildEtlUrl('moh-511-patient-list', {
     locationUuids: params.locationUuids || '',
     startDate: params.startDate || '',
     endDate: params.endDate || '',
     indicator: Array.isArray(params.indicator) ? params.indicator.join(',') : params.indicator || '',
+    reportName: params.reportName || '',
     ...pageParams(params),
   });
   try {
@@ -136,13 +162,13 @@ export async function getMoh510PatientList(params: PatientListParams): Promise<P
   }
 }
 
-export async function getMoh511PatientList(params: PatientListParams): Promise<PatientListPage> {
-  const url = await buildEtlUrl('moh-511-patient-list', {
+export async function getTBPatientList(params: PatientListParams): Promise<PatientListPage> {
+  const url = await buildEtlUrl('tb-patient-list', {
     locationUuids: params.locationUuids || '',
     startDate: params.startDate || '',
     endDate: params.endDate || '',
     indicator: Array.isArray(params.indicator) ? params.indicator.join(',') : params.indicator || '',
-    reportName: params.reportName || '',
+    reportName: params.reportName || 'moh711Report',
     ...pageParams(params),
   });
   try {
@@ -160,3 +186,28 @@ export async function getMoh511PatientList(params: PatientListParams): Promise<P
     throw new Error(`An error occurred while fetching the MOH-705 patient list: ${error.message}`);
   }
 }
+
+export async function getMoh512PatientList(params: PatientListParams): Promise<PatientListPage> {
+  const url = await buildEtlUrl('moh-512-patient-list', {
+    locationUuids: params.locationUuids || '',
+    startDate: params.startDate || '',
+    endDate: params.endDate || '',
+    indicator: Array.isArray(params.indicator) ? params.indicator.join(',') : params.indicator || '',
+    reportName: params.reportName || 'moh711Report',
+    ...pageParams(params),
+  });
+  try {
+    const response = await openmrsFetch(url);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to fetch patient list: ${response.status} - ${errorText}`);
+    }
+
+    const data = await response.json();
+
+    return toPatientListPage(data, params.startIndex ?? 0, params.limit ?? PAGE_SIZE);
+  } catch (error: any) {
+    throw new Error(`An error occurred while fetching the MOH-512 patient list: ${error.message}`);
+  }
+}

package/src/root.component.tsx

@@ -31,6 +31,8 @@ import styles from './root.scss';
 import Moh510RegisterComponent from './reports/moh-710/registers/moh-510/moh-510.component';
 import Moh222DailyRegister from './reports/moh-740/registers/moh-222-daily-register/moh-222-daily-register';
 import Moh270DailyRegister from './reports/moh-740/registers/moh-270-permanent-register/moh-270-permanent-register';
+import Moh512RegisterComponent from './reports/moh-711/registers/moh-512.component';
+import TbRegisterComponent from './reports/moh-711/registers/tb-register.component';
 
 const RootComponent: React.FC = () => {
   const baseName = window.getOpenmrsSpaBase() + 'home/reports';
@@ -69,6 +71,8 @@ const RootComponent: React.FC = () => {
           <Route path="/moh-270" element={<Moh270DailyRegister />} />
           <Route path="/moh-240-register" element={<Moh240LabRegister />} />
           <Route path="/tb-lab-register" element={<TbLabRegister />} />
+          <Route path="/moh-512-register" element={<Moh512RegisterComponent />} />
+          <Route path="/tb-register" element={<TbRegisterComponent />} />
         </Routes>
       </div>
     </BrowserRouter>