@ampath/esm-reports-app 1.0.0-next.21 → 1.0.0-next.22

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 (8) hide show
  1. package/dist/51.js +1 -1
  2. package/dist/51.js.map +1 -1
  3. package/dist/ampath-esm-reports-app.js.buildmanifest.json +3 -3
  4. package/dist/routes.json +1 -1
  5. package/package.json +1 -1
  6. package/src/reports/moh-740/moh-740.component.tsx +269 -51
  7. package/src/reports/moh-740/moh-740.resource.ts +1 -1
  8. package/src/reports/moh-740/types/index.ts +41 -0
package/dist/ampath-esm-reports-app.js.buildmanifest.json CHANGED
@@ -5,9 +5,9 @@
5
5
  "initial": false,
6
6
  "entry": false,
7
7
  "recorded": false,
8
- "size": 665123,
8
+ "size": 673335,
9
9
  "sizes": {
10
- "javascript": 665123
10
+ "javascript": 673335
11
11
  },
12
12
  "names": [],
13
13
  "idHints": [],
@@ -21,7 +21,7 @@
21
21
  "auxiliaryFiles": [
22
22
  "51.js.map"
23
23
  ],
24
- "hash": "99915df42e569bad",
24
+ "hash": "ddedad69cfbb1a9c",
25
25
  "childrenByOrder": {}
26
26
  },
