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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. package/dist/812.js +1 -1
  2. package/dist/{711.js → 879.js} +1 -1
  3. package/dist/{711.js.map → 879.js.map} +1 -1
  4. package/dist/ampath-esm-reports-app.js.buildmanifest.json +26 -26
  5. package/dist/main.js +1 -1
  6. package/dist/routes.json +1 -1
  7. package/package.json +1 -1
  8. package/src/reports/moh-706/sub-reports/bacteriology/bacteriology.component.tsx +24 -39
  9. package/src/reports/moh-706/sub-reports/blood-chemistry/blood-chemistry.component.tsx +22 -35
  10. package/src/reports/moh-706/sub-reports/drug-susceptibility-testing/drug-susceptibility-testing.component.tsx +31 -46
  11. package/src/reports/moh-706/sub-reports/haematology/haematology.component.tsx +23 -38
  12. package/src/reports/moh-706/sub-reports/histology-and-cytology/histology-and-cytology.component.tsx +20 -35
  13. package/src/reports/moh-706/sub-reports/parasitology/parasitology.component.tsx +9 -24
  14. package/src/reports/moh-706/sub-reports/serology/serology.component.tsx +7 -22
  15. package/src/reports/moh-706/sub-reports/specimen-referral-to-higher-levels/specimen-referral-to-higher-levels.component.tsx +7 -22
  16. package/src/reports/moh-706/sub-reports/urine-analysis/urine-analysis.component.tsx +17 -32
  17. package/src/reports/table-wrapper/table-row-mapper.component.tsx +42 -0
  18. package/src/utils/utils.ts +7 -0
package/src/reports/moh-706/sub-reports/histology-and-cytology/histology-and-cytology.component.tsx CHANGED
@@ -1,26 +1,19 @@
1
1
  import React, { useMemo } from "react";
2
- import { TableRow, TableCell } from '@carbon/react';
3
2
  import TableWrapper from "../../../table-wrapper/table-wrapper.component";
4
- import styles from '../../../table-wrapper/table-wrapper.scss';
3
+ import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
4
+ import { getCell } from "../../../../utils/utils";
5
5
 
