@ampath/esm-reports-app 1.0.0-next.41 → 1.0.0-next.45

package/src/reports/moh-505/moh-505-header.component.tsx

@@ -1,62 +1,64 @@
-import React, { useMemo } from "react";
-import TableWrapper from "../table-wrapper/table-wrapper.component";
-import TableRowMapper from "../table-wrapper/table-row-mapper.component";
-import { getCell } from "../../utils/utils";
+import React, { useMemo } from 'react';
+import dayjs from 'dayjs';
+import TableWrapper from '../table-wrapper/table-wrapper.component';
+import TableRowMapper from '../table-wrapper/table-row-mapper.component';
+import { getCell } from '../../utils/utils';
 import styles from './moh-505.scss';
 
-const MOH505Header: React.FC = () => {
-    const tableRows = useMemo(() => {
-        return [
-            {
-                tableCells: [
-                    getCell("", "County:", 1, 1, true),
-                    getCell("", "", 3),
-                ],
-            },
-            {
-                tableCells: [
-                    getCell("", "Sub-County:", 1, 1, true),
-                    getCell("", "", 3),
-                ],
-            },
-            {
-                tableCells: [
-                    getCell("", "Health Facility:", 1, 1, true),
-                    getCell("", "", 3),
-                ],
-            },
-            {
-                tableCells: [
-                    getCell("", "KMHFL code:", 1, 1, true),
-                    getCell("", "", 3),
-                ],
-            },
-            {
-                tableCells: [
-                    getCell("", "Facility Type:", 1, 1, true),
-                    getCell("", ""),
-                    getCell("", "Man. Agency:", 1, 1, true),
-                    getCell("", ""),
-                ],
-            },
-            {
-                tableCells: [
-                    getCell("", "Start date:", 1, 1, true),
-                    getCell("", ""),
-                    getCell("", "End date:", 1, 1, true),
-                    getCell("", ""),
-                ],
-            },
-        ];
-    }, []);
+interface MOH505HeaderProps {
+  facility?: string;
+  startDate?: string;
+  endDate?: string;
+}
+
+const asDate = (value?: string) => (value ? dayjs(value).format('DD/MM/YYYY') : '');
 
-    return <div className={styles.headerSection}>
-        <h3>MOH 505 IDSR</h3>
-        <h3>Weekly Epidemic Monitoring Form</h3>
-        <TableWrapper>
-            <TableRowMapper tableRows={tableRows} />
-        </TableWrapper>
+const MOH505Header: React.FC<MOH505HeaderProps> = ({ facility = '', startDate, endDate }) => {
+  const tableRows = useMemo(() => {
+    return [
+      {
+        tableCells: [getCell('', 'County:', 1, 1, true), getCell('', '', 3)],
+      },
+      {
+        tableCells: [getCell('', 'Sub-County:', 1, 1, true), getCell('', '', 3)],
+      },
+      {
+        tableCells: [getCell('', 'Health Facility:', 1, 1, true), getCell('', facility, 3)],
+      },
+      {
+        tableCells: [getCell('', 'KMHFL code:', 1, 1, true), getCell('', '', 3)],
+      },
+      {
+        tableCells: [
+          getCell('', 'Facility Type:', 1, 1, true),
+          getCell('', ''),
+          getCell('', 'Man. Agency:', 1, 1, true),
+          getCell('', ''),
+        ],
+      },
+      {
+        tableCells: [
+          getCell('', 'Start date:', 1, 1, true),
+          getCell('', asDate(startDate)),
+          getCell('', 'End date:', 1, 1, true),
+          getCell('', asDate(endDate)),
+        ],
+      },
+    ];
+  }, [facility, startDate, endDate]);
+
+  return (
+    <div className={styles.headerSection}>
+      <div className={styles.mainTitleBox}>
+        <p className={styles.ministry}>Ministry of Health</p>
+        <h3 className={styles.reportTitle}>MOH 505 IDSR</h3>
+        <p className={styles.subTitle}>Weekly Epidemic Monitoring Form</p>
+      </div>
+      <TableWrapper className={styles.headerTable}>
+        <TableRowMapper tableRows={tableRows} />
+      </TableWrapper>
     </div>
-}
+  );
+};
 
