@ampath/esm-reports-app 1.0.0-next.8 → 1.0.0-next.80

package/src/reports/table-wrapper/table-row-mapper.component.tsx

@@ -13,10 +13,15 @@ interface TableRowMapperProps {
             rowSpan: number;
         }>
     }[],
-    data?: any
+    data?: any,
+    redirectTo?: string,
+    locationUuids?: string,
+    startDate?: string,
+    endDate?: string
+    report?: string,
 }
 
-const TableRowMapper: React.FC<TableRowMapperProps> = ({ tableRows, data }) => {
+const TableRowMapper: React.FC<TableRowMapperProps> = ({ tableRows, data, redirectTo = "home/reports/moh-240", locationUuids, startDate, endDate, report = "moh-706" }) => {
     return <>
         {tableRows.map((tR) => (
             <TableRow>
@@ -24,12 +29,22 @@ const TableRowMapper: React.FC<TableRowMapperProps> = ({ tableRows, data }) => {
                     const value = data ? data[tC.key] : "";
 
                     const onClick = () => {
-                        if (!tC.label) {
-                            navigate({ to: "home/reports/moh-240" });
+                        if (!tC.label && tC.key) {
+                            const params = new URLSearchParams();
+                            if (locationUuids) params.append('locationUuids', locationUuids);
+                            if (startDate) params.append('startDate', startDate);
+                            if (endDate) params.append('endDate', endDate);
+                            if (tC.key) params.append('indicators', tC.key);
+                            params.append('report', report);
+                            // the row's own label, so the register header reads
+                            // the form row ("1.3 Ketones") instead of the key
+                            const rowLabel = tR.tableCells.find((c: any) => c.label)?.label;
+                            if (rowLabel) params.append('label', String(rowLabel));
+                            navigate({ to: `${redirectTo}?${params.toString()}` });
                         }
                     };
 
-                    return <TableCell className={styles.dataCell} colSpan={tC.colSpan} key={i} onClick={onClick}>
+                    return <TableCell className={styles.dataCell} colSpan={tC.colSpan} key={i} onClick={onClick} {...({ rowSpan: tC.rowSpan } as any)}>
                         {tC.label ? (tC.strong ? <strong>{tC.label}</strong> : tC.label) : value}
                     </TableCell>
 

package/src/reports/table-wrapper/table-wrapper.component.tsx

@@ -1,21 +1,30 @@
 import React from 'react';
-import { Table, TableBody } from '@carbon/react';
+import classNames from 'classnames';
 import styles from './table-wrapper.scss';
 
 interface TableWrapperProps {
-    children: React.ReactNode;
+  children: React.ReactNode;
+  /** Applied to the wrapper, so a report can use its own stylesheet */
+  className?: string;
 }
 
-const TableWrapper: React.FC<TableWrapperProps> = ({ children }) => {
-    return <>
-        <div className={styles.tableWrapper}>
-            <Table size="sm" className={styles.tableComponent}>
-                <TableBody>
-                    {children}
-                </TableBody>
-            </Table>
-        </div>
-    </>
-}
+/**
+ * The frame the form-shaped reports render their tables in.
+ *
+ * This used to be Carbon's `<Table>`, but every report that uses it is a
+ * printed form rather than a data grid: Carbon sizes its rows to 2rem and pads
+ * its cells to 1rem, at a specificity no report stylesheet can reasonably
+ * outrank. A plain table carries none of those rules, so the reports size their
+ * own cells for A4.
+ */
+const TableWrapper: React.FC<TableWrapperProps> = ({ children, className }) => {
+  return (
+    <div className={classNames(styles.tableWrapper, className)}>
+      <table>
+        <tbody>{children}</tbody>
+      </table>
+    </div>
+  );
+};
 
-export default TableWrapper;
+export default TableWrapper;

package/src/reports/table-wrapper/table-wrapper.scss

@@ -1,20 +1,5 @@
 .tableWrapper {
   overflow-x: auto;
-  border: 1px solid #d0d0d0;
-  border-radius: 4px;
-}
-
-.tableContainer {
-  width: 100%;
-  border-collapse: collapse;
-
-  thead {
-    background-color: #f4f4f4;
-  }
-
-  tbody tr {
-    border-bottom: 1px solid #e0e0e0;
-  }
 }
 
 .dataCell {
@@ -28,4 +13,4 @@
   &:hover {
     background-color: #f0f7ff;
   }
-}
+}

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

@@ -0,0 +1,27 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+import { buildEtlUrl } from '../utils/get-base-url';
+
+interface Moh267Params {
+  locationUuids: string;
+  startDate: string;
+  endDate: string;
+}
+
+/**
+ * MOH 267 PrEP Daily Activity Register: one row per PrEP visit in the period --
+ * the same visits as MOH 731 1.3 to 1.5 -- for the whole facility of the
+ * location, with the register's columns.
+ */
+export async function getMoh267(params: Moh267Params): Promise<Array<Record<string, unknown>>> {
+  const url = await buildEtlUrl('moh-267-register', {
+    locationUuids: params.locationUuids,
+    startDate: params.startDate,
+    endDate: params.endDate,
+  });
+  const response = await openmrsFetch(url);
+  if (!response.ok) {
+    throw new Error(`Failed to fetch the MOH 267 register: ${response.status} - ${await response.text()}`);
+  }
+  const data = await response.json();
+  return Array.isArray(data) ? data : [];
+}

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

@@ -0,0 +1,27 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+import { buildEtlUrl } from '../utils/get-base-url';
+
+interface Moh362Params {
+  locationUuids: string;
+  startDate: string;
+  endDate: string;
+}
+
+/**
+ * MOH 362 HTS Lab, Referral & Linkage Register: one row per test in the
+ * period -- the same tests as MOH 731 1.1 HIV Tests -- for the whole facility of
+ * the location, with the register's details.
+ */
+export async function getMoh362(params: Moh362Params): Promise<Array<Record<string, unknown>>> {
+  const url = await buildEtlUrl('moh-362-register', {
+    locationUuids: params.locationUuids,
+    startDate: params.startDate,
+    endDate: params.endDate,
+  });
+  const response = await openmrsFetch(url);
+  if (!response.ok) {
+    throw new Error(`Failed to fetch the MOH 362 register: ${response.status} - ${await response.text()}`);
+  }
+  const data = await response.json();
+  return Array.isArray(data) ? data : [];
+}

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

@@ -0,0 +1,69 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+import { buildEtlUrl } from '../utils/get-base-url';
+import {
+  PAGE_SIZE,
+  pageParams,
+  toPatientListPage,
+  type PatientListPage,
+  type PatientListParams,
+} from './patient-list-page';
+
+interface Moh505Params {
+  locationUuids: string;
+  startDate?: string;
+  endDate?: string;
+}
+
+interface Moh505Response {
+  result: Array<Record<string, unknown>>;
+}
+
+export async function getMoh505(params: Moh505Params): Promise<Array<Record<string, unknown>>> {
+  const url = await buildEtlUrl('moh-505', {
+    locationUuids: params.locationUuids || '',
+    startDate: params.startDate || '',
+    endDate: params.endDate || '',
+  });
+  try {
+    const response = await openmrsFetch(url);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to fetch MOH-505 report: ${response.status} - ${errorText}`);
+    }
+
+    const data = await response.json();
+
+    if (!Array.isArray(data.result)) {
+      throw new Error('Invalid MOH-505 response format: missing result array.');
+    }
+
+    return data.result;
+  } catch (error: any) {
+    throw new Error(`An error occurred while fetching the MOH-505 report: ${error.message}`);
+  }
+}
+
+export async function getMoh505PatientList(params: PatientListParams): Promise<PatientListPage> {
+  const url = await buildEtlUrl('moh-505/patient-list', {
+    locationUuids: params.locationUuids || '',
+    startDate: params.startDate || '',
+    endDate: params.endDate || '',
+    indicators: params.indicators || '',
+    ...pageParams(params),
+  });
+  try {
+    const response = await openmrsFetch(url);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to fetch MOH-505 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-505 patient list: ${error.message}`);
+  }
+}

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

@@ -0,0 +1,118 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+import { buildEtlUrl } from '../utils/get-base-url';
+import {
+  PAGE_SIZE,
+  pageParams,
+  toPatientListPage,
+  type PatientListPage,
+  type PatientListParams,
+} from './patient-list-page';
+
+interface Moh710Params {
+  locationUuids: string;
+  startDate?: string;
+  endDate?: string;
+  indicator?: string | string[];
+}
+
+export async function getMoh705a(params: Moh710Params): Promise<any> {
+  const url = await buildEtlUrl('moh-705a', {
+    locationUuids: params.locationUuids || '',
+    startDate: params.startDate || '',
+    endDate: params.endDate || '',
+  });
+  try {
+    const response = await openmrsFetch(url);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to fetch dashboard summary: ${response.status} - ${errorText}`);
+    }
+
+    const data = await response.json();
+    return data;
+  } catch (error: any) {
+    throw new Error(`An error occurred while fetching the MOH-710 report: ${error.message}`);
+  }
+}
+
+export async function getMoh705aPatientList(params: PatientListParams): Promise<PatientListPage> {
+  const endPoint = (() => {
+    if (params.from && params.from?.toLowerCase() === "moh-717") {
+      return "moh-717-patient-list";
+    }
+    return 'moh-705a-patient-list';
+  })();
+  const url = await buildEtlUrl(endPoint, {
+    locationUuids: params.locationUuids || '',
+    startDate: params.startDate || '',
+    endDate: params.endDate || '',
+    indicator: Array.isArray(params.indicator) ? params.indicator.join(',') : params.indicator || '',
+    ...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-705 patient list: ${error.message}`);
+  }
+}
+
+export async function getMoh705b(params: Moh710Params): Promise<any> {
+  const url = await buildEtlUrl('moh-705b', {
+    locationUuids: params.locationUuids || '',
+    startDate: params.startDate || '',
+    endDate: params.endDate || '',
+  });
+  try {
+    const response = await openmrsFetch(url);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to fetch dashboard summary: ${response.status} - ${errorText}`);
+    }
+
+    const data = await response.json();
+    return data;
+  } catch (error: any) {
+    throw new Error(`An error occurred while fetching the MOH-710 report: ${error.message}`);
+  }
+}
+
+export async function getMoh705bPatientList(params: PatientListParams): Promise<PatientListPage> {
+  const endPoint = (() => {
+    if (params.from && params.from?.toLowerCase() === "moh-717") {
+      return "moh-717-patient-list";
+    }
+    return 'moh-705b-patient-list';
+  })();
+  const url = await buildEtlUrl(endPoint, {
+    locationUuids: params.locationUuids || '',
+    startDate: params.startDate || '',
+    endDate: params.endDate || '',
+    indicator: Array.isArray(params.indicator) ? params.indicator.join(',') : params.indicator || '',
+    ...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-705 patient list: ${error.message}`);
+  }
+}

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

@@ -0,0 +1,80 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+import { buildEtlUrl } from '../utils/get-base-url';
+import {
+  PAGE_SIZE,
+  pageParams,
+  toPatientListPage,
+  type PatientListPage,
+  type PatientListParams,
+} from './patient-list-page';
+
+interface Moh706Params {
+  locationUuids: string;
+  startDate?: string;
+  endDate?: string;
+}
+
+interface Moh706Response {
+  result: Array<Record<string, unknown>>;
+}
+
+interface Moh706PatientListResponse {
+  result: Array<Record<string, unknown>>;
+}
+
+/**
+ * The ETL server validates the OpenMRS session cookie (JSESSIONID), so every
+ * request must carry it. `credentials: 'include'` keeps same-origin proxies
+ * working and is required when the ETL base URL is another origin.
+ */
+const WITH_SESSION_COOKIE = { credentials: 'include' as RequestCredentials };
+
+export async function getMoh706(params: Moh706Params): Promise<Array<Record<string, unknown>>> {
+  const url = await buildEtlUrl('lab-706', {
+    locationUuids: params.locationUuids || '',
+    startDate: params.startDate || '',
+    endDate: params.endDate || '',
+  });
+  try {
+    const response = await openmrsFetch(url, WITH_SESSION_COOKIE);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to fetch MOH-706 report: ${response.status} - ${errorText}`);
+    }
+
+    const data = await response.json();
+
+    if (!Array.isArray(data.result)) {
+      throw new Error('Invalid MOH-706 response format: missing result array.');
+    }
+
+    return data.result;
+  } catch (error: any) {
+    throw new Error(`An error occurred while fetching the MOH-706 report: ${error.message}`);
+  }
+}
+
+export async function getMoh706PatientList(params: PatientListParams): Promise<PatientListPage> {
+  const url = await buildEtlUrl('lab-706/patient-list', {
+    locationUuids: params.locationUuids || '',
+    startDate: params.startDate || '',
+    endDate: params.endDate || '',
+    indicators: params.indicators || '',
+    ...pageParams(params),
+  });
+  try {
+    const response = await openmrsFetch(url, WITH_SESSION_COOKIE);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to fetch MOH-706 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-706 patient list: ${error.message}`);
+  }
+}

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

@@ -1,25 +1,25 @@
 import { openmrsFetch } from '@openmrs/esm-framework';
-import { getEtlBaseUrl } from '../utils/get-base-url';
+import { buildEtlUrl } from '../utils/get-base-url';
+import { PAGE_SIZE, toPatientListPage, pageParams, type PatientListParams } from './patient-list-page';
 
 interface Moh710Params {
   locationUuids: string;
   startDate?: string;
   endDate?: string;
+  indicator?: string | string[];
+  startIndex?: number;
+  limit?: number;
+  reportName?: string;
 }
 
 export async function getMoh710(params: Moh710Params): Promise<any> {
-  const etlBaseUrl = await getEtlBaseUrl();
-  const url = `${etlBaseUrl}/moh-710`;
-  const queryparams = {
+  const url = await buildEtlUrl('moh-710', {
     locationUuids: params.locationUuids || '',
     startDate: params.startDate || '',
     endDate: params.endDate || '',
-  };
-  const queryString = new URLSearchParams(
-    Object.fromEntries(Object.entries(queryparams).filter(([_, v]) => v !== undefined && v !== null)),
-  ).toString();
+  });
   try {
-    const response = await openmrsFetch(`${url}?${queryString}`);
+    const response = await openmrsFetch(url);
 
     if (!response.ok) {
       const errorText = await response.text();
@@ -32,3 +32,54 @@ export async function getMoh710(params: Moh710Params): Promise<any> {
     throw new Error(`An error occurred while fetching the MOH-710 report: ${error.message}`);
   }
 }
+
+export async function getMoh510PatientList(params: PatientListParams): Promise<any> {
+  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 || '',
+    reportName: params.reportName || 'moh710Report',
+    ...pageParams(params),
+  });
+
+  try {
+    const response = await openmrsFetch(url);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to fetch dashboard summary: ${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-510 REgister: ${error.message}`);
+  }
+}
+
+export async function getMoh413PatientList(params: PatientListParams): Promise<any> {
+  const url = await buildEtlUrl('moh-413-patient-list', {
+    locationUuids: params.locationUuids || '',
+    startDate: params.startDate || '',
+    endDate: params.endDate || '',
+    indicator: Array.isArray(params.indicator) ? params.indicator.join(',') : params.indicator || '',
+    reportName: params.reportName || 'moh710Report',
+    ...pageParams(params),
+  });
+
+  try {
+    const response = await openmrsFetch(url);
+
+    if (!response.ok) {
+      const errorText = await response.text();
+      throw new Error(`Failed to fetch  moh-413: ${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-413 Register: ${error.message}`);
+  }
+}