6
6
  const HistologyAndCytology: React.FC = () => {
7
- const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
8
- key,
9
- value,
10
- strong,
11
- colSpan
12
- });
13
-
14
7
  const tableRows = useMemo(() => {
15
8
  return [
16
9
  {
17
- tableCells: [getCell("", "6 HISTOLOGY AND CYTOLOGY", 4, true)]
10
+ tableCells: [getCell("", "6 HISTOLOGY AND CYTOLOGY", 4, 1, true)]
18
11
  },
19
12
  {
20
13
  tableCells: [
21
- getCell("", "Smears", 1, true),
22
- getCell("", "Total Exam", 1, true),
23
- getCell("", "Malignant", 1, true),
14
+ getCell("", "Smears", 1, 1, true),
15
+ getCell("", "Total Exam", 1, 1, true),
16
+ getCell("", "Malignant", 1, 1, true),
24
17
  getCell(),
25
18
  ]
26
19
  },
@@ -29,9 +22,9 @@ const HistologyAndCytology: React.FC = () => {
29
22
  { tableCells: [getCell("", "6.3 Tissue impressions"), getCell(), getCell(), getCell()] },
30
23
  {
31
24
  tableCells: [
32
- getCell("", "Fine Needle Aspirates", 1, true),
33
- getCell("", "Total Exam", 1, true),
34
- getCell("", "Malignant", 1, true),
25
+ getCell("", "Fine Needle Aspirates", 1, 1, true),
26
+ getCell("", "Total Exam", 1, 1, true),
27
+ getCell("", "Malignant", 1, 1, true),
35
28
  getCell()
36
29
  ]
37
30
  },
@@ -42,9 +35,9 @@ const HistologyAndCytology: React.FC = () => {
42
35
  { tableCells: [getCell("", "6.8 Soft tissue masses"), getCell(), getCell(), getCell()] },
43
36
  {
44
37
  tableCells: [
45
- getCell("", "Fluid Cytology", 1, true),
46
- getCell("", "Total Exam", 1, true),
47
- getCell("", "Malignant", 2, true),
38
+ getCell("", "Fluid Cytology", 1, 1, true),
39
+ getCell("", "Total Exam", 1, 1, true),
40
+ getCell("", "Malignant", 2, 1, true),
48
41
  getCell()
49
42
  ]
50
43
  },
@@ -54,10 +47,10 @@ const HistologyAndCytology: React.FC = () => {
54
47
  { tableCells: [getCell("", "6.12 Urine"), getCell(), getCell(), getCell()] },
55
48
  {
56
49
  tableCells: [
57
- getCell("", "Tissue Histology", 1, true),
58
- getCell("", "Total Exam", 1, true),
59
- getCell("", "Malignant", 1, true),
60
- getCell("", "TNM Stage", 1, true),
50
+ getCell("", "Tissue Histology", 1, 1, true),
51
+ getCell("", "Total Exam", 1, 1, true),
52
+ getCell("", "Malignant", 1, 1, true),
53
+ getCell("", "TNM Stage", 1, 1, true),
61
54
  ]
62
55
  },
63
56
  { tableCells: [getCell("", "6.13 Prostate"), getCell(), getCell(), getCell()] },
@@ -75,9 +68,9 @@ const HistologyAndCytology: React.FC = () => {
75
68
  { tableCells: [getCell("", "6.25 Lymph nodes tissue"), getCell(), getCell(), getCell()] },
76
69
  {
77
70
  tableCells: [
78
- getCell("", "Bone Marrow Studies", 1, true),
79
- getCell("", "Total Exam", 1, true),
80
- getCell("", "Malignant", 1, true),
71
+ getCell("", "Bone Marrow Studies", 1, 1, true),
72
+ getCell("", "Total Exam", 1, 1, true),
73
+ getCell("", "Malignant", 1, 1, true),
81
74
  getCell()
82
75
  ]
83
76
  },
@@ -88,15 +81,7 @@ const HistologyAndCytology: React.FC = () => {
88
81
 
89
82
 
90
83
  return <TableWrapper>
91
- {tableRows.map((tR) => (
92
- <TableRow>
93
- {tR.tableCells.map((tC) => (
94
- <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
95
- {tC.strong ? <strong>{tC.value}</strong> : tC.value}
96
- </TableCell>
97
- ))}
98
- </TableRow>
99
- ))}
84
+ <TableRowMapper tableRows={tableRows} />
100
85
  </TableWrapper>
101
86
  }
102
87
 
package/src/reports/moh-706/sub-reports/parasitology/parasitology.component.tsx CHANGED
@@ -1,28 +1,21 @@
1
1
  import React, { useMemo } from "react";
2
- import { TableRow, TableCell } from '@carbon/react';
3
2
  import TableWrapper from "../../../table-wrapper/table-wrapper.component";
4
- import styles from '../../../table-wrapper/table-wrapper.scss';
3
+ import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
4
+ import { getCell } from "../../../../utils/utils";
5
5
 
6
6
  const Parasitology: React.FC = () => {
7
- const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
8
- key,
9
- value,
10
- strong,
11
- colSpan
12
- });
13
-
14
7
  const tableRows = useMemo(() => {
15
8
  return [
16
9
  {
17
10
  tableCells: [
18
- getCell("", "3 PARASITOLOGY", 3, true)
11
+ getCell("", "3 PARASITOLOGY", 3, 1, true)
19
12
  ]
20
13
  },
21
14
  {
22
15
  tableCells: [
23
- getCell("", "Malaria Test", 1, true),
24
- getCell("", "Total Exam", 1, true),
25
- getCell("", "Number Positive", 1, true)
16
+ getCell("", "Malaria Test", 1, 1, true),
17
+ getCell("", "Total Exam", 1, 1, true),
18
+ getCell("", "Number Positive", 1, 1, true)
26
19
  ]
27
20
  },
28
21
  {
@@ -55,9 +48,9 @@ const Parasitology: React.FC = () => {
55
48
  },
56
49
  {
57
50
  tableCells: [
58
- getCell("", "Stool Examination", 1, true),
51
+ getCell("", "Stool Examination", 1, 1, true),
59
52
  getCell(),
60
- getCell("", "Number Positive", 1, true),
53
+ getCell("", "Number Positive", 1, 1, true),
61
54
  ]
62
55
  },
63
56
  {
@@ -114,15 +107,7 @@ const Parasitology: React.FC = () => {
114
107
 
115
108
 
116
109
  return <TableWrapper>
117
- {tableRows.map((tR) => (
118
- <TableRow>
119
- {tR.tableCells.map((tC) => (
120
- <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
121
- {tC.strong ? <strong>{tC.value}</strong> : tC.value}
122
- </TableCell>
123
- ))}
124
- </TableRow>
125
- ))}
110
+ <TableRowMapper tableRows={tableRows} />
126
111
  </TableWrapper>
127
112
  }
128
113
 
package/src/reports/moh-706/sub-reports/serology/serology.component.tsx CHANGED
@@ -1,26 +1,19 @@
1
1
  import React, { useMemo } from "react";
2
- import { TableRow, TableCell } from '@carbon/react';
3
2
  import TableWrapper from "../../../table-wrapper/table-wrapper.component";
4
- import styles from '../../../table-wrapper/table-wrapper.scss';
3
+ import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
4
+ import { getCell } from "../../../../utils/utils";
5
5
 
6
6
  const Serology: React.FC = () => {
7
- const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
8
- key,
9
- value,
10
- strong,
11
- colSpan
12
- });
13
-
14
7
  const tableRows = useMemo(() => {
15
8
  return [
16
9
  {
17
- tableCells: [getCell("", "7. SEROLOGY", 3, true)]
10
+ tableCells: [getCell("", "7. SEROLOGY", 3, 1, true)]
18
11
  },
19
12
  {
20
13
  tableCells: [
21
- getCell("", "Serological Test", 1, true),
22
- getCell("", "Total Exam", 1, true),
23
- getCell("", "Number Positive", 1, true),
14
+ getCell("", "Serological Test", 1, 1, true),
15
+ getCell("", "Total Exam", 1, 1, true),
16
+ getCell("", "Number Positive", 1, 1, true),
24
17
  ]
25
18
  },
26
19
  { tableCells: [getCell("", "7.1 VDRL"), getCell(), getCell()] },
@@ -40,15 +33,7 @@ const Serology: React.FC = () => {
40
33
 
41
34
 
42
35
  return <TableWrapper>
43
- {tableRows.map((tR) => (
44
- <TableRow>
45
- {tR.tableCells.map((tC) => (
46
- <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
47
- {tC.strong ? <strong>{tC.value}</strong> : tC.value}
48
- </TableCell>
49
- ))}
50
- </TableRow>
51
- ))}
36
+ <TableRowMapper tableRows={tableRows} />
52
37
  </TableWrapper>
53
38
  }
54
39
 
package/src/reports/moh-706/sub-reports/specimen-referral-to-higher-levels/specimen-referral-to-higher-levels.component.tsx CHANGED
@@ -1,26 +1,19 @@
1
1
  import React, { useMemo } from "react";
2
- import { TableRow, TableCell } from '@carbon/react';
3
2
  import TableWrapper from "../../../table-wrapper/table-wrapper.component";
4
- import styles from '../../../table-wrapper/table-wrapper.scss';
3
+ import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
4
+ import { getCell } from "../../../../utils/utils";
5
5
 
6
6
  const SpecimenReferralToHigherLevels: React.FC = () => {
7
- const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
8
- key,
9
- value,
10
- strong,
11
- colSpan
12
- });
13
-
14
7
  const tableRows = useMemo(() => {
15
8
  return [
16
9
  {
17
- tableCells: [getCell("", "8. SPECIMEN REFERRAL TO HIGHER LEVELS", 3, true)]
10
+ tableCells: [getCell("", "8. SPECIMEN REFERRAL TO HIGHER LEVELS", 3, 1, true)]
18
11
  },
19
12
  {
20
13
  tableCells: [
21
- getCell("", "Specimen referral", 1, true),
22
- getCell("", "No. of specimens", 1, true),
23
- getCell("", "No. of results received", 1, true),
14
+ getCell("", "Specimen referral", 1, 1, true),
15
+ getCell("", "No. of specimens", 1, 1, true),
16
+ getCell("", "No. of results received", 1, 1, true),
24
17
  ]
25
18
  },
26
19
  { tableCells: [getCell("", "8.1 CD4"), getCell(), getCell()] },
@@ -39,15 +32,7 @@ const SpecimenReferralToHigherLevels: React.FC = () => {
39
32
 
40
33
 
41
34
  return <TableWrapper>
42
- {tableRows.map((tR) => (
43
- <TableRow>
44
- {tR.tableCells.map((tC) => (
45
- <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
46
- {tC.strong ? <strong>{tC.value}</strong> : tC.value}
47
- </TableCell>
48
- ))}
49
- </TableRow>
50
- ))}
35
+ <TableRowMapper tableRows={tableRows} />
51
36
  </TableWrapper>
52
37
  }
53
38
 
package/src/reports/moh-706/sub-reports/urine-analysis/urine-analysis.component.tsx CHANGED
@@ -1,97 +1,90 @@
1
1
  import React, { useMemo } from "react";
2
- import { TableRow, TableCell } from '@carbon/react';
3
2
  import TableWrapper from "../../../table-wrapper/table-wrapper.component";
4
- import styles from '../../../table-wrapper/table-wrapper.scss';
3
+ import TableRowMapper from "../../../table-wrapper/table-row-mapper.component";
4
+ import { getCell } from "../../../../utils/utils";
5
5
 
6
6
  const UrineAnalysis: React.FC = () => {
7
- const getCell = (key = "", value = "", colSpan = 1, strong = false) => ({
8
- key,
9
- value,
10
- strong,
11
- colSpan
12
- });
13
-
14
7
  const tableRows = useMemo(() => {
15
8
  return [
16
9
  {
17
10
  tableCells: [
18
- getCell("", "1 URINE ANALYSIS", 2, true),
11
+ getCell("", "1 URINE ANALYSIS", 2, 1, true),
19
12
  getCell()
20
13
  ]
21
14
  },
22
15
  {
23
16
  tableCells: [
24
17
  getCell(),
25
- getCell("", "Total Exam", 1, true),
26
- getCell("", "Number Positive", 1, true)
18
+ getCell("", "Total Exam", 1, 1, true),
19
+ getCell("", "Number Positive", 1, 1, true)
27
20
  ]
28
21
  },
29
22
  {
30
23
  tableCells: [
31
- getCell("", "1.1 Urine Chemistry", 1, true),
24
+ getCell("", "1.1 Urine Chemistry", 1, 1, true),
32
25
  getCell(),
33
26
  getCell(),
34
27
  ]
35
28
  },
36
29
  {
37
30
  tableCells: [
38
- getCell("", "1.2 Glucose", 1, false),
31
+ getCell("", "1.2 Glucose", 1, 1, false),
39
32
  getCell(),
40
33
  getCell(),
41
34
  ]
42
35
  },
43
36
  {
44
37
  tableCells: [
45
- getCell("", "1.3 Ketones", 1, false),
38
+ getCell("", "1.3 Ketones", 1, 1, false),
46
39
  getCell(),
47
40
  getCell(),
48
41
  ]
49
42
  },
50
43
  {
51
44
  tableCells: [
52
- getCell("", "1.4 Proteins", 1, false),
45
+ getCell("", "1.4 Proteins", 1, 1, false),
53
46
  getCell(),
54
47
  getCell(),
55
48
  ]
56
49
  },
57
50
  {
58
51
  tableCells: [
59
- getCell("", "1.5 Urine Microscopy", 1, true),
52
+ getCell("", "1.5 Urine Microscopy", 1, 1, true),
60
53
  getCell(),
61
- getCell("", "Number Positive", 1, true),
54
+ getCell("", "Number Positive", 1, 1, true),
62
55
  ]
63
56
  },
64
57
  {
65
58
  tableCells: [
66
- getCell("", "1.6 Pus cells (>5/hpf)", 1, false),
59
+ getCell("", "1.6 Pus cells (>5/hpf)", 1, 1, false),
67
60
  getCell(),
68
61
  getCell(),
69
62
  ]
70
63
  },
71
64
  {
72
65
  tableCells: [
73
- getCell("", "1.7 Shistosoma haematobium", 1, false),
66
+ getCell("", "1.7 Shistosoma haematobium", 1, 1, false),
74
67
  getCell(),
75
68
  getCell(),
76
69
  ]
77
70
  },
78
71
  {
79
72
  tableCells: [
80
- getCell("", "1.8 Trichomona vaginalis", 1, false),
73
+ getCell("", "1.8 Trichomona vaginalis", 1, 1, false),
81
74
  getCell(),
82
75
  getCell(),
83
76
  ]
84
77
  },
85
78
  {
86
79
  tableCells: [
87
- getCell("", "1.9 Yeast cells", 1, false),
80
+ getCell("", "1.9 Yeast cells", 1, 1, false),
88
81
  getCell(),
89
82
  getCell(),
90
83
  ]
91
84
  },
92
85
  {
93
86
  tableCells: [
94
- getCell("", "1.10 Bacteria", 1, false),
87
+ getCell("", "1.10 Bacteria", 1, 1, false),
95
88
  getCell(),
96
89
  getCell(),
97
90
  ]
@@ -101,15 +94,7 @@ const UrineAnalysis: React.FC = () => {
101
94
 
102
95
 
103
96
  return <TableWrapper>
104
- {tableRows.map((tR) => (
105
- <TableRow>
106
- {tR.tableCells.map((tC) => (
107
- <TableCell className={styles.dataCell} colSpan={tC.colSpan}>
108
- {tC.strong ? <strong>{tC.value}</strong> : tC.value}
109
- </TableCell>
110
- ))}
111
- </TableRow>
112
- ))}
97
+ <TableRowMapper tableRows={tableRows} />
113
98
  </TableWrapper>
114
99
  }
115
100
 
package/src/reports/table-wrapper/table-row-mapper.component.tsx ADDED
@@ -0,0 +1,42 @@
1
+ import React from "react";
2
+ import { TableRow, TableCell } from "@carbon/react";
3
+ import styles from './table-wrapper.scss';
4
+ import { navigate } from "@openmrs/esm-framework";
5
+
6
+ interface TableRowMapperProps {
7
+ tableRows: {
8
+ tableCells: Array<{
9
+ key: string;
10
+ label: any;
11
+ strong: boolean;
12
+ colSpan: number;
13
+ rowSpan: number;
14
+ }>
15
+ }[],
16
+ data?: any
17
+ }
18
+
19
+ const TableRowMapper: React.FC<TableRowMapperProps> = ({ tableRows, data }) => {
20
+ return <>
21
+ {tableRows.map((tR) => (
22
+ <TableRow>
23
+ {tR.tableCells.map((tC, i) => {
24
+ const value = data ? data[tC.key] : "";
25
+
26
+ const onClick = () => {
27
+ if (!tC.label) {
28
+ navigate({ to: "home/reports/moh-240" });
29
+ }
30
+ };
31
+
32
+ return <TableCell className={styles.dataCell} colSpan={tC.colSpan} key={i} onClick={onClick}>
33
+ {tC.label ? (tC.strong ? <strong>{tC.label}</strong> : tC.label) : value}
34
+ </TableCell>
35
+
36
+ })}
37
+ </TableRow>
38
+ ))}
39
+ </>
40
+ }
41
+
42
+ export default TableRowMapper;
package/src/utils/utils.ts ADDED
@@ -0,0 +1,7 @@
1
+ export const getCell = (key = "", label = "", colSpan = 1, rowSpan = 1, strong = false) => ({
2
+ key,
3
+ label,
4
+ strong,
5
+ colSpan,
6
+ rowSpan
7
+ });