-export default MOH505Header;
+export default MOH505Header;

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

@@ -1,23 +1,32 @@
 import React, { useEffect, useState } from 'react';
-import { useSession } from '@openmrs/esm-framework';
-import { Loading } from '@carbon/react';
+import { formatDate, useSession } from '@openmrs/esm-framework';
 import TableWrapper from '../table-wrapper/table-wrapper.component';
 import TableRowMapper from '../table-wrapper/table-row-mapper.component';
 import { getCell } from '../../utils/utils';
-import ReportFiltersComponent from '../../common/report-filters/report-filters.component';
+import { ReportFiltersComponent, type ReportPeriod } from '../../common/report-filters';
+import { showReportError } from '../../common/report-error';
+import { hasReportData, ReportPlaceholder } from '../../common/report-placeholder';
 import { getMoh505 } from '../../resources/moh-505.resource';
 import MOH505Header from './moh-505-header.component';
 import { useSearchParams } from 'react-router-dom';
+import { ReportSkeleton } from '../../common/report-skeleton';
+import { ReportPage } from '../../common/report-page';
+import styles from './moh-505.scss';
 
 const Moh505Report: React.FC = () => {
   const [moh505Data, setMoh505Data] = useState<any>({});
+  const isReportGenerated = hasReportData(moh505Data);
   const [isLoading, setIsLoading] = useState<boolean>(false);
-  const [errorMessage, setErrorMessage] = useState<string>('');
   const [filters, setFilters] = useState<{ locationUuids?: string; startDate?: string; endDate?: string }>({});
 
   const session = useSession();
   const locationUuids = session?.sessionLocation?.uuid;
 
+  /* Masthead and sign-off fill themselves in, as on the other reports */
+  const facility = session?.sessionLocation?.display ?? '';
+  const compiledBy = session?.user?.person?.display ?? session?.user?.display ?? '';
+  const compiledOn = formatDate(new Date(), { mode: 'standard', time: false, noToday: true });
+
   const [searchParams] = useSearchParams();
 
   useEffect(() => {
@@ -30,29 +39,9 @@ const Moh505Report: React.FC = () => {
     }
   }, [searchParams]);
 
-  const fetchMoh505Data = async (filters: { startDate?: string; endDate?: string; month?: string }) => {
-    setErrorMessage('');
+  const fetchMoh505Data = async ({ startDate, endDate }: Pick<ReportPeriod, 'startDate' | 'endDate'>) => {
     setIsLoading(true);
 
-    let startDate = filters.startDate;
-    let endDate = filters.endDate;
-
-    if (filters.month) {
-      const [year, monthIndex] = filters.month.split('-').map(Number);
-      const start = new Date(year, monthIndex - 1, 1);
-      const end = new Date(year, monthIndex, 0);
-
-      const formatLocalDate = (d: Date) => {
-        const y = d.getFullYear();
-        const m = String(d.getMonth() + 1).padStart(2, '0');
-        const day = String(d.getDate()).padStart(2, '0');
-        return `${y}-${m}-${day}`;
-      };
-
-      startDate = formatLocalDate(start);
-      endDate = formatLocalDate(end);
-    }
-
     const params = {
       locationUuids: locationUuids || '',
       startDate,
@@ -65,7 +54,7 @@ const Moh505Report: React.FC = () => {
       setMoh505Data(flatData);
       setFilters({ locationUuids: params.locationUuids, startDate, endDate });
     } catch (error: any) {
-      setErrorMessage(error instanceof Error ? error.message : String(error));
+      showReportError('the MOH-505 report', error);
     } finally {
       setIsLoading(false);
     }
@@ -236,13 +225,7 @@ const Moh505Report: React.FC = () => {
       ],
     },
     {
-      tableCells: [
-        getCell('', 'Suspected Malaria***'),
-        getCell(),
-        getCell(),
-        getCell(),
-        getCell('', '', 5),
-      ],
+      tableCells: [getCell('', 'Suspected Malaria***'), getCell(), getCell(), getCell(), getCell('', '', 5)],
     },
     {
       tableCells: [
@@ -408,33 +391,45 @@ const Moh505Report: React.FC = () => {
     <>
       <ReportFiltersComponent
         reportName="MOH-505 Report"
-        mode="monthly"
+        mode="both"
         onGenerate={fetchMoh505Data}
-        isLoding={isLoading}
+        isLoading={isLoading}
+        isReportGenerated={isReportGenerated}
       />
-      {isLoading && <Loading description="Fetching data...." />}
-      {!isLoading && errorMessage && (
-        <div>
-          <a href="#" className="close" data-dismiss="alert">
-            &times;
-          </a>
-          <h4>
-            <strong>
-              <span className="glyphicon glyphicon-warning-sign"></span>{' '}
-            </strong>{' '}
-            An error occurred while trying to load the report. Please try again.
-          </h4>
-          <p>
-            <small>{errorMessage}</small>
-          </p>
-        </div>
+      {isLoading && <ReportSkeleton />}
+      {!isLoading && !isReportGenerated && <ReportPlaceholder reportName="MOH-505" />}
+      {!isLoading && isReportGenerated && (
+        <ReportPage>
+          <div className={styles.sheet}>
+            <MOH505Header facility={facility} startDate={filters.startDate} endDate={filters.endDate} />
+            <TableWrapper>
+              <TableRowMapper
+                tableRows={tableRows}
+                data={moh505Data}
+                locationUuids={filters.locationUuids}
+                startDate={filters.startDate}
+                endDate={filters.endDate}
+                report="moh-505"
+              />
+            </TableWrapper>
+
+            <div className={styles.signOff}>
+              <span>
+                Compiled by:<span className={styles.line}>{compiledBy}</span>
+              </span>
+              <span>
+                Signature:
+                <span className={styles.line} />
+              </span>
+              <span>
+                Date:<span className={styles.shortLine}>{compiledOn}</span>
+              </span>
+            </div>
+          </div>
+        </ReportPage>
       )}
-      <MOH505Header />
-      <TableWrapper>
-        <TableRowMapper tableRows={tableRows} data={moh505Data} locationUuids={filters.locationUuids} startDate={filters.startDate} endDate={filters.endDate} report='moh-505' />
-      </TableWrapper>
     </>
   );
 };
 
-export default Moh505Report;
+export default Moh505Report;

package/src/reports/moh-505/moh-505.scss

@@ -1,3 +1,117 @@
+/* MOH-505 laid out for A4, on the same scale as the other reports.
+
+   This one renders through the shared TableWrapper, so its cells are styled
+   from `table-wrapper.scss` rather than here. Those rules are all single-class,
+   so scoping these under `.sheet` (a class plus an element, one step more
+   specific) wins deterministically -- no reliance on which module loads first.
+   The wrapper is asked for a plain table so Carbon's data-table rules, which
+   are far more specific, never apply at all. */
+
+$ink: #000;
+$rule: 1px solid $ink;
+
+$text: 7pt;
+$title: 7.5pt;
+$meta: 6.5pt;
+
+$pad: 3mm;
+
+.mainTitleBox {
+  padding: 2mm $pad;
+  text-align: center;
+  border: $rule;
+}
+
+.ministry {
+  font-size: $meta;
+}
+
+.reportTitle {
+  font-size: $title;
+  font-weight: 700;
+  color: $ink;
+}
+
+.subTitle {
+  font-size: $meta;
+  font-weight: 600;
+}
+
 .headerSection {
-  padding: 15px;
-}
+  padding: 0;
+}
+
+.sheet {
+  font-size: $text;
+
+  table {
+    width: 100%;
+    border-collapse: collapse;
+  }
+
+  td,
+  th {
+    height: auto;
+    min-width: 0;
+    padding: 0.7mm 1mm;
+    overflow-wrap: anywhere;
+    font-size: $text;
+    line-height: 1.25;
+    text-align: center;
+    border: $rule;
+  }
+
+  /* Row labels read as text, not as data */
+  td:first-child {
+    text-align: left;
+  }
+
+  /* The facility block's labels sit against their values rather than centred */
+
+  .headerTable td {
+    text-align: left;
+  }
+}
+
+/* Sign-off, enclosed by the form */
+
+.signOff {
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: baseline;
+  justify-content: space-between;
+  gap: 2.5mm;
+  padding: $pad;
+  font-size: $meta;
+  white-space: nowrap;
+  border: $rule;
+  border-top: none;
+
+  > span {
+    display: flex;
+    flex: 1 1 auto;
+    align-items: baseline;
+    min-width: 0;
+  }
+}
+
+.line,
+.shortLine {
+  padding: 0 0.5mm;
+  margin-left: 1mm;
+  overflow: hidden;
+  font-weight: 600;
+  text-align: center;
+  text-overflow: ellipsis;
+  border-bottom: $rule;
+}
+
+.line {
+  flex: 1 1 45mm;
+  min-width: 15mm;
+}
+
+.shortLine {
+  flex: 1 1 25mm;
+  min-width: 12mm;
+}

package/src/reports/moh-705B/moh-204b-register.component.tsx

@@ -1,58 +1,57 @@
-import { Button, Loading, Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@carbon/react';
-import React, { useEffect, useState } from 'react';
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@carbon/react';
+import React from 'react';
 
-import styles from './moh-705b.scss';
+import styles from '../../common/report-register/register-table.scss';
 import classNames from 'classnames';
 import { useLocation, useNavigate, useSearchParams } from 'react-router-dom';
 import { getMoh705bPatientList } from '../../resources/moh-705.resource';
+import { moh204bExportColumns } from './moh-204b.columns';
+import { RegisterLayout, usePatientList } from '../../common/report-register';
 
 const Moh204BRegisterComponent: React.FC = () => {
-  const [patientlist, setPatientList] = useState<any[]>([]);
-  const [isLoading, setIsLoading] = useState<boolean>(false);
   const [searchParams] = useSearchParams();
-  const navigate = useNavigate();
-  const location = useLocation();
   const startDate = searchParams.get('startDate');
   const endDate = searchParams.get('endDate');
   const locationUuids = searchParams.get('locationUuids');
   const indicator = searchParams.get('indicator');
 
-  useEffect(() => {
-    const fetchData = async () => {
-      if (!startDate || !endDate || !locationUuids || !indicator) return;
-
-      setIsLoading(true);
-
-      try {
-        const params = {
-          startDate,
-          endDate,
-          locationUuids,
-          indicator,
-        };
-
-        const data = await getMoh705bPatientList(params);
-        setPatientList(data?.results.results || []);
-      } catch (error) {
-        console.error('Failed to fetch register data', error);
-      } finally {
-        setIsLoading(false);
-      }
-    };
-
-    fetchData();
-  }, [startDate, endDate, locationUuids, indicator]);
-
-  function navigateBack() {
-    navigate(location.state?.from || '/moh-705b');
-  }
+  const {
+    rows: patientlist,
+    total,
+    isTotalExact,
+    isLoading,
+    page,
+    pageSize,
+    onPageChange,
+    fetchAll,
+  } = usePatientList(
+    ({ startIndex, limit }) =>
+      getMoh705bPatientList({
+        startDate: startDate!,
+        endDate: endDate!,
+        locationUuids: locationUuids!,
+        indicator: indicator!,
+        startIndex,
+        limit,
+      }),
+    [startDate, endDate, locationUuids, indicator],
+  );
 
   return (
-    <>
-      <div className={styles.buttonContainer}>
-        <Button onClick={navigateBack}>Back</Button>
-      </div>
-      <div>{isLoading && <Loading />}</div>
+    <RegisterLayout
+      parentLabel="MOH-705B Report"
+      parentPath="/moh-705b"
+      title="MOH 204B Over-5 Outpatient Register"
+      isLoading={isLoading}
+      isEmpty={patientlist.length === 0}
+      page={page}
+      pageSize={pageSize}
+      total={total}
+      isTotalExact={isTotalExact}
+      onPageChange={onPageChange}
+      fetchAll={fetchAll}
+      columns={moh204bExportColumns}
+    >
       <div className={styles.tableContainer}>
         <Table className={classNames(`${styles.table}`, `${styles.tableBordered}`, `${styles.tableStriped}`)}>
           <TableHead>
@@ -229,7 +228,7 @@ const Moh204BRegisterComponent: React.FC = () => {
           </TableBody>
         </Table>
       </div>
-    </>
+    </RegisterLayout>
   );
 };
 

package/src/reports/moh-705B/moh-204b.columns.ts

@@ -0,0 +1,39 @@
+import { type RegisterColumn } from '../../common/report-register';
+
+/**
+ * MOH 204B as the register prints it: one column per cell, in the order they appear.
+ */
+export const moh204bExportColumns: RegisterColumn[] = [
+  { header: 'Date (DD/MM/YYYY) - A', value: (row) => row.date ?? '' },
+  { header: 'OPD No. (New) - B', value: (row) => row.opd_number_new_visit ?? '' },
+  { header: 'OPD No. (Revisit) - C', value: (row) => row.opd_number_return_visit ?? '' },
+  { header: 'Referred From 1=CU, 2=From Other facility, 3= Within 4=N/A - D', value: (row) => row.referred_from ?? '' },
+  { header: 'Full Names (THREE names) - E', value: (row) => row.full_names ?? '' },
+  { header: 'Age in Years - F', value: (row) => row.age ?? '' },
+  { header: 'Sex - G', value: (row) => row.sex ?? '' },
+  { header: 'Countu/Sub- county - H', value: (row) => row.county_sub_county ?? '' },
+  { header: 'Village /Estate / Landmark - I', value: (row) => row.village_estate_landmark ?? '' },
+  { header: "Patient/ Parent/Caregivers's Telephone No. - J", value: (row) => row.phone_number ?? '' },
+  { header: 'Weight - K', value: (row) => row.weight ?? '' },
+  { header: 'Height - L', value: (row) => row.height ?? '' },
+  { header: 'BMI (Kg/m2) - M', value: (row) => row.bmi ?? '' },
+  { header: 'Temp (oC) - N', value: (row) => row.temp ?? '' },
+  { header: 'BP - O', value: (row) => row.systolic ?? '' },
+  { header: 'Visual Aquity "RE (Right Eye)"LE (Left Eye) - P', value: (row) => row.visual_aquity_re ?? '' },
+  {
+    header: 'TB Screening 1. presumed TB 2. No signs 3. On TB Treatment 4. Not done - Q',
+    value: (row) => row.tb_screening ?? '',
+  },
+  {
+    header:
+      'Malaria 1.Presenting with symptoms NOT Tested 2.RDT Tested (-ve) 3.Microscopy Tested (-ve) 4.RDT Tested (+ve) 5. Microscopy Tested (+ve) - R',
+    value: (row) => row.malaria ?? '',
+  },
+  { header: 'Diagnosis - S', value: (row) => row.diagnosis ?? '' },
+  { header: 'Treatment/Prescription - T', value: (row) => row.treatment_prescription ?? '' },
+  {
+    header: 'Referred to (1=CU, 2= to other H/F, 3=within the facility/ 4=N/A) - V',
+    value: (row) => row.referred_to ?? '',
+  },
+  { header: 'REMARKS/ Outcome - W', value: (row) => row.remarks ?? '' },
+];