@ampath/esm-reports-app 1.0.0-next.6 → 1.0.0-next.61

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

@@ -1,99 +1,99 @@
 import React, { useMemo } from "react";
-import { TableRow, TableCell } from '@carbon/react';
-import TableWrapper from "../../table-wrapper/table-wrapper.component";
-import styles from '../../table-wrapper/table-wrapper.scss';
+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 = () => {
-    const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
-        key,
-        value,
-        strong,
-        colSpan
-    });
+interface UrineAnalysisProps {
+    data?: any,
+    locationUuids?: string,
+    startDate?: string,
+    endDate?: string
+}
 
+const UrineAnalysis: React.FC<UrineAnalysisProps> = ({ data, locationUuids, startDate, endDate }) => {
     const tableRows = useMemo(() => {
         return [
             {
                 tableCells: [
-                    getCell("", "1 URINE ANALYSIS", 2, true),
+                    getCell("", "1 URINE ANALYSIS", 2, 1, true),
                     getCell()
                 ]
             },
             {
                 tableCells: [
                     getCell(),
-                    getCell("", "Total Exam", 1, true),
-                    getCell("", "Number Positive", 1, true)
+                    getCell("", "Total Exam", 1, 1, true),
+                    getCell("", "Number Positive", 1, 1, true)
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "1.1 Urine Chemistry", 1, true),
-                    getCell(),
-                    getCell(),
+                    getCell("", "1.1 Urine Chemistry", 1, 1, true),
+                    getCell("total_urinalysis"),
+                    getCell("positive_urinalysis"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "1.2 Glucose", 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("", "1.2 Glucose", 1, 1, false),
+                    getCell("total_urine_glucose_with_members"),
+                    getCell("positive_urine_glucose_with_members"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "1.3 Ketones", 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("", "1.3 Ketones", 1, 1, false),
+                    getCell("total_urine_ketones_with_members"),
+                    getCell("positive_urine_ketones_with_members"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "1.4 Proteins", 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("", "1.4 Proteins", 1, 1, false),
+                    getCell("total_urine_proteins_with_members"),
+                    getCell("positive_urine_proteins_with_members"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "1.5 Urine Microscopy", 1, true),
-                    getCell(),
-                    getCell("", "Number Positive", 1, true),
+                    getCell("", "1.5 Urine Microscopy", 1, 1, true),
+                    getCell("total_urine_microscopy"),
+                    getCell("", "Number Positive", 1, 1, true),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "1.6 Pus cells (>5/hpf)", 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("", "1.6 Pus cells (>5/hpf)", 1, 1, false),
+                    getCell("total_urine_pus_cells_with_members"),
+                    getCell("positive_urine_pus_cells_with_members"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "1.7 Shistosoma haematobium", 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("", "1.7 Shistosoma haematobium", 1, 1, false),
+                    getCell("total_urine_s_haematobium"),
+                    getCell("positive_urine_s_haematobium"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "1.8 Trichomona vaginalis", 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("", "1.8 Trichomona vaginalis", 1, 1, false),
+                    getCell("total_urine_t_vaginalis_with_members"),
+                    getCell("positive_urine_t_vaginalis_with_members"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "1.9 Yeast cells", 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("", "1.9 Yeast cells", 1, 1, false),
+                    getCell("total_urine_yeast_cells_with_members"),
+                    getCell("positive_urine_yeast_cells_with_members"),
                 ]
             },
             {
                 tableCells: [
-                    getCell("", "1.10 Bacteria", 1, false),
-                    getCell(),
-                    getCell(),
+                    getCell("", "1.10 Bacteria", 1, 1, false),
+                    getCell("total_bacteria"),
+                    getCell("positive_bacteria"),
                 ]
             },
         ]
@@ -101,15 +101,7 @@ const UrineAnalysis: React.FC = () => {
 
 
     return <TableWrapper>
-        {tableRows.map((tR) => (
-            <TableRow>
-                {tR.tableCells.map((tC) => (
-                    <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
-                        {tC.strong ? <strong>{tC.value}</strong> : tC.value}
-                    </TableCell>
-                ))}
-            </TableRow>
-        ))}
+         <TableRowMapper tableRows={tableRows} data={data} locationUuids={locationUuids} startDate={startDate} endDate={endDate} />
     </TableWrapper>
 }