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

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 +335 -69
  7. package/src/reports/moh-740/moh-740.resource.ts +1 -1
  8. package/src/reports/moh-740/types/index.ts +57 -4
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) => {
@@ -85,11 +85,11 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
85
85
 
86
86
  <table className={styles.topMeta}>
87
87
  <tr>
88
- <td className={styles.darkBorder}>Name of the facility: _________________________</td>
89
- <td className={styles.darkBorder}>MFL code: __________</td>
90
- <td className={styles.darkBorder}>County: ______________</td>
91
- <td className={styles.darkBorder}>Sub County: ____________</td>
92
- <td className={styles.darkBorder}>Month/Year: _________</td>
88
+ <td className={styles.darkBorder}>Name of the facility: {moh740Data.facility}</td>
89
+ <td className={styles.darkBorder}>MFL code: {moh740Data.mfl_code}</td>
90
+ <td className={styles.darkBorder}>County: {moh740Data.county}</td>
91
+ <td className={styles.darkBorder}>Sub County: {moh740Data.sub_county}</td>
92
+ <td className={styles.darkBorder}>Month/Year: {moh740Data.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}>
@@ -416,7 +506,31 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
416
506
  </td>
417
507
  </tr>
418
508
  <tr>
419
- <td className="darkBorder indent">0-18 years</td>
509
+ <td className="darkBorder indent">0-9 years</td>
510
+ <td className={styles.darkBorder}>
511
+ <DataCell
512
+ value={moh740Data.dc__gender__M__age_range__0_to_9__has_htn}
513
+ indicatorSelected={handleIndicatorSelected}
514
+ indicator="dc__gender__M__age_range__0_to_9__has_htn"
515
+ />
516
+ </td>
517
+ <td className={styles.darkBorder}>
518
+ <DataCell
519
+ value={moh740Data.dc__gender__F__age_range__0_to_9__has_htn}
520
+ indicatorSelected={handleIndicatorSelected}
521
+ indicator="dc__gender__F__age_range__0_to_9__has_htn"
522
+ />
523
+ </td>
524
+ <td className={styles.darkBorder}>
525
+ <DataCell
526
+ value={moh740Data.dc__age_range__0_to_9__has_htn}
527
+ indicatorSelected={handleIndicatorSelected}
528
+ indicator="dc__age_range__0_to_9__has_htn"
529
+ />
530
+ </td>
531
+ </tr>
532
+ <tr>
533
+ <td className="darkBorder indent">10-19 years</td>
420
534
  <td className={styles.darkBorder}>
421
535
  <DataCell
422
536
  value={moh740Data.dc__gender__M__age_range__10_to_19__has_htn}
@@ -431,25 +545,37 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
431
545
  indicator="dc__gender__F__age_range__10_to_19__has_htn"
432
546
  />
433
547
  </td>
434
- <td className={styles.darkBorder}></td>
548
+ <td className={styles.darkBorder}>
549
+ <DataCell
550
+ value={moh740Data.dc__age_range__10_to_19__has_htn}
551
+ indicatorSelected={handleIndicatorSelected}
552
+ indicator="dc__age_range__10_to_19__has_htn"
553
+ />
554
+ </td>
435
555
  </tr>
436
556
  <tr>
437
- <td className="darkBorder indent">19-35 years</td>
557
+ <td className="darkBorder indent">20-35 years</td>
438
558
  <td className={styles.darkBorder}>
439
559
  <DataCell
440
- value={moh740Data.dc__gender__M__age_range__19_to_35__has_htn}
560
+ value={moh740Data.dc__gender__M__age_range__20_to_35__has_htn}
441
561
  indicatorSelected={handleIndicatorSelected}
442
- indicator="dc__gender__M__age_range__19_to_35__has_htn"
562
+ indicator="dc__gender__M__age_range__20_to_35__has_htn"
443
563
  />
444
564
  </td>
445
565
  <td className={styles.darkBorder}>
446
566
  <DataCell
447
- value={moh740Data.dc__gender__F__age_range__19_to_35__has_htn}
567
+ value={moh740Data.dc__gender__F__age_range__20_to_35__has_htn}
448
568
  indicatorSelected={handleIndicatorSelected}
449
- indicator="dc__gender__F__age_range__19_to_35__has_htn"
569
+ indicator="dc__gender__F__age_range__20_to_35__has_htn"
570
+ />
571
+ </td>
572
+ <td className={styles.darkBorder}>
573
+ <DataCell
574
+ value={moh740Data.dc__age_range__20_to_35__has_htn}
575
+ indicatorSelected={handleIndicatorSelected}
576
+ indicator="dc__range__20_to_35__has_htn"
450
577
  />
451
578
  </td>
452
- <td className={styles.darkBorder}></td>
453
579
  </tr>
454
580
  <tr>
455
581
  <td className="darkBorder indent">36-60 years</td>
@@ -467,25 +593,37 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
467
593
  indicator="dc__gender__F__age_range__36_to_60__has_htn"
468
594
  />
469
595
  </td>
470
- <td className={styles.darkBorder}></td>
596
+ <td className={styles.darkBorder}>
597
+ <DataCell
598
+ value={moh740Data.dc__age_range__36_to_60__has_htn}
599
+ indicatorSelected={handleIndicatorSelected}
600
+ indicator="dc__age_range__36_to_60__has_htn"
601
+ />
602
+ </td>
471
603
  </tr>
472
604
  <tr>
473
605
  <td className="darkBorder indent">{'>'} 60 years</td>
474
606
  <td className={styles.darkBorder}>
475
607
  <DataCell
476
- value={moh740Data.dc__gender__M__age_range__60_and_above__has_htn}
608
+ value={moh740Data.dc__gender__M__age_range__61_and_above__has_htn}
477
609
  indicatorSelected={handleIndicatorSelected}
478
- indicator="dc__gender__M__age_range__60_and_above__has_htn"
610
+ indicator="dc__gender__M__age_range__61_and_above__has_htn"
479
611
  />
480
612
  </td>
481
613
  <td className={styles.darkBorder}>
482
614
  <DataCell
483
- value={moh740Data.dc__gender__F__age_range__60_and_above__has_htn}
615
+ value={moh740Data.dc__gender__F__age_range__61_and_above__has_htn}
484
616
  indicatorSelected={handleIndicatorSelected}
485
- indicator="dc__gender__F__age_range__60_and_above__has_htn"
617
+ indicator="dc__gender__F__age_range__61_and_above__has_htn"
618
+ />
619
+ </td>
620
+ <td className={styles.darkBorder}>
621
+ <DataCell
622
+ value={moh740Data.dc__age_range__61_and_above__has_htn}
623
+ indicatorSelected={handleIndicatorSelected}
624
+ indicator="dc__age_range__61_and_above__has_htn"
486
625
  />
487
626
  </td>
488
- <td className={styles.darkBorder}></td>
489
627
  </tr>
490
628
 
491
629
  <tr className={styles.sectionHeader}>
@@ -511,7 +649,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
511
649
  indicator="dc__gender__F__is_co_morbid"
512
650
  />
513
651
  </td>
514
- <td className={styles.darkBorder}></td>
652
+ <td className={styles.darkBorder}>
653
+ <DataCell
654
+ value={moh740Data.is_co_morbid}
655
+ indicatorSelected={handleIndicatorSelected}
656
+ indicator="is_co_morbid"
657
+ />
658
+ </td>
515
659
  </tr>
516
660
  <tr>
517
661
  <td className={styles.darkBorder}>Newly diagnosed co-morbid with both DM and HTN cases</td>
@@ -529,7 +673,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
529
673
  indicator="dc__gender__F__newly_diagnosed_co_morbid_this_month"
530
674
  />
531
675
  </td>
532
- <td className={styles.darkBorder}></td>
676
+ <td className={styles.darkBorder}>
677
+ <DataCell
678
+ value={moh740Data.newly_diagnosed_co_morbid_this_month}
679
+ indicatorSelected={handleIndicatorSelected}
680
+ indicator="newly_diagnosed_co_morbid_this_month"
681
+ />
682
+ </td>
533
683
  </tr>
534
684
  <tr>
535
685
  <td className={styles.darkBorder}>Revisit to clinic/Known co-morbid DM and HTN</td>
@@ -547,7 +697,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
547
697
  indicator="dc__gender__F__revisit_known_co_morbid"
548
698
  />
549
699
  </td>
550
- <td className={styles.darkBorder}></td>
700
+ <td className={styles.darkBorder}>
701
+ <DataCell
702
+ value={moh740Data.revisit_known_co_morbid}
703
+ indicatorSelected={handleIndicatorSelected}
704
+ indicator="revisit_known_co_morbid"
705
+ />
706
+ </td>
551
707
  </tr>
552
708
 
553
709
  <tr className={styles.sectionHeader}>
@@ -557,21 +713,75 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
557
713
  </tr>
558
714
  <tr>
559
715
  <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>
716
+ <td className={styles.darkBorder}>
717
+ <DataCell
718
+ value={moh740Data.dc__gender__M__on_insulin_this_month}
719
+ indicatorSelected={handleIndicatorSelected}
720
+ indicator="dc__gender__M__on_insulin_this_month"
721
+ />
722
+ </td>
723
+ <td className={styles.darkBorder}>
724
+ <DataCell
725
+ value={moh740Data.dc__gender__F__on_insulin_this_month}
726
+ indicatorSelected={handleIndicatorSelected}
727
+ indicator="dc__gender__F__on_insulin_this_month"
728
+ />
729
+ </td>
730
+ <td className={styles.darkBorder}>
731
+ <DataCell
732
+ value={moh740Data.on_insulin_this_month}
733
+ indicatorSelected={handleIndicatorSelected}
734
+ indicator="on_insulin_this_month"
735
+ />
736
+ </td>
563
737
  </tr>
564
738
  <tr>
565
739
  <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>
740
+ <td className={styles.darkBorder}>
741
+ <DataCell
742
+ value={moh740Data.dc__gender__M__on_ogla_meds_this_month}
743
+ indicatorSelected={handleIndicatorSelected}
744
+ indicator="dc__gender__M__on_ogla_meds_this_month"
745
+ />
746
+ </td>
747
+ <td className={styles.darkBorder}>
748
+ <DataCell
749
+ value={moh740Data.dc__gender__F__on_ogla_meds_this_month}
750
+ indicatorSelected={handleIndicatorSelected}
751
+ indicator="dc__gender__F__on_ogla_meds_this_month"
752
+ />
753
+ </td>
754
+ <td className={styles.darkBorder}>
755
+ <DataCell
756
+ value={moh740Data.on_ogla_meds_this_month}
757
+ indicatorSelected={handleIndicatorSelected}
758
+ indicator="on_ogla_meds_this_month"
759
+ />
760
+ </td>
569
761
  </tr>
570
762
  <tr>
571
763
  <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>
764
+ <td className={styles.darkBorder}>
765
+ <DataCell
766
+ value={moh740Data.dc__gender__M__on_both_insulin_and_ogla_meds_this_month}
767
+ indicatorSelected={handleIndicatorSelected}
768
+ indicator="dc__gender__M__on_both_insulin_and_ogla_meds_this_month"
769
+ />
770
+ </td>
771
+ <td className={styles.darkBorder}>
772
+ <DataCell
773
+ value={moh740Data.dc__gender__F__on_both_insulin_and_ogla_meds_this_month}
774
+ indicatorSelected={handleIndicatorSelected}
775
+ indicator="dc__gender__F__on_both_insulin_and_ogla_meds_this_month"
776
+ />
777
+ </td>
778
+ <td className={styles.darkBorder}>
779
+ <DataCell
780
+ value={moh740Data.on_both_insulin_and_ogla_meds_this_month}
781
+ indicatorSelected={handleIndicatorSelected}
782
+ indicator="on_both_insulin_and_ogla_meds_this_month"
783
+ />
784
+ </td>
575
785
  </tr>
576
786
  <tr>
577
787
  <td className={styles.darkBorder}>
@@ -633,7 +843,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
633
843
  indicator="dc__gender__F__stroke_diagnosis"
634
844
  />
635
845
  </td>
636
- <td className={styles.darkBorder}></td>
846
+ <td className={styles.darkBorder}>
847
+ <DataCell
848
+ value={moh740Data.stroke_diagnosis}
849
+ indicatorSelected={handleIndicatorSelected}
850
+ indicator="stroke_diagnosis"
851
+ />
852
+ </td>
637
853
  </tr>
638
854
  <tr>
639
855
  <td className="darkBorder indent">Ischemic heart disease</td>
@@ -651,7 +867,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
651
867
  indicator="dc__gender__F__ischemic_heart_disease_diagnosis"
652
868
  />
653
869
  </td>
654
- <td className={styles.darkBorder}></td>
870
+ <td className={styles.darkBorder}>
871
+ <DataCell
872
+ value={moh740Data.ischemic_heart_disease_diagnosis}
873
+ indicatorSelected={handleIndicatorSelected}
874
+ indicator="ischemic_heart_disease_diagnosis"
875
+ />
876
+ </td>
655
877
  </tr>
656
878
  <tr>
657
879
  <td className="darkBorder indent">Heart failure</td>
@@ -669,7 +891,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
669
891
  indicator="dc__gender__F__heart_failure_diagnosis"
670
892
  />
671
893
  </td>
672
- <td className={styles.darkBorder}></td>
894
+ <td className={styles.darkBorder}>
895
+ <DataCell
896
+ value={moh740Data.heart_failure_diagnosis}
897
+ indicatorSelected={handleIndicatorSelected}
898
+ indicator="heart_failure_diagnosis"
899
+ />
900
+ </td>
673
901
  </tr>
674
902
  <tr>
675
903
  <td className={styles.darkBorder}>No. of Patients with neuropathies (new diagnosis)</td>
@@ -687,7 +915,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
687
915
  indicator="dc__gender__F__has_neuropathies"
688
916
  />
689
917
  </td>
690
- <td className={styles.darkBorder}></td>
918
+ <td className={styles.darkBorder}>
919
+ <DataCell
920
+ value={moh740Data.has_neuropathies}
921
+ indicatorSelected={handleIndicatorSelected}
922
+ indicator="has_neuropathies"
923
+ />
924
+ </td>
691
925
  </tr>
692
926
 
693
927
  <tr className={styles.sectionHeader}>
@@ -711,7 +945,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
711
945
  indicator="dc__gender__F__screened_for_diabetic_foot_this_month"
712
946
  />
713
947
  </td>
714
- <td className={styles.darkBorder}></td>
948
+ <td className={styles.darkBorder}>
949
+ <DataCell
950
+ value={moh740Data.screened_for_diabetic_foot_this_month}
951
+ indicatorSelected={handleIndicatorSelected}
952
+ indicator="screened_for_diabetic_foot_this_month"
953
+ />
954
+ </td>
715
955
  </tr>
716
956
  <tr>
717
957
  <td className={styles.darkBorder}>No. of patients with diabetic foot (new diagnosis)</td>
@@ -729,7 +969,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
729
969
  indicator="dc__gender__F__has_diabetic_foot"
730
970
  />
731
971
  </td>
732
- <td className={styles.darkBorder}></td>
972
+ <td className={styles.darkBorder}>
973
+ <DataCell
974
+ value={moh740Data.has_diabetic_foot}
975
+ indicatorSelected={handleIndicatorSelected}
976
+ indicator="has_diabetic_foot"
977
+ />
978
+ </td>
733
979
  </tr>
734
980
  <tr>
735
981
  <td className={styles.darkBorder}>No. of Amputation due to diabetic foot</td>
@@ -747,7 +993,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
747
993
  indicator="dc__gender__F__amputation_due_to_diabetic_foot"
748
994
  />
749
995
  </td>
750
- <td className={styles.darkBorder}></td>
996
+ <td className={styles.darkBorder}>
997
+ <DataCell
998
+ value={moh740Data.amputation_due_to_diabetic_foot}
999
+ indicatorSelected={handleIndicatorSelected}
1000
+ indicator="amputation_due_to_diabetic_foot"
1001
+ />
1002
+ </td>
751
1003
  </tr>
752
1004
 
753
1005
  <tr className={styles.sectionHeader}>
@@ -783,7 +1035,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
783
1035
  indicator="dc__gender__F__screened_for_tb_this_month"
784
1036
  />
785
1037
  </td>
786
- <td className={styles.darkBorder}></td>
1038
+ <td className={styles.darkBorder}>
1039
+ <DataCell
1040
+ value={moh740Data.screened_for_tb_this_month}
1041
+ indicatorSelected={handleIndicatorSelected}
1042
+ indicator="screened_for_tb_this_month"
1043
+ />
1044
+ </td>
787
1045
  </tr>
788
1046
  <tr>
789
1047
  <td className={styles.darkBorder}>No. Screened Positive for Tuberculosis</td>
@@ -796,12 +1054,18 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
796
1054
  </td>
797
1055
  <td className={styles.darkBorder}>
798
1056
  <DataCell
799
- value={moh740Data.dc__gender__M__screened_postive_for_tb_this_month}
1057
+ value={moh740Data.dc__gender__F__screened_postive_for_tb_this_month}
800
1058
  indicatorSelected={handleIndicatorSelected}
801
- indicator="dc__gender__M__screened_postive_for_tb_this_month"
1059
+ indicator="dc__gender____screened_postive_for_tb_this_month"
1060
+ />
1061
+ </td>
1062
+ <td className={styles.darkBorder}>
1063
+ <DataCell
1064
+ value={moh740Data.screened_postive_for_tb_this_month}
1065
+ indicatorSelected={handleIndicatorSelected}
1066
+ indicator="screened_postive_for_tb_this_month"
802
1067
  />
803
1068
  </td>
804
- <td className={styles.darkBorder}></td>
805
1069
  </tr>
806
1070
  <tr>
807
1071
  <td className={styles.darkBorder}>No. enrolled with NHIF</td>
@@ -819,7 +1083,13 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
819
1083
  indicator="dc__gender__F__covered_by_shif"
820
1084
  />
821
1085
  </td>
822
- <td className={styles.darkBorder}></td>
1086
+ <td className={styles.darkBorder}>
1087
+ <DataCell
1088
+ value={moh740Data.covered_by_shif}
1089
+ indicatorSelected={handleIndicatorSelected}
1090
+ indicator="covered_by_shif"
1091
+ />
1092
+ </td>
823
1093
  </tr>
824
1094
 
825
1095
  <tr className={styles.subHeader}>
@@ -869,11 +1139,7 @@ const Moh740Report: React.FC<Moh740ReportProps> = () => {
869
1139
  </table>
870
1140
 
871
1141
  <div className={styles.signOff}>
872
- <p>
873
- Compiled by: Name: ___________________________________ Designation:
874
- ___________________________________
875
- </p>
876
- <p>Signature: ___________________________________ Date: ___________________________________</p>
1142
+
877
1143
  </div>
878
1144
  </>
879
1145
  ) : (