@ampath/esm-reports-app 1.0.0-next.11 → 1.0.0-next.13

package/src/reports/moh-706/sub-reports/urine-analysis/urine-analysis.component.tsx

@@ -3,7 +3,11 @@ import TableWrapper from "../../../table-wrapper/table-wrapper.component";
 import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
 import { getCell } from "../../../../utils/utils";
 
-const UrineAnalysis: React.FC = () => {
+interface UrineAnalysisProps {
+    data?: any
+}
+
+const UrineAnalysis: React.FC<UrineAnalysisProps> = ({ data }) => {
     const tableRows = useMemo(() => {
         return [
             {
@@ -22,29 +26,29 @@ const UrineAnalysis: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "1.1 Urine Chemistry", 1, 1, true),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urinalysis"),
+                    getCell("positive_urinalysis"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.2 Glucose", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_glucose"),
+                    getCell("positive_urine_glucose"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.3 Ketones", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_ketones"),
+                    getCell("positive_urine_ketones"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.4 Proteins", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_proteins"),
+                    getCell("positive_urine_proteins"),
                 ]
             },
             {
@@ -57,29 +61,29 @@ const UrineAnalysis: React.FC = () => {
             {
                 tableCells: [
                     getCell("", "1.6 Pus cells (>5/hpf)", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_pus_cells"),
+                    getCell("positive_urine_pus_cells"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.7 Shistosoma haematobium", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_s_haematobium"),
+                    getCell("positive_urine_s_haematobium"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.8 Trichomona vaginalis", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_t_vaginalis"),
+                    getCell("positive_urine_t_vaginalis"),
                 ]
             },
             {
                 tableCells: [
                     getCell("", "1.9 Yeast cells", 1, 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("total_urine_yeast_cells"),
+                    getCell("positive_urine_yeast_cells"),
                 ]
             },
             {
@@ -94,7 +98,7 @@ const UrineAnalysis: React.FC = () => {
 
 
     return <TableWrapper>
-         <TableRowMapper tableRows={tableRows} />
+         <TableRowMapper tableRows={tableRows} data={data} />
     </TableWrapper>
 }
 

package/src/reports/moh-740/moh-740.resource.ts

@@ -1,10 +1,11 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
 import { getEtlBaseUrl } from '../../utils/get-base-url';
 import { type Moh740Resp, type Moh740Dto, type Moh740Data } from './types';
 
 export async function fetchMoh740Report(params: Moh740Dto): Promise<Moh740Data> {
   const etlBaseUrl = await getEtlBaseUrl();
   const moh740Url = `${etlBaseUrl}/moh-740-report?endDate=${params.endDate}&locationUuids=${params.locationUuid}`;
-  const resp = await fetch(moh740Url);
+  const resp = await openmrsFetch(moh740Url);
   const data: Moh740Resp = await resp.json();
   if (data && data.result) {
     return data.result[0];

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

@@ -13,10 +13,11 @@ interface TableRowMapperProps {
             rowSpan: number;
         }>
     }[],
-    data?: any
+    data?: any,
+    redirectTo?: string
 }
 
-const TableRowMapper: React.FC<TableRowMapperProps> = ({ tableRows, data }) => {
+const TableRowMapper: React.FC<TableRowMapperProps> = ({ tableRows, data, redirectTo = "home/reports/moh-240" }) => {
     return <>
         {tableRows.map((tR) => (
             <TableRow>
@@ -25,7 +26,7 @@ const TableRowMapper: React.FC<TableRowMapperProps> = ({ tableRows, data }) => {
 
                     const onClick = () => {
                         if (!tC.label) {
-                            navigate({ to: "home/reports/moh-240" });
+                            navigate({ to: redirectTo });
                         }
                     };
 

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

@@ -0,0 +1,43 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+import { getEtlBaseUrl } from '../utils/get-base-url';
+
+interface Moh706Params {
+  locationUuids: string;
+  startDate?: string;
+  endDate?: string;
+}
+
+interface Moh706Response {
+  result: Array<Record<string, unknown>>;
+}
+
+export async function getMoh706(params: Moh706Params): Promise<Array<Record<string, unknown>>> {
+  const etlBaseUrl = await getEtlBaseUrl();
+  const url = `${etlBaseUrl}/lab-706`;
+  const queryparams = {
+    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}`);
+
+    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}`);
+  }
+}

package/src/utils/utils.ts

@@ -1,7 +1,36 @@
+import { openmrsFetch } from '@openmrs/esm-framework';
+
 export const getCell = (key = "", label = "", colSpan = 1, rowSpan = 1, strong = false) => ({
     key,
     label,
     strong,
     colSpan,
     rowSpan
-});
+});
+
+export async function getJson<T>(url: string, payload: Record<string, unknown> | null = null): Promise<T> {
+  let requestUrl = url;
+
+  if (payload && Object.keys(payload).length > 0) {
+    const queryString = new URLSearchParams(
+      Object.entries(payload).filter(([, value]) => value !== undefined && value !== null) as Array<[string, string]>,
+    ).toString();
+
+    if (queryString) {
+      requestUrl = `${url}?${queryString}`;
+    }
+  }
+
+  const response = await openmrsFetch(requestUrl);
+
+  if (!response.ok) {
+    const errorText = await response.text();
+    throw new Error(`Request failed with ${response.status}: ${errorText}`);
+  }
+
+  if (response.status === 204 || response.headers.get('content-length') === '0') {
+    return Promise.resolve({} as T);
+  }
+
+  return response.json() as Promise<T>;
+}