27
27
  {
package/dist/routes.json CHANGED
@@ -1 +1 @@
1
- {"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"extensions":[{"name":"ampath-reports-dashboard-link","component":"reportsDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"reports","slot":"ampath-reports-dashboard-slot","title":"Reports"},"online":true,"offline":true},{"component":"root","name":"ampath-reports-dashboard-root","slot":"ampath-reports-dashboard-slot"}],"pages":[],"version":"1.0.0-next.21"}
1
+ {"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"extensions":[{"name":"ampath-reports-dashboard-link","component":"reportsDashboardLink","slot":"homepage-dashboard-slot","meta":{"name":"reports","slot":"ampath-reports-dashboard-slot","title":"Reports"},"online":true,"offline":true},{"component":"root","name":"ampath-reports-dashboard-root","slot":"ampath-reports-dashboard-slot"}],"pages":[],"version":"1.0.0-next.22"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ampath/esm-reports-app",
3
- "version": "1.0.0-next.21",
3
+ "version": "1.0.0-next.22",
4
4
  "license": "MPL-2.0",
5
5
  "description": "An AMPATH application for M&E reports",
6
6
  "browser": "dist/ampath-esm-reports-app.js",
package/src/reports/moh-740/moh-740.component.tsx CHANGED
@@ -11,12 +11,12 @@ import Moh740PatientList from './registers/moh-740-patient-list';
11
11
  interface Moh740ReportProps {}
12
12
  const Moh740Report: React.FC<Moh740ReportProps> = () => {
13
13
  const [isLoading, setIsLoading] = useState<boolean>(false);
14
- const [moh740Data, setMoh740Data] = useState<Moh740Data>();
14
+ const [moh740Data, setMoh740Data] = useState<Moh740Data| null>(null);
15
15
  const [view, setView] = useState<string>('report');
16
16
  const [selectedIndicator, setSelectedIndicator] = useState<string>();
17
17
  const [reportingMonth, setReportingMonth] = useState<string>();
18
18
  const session = useSession();
19
- const locationUuid = session.sessionLocation.uuid;
19
+ const locationUuid = session.sessionLocation?.uuid;
20
20
  const getMoh740ReportData = async (filters: ReportFilters) => {
21
21
  setIsLoading(true);
22
22
  try {
@@ -27,7 +27,7 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
27
27
  } else {
28
28
  setMoh740Data(null);
29
29
  }
30
- } catch (error) {
30
+ } catch (error:any) {
31
31
  showSnackbar({
32
32
  kind: 'error',
33
33
  title: 'Error Fetching MOH-740 Report',
@@ -42,7 +42,7 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
42
42
  setReportingMonth(lastDay);
43
43
  return {
44
44
  endDate: lastDay,
45
- locationUuid: locationUuid,
45
+ locationUuid: locationUuid ?? '',
46
46
  };
47
47
  };
48
48
  const handleIndicatorSelected = (selectedIndicator: string) => {
@@ -89,7 +89,7 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
89
89
  <td className={styles.darkBorder}>MFL code: __________</td>
90
90
  <td className={styles.darkBorder}>County: ______________</td>
91
91
  <td className={styles.darkBorder}>Sub County: ____________</td>
92
- <td className={styles.darkBorder}>Month/Year: _________</td>
92
+ <td className={styles.darkBorder}>Month/Year: {reportingMonth}</td>
93
93
  </tr>
94
94
  </table>
95
95
 
@@ -124,7 +124,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
124
124
  indicator="dc__gender__F__cumulative_diabetes_patients_in_care"
125
125
  />
126
126
  </td>
127
- <td className={styles.darkBorder}></td>
127
+ <td className={styles.darkBorder}>
128
+ <DataCell
129
+ value={moh740Data.cumulative_diabetes_patients_in_care}
130
+ indicatorSelected={handleIndicatorSelected}
131
+ indicator="cumulative_diabetes_patients_in_care"
132
+ />
133
+ </td>
128
134
  </tr>
129
135
  <tr>
130
136
  <td className={styles.darkBorder}>No. of newly diagnosed diabetes cases</td>
@@ -142,7 +148,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
142
148
  indicator="dc__gender__F__newly_diagnosed_diabetes"
143
149
  />
144
150
  </td>
145
- <td className={styles.darkBorder}></td>
151
+ <td className={styles.darkBorder}>
152
+ <DataCell
153
+ value={moh740Data.newly_diagnosed_diabetes}
154
+ indicatorSelected={handleIndicatorSelected}
155
+ indicator="newly_diagnosed_diabetes"
156
+ />
157
+ </td>
146
158
  </tr>
147
159
  <tr>
148
160
  <td className={styles.darkBorder}>Revisit to clinic/Known DM</td>
@@ -160,7 +172,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
160
172
  indicator="dc__gender__F__revisit_to_clinic_known_dm"
161
173
  />
162
174
  </td>
163
- <td className={styles.darkBorder}></td>
175
+ <td className={styles.darkBorder}>
176
+ <DataCell
177
+ value={moh740Data.revisit_to_clinic_known_dm}
178
+ indicatorSelected={handleIndicatorSelected}
179
+ indicator="revisit_to_clinic_known_dm"
180
+ />
181
+ </td>
164
182
  </tr>
165
183
 
166
184
  <tr className={styles.subHeader}>
@@ -184,7 +202,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
184
202
  indicator="dc__gender__F__age_range__0_to_5__type_1_diabetes_mellitus"
185
203
  />
186
204
  </td>
187
- <td className={styles.darkBorder}></td>
205
+ <td className={styles.darkBorder}>
206
+ <DataCell
207
+ value={moh740Data.dc__age_range__0_to_5__type_1_diabetes_mellitus}
208
+ indicatorSelected={handleIndicatorSelected}
209
+ indicator="dc__age_range__0_to_5__type_1_diabetes_mellitus"
210
+ />
211
+ </td>
188
212
  </tr>
189
213
  <tr>
190
214
  <td className="darkBorder indent">6-9 years</td>
@@ -202,7 +226,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
202
226
  indicator="dc__gender__F__age_range__6_to_9__type_1_diabetes_mellitus"
203
227
  />
204
228
  </td>
205
- <td className={styles.darkBorder}></td>
229
+ <td className={styles.darkBorder}>
230
+ <DataCell
231
+ value={moh740Data.dc__age_range__6_to_9__type_1_diabetes_mellitus}
232
+ indicatorSelected={handleIndicatorSelected}
233
+ indicator="dc__age_range__6_to_9__type_1_diabetes_mellitus"
234
+ />
235
+ </td>
206
236
  </tr>
207
237
  <tr>
208
238
  <td className="darkBorder indent">10-19 years</td>
@@ -220,7 +250,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
220
250
  indicator="dc__gender__F__age_range__10_to_19__type_1_diabetes_mellitus"
221
251
  />
222
252
  </td>
223
- <td className={styles.darkBorder}></td>
253
+ <td className={styles.darkBorder}>
254
+ <DataCell
255
+ value={moh740Data.dc__age_range__10_to_19__type_1_diabetes_mellitus}
256
+ indicatorSelected={handleIndicatorSelected}
257
+ indicator="dc__age_range__10_to_19__type_1_diabetes_mellitus"
258
+ />
259
+ </td>
224
260
  </tr>
225
261
  <tr>
226
262
  <td className="darkBorder indent">20-35 years</td>
@@ -238,7 +274,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
238
274
  indicator="dc__gender__F__age_range__20_to_35__type_1_diabetes_mellitus"
239
275
  />
240
276
  </td>
241
- <td className={styles.darkBorder}></td>
277
+ <td className={styles.darkBorder}>
278
+ <DataCell
279
+ value={moh740Data.dc__age_range__20_to_35__type_1_diabetes_mellitus}
280
+ indicatorSelected={handleIndicatorSelected}
281
+ indicator="dc__age_range__20_to_35__type_1_diabetes_mellitus"
282
+ />
283
+ </td>
242
284
  </tr>
243
285
  <tr>
244
286
  <td className="darkBorder indent">{'>'} 35 years</td>
@@ -246,17 +288,23 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
246
288
  <DataCell
247
289
  value={moh740Data.dc__gender__M__age_range__36_and_above__type_1_diabetes_mellitus}
248
290
  indicatorSelected={handleIndicatorSelected}
249
- indicator="dc__gender__M__age_range__35_and_above__type_1_diabetes_mellitus"
291
+ indicator="dc__gender__M__age_range__36_and_above__type_1_diabetes_mellitus"
250
292
  />
251
293
  </td>
252
294
  <td className={styles.darkBorder}>
253
295
  <DataCell
254
296
  value={moh740Data.dc__gender__F__age_range__36_and_above__type_1_diabetes_mellitus}
255
297
  indicatorSelected={handleIndicatorSelected}
256
- indicator="dc__gender__F__age_range__35_and_above__type_1_diabetes_mellitus"
298
+ indicator="dc__gender__F__age_range__36_and_above__type_1_diabetes_mellitus"
299
+ />
300
+ </td>
301
+ <td className={styles.darkBorder}>
302
+ <DataCell
303
+ value={moh740Data.dc__age_range__36_and_above__type_1_diabetes_mellitus}
304
+ indicatorSelected={handleIndicatorSelected}
305
+ indicator="dc__age_range__36_and_above__type_1_diabetes_mellitus"
257
306
  />
258
307
  </td>
259
- <td className={styles.darkBorder}></td>
260
308
  </tr>
261
309
 
262
310
  <tr className={styles.subHeader}>
@@ -280,7 +328,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
280
328
  indicator="dc__gender__F__age_range__0_to_18__type_2_diabetes_mellitus"
281
329
  />
282
330
  </td>
283
- <td className={styles.darkBorder}></td>
331
+ <td className={styles.darkBorder}>
332
+ <DataCell
333
+ value={moh740Data.dc__age_range__0_to_18__type_2_diabetes_mellitus}
334
+ indicatorSelected={handleIndicatorSelected}
335
+ indicator="dc__age_range__0_to_18__type_2_diabetes_mellitus"
336
+ />
337
+ </td>
284
338
  </tr>
285
339
  <tr>
286
340
  <td className="darkBorder indent">19-35 years</td>
@@ -298,7 +352,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
298
352
  indicator="dc__gender__F__age_range__19_to_35__type_2_diabetes_mellitus"
299
353
  />
300
354
  </td>
301
- <td className={styles.darkBorder}></td>
355
+ <td className={styles.darkBorder}>
356
+ <DataCell
357
+ value={moh740Data.dc__age_range__19_to_35__type_2_diabetes_mellitus}
358
+ indicatorSelected={handleIndicatorSelected}
359
+ indicator="dc__age_range__19_to_35__type_2_diabetes_mellitus"
360
+ />
361
+ </td>
302
362
  </tr>
303
363
  <tr>
304
364
  <td className="darkBorder indent">36-60 years</td>
@@ -316,7 +376,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
316
376
  indicator="dc__gender__F__age_range__36_to_60__type_2_diabetes_mellitus"
317
377
  />
318
378
  </td>
319
- <td className={styles.darkBorder}></td>
379
+ <td className={styles.darkBorder}>
380
+ <DataCell
381
+ value={moh740Data.dc__age_range__36_to_60__type_2_diabetes_mellitus}
382
+ indicatorSelected={handleIndicatorSelected}
383
+ indicator="dc__age_range__36_to_60__type_2_diabetes_mellitus"
384
+ />
385
+ </td>
320
386
  </tr>
321
387
  <tr>
322
388
  <td className="darkBorder indent">{'>'} 60 years</td>
@@ -334,7 +400,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
334
400
  indicator="dc__gender__F__age_range__61_and_above__type_2_diabetes_mellitus"
335
401
  />
336
402
  </td>
337
- <td className={styles.darkBorder}></td>
403
+ <td className={styles.darkBorder}>
404
+ <DataCell
405
+ value={moh740Data.dc__age_range__61_and_above__type_2_diabetes_mellitus}
406
+ indicatorSelected={handleIndicatorSelected}
407
+ indicator="dc__age_range__61_and_above__type_2_diabetes_mellitus"
408
+ />
409
+ </td>
338
410
  </tr>
339
411
 
340
412
  <tr>
@@ -371,7 +443,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
371
443
  indicator="dc__gender__F__cumulative_htn_patient"
372
444
  />
373
445
  </td>
374
- <td className={styles.darkBorder}></td>
446
+ <td className={styles.darkBorder}>
447
+ <DataCell
448
+ value={moh740Data.cumulative_htn_patient}
449
+ indicatorSelected={handleIndicatorSelected}
450
+ indicator="cumulative_htn_patient"
451
+ />
452
+ </td>
375
453
  </tr>
376
454
  <tr>
377
455
  <td className={styles.darkBorder}>No. of newly diagnosed hypertension cases</td>
@@ -389,7 +467,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
389
467
  indicator="dc__gender__F__newly_diagnosed_htn_this_month"
390
468
  />
391
469
  </td>
392
- <td className={styles.darkBorder}></td>
470
+ <td className={styles.darkBorder}>
471
+ <DataCell
472
+ value={moh740Data.newly_diagnosed_htn_this_month}
473
+ indicatorSelected={handleIndicatorSelected}
474
+ indicator="newly_diagnosed_htn_this_month"
475
+ />
476
+ </td>
393
477
  </tr>
394
478
  <tr>
395
479
  <td className={styles.darkBorder}>Revisit to clinic/Known HTN</td>
@@ -407,7 +491,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
407
491
  indicator="dc__gender__F__revisit_known_htn"
408
492
  />
409
493
  </td>
410
- <td className={styles.darkBorder}></td>
494
+ <td className={styles.darkBorder}>
495
+ <DataCell
496
+ value={moh740Data.revisit_known_htn}
497
+ indicatorSelected={handleIndicatorSelected}
498
+ indicator="revisit_known_htn"
499
+ />
500
+ </td>
411
501
  </tr>
412
502
 
413
503
  <tr className={styles.subHeader}>
@@ -511,7 +601,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
511
601
  indicator="dc__gender__F__is_co_morbid"
512
602
  />
513
603
  </td>
514
- <td className={styles.darkBorder}></td>
604
+ <td className={styles.darkBorder}>
605
+ <DataCell
606
+ value={moh740Data.is_co_morbid}
607
+ indicatorSelected={handleIndicatorSelected}
608
+ indicator="is_co_morbid"
609
+ />
610
+ </td>
515
611
  </tr>
516
612
  <tr>
517
613
  <td className={styles.darkBorder}>Newly diagnosed co-morbid with both DM and HTN cases</td>
@@ -529,7 +625,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
529
625
  indicator="dc__gender__F__newly_diagnosed_co_morbid_this_month"
530
626
  />
531
627
  </td>
532
- <td className={styles.darkBorder}></td>
628
+ <td className={styles.darkBorder}>
629
+ <DataCell
630
+ value={moh740Data.newly_diagnosed_co_morbid_this_month}
631
+ indicatorSelected={handleIndicatorSelected}
632
+ indicator="newly_diagnosed_co_morbid_this_month"
633
+ />
634
+ </td>
533
635
  </tr>
534
636
  <tr>
535
637
  <td className={styles.darkBorder}>Revisit to clinic/Known co-morbid DM and HTN</td>
@@ -547,7 +649,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
547
649
  indicator="dc__gender__F__revisit_known_co_morbid"
548
650
  />
549
651
  </td>
550
- <td className={styles.darkBorder}></td>
652
+ <td className={styles.darkBorder}>
653
+ <DataCell
654
+ value={moh740Data.revisit_known_co_morbid}
655
+ indicatorSelected={handleIndicatorSelected}
656
+ indicator="revisit_known_co_morbid"
657
+ />
658
+ </td>
551
659
  </tr>
552
660
 
553
661
  <tr className={styles.sectionHeader}>
@@ -557,21 +665,75 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
557
665
  </tr>
558
666
  <tr>
559
667
  <td className={styles.darkBorder}>No. of patients on insulin</td>
560
- <td className={styles.darkBorder}></td>
561
- <td className={styles.darkBorder}></td>
562
- <td className={styles.darkBorder}></td>
668
+ <td className={styles.darkBorder}>
669
+ <DataCell
670
+ value={moh740Data.dc__gender__M__on_insulin_this_month}
671
+ indicatorSelected={handleIndicatorSelected}
672
+ indicator="dc__gender__M__on_insulin_this_month"
673
+ />
674
+ </td>
675
+ <td className={styles.darkBorder}>
676
+ <DataCell
677
+ value={moh740Data.dc__gender__F__on_insulin_this_month}
678
+ indicatorSelected={handleIndicatorSelected}
679
+ indicator="dc__gender__F__on_insulin_this_month"
680
+ />
681
+ </td>
682
+ <td className={styles.darkBorder}>
683
+ <DataCell
684
+ value={moh740Data.on_insulin_this_month}
685
+ indicatorSelected={handleIndicatorSelected}
686
+ indicator="on_insulin_this_month"
687
+ />
688
+ </td>
563
689
  </tr>
564
690
  <tr>
565
691
  <td className={styles.darkBorder}>No. of patients on OGLAs</td>
566
- <td className={styles.darkBorder}></td>
567
- <td className={styles.darkBorder}></td>
568
- <td className={styles.darkBorder}></td>
692
+ <td className={styles.darkBorder}>
693
+ <DataCell
694
+ value={moh740Data.dc__gender__M__on_ogla_meds_this_month}
695
+ indicatorSelected={handleIndicatorSelected}
696
+ indicator="dc__gender__M__on_ogla_meds_this_month"
697
+ />
698
+ </td>
699
+ <td className={styles.darkBorder}>
700
+ <DataCell
701
+ value={moh740Data.dc__gender__F__on_ogla_meds_this_month}
702
+ indicatorSelected={handleIndicatorSelected}
703
+ indicator="dc__gender__F__on_ogla_meds_this_month"
704
+ />
705
+ </td>
706
+ <td className={styles.darkBorder}>
707
+ <DataCell
708
+ value={moh740Data.on_ogla_meds_this_month}
709
+ indicatorSelected={handleIndicatorSelected}
710
+ indicator="on_ogla_meds_this_month"
711
+ />
712
+ </td>
569
713
  </tr>
570
714
  <tr>
571
715
  <td className={styles.darkBorder}>No. of patients on both (Insulin and OGLAs)</td>
572
- <td className={styles.darkBorder}></td>
573
- <td className={styles.darkBorder}></td>
574
- <td className={styles.darkBorder}></td>
716
+ <td className={styles.darkBorder}>
717
+ <DataCell
718
+ value={moh740Data.dc__gender__M__on_both_insulin_and_ogla_meds_this_month}
719
+ indicatorSelected={handleIndicatorSelected}
720
+ indicator="dc__gender__M__on_both_insulin_and_ogla_meds_this_month"
721
+ />
722
+ </td>
723
+ <td className={styles.darkBorder}>
724
+ <DataCell
725
+ value={moh740Data.dc__gender__F__on_both_insulin_and_ogla_meds_this_month}
726
+ indicatorSelected={handleIndicatorSelected}
727
+ indicator="dc__gender__F__on_both_insulin_and_ogla_meds_this_month"
728
+ />
729
+ </td>
730
+ <td className={styles.darkBorder}>
731
+ <DataCell
732
+ value={moh740Data.on_both_insulin_and_ogla_meds_this_month}
733
+ indicatorSelected={handleIndicatorSelected}
734
+ indicator="on_both_insulin_and_ogla_meds_this_month"
735
+ />
736
+ </td>
575
737
  </tr>
576
738
  <tr>
577
739
  <td className={styles.darkBorder}>
@@ -633,7 +795,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
633
795
  indicator="dc__gender__F__stroke_diagnosis"
634
796
  />
635
797
  </td>
636
- <td className={styles.darkBorder}></td>
798
+ <td className={styles.darkBorder}>
799
+ <DataCell
800
+ value={moh740Data.stroke_diagnosis}
801
+ indicatorSelected={handleIndicatorSelected}
802
+ indicator="stroke_diagnosis"
803
+ />
804
+ </td>
637
805
  </tr>
638
806
  <tr>
639
807
  <td className="darkBorder indent">Ischemic heart disease</td>
@@ -651,7 +819,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
651
819
  indicator="dc__gender__F__ischemic_heart_disease_diagnosis"
652
820
  />
653
821
  </td>
654
- <td className={styles.darkBorder}></td>
822
+ <td className={styles.darkBorder}>
823
+ <DataCell
824
+ value={moh740Data.ischemic_heart_disease_diagnosis}
825
+ indicatorSelected={handleIndicatorSelected}
826
+ indicator="ischemic_heart_disease_diagnosis"
827
+ />
828
+ </td>
655
829
  </tr>
656
830
  <tr>
657
831
  <td className="darkBorder indent">Heart failure</td>
@@ -669,7 +843,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
669
843
  indicator="dc__gender__F__heart_failure_diagnosis"
670
844
  />
671
845
  </td>
672
- <td className={styles.darkBorder}></td>
846
+ <td className={styles.darkBorder}>
847
+ <DataCell
848
+ value={moh740Data.heart_failure_diagnosis}
849
+ indicatorSelected={handleIndicatorSelected}
850
+ indicator="heart_failure_diagnosis"
851
+ />
852
+ </td>
673
853
  </tr>
674
854
  <tr>
675
855
  <td className={styles.darkBorder}>No. of Patients with neuropathies (new diagnosis)</td>
@@ -687,7 +867,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
687
867
  indicator="dc__gender__F__has_neuropathies"
688
868
  />
689
869
  </td>
690
- <td className={styles.darkBorder}></td>
870
+ <td className={styles.darkBorder}>
871
+ <DataCell
872
+ value={moh740Data.has_neuropathies}
873
+ indicatorSelected={handleIndicatorSelected}
874
+ indicator="has_neuropathies"
875
+ />
876
+ </td>
691
877
  </tr>
692
878
 
693
879
  <tr className={styles.sectionHeader}>
@@ -711,7 +897,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
711
897
  indicator="dc__gender__F__screened_for_diabetic_foot_this_month"
712
898
  />
713
899
  </td>
714
- <td className={styles.darkBorder}></td>
900
+ <td className={styles.darkBorder}>
901
+ <DataCell
902
+ value={moh740Data.screened_for_diabetic_foot_this_month}
903
+ indicatorSelected={handleIndicatorSelected}
904
+ indicator="screened_for_diabetic_foot_this_month"
905
+ />
906
+ </td>
715
907
  </tr>
716
908
  <tr>
717
909
  <td className={styles.darkBorder}>No. of patients with diabetic foot (new diagnosis)</td>
@@ -729,7 +921,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
729
921
  indicator="dc__gender__F__has_diabetic_foot"
730
922
  />
731
923
  </td>
732
- <td className={styles.darkBorder}></td>
924
+ <td className={styles.darkBorder}>
925
+ <DataCell
926
+ value={moh740Data.has_diabetic_foot}
927
+ indicatorSelected={handleIndicatorSelected}
928
+ indicator="has_diabetic_foot"
929
+ />
930
+ </td>
733
931
  </tr>
734
932
  <tr>
735
933
  <td className={styles.darkBorder}>No. of Amputation due to diabetic foot</td>
@@ -747,7 +945,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
747
945
  indicator="dc__gender__F__amputation_due_to_diabetic_foot"
748
946
  />
749
947
  </td>
750
- <td className={styles.darkBorder}></td>
948
+ <td className={styles.darkBorder}>
949
+ <DataCell
950
+ value={moh740Data.amputation_due_to_diabetic_foot}
951
+ indicatorSelected={handleIndicatorSelected}
952
+ indicator="amputation_due_to_diabetic_foot"
953
+ />
954
+ </td>
751
955
  </tr>
752
956
 
753
957
  <tr className={styles.sectionHeader}>
@@ -783,7 +987,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
783
987
  indicator="dc__gender__F__screened_for_tb_this_month"
784
988
  />
785
989
  </td>
786
- <td className={styles.darkBorder}></td>
990
+ <td className={styles.darkBorder}>
991
+ <DataCell
992
+ value={moh740Data.screened_for_tb_this_month}
993
+ indicatorSelected={handleIndicatorSelected}
994
+ indicator="screened_for_tb_this_month"
995
+ />
996
+ </td>
787
997
  </tr>
788
998
  <tr>
789
999
  <td className={styles.darkBorder}>No. Screened Positive for Tuberculosis</td>
@@ -796,12 +1006,18 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
796
1006
  </td>
797
1007
  <td className={styles.darkBorder}>
798
1008
  <DataCell
799
- value={moh740Data.dc__gender__M__screened_postive_for_tb_this_month}
1009
+ value={moh740Data.dc__gender__F__screened_postive_for_tb_this_month}
800
1010
  indicatorSelected={handleIndicatorSelected}
801
- indicator="dc__gender__M__screened_postive_for_tb_this_month"
1011
+ indicator="dc__gender____screened_postive_for_tb_this_month"
1012
+ />
1013
+ </td>
1014
+ <td className={styles.darkBorder}>
1015
+ <DataCell
1016
+ value={moh740Data.screened_postive_for_tb_this_month}
1017
+ indicatorSelected={handleIndicatorSelected}
1018
+ indicator="screened_postive_for_tb_this_month"
802
1019
  />
803
1020
  </td>
804
- <td className={styles.darkBorder}></td>
805
1021
  </tr>
806
1022
  <tr>
807
1023
  <td className={styles.darkBorder}>No. enrolled with NHIF</td>
@@ -819,7 +1035,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
819
1035
  indicator="dc__gender__F__covered_by_shif"
820
1036
  />
821
1037
  </td>
822
- <td className={styles.darkBorder}></td>
1038
+ <td className={styles.darkBorder}>
1039
+ <DataCell
1040
+ value={moh740Data.covered_by_shif}
1041
+ indicatorSelected={handleIndicatorSelected}
1042
+ indicator="covered_by_shif"
1043
+ />
1044
+ </td>
823
1045
  </tr>
824
1046
 
825
1047
  <tr className={styles.subHeader}>
@@ -869,11 +1091,7 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
869
1091
  </table>
870
1092
 
871
1093
  <div className={styles.signOff}>
872
- <p>
873
- Compiled by: Name: ___________________________________ Designation:
874
- ___________________________________
875
- </p>
876
- <p>Signature: ___________________________________ Date: ___________________________________</p>
1094
+
877
1095
  </div>
878
1096
  </>
879
1097
  ) : (
package/src/reports/moh-740/moh-740.resource.ts CHANGED
@@ -11,7 +11,7 @@ import {
11
11
 
12
12
  const baseMoh740Url = 'moh-740-report';
13
13
 
14
- export async function fetchMoh740Report(params: Moh740Dto): Promise<Moh740Data> {
14
+ export async function fetchMoh740Report(params: Moh740Dto): Promise<Moh740Data | null> {
15
15
  const etlBaseUrl = await getEtlBaseUrl();
16
16
  const moh740Url = `${etlBaseUrl}/${baseMoh740Url}?endDate=${params.endDate}&locationUuids=${params.locationUuid}`;
17
17
  const resp = await openmrsFetch(moh740Url);