@ampath/esm-reports-app 1.0.0-next.55 → 1.0.0-next.56

package/src/reports/moh-705a/moh-705a.scss

@@ -64,23 +64,65 @@ $pad: 3mm;
 }
 
 .container {
-  overflow-x: auto;
+  overflow-x: visible;
   margin: 0;
 }
 
 .table {
   width: 100%;
+  table-layout: fixed;
   border-collapse: collapse;
+  font-family: inherit;
+}
+
+.numberColumn {
+  width: 3mm;
+}
+
+.diseaseColumn {
+  width: 34mm;
+}
+
+.dayColumn {
+  width: 4.5mm;
+}
+
+.totalColumn {
+  width: 8mm;
 }
 
 .tableBordered td,
 .tableBordered th {
-  padding: 1mm 1.5mm;
+  box-sizing: border-box;
+  padding: 0.6mm 0.45mm;
   font-size: $text;
   text-align: left;
   border: $rule;
 }
 
+.tableBordered tbody td:nth-child(n + 3):not(:last-child),
+.tableBordered thead th:nth-child(n + 2):not(:last-child) {
+  width: 4.5mm;
+  font-size: 5pt;
+  white-space: nowrap;
+  text-align: center;
+}
+
+.tableBordered tbody td:last-child,
+.tableBordered thead th:last-child {
+  width: 8mm;
+  text-align: center;
+}
+
+.tableBordered tbody td:nth-child(2) {
+  font-family: inherit;
+  overflow-wrap: anywhere;
+}
+
+.tableBordered tbody td:nth-child(n + 3) {
+  text-align: center;
+}
+
 .tableBordered th {
   font-weight: 700;
   color: $ink;

package/src/reports/moh-705a/registers/moh-204a-register.component.tsx

@@ -8,7 +8,7 @@ import { getMoh705aPatientList } from '../../../resources/moh-705.resource';
 import { moh204aExportColumns } from './moh-204a.columns';
 import { RegisterLayout, usePatientList } from '../../../common/report-register';
 
-interface Moh204ARegisterComponentProps {}
+interface Moh204ARegisterComponentProps { }
 
 const Moh204ARegisterComponent: React.FC<Moh204ARegisterComponentProps> = () => {
   const [searchParams] = useSearchParams();
@@ -39,6 +39,15 @@ const Moh204ARegisterComponent: React.FC<Moh204ARegisterComponentProps> = () =>
     [startDate, endDate, locationUuids, indicator],
   );
 
+  const removePatientListDuplicates = async () => {
+    const list = await fetchAll();
+    const filtered = uniqueBy(list, 'person_id');
+    return filtered;
+  }
+
+  const uniqueBy = (arr: any, key: string) =>
+    [...new Map(arr.map((item: any) => [item[key], item])).values()] as Record<string, any>[];
+
   return (
     <RegisterLayout
       parentLabel="MOH-705A Report"
@@ -51,7 +60,7 @@ const Moh204ARegisterComponent: React.FC<Moh204ARegisterComponentProps> = () =>
       total={total}
       isTotalExact={isTotalExact}
       onPageChange={onPageChange}
-      fetchAll={fetchAll}
+      fetchAll={removePatientListDuplicates}
       columns={moh204aExportColumns}
     >
       <div className={styles.tableContainer}>
@@ -273,7 +282,7 @@ const Moh204ARegisterComponent: React.FC<Moh204ARegisterComponentProps> = () =>
           </TableHead>
           <TableBody>
             {patientlist?.length > 0 ? (
-              patientlist?.map((patient) => (
+              uniqueBy(patientlist, 'person_id')?.map((patient) => (
                 <TableRow key={patient.person_id || patient.id}>
                   <TableCell>{patient.date}</TableCell>
                   <TableCell>{patient.opd_number_new_visit}</TableCell>

package/webpack.config.js

@@ -1 +1,22 @@
-module.exports = require('openmrs/default-webpack-config');
+const path = require('path');
+const config = (module.exports = require('openmrs/default-webpack-config'));
+config.watchConfig.ignored = ['.git', 'test-results', `${path.resolve(__dirname, 'dist')}/**`];
+config.overrides.resolve = {
+  fallback: {
+    crypto: false,
+    stream: false,
+    os: false,
+    path: false,
+    zlib: false,
+    https: false,
+    http: false,
+    util: false,
+    url: false,
+  },
+  extensions: ['.tsx', '.ts', '.jsx', '.js', '.scss'],
+  alias: {
+    '@openmrs/esm-framework': '@openmrs/esm-framework/src/internal',
+  },
+};
+
+module.exports = config;

package/dist/907.css.map

@@ -1 +0,0 @@
-{"version":3,"file":"907.css","mappings":"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","sources":["webpack://@ampath/esm-reports-app/./src/dashboard/reports-dashboard.module.scss","webpack://@ampath/esm-reports-app/./src/common/report-filters/report-filters.scss","webpack://@ampath/esm-reports-app/./src/common/report-placeholder/report-placeholder.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-710/moh-710.scss","webpack://@ampath/esm-reports-app/./src/common/report-skeleton/report-skeleton.scss","webpack://@ampath/esm-reports-app/./src/common/report-page/report-page.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-711/moh711.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-717/moh717.scss","webpack://@ampath/esm-reports-app/./src/reports/table-wrapper/table-wrapper.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-706/moh-706.scss","webpack://@ampath/esm-reports-app/./src/common/report-register/register-table.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-240/moh-240.scss","webpack://@ampath/esm-reports-app/./src/common/report-register/register-layout.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-505/moh-505.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-705B/moh-705b.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-705a/moh-705a.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-745/moh-745.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-740/moh-740.component.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-740/shared/data-cell/data-cell.scss","webpack://@ampath/esm-reports-app/./src/reports/moh-731/moh-731.scss","webpack://@ampath/esm-reports-app/./node_modules/@openmrs/esm-styleguide/src/_vars.scss","webpack://@ampath/esm-reports-app/./src/root.scss"],"names":[],"sourceRoot":""}