From 2b3ec3761561239b083a5029fe9ac52eaa63cf51 Mon Sep 17 00:00:00 2001
From: Faith Kamau <121166087+hiqedme@users.noreply.github.com>
Date: Thu, 6 Jun 2024 10:56:31 +0300
Subject: [PATCH 01/50] Poc 739 (#1752)

* POC-737: Development of MOH Registers

* POC-737: Development of MOH Registers

* POC-739: MOH 408 HIV Exposed Infant Registers

* POC-739 added data for HEI

---------

Co-authored-by: Alfred-Mutai <mutaialfr@gmail.com>
---
 .../hiv/data-analytics-hiv.module.ts          |  22 +-
 .../hiv/data-analytics-hiv.routes.ts          | 100 +++++++++
 .../anc-register/anc-register.component.css   |   0
 .../anc-register/anc-register.component.html  |  54 +++++
 .../anc-register.component.spec.ts            |  24 ++
 .../anc-register/anc-register.component.ts    | 161 ++++++++++++++
 .../cntdaily-register.component.css           |   0
 .../cntdaily-register.component.html          |  54 +++++
 .../cntdaily-register.component.spec.ts       |  24 ++
 .../cntdaily-register.component.ts            | 161 ++++++++++++++
 .../defaultertracing-register.component.css   |   0
 .../defaultertracing-register.component.html  |  54 +++++
 ...efaultertracing-register.component.spec.ts |  24 ++
 .../defaultertracing-register.component.ts    | 161 ++++++++++++++
 .../hei-register/hei-register.component.css   |   8 +
 .../hei-register/hei-register.component.html  | 206 ++++++++++++++++++
 .../hei-register.component.spec.ts            |  24 ++
 .../hei-register/hei-register.component.ts    | 167 ++++++++++++++
 .../htsrefferallinkage-register.component.css |   0
 ...htsrefferallinkage-register.component.html |  54 +++++
 ...refferallinkage-register.component.spec.ts |  24 ++
 .../htsrefferallinkage-register.component.ts  | 161 ++++++++++++++
 .../maternity-register.component.css          |   0
 .../maternity-register.component.html         |  54 +++++
 .../maternity-register.component.spec.ts      |  24 ++
 .../maternity-register.component.ts           | 161 ++++++++++++++
 .../nutrition-register.component.css          |   0
 .../nutrition-register.component.html         |  54 +++++
 .../nutrition-register.component.spec.ts      |  24 ++
 .../nutrition-register.component.ts           | 161 ++++++++++++++
 .../pnc-register/pnc-register.component.css   |   0
 .../pnc-register/pnc-register.component.html  |  54 +++++
 .../pnc-register.component.spec.ts            |  24 ++
 .../pnc-register/pnc-register.component.ts    | 161 ++++++++++++++
 .../prepdaily-register.component.css          |   0
 .../prepdaily-register.component.html         |  54 +++++
 .../prepdaily-register.component.spec.ts      |  24 ++
 .../prepdaily-register.component.ts           | 161 ++++++++++++++
 .../hiv/registers/registers.component.css     |   0
 .../hiv/registers/registers.component.html    |  27 +++
 .../hiv/registers/registers.component.spec.ts |  24 ++
 .../hiv/registers/registers.component.ts      |  79 +++++++
 .../etl-api/hei-register-resource.service.ts  |  58 +++++
 .../schema/analytics.dashboard.conf.json      |   6 +
 44 files changed, 2632 insertions(+), 1 deletion(-)
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/registers.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/registers.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/registers.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/registers.component.ts
 create mode 100644 src/app/etl-api/hei-register-resource.service.ts

diff --git a/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.module.ts b/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.module.ts
index f0664f9b7..d370a3a9e 100644
--- a/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.module.ts
+++ b/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.module.ts
@@ -44,6 +44,16 @@ import { TxMmdReportComponent } from './datim-reports/tx-mmd-report.component';
 import { TxRttReportComponent } from './datim-reports/tx-rtt-report.component';
 import { AhdReportComponent } from './ahd-report/ahd-report.component';
 import { PlhivNcdV2ReportComponent } from './plhiv-ncd-v2-report/plhiv-ncd-v2-report.component';
+import { RegistersComponent } from './registers/registers.component';
+import { HeiRegisterComponent } from './registers/hei-register/hei-register.component';
+import { AncRegisterComponent } from './registers/anc-register/anc-register.component';
+import { NutritionRegisterComponent } from './registers/nutrition-register/nutrition-register.component';
+import { MaternityRegisterComponent } from './registers/maternity-register/maternity-register.component';
+import { HtsrefferallinkageRegisterComponent } from './registers/htsrefferallinkage-register/htsrefferallinkage-register.component';
+import { PncRegisterComponent } from './registers/pnc-register/pnc-register.component';
+import { DefaultertracingRegisterComponent } from './registers/defaultertracing-register/defaultertracing-register.component';
+import { PrepdailyRegisterComponent } from './registers/prepdaily-register/prepdaily-register.component';
+import { CntdailyRegisterComponent } from './registers/cntdaily-register/cntdaily-register.component';
 
 @NgModule({
   imports: [
@@ -97,7 +107,17 @@ import { PlhivNcdV2ReportComponent } from './plhiv-ncd-v2-report/plhiv-ncd-v2-re
     TxMmdReportComponent,
     TxRttReportComponent,
     PlhivNcdV2ReportComponent,
-    AhdReportComponent
+    AhdReportComponent,
+    RegistersComponent,
+    HeiRegisterComponent,
+    AncRegisterComponent,
+    NutritionRegisterComponent,
+    MaternityRegisterComponent,
+    HtsrefferallinkageRegisterComponent,
+    PncRegisterComponent,
+    DefaultertracingRegisterComponent,
+    PrepdailyRegisterComponent,
+    CntdailyRegisterComponent
   ],
   providers: [
     DataAnalyticsDashboardService,
diff --git a/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.routes.ts b/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.routes.ts
index 2a04aba4e..1122e2fbd 100644
--- a/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.routes.ts
+++ b/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.routes.ts
@@ -59,6 +59,16 @@ import { PlhivNcdV2ReportPatientListComponent } from 'src/app/hiv-care-lib/plhiv
 import { PlhivNcdV2ReportComponent } from './plhiv-ncd-v2-report/plhiv-ncd-v2-report.component';
 import { CaseSurveillanceBaseComponent } from 'src/app/hiv-care-lib/dqa-reports/case-surveillance/case-surveillance-base/case-surveillance-base.component';
 import { CaseSurveillancePatientListComponent } from 'src/app/hiv-care-lib/dqa-reports/case-surveillance/case-surveillance-patient-list/case-surveillance-patient-list.component';
+import { RegistersComponent } from './registers/registers.component';
+import { HeiRegisterComponent } from './registers/hei-register/hei-register.component';
+import { AncRegisterComponent } from './registers/anc-register/anc-register.component';
+import { NutritionRegisterComponent } from './registers/nutrition-register/nutrition-register.component';
+import { MaternityRegisterComponent } from './registers/maternity-register/maternity-register.component';
+import { HtsrefferallinkageRegisterComponent } from './registers/htsrefferallinkage-register/htsrefferallinkage-register.component';
+import { PncRegisterComponent } from './registers/pnc-register/pnc-register.component';
+import { DefaultertracingRegisterComponent } from './registers/defaultertracing-register/defaultertracing-register.component';
+import { PrepdailyRegisterComponent } from './registers/prepdaily-register/prepdaily-register.component';
+import { CntdailyRegisterComponent } from './registers/cntdaily-register/cntdaily-register.component';
 
 const routes: Routes = [
   {
@@ -287,6 +297,96 @@ const routes: Routes = [
       }
     ]
   },
+  {
+    path: 'registers',
+    children: [
+      {
+        path: '',
+        component: RegistersComponent
+      },
+      {
+        path: 'hei-register',
+        children: [
+          {
+            path: '',
+            component: HeiRegisterComponent
+          }
+        ]
+      },
+      {
+        path: 'anc-register',
+        children: [
+          {
+            path: '',
+            component: AncRegisterComponent
+          }
+        ]
+      },
+      {
+        path: 'nutrition-register',
+        children: [
+          {
+            path: '',
+            component: NutritionRegisterComponent
+          }
+        ]
+      },
+      {
+        path: 'maternity-register',
+        children: [
+          {
+            path: '',
+            component: MaternityRegisterComponent
+          }
+        ]
+      },
+      {
+        path: 'htsrefferallinkage-register',
+        children: [
+          {
+            path: '',
+            component: HtsrefferallinkageRegisterComponent
+          }
+        ]
+      },
+      {
+        path: 'pnc-register',
+        children: [
+          {
+            path: '',
+            component: PncRegisterComponent
+          }
+        ]
+      },
+      {
+        path: 'defaultertracing-register',
+        children: [
+          {
+            path: '',
+            component: DefaultertracingRegisterComponent
+          }
+        ]
+      },
+      {
+        path: 'prepdaily-register',
+        children: [
+          {
+            path: '',
+            component: PrepdailyRegisterComponent
+          }
+        ]
+      },
+      {
+        path: 'cntdaily-register',
+        children: [
+          {
+            path: '',
+            component: CntdailyRegisterComponent
+          }
+        ]
+      }
+    ]
+  },
   {
     path: 'datim-report',
     children: [
diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
new file mode 100644
index 000000000..40a18d212
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
@@ -0,0 +1,54 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        [monthString]="_month"
+        (onMonthChange)="onMonthChange($event)"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+<div>
+  <p-tabView>
+    <p-tabPanel
+      header="Report View"
+      leftIcon="fa-file-pdf-o"
+      [selected]="currentViewBelow === 'pdf'"
+    >
+      <!-- <app-tx-ml-report-view
+        [SummaryData]="txnewReportSummaryData"
+        [sectionDefs]="columnDefs"
+        (CellSelection)="onIndicatorSelected($event)"
+        [reportDetails]="params"
+        [reportHeader]="reportName"
+      ></app-tx-ml-report-view> -->
+    </p-tabPanel>
+  </p-tabView>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.spec.ts
new file mode 100644
index 000000000..dc9a601fd
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AncRegisterComponent } from './anc-register.component';
+
+describe('AncRegisterComponent', () => {
+  let component: AncRegisterComponent;
+  let fixture: ComponentFixture<AncRegisterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [AncRegisterComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AncRegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
new file mode 100644
index 000000000..661cc2895
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
@@ -0,0 +1,161 @@
+import { Component, OnInit, Output } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+@Component({
+  selector: 'app-anc-register',
+  templateUrl: './anc-register.component.html',
+  styleUrls: ['./anc-register.component.css']
+})
+export class AncRegisterComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public txnewReportSummaryData: any = [];
+  public columnDefs: any = [];
+  public reportName = 'ANC Register';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'locationControl,monthControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  constructor(public router: Router, public route: ActivatedRoute) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment()
+            .subtract(1, 'M')
+            .endOf('month')
+            .format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl(params.location_uuid);
+    });
+    this.txnewReportSummaryData = [];
+    // this.getTxNewReport(this.params);
+  }
+
+  public storeParamsInUrl(param) {
+    this.params = {
+      locationUuids: param,
+      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      reportName: this.reportName,
+      _date: Moment(this._month).format('DD-MM-YYYY')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  // public getTxNewReport(params: any) {
+  //   this.isLoading = true;
+  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
+  //     if (data.error) {
+  //       this.showInfoMessage = true;
+  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
+  //       this.isLoading = false;
+  //     } else {
+  //       this.showInfoMessage = false;
+  //       this.columnDefs = data.sectionDefinitions;
+  //       this.txnewReportSummaryData = data.result;
+  //       this.calculateTotalSummary();
+  //       this.isLoading = false;
+  //       this.showDraftReportAlert(this._month);
+  //     }
+  //   });
+  // }
+
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.txnewReportSummaryData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.txnewReportSummaryData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: value.field,
+        indicatorHeader: value.headerName,
+        indicatorGender: value.gender,
+        month: this._month,
+        locationUuids: value.location,
+        currentView: this.currentView
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
new file mode 100644
index 000000000..40a18d212
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -0,0 +1,54 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        [monthString]="_month"
+        (onMonthChange)="onMonthChange($event)"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+<div>
+  <p-tabView>
+    <p-tabPanel
+      header="Report View"
+      leftIcon="fa-file-pdf-o"
+      [selected]="currentViewBelow === 'pdf'"
+    >
+      <!-- <app-tx-ml-report-view
+        [SummaryData]="txnewReportSummaryData"
+        [sectionDefs]="columnDefs"
+        (CellSelection)="onIndicatorSelected($event)"
+        [reportDetails]="params"
+        [reportHeader]="reportName"
+      ></app-tx-ml-report-view> -->
+    </p-tabPanel>
+  </p-tabView>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.spec.ts
new file mode 100644
index 000000000..afa8dd874
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { CntdailyRegisterComponent } from './cntdaily-register.component';
+
+describe('CntdailyRegisterComponent', () => {
+  let component: CntdailyRegisterComponent;
+  let fixture: ComponentFixture<CntdailyRegisterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [CntdailyRegisterComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CntdailyRegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
new file mode 100644
index 000000000..ac6aed7de
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
@@ -0,0 +1,161 @@
+import { Component, OnInit, Output } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+@Component({
+  selector: 'app-cntdaily-register',
+  templateUrl: './cntdaily-register.component.html',
+  styleUrls: ['./cntdaily-register.component.css']
+})
+export class CntdailyRegisterComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public txnewReportSummaryData: any = [];
+  public columnDefs: any = [];
+  public reportName = 'Care and Treatment Daily Activity';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'locationControl,monthControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  constructor(public router: Router, public route: ActivatedRoute) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment()
+            .subtract(1, 'M')
+            .endOf('month')
+            .format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl(params.location_uuid);
+    });
+    this.txnewReportSummaryData = [];
+    // this.getTxNewReport(this.params);
+  }
+
+  public storeParamsInUrl(param) {
+    this.params = {
+      locationUuids: param,
+      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      reportName: this.reportName,
+      _date: Moment(this._month).format('DD-MM-YYYY')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  // public getTxNewReport(params: any) {
+  //   this.isLoading = true;
+  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
+  //     if (data.error) {
+  //       this.showInfoMessage = true;
+  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
+  //       this.isLoading = false;
+  //     } else {
+  //       this.showInfoMessage = false;
+  //       this.columnDefs = data.sectionDefinitions;
+  //       this.txnewReportSummaryData = data.result;
+  //       this.calculateTotalSummary();
+  //       this.isLoading = false;
+  //       this.showDraftReportAlert(this._month);
+  //     }
+  //   });
+  // }
+
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.txnewReportSummaryData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.txnewReportSummaryData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: value.field,
+        indicatorHeader: value.headerName,
+        indicatorGender: value.gender,
+        month: this._month,
+        locationUuids: value.location,
+        currentView: this.currentView
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
new file mode 100644
index 000000000..40a18d212
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
@@ -0,0 +1,54 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        [monthString]="_month"
+        (onMonthChange)="onMonthChange($event)"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+<div>
+  <p-tabView>
+    <p-tabPanel
+      header="Report View"
+      leftIcon="fa-file-pdf-o"
+      [selected]="currentViewBelow === 'pdf'"
+    >
+      <!-- <app-tx-ml-report-view
+        [SummaryData]="txnewReportSummaryData"
+        [sectionDefs]="columnDefs"
+        (CellSelection)="onIndicatorSelected($event)"
+        [reportDetails]="params"
+        [reportHeader]="reportName"
+      ></app-tx-ml-report-view> -->
+    </p-tabPanel>
+  </p-tabView>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.spec.ts
new file mode 100644
index 000000000..85c755813
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DefaultertracingRegisterComponent } from './defaultertracing-register.component';
+
+describe('DefaultertracingRegisterComponent', () => {
+  let component: DefaultertracingRegisterComponent;
+  let fixture: ComponentFixture<DefaultertracingRegisterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [DefaultertracingRegisterComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DefaultertracingRegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
new file mode 100644
index 000000000..83b012c91
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
@@ -0,0 +1,161 @@
+import { Component, OnInit, Output } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+@Component({
+  selector: 'app-defaultertracing-register',
+  templateUrl: './defaultertracing-register.component.html',
+  styleUrls: ['./defaultertracing-register.component.css']
+})
+export class DefaultertracingRegisterComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public txnewReportSummaryData: any = [];
+  public columnDefs: any = [];
+  public reportName = 'Defaulter Tracing Register';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'locationControl,monthControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  constructor(public router: Router, public route: ActivatedRoute) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment()
+            .subtract(1, 'M')
+            .endOf('month')
+            .format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl(params.location_uuid);
+    });
+    this.txnewReportSummaryData = [];
+    // this.getTxNewReport(this.params);
+  }
+
+  public storeParamsInUrl(param) {
+    this.params = {
+      locationUuids: param,
+      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      reportName: this.reportName,
+      _date: Moment(this._month).format('DD-MM-YYYY')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  // public getTxNewReport(params: any) {
+  //   this.isLoading = true;
+  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
+  //     if (data.error) {
+  //       this.showInfoMessage = true;
+  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
+  //       this.isLoading = false;
+  //     } else {
+  //       this.showInfoMessage = false;
+  //       this.columnDefs = data.sectionDefinitions;
+  //       this.txnewReportSummaryData = data.result;
+  //       this.calculateTotalSummary();
+  //       this.isLoading = false;
+  //       this.showDraftReportAlert(this._month);
+  //     }
+  //   });
+  // }
+
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.txnewReportSummaryData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.txnewReportSummaryData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: value.field,
+        indicatorHeader: value.headerName,
+        indicatorGender: value.gender,
+        month: this._month,
+        locationUuids: value.location,
+        currentView: this.currentView
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.css
new file mode 100644
index 000000000..a6a8ced85
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.css
@@ -0,0 +1,8 @@
+tr,
+.table-bordered th,
+.table-bordered td {
+  border: 2px solid #000; /* Darker border color */
+}
+tbody tr {
+  height: 20px; /* Adjust the height as per your design */
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
new file mode 100644
index 000000000..fedc228d4
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
@@ -0,0 +1,206 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        [monthString]="_month"
+        (onMonthChange)="onMonthChange($event)"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot *ngIf="heiRegisterData && heiRegisterData.length > 0">
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b>HIV EXPOSED INFANT REGISTER MOH 408</b>
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th colspan="58">
+            Cohort: Month/Year
+            (MMM-YYYY).........................../..............................................
+          </th>
+        </tr>
+        <tr>
+          <th colspan="25">Infant and Mother/Guardian Information</th>
+          <th colspan="5" rowspan="2">
+            First HIV DNA PCR Test at Birth, 6 weeks or First Contact
+          </th>
+          <th colspan="4" rowspan="2">Second HIV DNA PCR Test</th>
+          <th colspan="4" rowspan="2">Third HIV DNA PCR Test</th>
+          <th colspan="4" rowspan="2">HEI Outcomes at 12 months</th>
+          <th colspan="4" rowspan="2">Confirmatory PCR</th>
+          <th colspan="4" rowspan="2">Antibody test (18 to 24 months)</th>
+          <th colspan="4" rowspan="2">HEI Outcomes at 24 months</th>
+          <th colspan="4" rowspan="4">Comments</th>
+        </tr>
+        <tr>
+          <th colspan="10">Registration Information</th>
+          <th colspan="11">Infant's information</th>
+          <th colspan="4">Parent's information</th>
+        </tr>
+        <tr>
+          <th colspan="1" rowspan="2">Serial No.</th>
+          <th colspan="3" rowspan="2">
+            Date of Collected enrollment (DD/MM/YYYY)
+          </th>
+          <th colspan="3">Birth Certificate Number</th>
+          <th colspan="3" rowspan="2">HEI ID (MFL-YYYY-NNNN)</th>
+          <th colspan="4" rowspan="2">Infant's Name</th>
+          <th colspan="2" rowspan="2">DOB (DD/MM/YYYY)</th>
+          <th colspan="2">Sex</th>
+          <th colspan="3">
+            Infant Prophylaxis 1=NVP, 2=AZT, 3=NVP &AZT, 4=None,
+          </th>
+          <th colspan="4">Father's/Mother's/Guardian's Name</th>
+          <th colspan="1" rowspan="2">Age at Test (in wks)</th>
+          <th colspan="2" rowspan="2">
+            Type of Test 1=At Birth 2=at 6 weeks 3=at First Contact
+          </th>
+          <th colspan="2">Date Sample Collected</th>
+          <th colspan="2" rowspan="2">Age at Test (in months)</th>
+          <th colspan="2">Date Sample Collected</th>
+          <th colspan="2" rowspan="2">Age at Test (in months)</th>
+          <th colspan="2">Date Sample Collected</th>
+          <th colspan="2">Infant Feeding</th>
+          <th colspan="2" rowspan="2">
+            1=Infected 2= Uninfected 3=Lost to Follow 4=Transfer Out 5=Dead
+          </th>
+          <th colspan="2" rowspan="2">Age at Test (in months)</th>
+          <th colspan="2">Date Sample Collected</th>
+          <th colspan="2" rowspan="2">Age at Test (in months)</th>
+          <th colspan="2">Date Sample Collected</th>
+          <th colspan="2">Infant Feeding</th>
+          <th colspan="2" rowspan="2">
+            1=Infected 2= Uninfected 3=Lost to Follow 4=Transfer Out 5=Dead
+          </th>
+        </tr>
+        <tr>
+          <th colspan="3">Client Unique Number (NUPI)</th>
+          <th colspan="2">(M/F)</th>
+          <th colspan="3">(M/F)</th>
+          <th colspan="4">Telephone number</th>
+          <th colspan="2">Test result (P,N)</th>
+          <th colspan="2">Test result (P,N)</th>
+          <th colspan="2">Test result (P,N)</th>
+          <th colspan="2">BF=Breastfeeding NBF=Not Breastfeeding</th>
+          <th colspan="2">Test result (P,N)</th>
+          <th colspan="2">Test result (P,N)</th>
+          <th colspan="2">BF=Breastfeeding NBF=Not Breastfeeding</th>
+        </tr>
+        <tr>
+          <th class="text-center">(a)</th>
+          <th colspan="3" class="text-center">(b)</th>
+          <th colspan="3" class="text-center">(c)</th>
+          <th colspan="3" class="text-center">(d)</th>
+          <th colspan="4" class="text-center">(e)</th>
+          <th colspan="2" class="text-center">(f)</th>
+          <th colspan="2" class="text-center">(g)</th>
+          <th colspan="3" class="text-center">(h)</th>
+          <th colspan="4" class="text-center">(i)</th>
+          <th class="text-center">(j)</th>
+          <th colspan="2" class="text-center">(k)</th>
+          <th colspan="2" class="text-center">(l)</th>
+          <th colspan="2" class="text-center">(m)</th>
+          <th colspan="2" class="text-center">(n)</th>
+          <th colspan="2" class="text-center">(o)</th>
+          <th colspan="2" class="text-center">(p)</th>
+          <th colspan="2" class="text-center">(q)</th>
+          <th colspan="2" class="text-center">(r)</th>
+          <th colspan="2" class="text-center">(s)</th>
+          <th colspan="2" class="text-center">(t)</th>
+          <th colspan="2" class="text-center">(u)</th>
+          <th colspan="2" class="text-center">(v)</th>
+          <th colspan="2" class="text-center">(w)</th>
+          <th colspan="2" class="text-center">(x)</th>
+          <th colspan="4" class="text-center">(y)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <ng-container
+            *ngFor="let data of heiRegisterData; let a = index"
+          >
+          <tr>
+            <td class="text-center" rowspan="2">{{a+1}}</td>
+            <td colspan="3" class="text-center" rowspan="2">{{data.date_enrolled}}</td>
+            <td colspan="3" class="text-center">{{data.Birth_Certificate_number}}</td>
+            <td colspan="3" class="text-center" rowspan="2">{{data.HEI_ID}}</td>
+            <td colspan="4" class="text-center" rowspan="2">{{data.Infant_name}}</td>
+            <td colspan="2" class="text-center" rowspan="2">{{data.birth_date}}</td>
+            <td colspan="2" class="text-center">Sex</td>
+            <td colspan="3" class="text-center" rowspan="2">{{null}}</td>
+            <td colspan="4" class="text-center">{{data.parent_name}}</td>
+            <td class="text-center" rowspan="2">{{data.age_in_weeks_on_first_pcr}}</td>
+            <td colspan="2" class="text-center" rowspan="2">{{date_enrolled}}</td>
+            <td colspan="2" class="text-center">{{data.first_pcr_date}}</td>
+            <td colspan="2" class="text-center" rowspan="2">{{data.age_in_months_on_second_pcr}}</td>
+            <td colspan="2" class="text-center">{{data.second_pcr_date}}</td>
+            <td colspan="2" class="text-center" rowspan="2">{{data.age_in_months_on_third_pcr}}</td>
+            <td colspan="2" class="text-center">{{data.third_pcr_date}}</td>
+            <td colspan="2" class="text-center">Infant Feeding</td>
+            <td colspan="2" class="text-center" rowspan="2">{{data.hei_outcome}}</td>
+            <td colspan="2" class="text-center" rowspan="2">{{data.age_in_months_on_confirm_pcr}}</td>
+            <td colspan="2" class="text-center">{{data.confirm_pcr_date}}</td>
+            <td colspan="2" class="text-center" rowspan="2">{{data.age_in_months_on_first_antibody}}</td>
+            <td colspan="2" class="text-center">{{data.first_antibody_date}}</td>
+            <td colspan="2" class="text-center">{{null}}</td>
+            <td colspan="2" class="text-center">{{null}}</td>
+            <td colspan="4" class="text-center" rowspan="2">{{null}}</td>
+          </tr>
+          <tr>
+            <td colspan="3" class="text-center">{{data.NUPI}}</td>
+            <td colspan="2" class="text-center">{{data.gender}}</td>
+            <td colspan="4" class="text-center">{{data.Phone_Number}}</td>
+            <td colspan="2" class="text-center">{{data.results_pcr_first_pcr}}</td>
+            <td colspan="2" class="text-center">{{data.results_pcr_second_pcr}}</td>
+            <td colspan="2" class="text-center">{{data.results_pcr_third_pcr}}</td>
+            <td colspan="2" class="text-center">{{data.infant_feeding}}</td>
+            <td colspan="2" class="text-center">{{data.results_confirm_pcr}}</td>
+            <td colspan="2" class="text-center">{{data.results_first_antibody}}</td>
+            <td colspan="2" class="text-center">{{null}}</td>
+            <td colspan="2" class="text-center">{{null}}</td>
+          </tr>
+        </ng-container>
+
+
+       
+       
+      </tbody>
+    </table>
+  </div>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.spec.ts
new file mode 100644
index 000000000..19143ac64
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HeiRegisterComponent } from './hei-register.component';
+
+describe('HeiRegisterComponent', () => {
+  let component: HeiRegisterComponent;
+  let fixture: ComponentFixture<HeiRegisterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [HeiRegisterComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HeiRegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
new file mode 100644
index 000000000..5721caff6
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
@@ -0,0 +1,167 @@
+import { Component, OnInit, Output } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+import { HeiRegisterResourceService } from 'src/app/etl-api/hei-register-resource.service';
+@Component({
+  selector: 'app-hei-register',
+  templateUrl: './hei-register.component.html',
+  styleUrls: ['./hei-register.component.css']
+})
+export class HeiRegisterComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public heiRegisterData: any = [];
+  public columnDefs: any = [];
+  public reportName = 'HEI Register';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'locationControl,monthControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public heiRegisterService: HeiRegisterResourceService
+  ) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment()
+            .subtract(1, 'M')
+            .endOf('month')
+            .format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl(params.location_uuid);
+    });
+    this.heiRegisterData = [];
+    this.getHeiRegisterData(this.params);
+  }
+
+  public storeParamsInUrl(param) {
+    this.params = {
+      locationUuids: param,
+      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      reportName: this.reportName,
+      _date: Moment(this._month).format('DD-MM-YYYY')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  public getHeiRegisterData(params: any) {
+    this.isLoading = true;
+    this.heiRegisterService.getHeiRegister(params).subscribe((data) => {
+      if (data.error) {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      } else {
+        console.log('HeiDataSummary: ', data);
+        this.showInfoMessage = false;
+        this.columnDefs = data.sectionDefinitions;
+        this.heiRegisterData = data;
+        //  this.calculateTotalSummary();
+        this.isLoading = false;
+        this.showDraftReportAlert(this._month);
+      }
+    });
+  }
+
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.heiRegisterData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.heiRegisterData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: value.field,
+        indicatorHeader: value.headerName,
+        indicatorGender: value.gender,
+        month: this._month,
+        locationUuids: value.location,
+        currentView: this.currentView
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
new file mode 100644
index 000000000..40a18d212
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
@@ -0,0 +1,54 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        [monthString]="_month"
+        (onMonthChange)="onMonthChange($event)"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+<div>
+  <p-tabView>
+    <p-tabPanel
+      header="Report View"
+      leftIcon="fa-file-pdf-o"
+      [selected]="currentViewBelow === 'pdf'"
+    >
+      <!-- <app-tx-ml-report-view
+        [SummaryData]="txnewReportSummaryData"
+        [sectionDefs]="columnDefs"
+        (CellSelection)="onIndicatorSelected($event)"
+        [reportDetails]="params"
+        [reportHeader]="reportName"
+      ></app-tx-ml-report-view> -->
+    </p-tabPanel>
+  </p-tabView>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.spec.ts
new file mode 100644
index 000000000..925245470
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HtsrefferallinkageRegisterComponent } from './htsrefferallinkage-register.component';
+
+describe('HtsrefferallinkageRegisterComponent', () => {
+  let component: HtsrefferallinkageRegisterComponent;
+  let fixture: ComponentFixture<HtsrefferallinkageRegisterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [HtsrefferallinkageRegisterComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HtsrefferallinkageRegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
new file mode 100644
index 000000000..503ec25fc
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
@@ -0,0 +1,161 @@
+import { Component, OnInit, Output } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+@Component({
+  selector: 'app-htsrefferallinkage-register',
+  templateUrl: './htsrefferallinkage-register.component.html',
+  styleUrls: ['./htsrefferallinkage-register.component.css']
+})
+export class HtsrefferallinkageRegisterComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public txnewReportSummaryData: any = [];
+  public columnDefs: any = [];
+  public reportName = 'HTS Lab Refferal & Linkage Register';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'locationControl,monthControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  constructor(public router: Router, public route: ActivatedRoute) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment()
+            .subtract(1, 'M')
+            .endOf('month')
+            .format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl(params.location_uuid);
+    });
+    this.txnewReportSummaryData = [];
+    // this.getTxNewReport(this.params);
+  }
+
+  public storeParamsInUrl(param) {
+    this.params = {
+      locationUuids: param,
+      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      reportName: this.reportName,
+      _date: Moment(this._month).format('DD-MM-YYYY')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  // public getTxNewReport(params: any) {
+  //   this.isLoading = true;
+  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
+  //     if (data.error) {
+  //       this.showInfoMessage = true;
+  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
+  //       this.isLoading = false;
+  //     } else {
+  //       this.showInfoMessage = false;
+  //       this.columnDefs = data.sectionDefinitions;
+  //       this.txnewReportSummaryData = data.result;
+  //       this.calculateTotalSummary();
+  //       this.isLoading = false;
+  //       this.showDraftReportAlert(this._month);
+  //     }
+  //   });
+  // }
+
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.txnewReportSummaryData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.txnewReportSummaryData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: value.field,
+        indicatorHeader: value.headerName,
+        indicatorGender: value.gender,
+        month: this._month,
+        locationUuids: value.location,
+        currentView: this.currentView
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
new file mode 100644
index 000000000..40a18d212
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
@@ -0,0 +1,54 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        [monthString]="_month"
+        (onMonthChange)="onMonthChange($event)"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+<div>
+  <p-tabView>
+    <p-tabPanel
+      header="Report View"
+      leftIcon="fa-file-pdf-o"
+      [selected]="currentViewBelow === 'pdf'"
+    >
+      <!-- <app-tx-ml-report-view
+        [SummaryData]="txnewReportSummaryData"
+        [sectionDefs]="columnDefs"
+        (CellSelection)="onIndicatorSelected($event)"
+        [reportDetails]="params"
+        [reportHeader]="reportName"
+      ></app-tx-ml-report-view> -->
+    </p-tabPanel>
+  </p-tabView>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.spec.ts
new file mode 100644
index 000000000..1a50a56fd
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { MaternityRegisterComponent } from './maternity-register.component';
+
+describe('MaternityRegisterComponent', () => {
+  let component: MaternityRegisterComponent;
+  let fixture: ComponentFixture<MaternityRegisterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [MaternityRegisterComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MaternityRegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts
new file mode 100644
index 000000000..8fe1183d4
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts
@@ -0,0 +1,161 @@
+import { Component, OnInit, Output } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+@Component({
+  selector: 'app-maternity-register',
+  templateUrl: './maternity-register.component.html',
+  styleUrls: ['./maternity-register.component.css']
+})
+export class MaternityRegisterComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public txnewReportSummaryData: any = [];
+  public columnDefs: any = [];
+  public reportName = 'Martenity Register';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'locationControl,monthControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  constructor(public router: Router, public route: ActivatedRoute) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment()
+            .subtract(1, 'M')
+            .endOf('month')
+            .format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl(params.location_uuid);
+    });
+    this.txnewReportSummaryData = [];
+    // this.getTxNewReport(this.params);
+  }
+
+  public storeParamsInUrl(param) {
+    this.params = {
+      locationUuids: param,
+      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      reportName: this.reportName,
+      _date: Moment(this._month).format('DD-MM-YYYY')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  // public getTxNewReport(params: any) {
+  //   this.isLoading = true;
+  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
+  //     if (data.error) {
+  //       this.showInfoMessage = true;
+  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
+  //       this.isLoading = false;
+  //     } else {
+  //       this.showInfoMessage = false;
+  //       this.columnDefs = data.sectionDefinitions;
+  //       this.txnewReportSummaryData = data.result;
+  //       this.calculateTotalSummary();
+  //       this.isLoading = false;
+  //       this.showDraftReportAlert(this._month);
+  //     }
+  //   });
+  // }
+
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.txnewReportSummaryData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.txnewReportSummaryData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: value.field,
+        indicatorHeader: value.headerName,
+        indicatorGender: value.gender,
+        month: this._month,
+        locationUuids: value.location,
+        currentView: this.currentView
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
new file mode 100644
index 000000000..40a18d212
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
@@ -0,0 +1,54 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        [monthString]="_month"
+        (onMonthChange)="onMonthChange($event)"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+<div>
+  <p-tabView>
+    <p-tabPanel
+      header="Report View"
+      leftIcon="fa-file-pdf-o"
+      [selected]="currentViewBelow === 'pdf'"
+    >
+      <!-- <app-tx-ml-report-view
+        [SummaryData]="txnewReportSummaryData"
+        [sectionDefs]="columnDefs"
+        (CellSelection)="onIndicatorSelected($event)"
+        [reportDetails]="params"
+        [reportHeader]="reportName"
+      ></app-tx-ml-report-view> -->
+    </p-tabPanel>
+  </p-tabView>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.spec.ts
new file mode 100644
index 000000000..02a62ca91
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NutritionRegisterComponent } from './nutrition-register.component';
+
+describe('NutritionRegisterComponent', () => {
+  let component: NutritionRegisterComponent;
+  let fixture: ComponentFixture<NutritionRegisterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [NutritionRegisterComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NutritionRegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.ts
new file mode 100644
index 000000000..3240e3fd1
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.ts
@@ -0,0 +1,161 @@
+import { Component, OnInit, Output } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+@Component({
+  selector: 'app-nutrition-register',
+  templateUrl: './nutrition-register.component.html',
+  styleUrls: ['./nutrition-register.component.css']
+})
+export class NutritionRegisterComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public txnewReportSummaryData: any = [];
+  public columnDefs: any = [];
+  public reportName = 'Nutrition Service Register';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'locationControl,monthControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  constructor(public router: Router, public route: ActivatedRoute) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment()
+            .subtract(1, 'M')
+            .endOf('month')
+            .format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl(params.location_uuid);
+    });
+    this.txnewReportSummaryData = [];
+    // this.getTxNewReport(this.params);
+  }
+
+  public storeParamsInUrl(param) {
+    this.params = {
+      locationUuids: param,
+      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      reportName: this.reportName,
+      _date: Moment(this._month).format('DD-MM-YYYY')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  // public getTxNewReport(params: any) {
+  //   this.isLoading = true;
+  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
+  //     if (data.error) {
+  //       this.showInfoMessage = true;
+  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
+  //       this.isLoading = false;
+  //     } else {
+  //       this.showInfoMessage = false;
+  //       this.columnDefs = data.sectionDefinitions;
+  //       this.txnewReportSummaryData = data.result;
+  //       this.calculateTotalSummary();
+  //       this.isLoading = false;
+  //       this.showDraftReportAlert(this._month);
+  //     }
+  //   });
+  // }
+
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.txnewReportSummaryData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.txnewReportSummaryData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: value.field,
+        indicatorHeader: value.headerName,
+        indicatorGender: value.gender,
+        month: this._month,
+        locationUuids: value.location,
+        currentView: this.currentView
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html
new file mode 100644
index 000000000..40a18d212
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html
@@ -0,0 +1,54 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        [monthString]="_month"
+        (onMonthChange)="onMonthChange($event)"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+<div>
+  <p-tabView>
+    <p-tabPanel
+      header="Report View"
+      leftIcon="fa-file-pdf-o"
+      [selected]="currentViewBelow === 'pdf'"
+    >
+      <!-- <app-tx-ml-report-view
+        [SummaryData]="txnewReportSummaryData"
+        [sectionDefs]="columnDefs"
+        (CellSelection)="onIndicatorSelected($event)"
+        [reportDetails]="params"
+        [reportHeader]="reportName"
+      ></app-tx-ml-report-view> -->
+    </p-tabPanel>
+  </p-tabView>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.spec.ts
new file mode 100644
index 000000000..bc56e4b5d
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PncRegisterComponent } from './pnc-register.component';
+
+describe('PncRegisterComponent', () => {
+  let component: PncRegisterComponent;
+  let fixture: ComponentFixture<PncRegisterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [PncRegisterComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PncRegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.ts
new file mode 100644
index 000000000..160dead32
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.ts
@@ -0,0 +1,161 @@
+import { Component, OnInit, Output } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+@Component({
+  selector: 'app-pnc-register',
+  templateUrl: './pnc-register.component.html',
+  styleUrls: ['./pnc-register.component.css']
+})
+export class PncRegisterComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public txnewReportSummaryData: any = [];
+  public columnDefs: any = [];
+  public reportName = 'PNC Register';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'locationControl,monthControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  constructor(public router: Router, public route: ActivatedRoute) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment()
+            .subtract(1, 'M')
+            .endOf('month')
+            .format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl(params.location_uuid);
+    });
+    this.txnewReportSummaryData = [];
+    // this.getTxNewReport(this.params);
+  }
+
+  public storeParamsInUrl(param) {
+    this.params = {
+      locationUuids: param,
+      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      reportName: this.reportName,
+      _date: Moment(this._month).format('DD-MM-YYYY')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  // public getTxNewReport(params: any) {
+  //   this.isLoading = true;
+  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
+  //     if (data.error) {
+  //       this.showInfoMessage = true;
+  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
+  //       this.isLoading = false;
+  //     } else {
+  //       this.showInfoMessage = false;
+  //       this.columnDefs = data.sectionDefinitions;
+  //       this.txnewReportSummaryData = data.result;
+  //       this.calculateTotalSummary();
+  //       this.isLoading = false;
+  //       this.showDraftReportAlert(this._month);
+  //     }
+  //   });
+  // }
+
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.txnewReportSummaryData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.txnewReportSummaryData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: value.field,
+        indicatorHeader: value.headerName,
+        indicatorGender: value.gender,
+        month: this._month,
+        locationUuids: value.location,
+        currentView: this.currentView
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
new file mode 100644
index 000000000..40a18d212
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
@@ -0,0 +1,54 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        [monthString]="_month"
+        (onMonthChange)="onMonthChange($event)"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+<div>
+  <p-tabView>
+    <p-tabPanel
+      header="Report View"
+      leftIcon="fa-file-pdf-o"
+      [selected]="currentViewBelow === 'pdf'"
+    >
+      <!-- <app-tx-ml-report-view
+        [SummaryData]="txnewReportSummaryData"
+        [sectionDefs]="columnDefs"
+        (CellSelection)="onIndicatorSelected($event)"
+        [reportDetails]="params"
+        [reportHeader]="reportName"
+      ></app-tx-ml-report-view> -->
+    </p-tabPanel>
+  </p-tabView>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.spec.ts
new file mode 100644
index 000000000..b44182395
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PrepdailyRegisterComponent } from './prepdaily-register.component';
+
+describe('PrepdailyRegisterComponent', () => {
+  let component: PrepdailyRegisterComponent;
+  let fixture: ComponentFixture<PrepdailyRegisterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [PrepdailyRegisterComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PrepdailyRegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
new file mode 100644
index 000000000..c982e94bd
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
@@ -0,0 +1,161 @@
+import { Component, OnInit, Output } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+@Component({
+  selector: 'app-prepdaily-register',
+  templateUrl: './prepdaily-register.component.html',
+  styleUrls: ['./prepdaily-register.component.css']
+})
+export class PrepdailyRegisterComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public txnewReportSummaryData: any = [];
+  public columnDefs: any = [];
+  public reportName = 'PrEP Daily Activity Register';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'locationControl,monthControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  constructor(public router: Router, public route: ActivatedRoute) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment()
+            .subtract(1, 'M')
+            .endOf('month')
+            .format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl(params.location_uuid);
+    });
+    this.txnewReportSummaryData = [];
+    // this.getTxNewReport(this.params);
+  }
+
+  public storeParamsInUrl(param) {
+    this.params = {
+      locationUuids: param,
+      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
+      reportName: this.reportName,
+      _date: Moment(this._month).format('DD-MM-YYYY')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  // public getTxNewReport(params: any) {
+  //   this.isLoading = true;
+  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
+  //     if (data.error) {
+  //       this.showInfoMessage = true;
+  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
+  //       this.isLoading = false;
+  //     } else {
+  //       this.showInfoMessage = false;
+  //       this.columnDefs = data.sectionDefinitions;
+  //       this.txnewReportSummaryData = data.result;
+  //       this.calculateTotalSummary();
+  //       this.isLoading = false;
+  //       this.showDraftReportAlert(this._month);
+  //     }
+  //   });
+  // }
+
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.txnewReportSummaryData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.txnewReportSummaryData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: value.field,
+        indicatorHeader: value.headerName,
+        indicatorGender: value.gender,
+        month: this._month,
+        locationUuids: value.location,
+        currentView: this.currentView
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/registers.component.css b/src/app/data-analytics-dashboard/hiv/registers/registers.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/registers/registers.component.html b/src/app/data-analytics-dashboard/hiv/registers/registers.component.html
new file mode 100644
index 000000000..e040fcba0
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/registers.component.html
@@ -0,0 +1,27 @@
+<!--component html goes here -->
+<h3 *ngIf="isBusy">Loading available dashboards ...</h3>
+<div
+  *ngIf="!isBusy && errorMessage !== ''"
+  style="border: 1px solid gray; padding: 4px; color: darkred"
+>
+  <span class="fa fa-warning"></span> {{ errorMessage }}
+</div>
+<div *ngIf="!isBusy && errorMessage === ''">
+  <div class="row">
+    <div
+      *ngFor="let dashboard of dashboards"
+      class="card-item col-md-4 col-sm-4 col-lg-4 col-xs-12"
+    >
+      <a (click)="viewDashboard(dashboard)">
+        <div class="thumbnail dashboard-card" style="padding: 4px">
+          <div class="caption">
+            <h4>{{ dashboard.title }}</h4>
+            <hr class="intro-divider dashboard-divider" />
+            <span class="fa fa-3x {{ dashboard.icon }} fa-fw"></span>
+            <h5>{{ dashboard.description }}</h5>
+          </div>
+        </div>
+      </a>
+    </div>
+  </div>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/registers.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/registers.component.spec.ts
new file mode 100644
index 000000000..769a029a0
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/registers.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { RegistersComponent } from './registers.component';
+
+describe('RegistersComponent', () => {
+  let component: RegistersComponent;
+  let fixture: ComponentFixture<RegistersComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [RegistersComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RegistersComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/registers.component.ts b/src/app/data-analytics-dashboard/hiv/registers/registers.component.ts
new file mode 100644
index 000000000..92750254f
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/registers.component.ts
@@ -0,0 +1,79 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+
+@Component({
+  selector: 'app-registers',
+  templateUrl: './registers.component.html',
+  styleUrls: ['./registers.component.css']
+})
+export class RegistersComponent implements OnInit {
+  public isBusy = false;
+  public errorMessage = '';
+
+  public dashboards: Array<any> = [];
+  constructor(public router: Router, public route: ActivatedRoute) {}
+
+  ngOnInit() {
+    this.dashboards = [
+      {
+        title: 'MOH-408: HEI Register',
+        description: '',
+        url: 'hei-register',
+        icon: 'fa'
+      },
+      {
+        title: 'MOH-405: ANC Register',
+        description: '',
+        url: 'anc-register',
+        icon: 'fa'
+      },
+      {
+        title: 'MOH-407: Nutrition Service Register',
+        description: '',
+        url: 'nutrition-register',
+        icon: 'fa'
+      },
+      {
+        title: 'MOH-333: Martenity Register',
+        description: '',
+        url: 'maternity-register',
+        icon: 'fa'
+      },
+      {
+        title: 'MOH-362: HTS Lab Refferal & Linkage Register',
+        description: '',
+        url: 'htsrefferallinkage-register',
+        icon: 'fa'
+      },
+      {
+        title: 'MOH-406: PNC Register',
+        description: '',
+        url: 'pnc-register',
+        icon: 'fa'
+      },
+      {
+        title: 'Defaulter Tracing Register',
+        description: '',
+        url: 'defaultertracing-register',
+        icon: 'fa'
+      },
+      {
+        title: 'MOH-267: PrEP Daily Activity Register',
+        description: '',
+        url: 'prepdaily-register',
+        icon: 'fa'
+      },
+      {
+        title: 'MOH-366: Care and Treatment Daily Activity',
+        description: '',
+        url: 'cntdaily-register',
+        icon: 'fa'
+      }
+    ];
+  }
+  public viewDashboard(dashboard: any) {
+    this.router.navigate([dashboard.url], {
+      relativeTo: this.route
+    });
+  }
+}
diff --git a/src/app/etl-api/hei-register-resource.service.ts b/src/app/etl-api/hei-register-resource.service.ts
new file mode 100644
index 000000000..9fe930f89
--- /dev/null
+++ b/src/app/etl-api/hei-register-resource.service.ts
@@ -0,0 +1,58 @@
+import { Injectable } from '@angular/core';
+import { AppSettingsService } from '../app-settings/app-settings.service';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import * as Moment from 'moment';
+import { catchError, map } from 'rxjs/operators';
+@Injectable({
+  providedIn: 'root'
+})
+export class HeiRegisterResourceService {
+  public get url(): string {
+    return this.appSettingsService.getEtlRestbaseurl().trim();
+  }
+  constructor(
+    public http: HttpClient,
+    public appSettingsService: AppSettingsService
+  ) {}
+  public getHeiRegister(params: any): Observable<any> {
+    // tslint:disable-next-line: max-line-length
+    return this.http
+      .get(
+        `${this.url}hei-register?endDate=${params.month}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+  public getTxNewPatientList(params: any): Observable<any> {
+    // tslint:disable-next-line: max-line-length
+    return this.http
+      .get(
+        `${this.url}txnew-summary-patient-list?endDate=${params.month}&locationUuids=${params.locationUuids}&indicators=${params.indicators}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+}
diff --git a/src/app/shared/dynamic-route/schema/analytics.dashboard.conf.json b/src/app/shared/dynamic-route/schema/analytics.dashboard.conf.json
index 0cc6d3a9c..ebd82770a 100644
--- a/src/app/shared/dynamic-route/schema/analytics.dashboard.conf.json
+++ b/src/app/shared/dynamic-route/schema/analytics.dashboard.conf.json
@@ -114,6 +114,12 @@
           "icon": "fa fa-file",
           "isSideBarOpen": false
         },
+        {
+          "url": "registers",
+          "label": "Registers",
+          "icon": "fa fa-list-alt",
+          "isSideBarOpen": false
+        },
         {
           "url": "select-department",
           "label": "Change Department",

From 587bc2e1b7711aec55d7d2d74e460d38e67578d9 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Fri, 24 May 2024 15:29:39 +0300
Subject: [PATCH 02/50] POC-746: MOH 366 Care and Treatment Daily Activity

---
 .../cntdaily-register.component.css           |  14 +
 .../cntdaily-register.component.html          | 990 +++++++++++++++++-
 2 files changed, 988 insertions(+), 16 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css
index e69de29bb..7d7e743ba 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css
@@ -0,0 +1,14 @@
+tr,
+.table-bordered th,
+.table-bordered td {
+  border: 2px solid #000; /* Darker border color */
+}
+tbody tr {
+  height: 20px; /* Adjust the height as per your design */
+}
+.vertical-text {
+  writing-mode: vertical-rl;
+  text-orientation: mixed;
+  transform: rotate(180deg);
+  white-space: nowrap;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index 40a18d212..0dfc1180d 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -35,20 +35,978 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div>
-  <p-tabView>
-    <p-tabPanel
-      header="Report View"
-      leftIcon="fa-file-pdf-o"
-      [selected]="currentViewBelow === 'pdf'"
-    >
-      <!-- <app-tx-ml-report-view
-        [SummaryData]="txnewReportSummaryData"
-        [sectionDefs]="columnDefs"
-        (CellSelection)="onIndicatorSelected($event)"
-        [reportDetails]="params"
-        [reportHeader]="reportName"
-      ></app-tx-ml-report-view> -->
-    </p-tabPanel>
-  </p-tabView>
+
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b>HIV Care Treatment Daily Activity Register MOH 366</b>
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th rowspan="4">No</th>
+          <th colspan="2" rowspan="4">Date</th>
+          <th colspan="3">National Identification Number</th>
+          <th colspan="3" rowspan="4">Client CCC Number</th>
+          <th rowspan="4">Age</th>
+          <th colspan="14" class="text-centre">Starting ART</th>
+          <th colspan="4" class="text-centre">
+            TB in HIV Care <br />(Newly Initiated on ART)
+          </th>
+          <th colspan="14" class="text-centre">
+            Currently on ART (Starting and Continuing ART)
+          </th>
+          <th colspan="4" class="text-centre">DSD</th>
+          <th colspan="4" rowspan="4" class="text-centre">Remarks</th>
+        </tr>
+        <tr>
+          <th colspan="3" rowspan="3">Client Unique Number (NUPI)</th>
+          <th colspan="14" rowspan="2" class="text-centre">
+            Tick as appropriate for age
+          </th>
+          <th colspan="2">Screened for TB</th>
+          <th colspan="2">Started TPT</th>
+          <th colspan="14" rowspan="2" class="text-centre">
+            Indicate No. of months of till next appointment or <br />
+            "R"for patients making unscheduled visits
+          </th>
+          <th colspan="2">Status</th>
+          <th colspan="2">Type</th>
+        </tr>
+        <tr>
+          <th colspan="4" class="text-centre">Indicate Y/N/NA</th>
+          <th colspan="2" rowspan="2" class="text-center vertical-text">
+            E=Established <br />
+            NE=Not Established
+          </th>
+          <th colspan="2" rowspan="2" class="text-center">
+            C<br />
+            FT<br />
+            HFAG<br />
+            PFAG<br />
+            HCAG<br />
+            PCAG<br />
+            CP<br />
+            CADP<br />
+            IACD
+          </th>
+        </tr>
+        <tr>
+          <th class="text-center vertical-text">< 1 yrs (M)</th>
+          <th class="text-center vertical-text">< 1 yrs (F)</th>
+          <th class="text-center vertical-text">1-4 yrs (M)</th>
+          <th class="text-center vertical-text">1-4 yrs (F)</th>
+          <th class="text-center vertical-text">5-9 yrs (M)</th>
+          <th class="text-center vertical-text">5-9 yrs (F)</th>
+          <th class="text-center vertical-text">10-14 yrs (M)</th>
+          <th class="text-center vertical-text">10-14 yrs (F)</th>
+          <th class="text-center vertical-text">15-19 yrs (M)</th>
+          <th class="text-center vertical-text">15-19 yrs (F)</th>
+          <th class="text-center vertical-text">20-24 yrs(M)</th>
+          <th class="text-center vertical-text">20-24 yrs (F)</th>
+          <th class="text-center vertical-text">25+ yrs (M)</th>
+          <th class="text-center vertical-text">25+ yrs (F)</th>
+          <th class="text-center vertical-text">< 15 yrs</th>
+          <th class="text-center vertical-text">15+ yrs</th>
+          <th class="text-center vertical-text">< 15 yrs</th>
+          <th class="text-center vertical-text">15+ yrs</th>
+          <th class="text-center vertical-text">< 1 yrs (M)</th>
+          <th class="text-center vertical-text">< 1 yrs (F)</th>
+          <th class="text-center vertical-text">1-4 yrs (M)</th>
+          <th class="text-center vertical-text">1-4 yrs (F)</th>
+          <th class="text-center vertical-text">5-9 yrs (M)</th>
+          <th class="text-center vertical-text">5-9 yrs (F)</th>
+          <th class="text-center vertical-text">10-14 yrs (M)</th>
+          <th class="text-center vertical-text">10-14 yrs (F)</th>
+          <th class="text-center vertical-text">15-19 yrs (M)</th>
+          <th class="text-center vertical-text">15-19 yrs (F)</th>
+          <th class="text-center vertical-text">20-24 yrs(M)</th>
+          <th class="text-center vertical-text">20-24 yrs (F)</th>
+          <th class="text-center vertical-text">25+ yrs (M)</th>
+          <th class="text-center vertical-text">25+ yrs (F)</th>
+        </tr>
+        <tr>
+          <th class="text-center">(a)</th>
+          <th colspan="2" class="text-center">(b)</th>
+          <th colspan="3" class="text-center">(c)</th>
+          <th colspan="3" class="text-center">(d)</th>
+          <th class="text-center">(e)</th>
+          <th class="text-center">(f)</th>
+          <th class="text-center">(g)</th>
+          <th class="text-center">(h)</th>
+          <th class="text-center">(i)</th>
+          <th class="text-center">(j)</th>
+          <th class="text-center">(k)</th>
+          <th class="text-center">(l)</th>
+          <th class="text-center">(m)</th>
+          <th class="text-center">(n)</th>
+          <th class="text-center">(o)</th>
+          <th class="text-center">(q)</th>
+          <th class="text-center">(r)</th>
+          <th class="text-center">(s)</th>
+          <th class="text-center">(t)</th>
+          <th class="text-center">(u)</th>
+          <th class="text-center">(v)</th>
+          <th class="text-center">(w)</th>
+          <th class="text-center">(x)</th>
+          <th class="text-center">(y)</th>
+          <th class="text-center">(z)</th>
+          <th class="text-center">(aa)</th>
+          <th class="text-center">(ab)</th>
+          <th class="text-center">(ac)</th>
+          <th class="text-center">(ad)</th>
+          <th class="text-center">(ae)</th>
+          <th class="text-center">(af)</th>
+          <th class="text-center">(ag)</th>
+          <th class="text-center">(ah)</th>
+          <th class="text-center">(ai)</th>
+          <th class="text-center">(aj)</th>
+          <th class="text-center">(ak)</th>
+          <th class="text-center">(al)</th>
+          <th colspan="2" class="text-center">(am)</th>
+          <th colspan="2" class="text-center">(an)</th>
+          <th colspan="4" class="text-center">(ao)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="6" class="text-left"><b>Data element CODE</b></td>
+          <td colspan="3" class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center vertical-text">HV03-01</td>
+          <td class="text-center vertical-text">HV03-02</td>
+          <td class="text-center vertical-text">HV03-03</td>
+          <td class="text-center vertical-text">HV03-04</td>
+          <td class="text-center vertical-text">HV03-05</td>
+          <td class="text-center vertical-text">HV03-06</td>
+          <td class="text-center vertical-text">HV03-07</td>
+          <td class="text-center vertical-text">HV03-08</td>
+          <td class="text-center vertical-text">HV03-09</td>
+          <td class="text-center vertical-text">HV03-10</td>
+          <td class="text-center vertical-text">HV03-11</td>
+          <td class="text-center vertical-text">HV03-12</td>
+          <td class="text-center vertical-text">HV03-13</td>
+          <td class="text-center vertical-text">HV03-14</td>
+          <td class="text-center vertical-text">HV03-15</td>
+          <td class="text-center vertical-text">HV03-16</td>
+          <td class="text-center vertical-text">HV03-17</td>
+          <td class="text-center vertical-text">HV03-18</td>
+          <td class="text-center vertical-text">HV03-19</td>
+          <td class="text-center vertical-text">HV03-20</td>
+          <td class="text-center vertical-text">HV03-21</td>
+          <td class="text-center vertical-text">HV03-22</td>
+          <td class="text-center vertical-text">HV03-23</td>
+          <td class="text-center vertical-text">HV03-24</td>
+          <td class="text-center vertical-text">HV03-25</td>
+          <td class="text-center vertical-text">HV03-26</td>
+          <td class="text-center vertical-text">HV03-27</td>
+          <td class="text-center vertical-text">HV03-28</td>
+          <td class="text-center vertical-text">HV03-29</td>
+          <td class="text-center vertical-text">HV03-30</td>
+          <td class="text-center vertical-text">HV03-31</td>
+          <td class="text-center vertical-text">HV03-32</td>
+          <td colspan="2" class="text-center vertical-text">HV03-33</td>
+          <td colspan="2" class="text-center vertical-text">HV03-34</td>
+          <td colspan="4" class="text-center vertical-text"></td>
+        </tr>
+        <tr>
+          <td colspan="6" class="text-left"><b>TOTAL this Page</b></td>
+          <td colspan="3" class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="6" class="text-left"><b>TOTAL this Page</b></td>
+          <td colspan="3" class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="6" class="text-center"><b>TOTAL this Month</b></td>
+          <td colspan="3" class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="6" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td class="text-center">(e)</td>
+          <td class="text-center">(f)</td>
+          <td class="text-center">(g)</td>
+          <td class="text-center">(h)</td>
+          <td class="text-center">(i)</td>
+          <td class="text-center">(j)</td>
+          <td class="text-center">(k)</td>
+          <td class="text-center">(l)</td>
+          <td class="text-center">(m)</td>
+          <td class="text-center">(n)</td>
+          <td class="text-center">(o)</td>
+          <td class="text-center">(q)</td>
+          <td class="text-center">(r)</td>
+          <td class="text-center">(s)</td>
+          <td class="text-center">(t)</td>
+          <td class="text-center">(u)</td>
+          <td class="text-center">(v)</td>
+          <td class="text-center">(w)</td>
+          <td class="text-center">(x)</td>
+          <td class="text-center">(y)</td>
+          <td class="text-center">(z)</td>
+          <td class="text-center">(aa)</td>
+          <td class="text-center">(ab)</td>
+          <td class="text-center">(ac)</td>
+          <td class="text-center">(ad)</td>
+          <td class="text-center">(ae)</td>
+          <td class="text-center">(af)</td>
+          <td class="text-center">(ag)</td>
+          <td class="text-center">(ah)</td>
+          <td class="text-center">(ai)</td>
+          <td class="text-center">(aj)</td>
+          <td class="text-center">(ak)</td>
+          <td class="text-center">(al)</td>
+          <td colspan="2" class="text-center">(am)</td>
+          <td colspan="2" class="text-center">(an)</td>
+          <td colspan="4" class="text-center">(ao)</td>
+        </tr>
+        <tr>
+          <td colspan="10" rowspan="10" class="text-center">
+            <b>Summary of clinical visits</b>
+          </td>
+          <td colspan="14" class="text-right">
+            Count of clients with 2 months appointment
+          </td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td colspan="8" rowspan="10" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right"><b>Total this Month (2s)</b></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right">
+            Count of clients with 3 months appointment
+          </td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right"><b>Total this Month (3s)</b></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right">
+            Count of clients with 4 months appointment
+          </td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right"><b>Total this Month (4s)</b></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right">
+            Count of clients with 5 months appointment
+          </td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right"><b>Total this Month (5s)</b></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right">
+            Count of clients with 6 months appointment
+          </td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right"><b>Total this Month (6s)</b></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>

From 60c7144f056a3d663f24c62f6059927b086a161b Mon Sep 17 00:00:00 2001
From: Faith Kamau <121166087+hiqedme@users.noreply.github.com>
Date: Wed, 5 Jun 2024 16:34:30 +0300
Subject: [PATCH 03/50] POC-746 added data for HEI

---
 .../cntdaily-register.component.html          | 883 ++----------------
 .../cntdaily-register.component.ts            |  54 +-
 .../care-treatment-resource.service.ts        |  38 +
 3 files changed, 122 insertions(+), 853 deletions(-)
 create mode 100644 src/app/etl-api/care-treatment-resource.service.ts

diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index 0dfc1180d..0852fc031 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -36,7 +36,7 @@ <h4 *ngIf="!statusError">
   This report is likely to change without warning.
 </div>
 
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot *ngIf="careTreatmentRegisterData && careTreatmentRegisterData.length > 0">
   <div class="table-responsive">
     <div class="row">
       <div class="col-md-4">
@@ -177,835 +177,58 @@ <h4 *ngIf="!statusError">
         </tr>
       </thead>
       <tbody>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="6" class="text-left"><b>Data element CODE</b></td>
-          <td colspan="3" class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center vertical-text">HV03-01</td>
-          <td class="text-center vertical-text">HV03-02</td>
-          <td class="text-center vertical-text">HV03-03</td>
-          <td class="text-center vertical-text">HV03-04</td>
-          <td class="text-center vertical-text">HV03-05</td>
-          <td class="text-center vertical-text">HV03-06</td>
-          <td class="text-center vertical-text">HV03-07</td>
-          <td class="text-center vertical-text">HV03-08</td>
-          <td class="text-center vertical-text">HV03-09</td>
-          <td class="text-center vertical-text">HV03-10</td>
-          <td class="text-center vertical-text">HV03-11</td>
-          <td class="text-center vertical-text">HV03-12</td>
-          <td class="text-center vertical-text">HV03-13</td>
-          <td class="text-center vertical-text">HV03-14</td>
-          <td class="text-center vertical-text">HV03-15</td>
-          <td class="text-center vertical-text">HV03-16</td>
-          <td class="text-center vertical-text">HV03-17</td>
-          <td class="text-center vertical-text">HV03-18</td>
-          <td class="text-center vertical-text">HV03-19</td>
-          <td class="text-center vertical-text">HV03-20</td>
-          <td class="text-center vertical-text">HV03-21</td>
-          <td class="text-center vertical-text">HV03-22</td>
-          <td class="text-center vertical-text">HV03-23</td>
-          <td class="text-center vertical-text">HV03-24</td>
-          <td class="text-center vertical-text">HV03-25</td>
-          <td class="text-center vertical-text">HV03-26</td>
-          <td class="text-center vertical-text">HV03-27</td>
-          <td class="text-center vertical-text">HV03-28</td>
-          <td class="text-center vertical-text">HV03-29</td>
-          <td class="text-center vertical-text">HV03-30</td>
-          <td class="text-center vertical-text">HV03-31</td>
-          <td class="text-center vertical-text">HV03-32</td>
-          <td colspan="2" class="text-center vertical-text">HV03-33</td>
-          <td colspan="2" class="text-center vertical-text">HV03-34</td>
-          <td colspan="4" class="text-center vertical-text"></td>
-        </tr>
-        <tr>
-          <td colspan="6" class="text-left"><b>TOTAL this Page</b></td>
-          <td colspan="3" class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="6" class="text-left"><b>TOTAL this Page</b></td>
-          <td colspan="3" class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="6" class="text-center"><b>TOTAL this Month</b></td>
-          <td colspan="3" class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="6" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td class="text-center">(e)</td>
-          <td class="text-center">(f)</td>
-          <td class="text-center">(g)</td>
-          <td class="text-center">(h)</td>
-          <td class="text-center">(i)</td>
-          <td class="text-center">(j)</td>
-          <td class="text-center">(k)</td>
-          <td class="text-center">(l)</td>
-          <td class="text-center">(m)</td>
-          <td class="text-center">(n)</td>
-          <td class="text-center">(o)</td>
-          <td class="text-center">(q)</td>
-          <td class="text-center">(r)</td>
-          <td class="text-center">(s)</td>
-          <td class="text-center">(t)</td>
-          <td class="text-center">(u)</td>
-          <td class="text-center">(v)</td>
-          <td class="text-center">(w)</td>
-          <td class="text-center">(x)</td>
-          <td class="text-center">(y)</td>
-          <td class="text-center">(z)</td>
-          <td class="text-center">(aa)</td>
-          <td class="text-center">(ab)</td>
-          <td class="text-center">(ac)</td>
-          <td class="text-center">(ad)</td>
-          <td class="text-center">(ae)</td>
-          <td class="text-center">(af)</td>
-          <td class="text-center">(ag)</td>
-          <td class="text-center">(ah)</td>
-          <td class="text-center">(ai)</td>
-          <td class="text-center">(aj)</td>
-          <td class="text-center">(ak)</td>
-          <td class="text-center">(al)</td>
-          <td colspan="2" class="text-center">(am)</td>
-          <td colspan="2" class="text-center">(an)</td>
-          <td colspan="4" class="text-center">(ao)</td>
-        </tr>
-        <tr>
-          <td colspan="10" rowspan="10" class="text-center">
-            <b>Summary of clinical visits</b>
-          </td>
-          <td colspan="14" class="text-right">
-            Count of clients with 2 months appointment
-          </td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td colspan="8" rowspan="10" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right"><b>Total this Month (2s)</b></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right">
-            Count of clients with 3 months appointment
-          </td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right"><b>Total this Month (3s)</b></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right">
-            Count of clients with 4 months appointment
-          </td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right"><b>Total this Month (4s)</b></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right">
-            Count of clients with 5 months appointment
-          </td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right"><b>Total this Month (5s)</b></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right">
-            Count of clients with 6 months appointment
-          </td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right"><b>Total this Month (6s)</b></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
+        <ng-container
+            *ngFor="let data of careTreatmentRegisterData; let a = index"
+          >
+          <tr>
+            <td class="text-center" rowspan="2">{{a+1}}</td>
+            <td colspan="2" class="text-center" rowspan="2">{{data.DATE}}</td>
+            <td colspan="3" class="text-center">{{data.National_ID}}</td>
+            <td colspan="3" class="text-center" rowspan="2">{{data.CCC_Number}}</td>
+            <td class="text-center" rowspan="2">{{data.Age}}</td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td class="text-center" rowspan="2"></td>
+            <td colspan="2" class="text-center" rowspan="2"></td>
+            <td colspan="2" class="text-center" rowspan="2"></td>
+            <td colspan="4" class="text-center" rowspan="2"></td>
+          </tr>
+          <tr>
+            <td colspan="3" class="text-center">{{data.NUPI}}</td>
+          </tr>
+        </ng-container>
+
+      
+       
       </tbody>
     </table>
   </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
index ac6aed7de..69f16c6f9 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, Output } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { CareTreatmentResourceService } from 'src/app/etl-api/care-treatment-resource.service';
 @Component({
   selector: 'app-cntdaily-register',
   templateUrl: './cntdaily-register.component.html',
@@ -12,7 +13,7 @@ export class CntdailyRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public txnewReportSummaryData: any = [];
+  public careTreatmentRegisterData: any = [];
   public columnDefs: any = [];
   public reportName = 'Care and Treatment Daily Activity';
   public currentView = 'monthly';
@@ -48,7 +49,11 @@ export class CntdailyRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(public router: Router, public route: ActivatedRoute) {
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public careTreatmentRegisterService: CareTreatmentResourceService
+  ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -71,8 +76,8 @@ export class CntdailyRegisterComponent implements OnInit {
     this.route.parent.parent.params.subscribe((params: any) => {
       this.storeParamsInUrl(params.location_uuid);
     });
-    this.txnewReportSummaryData = [];
-    // this.getTxNewReport(this.params);
+    this.careTreatmentRegisterData = [];
+    this.getCareTreatmentRegisterData(this.params);
   }
 
   public storeParamsInUrl(param) {
@@ -89,31 +94,34 @@ export class CntdailyRegisterComponent implements OnInit {
     });
   }
 
-  // public getTxNewReport(params: any) {
-  //   this.isLoading = true;
-  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
-  //     if (data.error) {
-  //       this.showInfoMessage = true;
-  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
-  //       this.isLoading = false;
-  //     } else {
-  //       this.showInfoMessage = false;
-  //       this.columnDefs = data.sectionDefinitions;
-  //       this.txnewReportSummaryData = data.result;
-  //       this.calculateTotalSummary();
-  //       this.isLoading = false;
-  //       this.showDraftReportAlert(this._month);
-  //     }
-  //   });
-  // }
+  public getCareTreatmentRegisterData(params: any) {
+    this.isLoading = true;
+    this.careTreatmentRegisterService
+      .getCareTreatmentRegister(params)
+      .subscribe((data) => {
+        if (data.error) {
+          this.showInfoMessage = true;
+          this.errorMessage = `There has been an error while loading the report, please retry again`;
+          this.isLoading = false;
+        } else {
+          console.log('Care&Treatment', data);
+          this.showInfoMessage = false;
+          this.columnDefs = data.sectionDefinitions;
+          this.careTreatmentRegisterData = data;
+          this.calculateTotalSummary();
+          this.isLoading = false;
+          this.showDraftReportAlert(this._month);
+        }
+      });
+  }
 
   public calculateTotalSummary() {
     const totalsRow = [];
-    if (this.txnewReportSummaryData.length > 0) {
+    if (this.careTreatmentRegisterData.length > 0) {
       const totalObj = {
         location: 'Totals'
       };
-      _.each(this.txnewReportSummaryData, (row) => {
+      _.each(this.careTreatmentRegisterData, (row) => {
         Object.keys(row).map((key) => {
           if (Number.isInteger(row[key]) === true) {
             if (totalObj[key]) {
diff --git a/src/app/etl-api/care-treatment-resource.service.ts b/src/app/etl-api/care-treatment-resource.service.ts
new file mode 100644
index 000000000..77e76f6fd
--- /dev/null
+++ b/src/app/etl-api/care-treatment-resource.service.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+import { AppSettingsService } from '../app-settings/app-settings.service';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import * as Moment from 'moment';
+import { catchError, map } from 'rxjs/operators';
+@Injectable({
+  providedIn: 'root'
+})
+export class CareTreatmentResourceService {
+  public get url(): string {
+    return this.appSettingsService.getEtlRestbaseurl().trim();
+  }
+  constructor(
+    public http: HttpClient,
+    public appSettingsService: AppSettingsService
+  ) {}
+  public getCareTreatmentRegister(params: any): Observable<any> {
+    // tslint:disable-next-line: max-line-length
+    return this.http
+      .get(
+        `${this.url}care-and-treatment-register?endDate=${params.month}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+}

From f9883b23c0b69b2a68f3c152b29f85f663ea92f1 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 23 May 2024 09:56:13 +0300
Subject: [PATCH 04/50] POC-737: Development of MOH Registers

---
 .../cntdaily-register.component.html          | 213 ++----------------
 .../cntdaily-register.component.ts            |  54 ++---
 .../hei-register/hei-register.component.html  | 184 ++-------------
 .../hei-register/hei-register.component.ts    |  52 ++---
 4 files changed, 78 insertions(+), 425 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index 0852fc031..40a18d212 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -35,201 +35,20 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot *ngIf="careTreatmentRegisterData && careTreatmentRegisterData.length > 0">
-  <div class="table-responsive">
-    <div class="row">
-      <div class="col-md-4">
-        <b>Ministry Of Health</b>
-      </div>
-      <div class="col-md-4 text-center">
-        <b>HIV Care Treatment Daily Activity Register MOH 366</b>
-      </div>
-      <div class="col-md-4 text-right">
-        <b>Ver. July 2023</b>
-      </div>
-    </div>
-    <table class="table table-bordered text-centre">
-      <thead>
-        <tr>
-          <th rowspan="4">No</th>
-          <th colspan="2" rowspan="4">Date</th>
-          <th colspan="3">National Identification Number</th>
-          <th colspan="3" rowspan="4">Client CCC Number</th>
-          <th rowspan="4">Age</th>
-          <th colspan="14" class="text-centre">Starting ART</th>
-          <th colspan="4" class="text-centre">
-            TB in HIV Care <br />(Newly Initiated on ART)
-          </th>
-          <th colspan="14" class="text-centre">
-            Currently on ART (Starting and Continuing ART)
-          </th>
-          <th colspan="4" class="text-centre">DSD</th>
-          <th colspan="4" rowspan="4" class="text-centre">Remarks</th>
-        </tr>
-        <tr>
-          <th colspan="3" rowspan="3">Client Unique Number (NUPI)</th>
-          <th colspan="14" rowspan="2" class="text-centre">
-            Tick as appropriate for age
-          </th>
-          <th colspan="2">Screened for TB</th>
-          <th colspan="2">Started TPT</th>
-          <th colspan="14" rowspan="2" class="text-centre">
-            Indicate No. of months of till next appointment or <br />
-            "R"for patients making unscheduled visits
-          </th>
-          <th colspan="2">Status</th>
-          <th colspan="2">Type</th>
-        </tr>
-        <tr>
-          <th colspan="4" class="text-centre">Indicate Y/N/NA</th>
-          <th colspan="2" rowspan="2" class="text-center vertical-text">
-            E=Established <br />
-            NE=Not Established
-          </th>
-          <th colspan="2" rowspan="2" class="text-center">
-            C<br />
-            FT<br />
-            HFAG<br />
-            PFAG<br />
-            HCAG<br />
-            PCAG<br />
-            CP<br />
-            CADP<br />
-            IACD
-          </th>
-        </tr>
-        <tr>
-          <th class="text-center vertical-text">< 1 yrs (M)</th>
-          <th class="text-center vertical-text">< 1 yrs (F)</th>
-          <th class="text-center vertical-text">1-4 yrs (M)</th>
-          <th class="text-center vertical-text">1-4 yrs (F)</th>
-          <th class="text-center vertical-text">5-9 yrs (M)</th>
-          <th class="text-center vertical-text">5-9 yrs (F)</th>
-          <th class="text-center vertical-text">10-14 yrs (M)</th>
-          <th class="text-center vertical-text">10-14 yrs (F)</th>
-          <th class="text-center vertical-text">15-19 yrs (M)</th>
-          <th class="text-center vertical-text">15-19 yrs (F)</th>
-          <th class="text-center vertical-text">20-24 yrs(M)</th>
-          <th class="text-center vertical-text">20-24 yrs (F)</th>
-          <th class="text-center vertical-text">25+ yrs (M)</th>
-          <th class="text-center vertical-text">25+ yrs (F)</th>
-          <th class="text-center vertical-text">< 15 yrs</th>
-          <th class="text-center vertical-text">15+ yrs</th>
-          <th class="text-center vertical-text">< 15 yrs</th>
-          <th class="text-center vertical-text">15+ yrs</th>
-          <th class="text-center vertical-text">< 1 yrs (M)</th>
-          <th class="text-center vertical-text">< 1 yrs (F)</th>
-          <th class="text-center vertical-text">1-4 yrs (M)</th>
-          <th class="text-center vertical-text">1-4 yrs (F)</th>
-          <th class="text-center vertical-text">5-9 yrs (M)</th>
-          <th class="text-center vertical-text">5-9 yrs (F)</th>
-          <th class="text-center vertical-text">10-14 yrs (M)</th>
-          <th class="text-center vertical-text">10-14 yrs (F)</th>
-          <th class="text-center vertical-text">15-19 yrs (M)</th>
-          <th class="text-center vertical-text">15-19 yrs (F)</th>
-          <th class="text-center vertical-text">20-24 yrs(M)</th>
-          <th class="text-center vertical-text">20-24 yrs (F)</th>
-          <th class="text-center vertical-text">25+ yrs (M)</th>
-          <th class="text-center vertical-text">25+ yrs (F)</th>
-        </tr>
-        <tr>
-          <th class="text-center">(a)</th>
-          <th colspan="2" class="text-center">(b)</th>
-          <th colspan="3" class="text-center">(c)</th>
-          <th colspan="3" class="text-center">(d)</th>
-          <th class="text-center">(e)</th>
-          <th class="text-center">(f)</th>
-          <th class="text-center">(g)</th>
-          <th class="text-center">(h)</th>
-          <th class="text-center">(i)</th>
-          <th class="text-center">(j)</th>
-          <th class="text-center">(k)</th>
-          <th class="text-center">(l)</th>
-          <th class="text-center">(m)</th>
-          <th class="text-center">(n)</th>
-          <th class="text-center">(o)</th>
-          <th class="text-center">(q)</th>
-          <th class="text-center">(r)</th>
-          <th class="text-center">(s)</th>
-          <th class="text-center">(t)</th>
-          <th class="text-center">(u)</th>
-          <th class="text-center">(v)</th>
-          <th class="text-center">(w)</th>
-          <th class="text-center">(x)</th>
-          <th class="text-center">(y)</th>
-          <th class="text-center">(z)</th>
-          <th class="text-center">(aa)</th>
-          <th class="text-center">(ab)</th>
-          <th class="text-center">(ac)</th>
-          <th class="text-center">(ad)</th>
-          <th class="text-center">(ae)</th>
-          <th class="text-center">(af)</th>
-          <th class="text-center">(ag)</th>
-          <th class="text-center">(ah)</th>
-          <th class="text-center">(ai)</th>
-          <th class="text-center">(aj)</th>
-          <th class="text-center">(ak)</th>
-          <th class="text-center">(al)</th>
-          <th colspan="2" class="text-center">(am)</th>
-          <th colspan="2" class="text-center">(an)</th>
-          <th colspan="4" class="text-center">(ao)</th>
-        </tr>
-      </thead>
-      <tbody>
-        <ng-container
-            *ngFor="let data of careTreatmentRegisterData; let a = index"
-          >
-          <tr>
-            <td class="text-center" rowspan="2">{{a+1}}</td>
-            <td colspan="2" class="text-center" rowspan="2">{{data.DATE}}</td>
-            <td colspan="3" class="text-center">{{data.National_ID}}</td>
-            <td colspan="3" class="text-center" rowspan="2">{{data.CCC_Number}}</td>
-            <td class="text-center" rowspan="2">{{data.Age}}</td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td class="text-center" rowspan="2"></td>
-            <td colspan="2" class="text-center" rowspan="2"></td>
-            <td colspan="2" class="text-center" rowspan="2"></td>
-            <td colspan="4" class="text-center" rowspan="2"></td>
-          </tr>
-          <tr>
-            <td colspan="3" class="text-center">{{data.NUPI}}</td>
-          </tr>
-        </ng-container>
-
-      
-       
-      </tbody>
-    </table>
-  </div>
+<div>
+  <p-tabView>
+    <p-tabPanel
+      header="Report View"
+      leftIcon="fa-file-pdf-o"
+      [selected]="currentViewBelow === 'pdf'"
+    >
+      <!-- <app-tx-ml-report-view
+        [SummaryData]="txnewReportSummaryData"
+        [sectionDefs]="columnDefs"
+        (CellSelection)="onIndicatorSelected($event)"
+        [reportDetails]="params"
+        [reportHeader]="reportName"
+      ></app-tx-ml-report-view> -->
+    </p-tabPanel>
+  </p-tabView>
 </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
index 69f16c6f9..ac6aed7de 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
@@ -2,7 +2,6 @@ import { Component, OnInit, Output } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
-import { CareTreatmentResourceService } from 'src/app/etl-api/care-treatment-resource.service';
 @Component({
   selector: 'app-cntdaily-register',
   templateUrl: './cntdaily-register.component.html',
@@ -13,7 +12,7 @@ export class CntdailyRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public careTreatmentRegisterData: any = [];
+  public txnewReportSummaryData: any = [];
   public columnDefs: any = [];
   public reportName = 'Care and Treatment Daily Activity';
   public currentView = 'monthly';
@@ -49,11 +48,7 @@ export class CntdailyRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(
-    public router: Router,
-    public route: ActivatedRoute,
-    public careTreatmentRegisterService: CareTreatmentResourceService
-  ) {
+  constructor(public router: Router, public route: ActivatedRoute) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -76,8 +71,8 @@ export class CntdailyRegisterComponent implements OnInit {
     this.route.parent.parent.params.subscribe((params: any) => {
       this.storeParamsInUrl(params.location_uuid);
     });
-    this.careTreatmentRegisterData = [];
-    this.getCareTreatmentRegisterData(this.params);
+    this.txnewReportSummaryData = [];
+    // this.getTxNewReport(this.params);
   }
 
   public storeParamsInUrl(param) {
@@ -94,34 +89,31 @@ export class CntdailyRegisterComponent implements OnInit {
     });
   }
 
-  public getCareTreatmentRegisterData(params: any) {
-    this.isLoading = true;
-    this.careTreatmentRegisterService
-      .getCareTreatmentRegister(params)
-      .subscribe((data) => {
-        if (data.error) {
-          this.showInfoMessage = true;
-          this.errorMessage = `There has been an error while loading the report, please retry again`;
-          this.isLoading = false;
-        } else {
-          console.log('Care&Treatment', data);
-          this.showInfoMessage = false;
-          this.columnDefs = data.sectionDefinitions;
-          this.careTreatmentRegisterData = data;
-          this.calculateTotalSummary();
-          this.isLoading = false;
-          this.showDraftReportAlert(this._month);
-        }
-      });
-  }
+  // public getTxNewReport(params: any) {
+  //   this.isLoading = true;
+  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
+  //     if (data.error) {
+  //       this.showInfoMessage = true;
+  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
+  //       this.isLoading = false;
+  //     } else {
+  //       this.showInfoMessage = false;
+  //       this.columnDefs = data.sectionDefinitions;
+  //       this.txnewReportSummaryData = data.result;
+  //       this.calculateTotalSummary();
+  //       this.isLoading = false;
+  //       this.showDraftReportAlert(this._month);
+  //     }
+  //   });
+  // }
 
   public calculateTotalSummary() {
     const totalsRow = [];
-    if (this.careTreatmentRegisterData.length > 0) {
+    if (this.txnewReportSummaryData.length > 0) {
       const totalObj = {
         location: 'Totals'
       };
-      _.each(this.careTreatmentRegisterData, (row) => {
+      _.each(this.txnewReportSummaryData, (row) => {
         Object.keys(row).map((key) => {
           if (Number.isInteger(row[key]) === true) {
             if (totalObj[key]) {
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
index fedc228d4..40a18d212 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
@@ -35,172 +35,20 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot *ngIf="heiRegisterData && heiRegisterData.length > 0">
-  <div class="table-responsive">
-    <div class="row">
-      <div class="col-md-4">
-        <b>Ministry Of Health</b>
-      </div>
-      <div class="col-md-4 text-center">
-        <b>HIV EXPOSED INFANT REGISTER MOH 408</b>
-      </div>
-      <div class="col-md-4 text-right">
-        <b>Ver. July 2023</b>
-      </div>
-    </div>
-    <table class="table table-bordered text-centre">
-      <thead>
-        <tr>
-          <th colspan="58">
-            Cohort: Month/Year
-            (MMM-YYYY).........................../..............................................
-          </th>
-        </tr>
-        <tr>
-          <th colspan="25">Infant and Mother/Guardian Information</th>
-          <th colspan="5" rowspan="2">
-            First HIV DNA PCR Test at Birth, 6 weeks or First Contact
-          </th>
-          <th colspan="4" rowspan="2">Second HIV DNA PCR Test</th>
-          <th colspan="4" rowspan="2">Third HIV DNA PCR Test</th>
-          <th colspan="4" rowspan="2">HEI Outcomes at 12 months</th>
-          <th colspan="4" rowspan="2">Confirmatory PCR</th>
-          <th colspan="4" rowspan="2">Antibody test (18 to 24 months)</th>
-          <th colspan="4" rowspan="2">HEI Outcomes at 24 months</th>
-          <th colspan="4" rowspan="4">Comments</th>
-        </tr>
-        <tr>
-          <th colspan="10">Registration Information</th>
-          <th colspan="11">Infant's information</th>
-          <th colspan="4">Parent's information</th>
-        </tr>
-        <tr>
-          <th colspan="1" rowspan="2">Serial No.</th>
-          <th colspan="3" rowspan="2">
-            Date of Collected enrollment (DD/MM/YYYY)
-          </th>
-          <th colspan="3">Birth Certificate Number</th>
-          <th colspan="3" rowspan="2">HEI ID (MFL-YYYY-NNNN)</th>
-          <th colspan="4" rowspan="2">Infant's Name</th>
-          <th colspan="2" rowspan="2">DOB (DD/MM/YYYY)</th>
-          <th colspan="2">Sex</th>
-          <th colspan="3">
-            Infant Prophylaxis 1=NVP, 2=AZT, 3=NVP &AZT, 4=None,
-          </th>
-          <th colspan="4">Father's/Mother's/Guardian's Name</th>
-          <th colspan="1" rowspan="2">Age at Test (in wks)</th>
-          <th colspan="2" rowspan="2">
-            Type of Test 1=At Birth 2=at 6 weeks 3=at First Contact
-          </th>
-          <th colspan="2">Date Sample Collected</th>
-          <th colspan="2" rowspan="2">Age at Test (in months)</th>
-          <th colspan="2">Date Sample Collected</th>
-          <th colspan="2" rowspan="2">Age at Test (in months)</th>
-          <th colspan="2">Date Sample Collected</th>
-          <th colspan="2">Infant Feeding</th>
-          <th colspan="2" rowspan="2">
-            1=Infected 2= Uninfected 3=Lost to Follow 4=Transfer Out 5=Dead
-          </th>
-          <th colspan="2" rowspan="2">Age at Test (in months)</th>
-          <th colspan="2">Date Sample Collected</th>
-          <th colspan="2" rowspan="2">Age at Test (in months)</th>
-          <th colspan="2">Date Sample Collected</th>
-          <th colspan="2">Infant Feeding</th>
-          <th colspan="2" rowspan="2">
-            1=Infected 2= Uninfected 3=Lost to Follow 4=Transfer Out 5=Dead
-          </th>
-        </tr>
-        <tr>
-          <th colspan="3">Client Unique Number (NUPI)</th>
-          <th colspan="2">(M/F)</th>
-          <th colspan="3">(M/F)</th>
-          <th colspan="4">Telephone number</th>
-          <th colspan="2">Test result (P,N)</th>
-          <th colspan="2">Test result (P,N)</th>
-          <th colspan="2">Test result (P,N)</th>
-          <th colspan="2">BF=Breastfeeding NBF=Not Breastfeeding</th>
-          <th colspan="2">Test result (P,N)</th>
-          <th colspan="2">Test result (P,N)</th>
-          <th colspan="2">BF=Breastfeeding NBF=Not Breastfeeding</th>
-        </tr>
-        <tr>
-          <th class="text-center">(a)</th>
-          <th colspan="3" class="text-center">(b)</th>
-          <th colspan="3" class="text-center">(c)</th>
-          <th colspan="3" class="text-center">(d)</th>
-          <th colspan="4" class="text-center">(e)</th>
-          <th colspan="2" class="text-center">(f)</th>
-          <th colspan="2" class="text-center">(g)</th>
-          <th colspan="3" class="text-center">(h)</th>
-          <th colspan="4" class="text-center">(i)</th>
-          <th class="text-center">(j)</th>
-          <th colspan="2" class="text-center">(k)</th>
-          <th colspan="2" class="text-center">(l)</th>
-          <th colspan="2" class="text-center">(m)</th>
-          <th colspan="2" class="text-center">(n)</th>
-          <th colspan="2" class="text-center">(o)</th>
-          <th colspan="2" class="text-center">(p)</th>
-          <th colspan="2" class="text-center">(q)</th>
-          <th colspan="2" class="text-center">(r)</th>
-          <th colspan="2" class="text-center">(s)</th>
-          <th colspan="2" class="text-center">(t)</th>
-          <th colspan="2" class="text-center">(u)</th>
-          <th colspan="2" class="text-center">(v)</th>
-          <th colspan="2" class="text-center">(w)</th>
-          <th colspan="2" class="text-center">(x)</th>
-          <th colspan="4" class="text-center">(y)</th>
-        </tr>
-      </thead>
-      <tbody>
-        <ng-container
-            *ngFor="let data of heiRegisterData; let a = index"
-          >
-          <tr>
-            <td class="text-center" rowspan="2">{{a+1}}</td>
-            <td colspan="3" class="text-center" rowspan="2">{{data.date_enrolled}}</td>
-            <td colspan="3" class="text-center">{{data.Birth_Certificate_number}}</td>
-            <td colspan="3" class="text-center" rowspan="2">{{data.HEI_ID}}</td>
-            <td colspan="4" class="text-center" rowspan="2">{{data.Infant_name}}</td>
-            <td colspan="2" class="text-center" rowspan="2">{{data.birth_date}}</td>
-            <td colspan="2" class="text-center">Sex</td>
-            <td colspan="3" class="text-center" rowspan="2">{{null}}</td>
-            <td colspan="4" class="text-center">{{data.parent_name}}</td>
-            <td class="text-center" rowspan="2">{{data.age_in_weeks_on_first_pcr}}</td>
-            <td colspan="2" class="text-center" rowspan="2">{{date_enrolled}}</td>
-            <td colspan="2" class="text-center">{{data.first_pcr_date}}</td>
-            <td colspan="2" class="text-center" rowspan="2">{{data.age_in_months_on_second_pcr}}</td>
-            <td colspan="2" class="text-center">{{data.second_pcr_date}}</td>
-            <td colspan="2" class="text-center" rowspan="2">{{data.age_in_months_on_third_pcr}}</td>
-            <td colspan="2" class="text-center">{{data.third_pcr_date}}</td>
-            <td colspan="2" class="text-center">Infant Feeding</td>
-            <td colspan="2" class="text-center" rowspan="2">{{data.hei_outcome}}</td>
-            <td colspan="2" class="text-center" rowspan="2">{{data.age_in_months_on_confirm_pcr}}</td>
-            <td colspan="2" class="text-center">{{data.confirm_pcr_date}}</td>
-            <td colspan="2" class="text-center" rowspan="2">{{data.age_in_months_on_first_antibody}}</td>
-            <td colspan="2" class="text-center">{{data.first_antibody_date}}</td>
-            <td colspan="2" class="text-center">{{null}}</td>
-            <td colspan="2" class="text-center">{{null}}</td>
-            <td colspan="4" class="text-center" rowspan="2">{{null}}</td>
-          </tr>
-          <tr>
-            <td colspan="3" class="text-center">{{data.NUPI}}</td>
-            <td colspan="2" class="text-center">{{data.gender}}</td>
-            <td colspan="4" class="text-center">{{data.Phone_Number}}</td>
-            <td colspan="2" class="text-center">{{data.results_pcr_first_pcr}}</td>
-            <td colspan="2" class="text-center">{{data.results_pcr_second_pcr}}</td>
-            <td colspan="2" class="text-center">{{data.results_pcr_third_pcr}}</td>
-            <td colspan="2" class="text-center">{{data.infant_feeding}}</td>
-            <td colspan="2" class="text-center">{{data.results_confirm_pcr}}</td>
-            <td colspan="2" class="text-center">{{data.results_first_antibody}}</td>
-            <td colspan="2" class="text-center">{{null}}</td>
-            <td colspan="2" class="text-center">{{null}}</td>
-          </tr>
-        </ng-container>
-
-
-       
-       
-      </tbody>
-    </table>
-  </div>
+<div>
+  <p-tabView>
+    <p-tabPanel
+      header="Report View"
+      leftIcon="fa-file-pdf-o"
+      [selected]="currentViewBelow === 'pdf'"
+    >
+      <!-- <app-tx-ml-report-view
+        [SummaryData]="txnewReportSummaryData"
+        [sectionDefs]="columnDefs"
+        (CellSelection)="onIndicatorSelected($event)"
+        [reportDetails]="params"
+        [reportHeader]="reportName"
+      ></app-tx-ml-report-view> -->
+    </p-tabPanel>
+  </p-tabView>
 </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
index 5721caff6..2a9de1b47 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
@@ -2,7 +2,6 @@ import { Component, OnInit, Output } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
-import { HeiRegisterResourceService } from 'src/app/etl-api/hei-register-resource.service';
 @Component({
   selector: 'app-hei-register',
   templateUrl: './hei-register.component.html',
@@ -13,7 +12,7 @@ export class HeiRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public heiRegisterData: any = [];
+  public txnewReportSummaryData: any = [];
   public columnDefs: any = [];
   public reportName = 'HEI Register';
   public currentView = 'monthly';
@@ -49,11 +48,7 @@ export class HeiRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(
-    public router: Router,
-    public route: ActivatedRoute,
-    public heiRegisterService: HeiRegisterResourceService
-  ) {
+  constructor(public router: Router, public route: ActivatedRoute) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -76,8 +71,8 @@ export class HeiRegisterComponent implements OnInit {
     this.route.parent.parent.params.subscribe((params: any) => {
       this.storeParamsInUrl(params.location_uuid);
     });
-    this.heiRegisterData = [];
-    this.getHeiRegisterData(this.params);
+    this.txnewReportSummaryData = [];
+    // this.getTxNewReport(this.params);
   }
 
   public storeParamsInUrl(param) {
@@ -94,32 +89,31 @@ export class HeiRegisterComponent implements OnInit {
     });
   }
 
-  public getHeiRegisterData(params: any) {
-    this.isLoading = true;
-    this.heiRegisterService.getHeiRegister(params).subscribe((data) => {
-      if (data.error) {
-        this.showInfoMessage = true;
-        this.errorMessage = `There has been an error while loading the report, please retry again`;
-        this.isLoading = false;
-      } else {
-        console.log('HeiDataSummary: ', data);
-        this.showInfoMessage = false;
-        this.columnDefs = data.sectionDefinitions;
-        this.heiRegisterData = data;
-        //  this.calculateTotalSummary();
-        this.isLoading = false;
-        this.showDraftReportAlert(this._month);
-      }
-    });
-  }
+  // public getTxNewReport(params: any) {
+  //   this.isLoading = true;
+  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
+  //     if (data.error) {
+  //       this.showInfoMessage = true;
+  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
+  //       this.isLoading = false;
+  //     } else {
+  //       this.showInfoMessage = false;
+  //       this.columnDefs = data.sectionDefinitions;
+  //       this.txnewReportSummaryData = data.result;
+  //       this.calculateTotalSummary();
+  //       this.isLoading = false;
+  //       this.showDraftReportAlert(this._month);
+  //     }
+  //   });
+  // }
 
   public calculateTotalSummary() {
     const totalsRow = [];
-    if (this.heiRegisterData.length > 0) {
+    if (this.txnewReportSummaryData.length > 0) {
       const totalObj = {
         location: 'Totals'
       };
-      _.each(this.heiRegisterData, (row) => {
+      _.each(this.txnewReportSummaryData, (row) => {
         Object.keys(row).map((key) => {
           if (Number.isInteger(row[key]) === true) {
             if (totalObj[key]) {

From fbb8db84475a13aedd51269bb9216ea518095aee Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Mon, 27 May 2024 12:24:25 +0300
Subject: [PATCH 05/50] POC-745: MOH 267 PrEP Daily Activity Register

---
 .../cntdaily-register.component.html          |  54 ---
 .../prepdaily-register.component.css          |  14 +
 .../prepdaily-register.component.html         | 372 +++++++++++++++++-
 3 files changed, 370 insertions(+), 70 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index 40a18d212..e69de29bb 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -1,54 +0,0 @@
-<h4 class="component-title text-success">
-  <span class="fa fa-table"></span>{{ reportName }}
-</h4>
-
-<div class="loader" *ngIf="isLoading">
-  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
-</div>
-
-<p-tabView>
-  <div>
-    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
-      <report-filters
-        [enabledControls]="enabledControls"
-        [monthString]="_month"
-        (onMonthChange)="onMonthChange($event)"
-        [reportName]="reportName"
-        (generateReport)="generateReport()"
-      >
-      </report-filters>
-    </p-tabPanel>
-  </div>
-</p-tabView>
-
-<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
-  <a href="#" class="close" data-dismiss="alert">&times;</a>
-  <h4 *ngIf="!statusError">
-    <strong><span class="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>
-<div *ngIf="!isReleased" class="alert alert-warning">
-  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
-  This report is likely to change without warning.
-</div>
-<div>
-  <p-tabView>
-    <p-tabPanel
-      header="Report View"
-      leftIcon="fa-file-pdf-o"
-      [selected]="currentViewBelow === 'pdf'"
-    >
-      <!-- <app-tx-ml-report-view
-        [SummaryData]="txnewReportSummaryData"
-        [sectionDefs]="columnDefs"
-        (CellSelection)="onIndicatorSelected($event)"
-        [reportDetails]="params"
-        [reportHeader]="reportName"
-      ></app-tx-ml-report-view> -->
-    </p-tabPanel>
-  </p-tabView>
-</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css
index e69de29bb..7d7e743ba 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css
@@ -0,0 +1,14 @@
+tr,
+.table-bordered th,
+.table-bordered td {
+  border: 2px solid #000; /* Darker border color */
+}
+tbody tr {
+  height: 20px; /* Adjust the height as per your design */
+}
+.vertical-text {
+  writing-mode: vertical-rl;
+  text-orientation: mixed;
+  transform: rotate(180deg);
+  white-space: nowrap;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
index 40a18d212..70eaf9048 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
@@ -35,20 +35,360 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div>
-  <p-tabView>
-    <p-tabPanel
-      header="Report View"
-      leftIcon="fa-file-pdf-o"
-      [selected]="currentViewBelow === 'pdf'"
-    >
-      <!-- <app-tx-ml-report-view
-        [SummaryData]="txnewReportSummaryData"
-        [sectionDefs]="columnDefs"
-        (CellSelection)="onIndicatorSelected($event)"
-        [reportDetails]="params"
-        [reportHeader]="reportName"
-      ></app-tx-ml-report-view> -->
-    </p-tabPanel>
-  </p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b>MOH 267 PrEP Daily Activity Register</b>
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th rowspan="2" colspan="2">PrEP No</th>
+          <th rowspan="2" colspan="2">Date of Visit</th>
+          <th colspan="3">National Identification Number</th>
+          <th rowspan="2" colspan="2">Age</th>
+          <th rowspan="2" colspan="2">
+            Sex <br />
+            (M/F)
+          </th>
+          <th rowspan="2" colspan="3">
+            Population type<br />
+            (Use the codes): <br />
+            1. General Population <br />
+            2. Discordant Couple <br />
+            3. MSM/MSW <br />
+            4. FSW<br />
+            5. PWID/PWUD<br />
+            6. VP
+          </th>
+          <th rowspan="2" colspan="2">
+            Client PrEP Status: <br />
+            N- New <br />
+            C- Continuing <br />
+            D-Discontinued<br />
+            R-Restart
+          </th>
+          <th rowspan="2" colspan="3">
+            PrEP Method: <br />
+            1. Daily oral PrEP <br />
+            2. Event driven oral PrEP<br />
+            3. Dapivirine Vaginal ring <br />
+            4. Cabotegravir Injectable
+          </th>
+          <th rowspan="2" colspan="2">
+            HIV Results <br />
+            (N/P/Ic/NA)
+          </th>
+          <th rowspan="2" colspan="2">
+            Diagnosed with <br />
+            STI<br />
+            (N/Y)
+          </th>
+          <th rowspan="2" colspan="4">Remarks</th>
+        </tr>
+        <tr>
+          <th colspan="3">National Unique Patient Identifier (NUPI)</th>
+        </tr>
+        <tr>
+          <th colspan="2" class="text-center">(a)</th>
+          <th colspan="2" class="text-center">(b)</th>
+          <th colspan="3" class="text-center">(c)</th>
+          <th colspan="2" class="text-center">(d)</th>
+          <th colspan="2" class="text-center">(e)</th>
+          <th colspan="3" class="text-center">(f)</th>
+          <th colspan="2" class="text-center">(g)</th>
+          <th colspan="3" class="text-center">(h)</th>
+          <th colspan="2" class="text-center">(i)</th>
+          <th colspan="2" class="text-center">(j)</th>
+          <th colspan="4" class="text-center">(k)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="3" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="2" rowspan="2" class="text-center"></td>
+          <td colspan="4" rowspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="7"><b>TOTAL this Page</b></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="7"><b>TOTAL this Month</b></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+        </tr>
+        <!-- <tr>
+          <ng-container style="padding: 20px;">
+            <div class="row">
+              <div class="col-md-3">
+                <table>
+                  <thead>
+                    <tr>
+                        <th>Name</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td>Administ</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <div class="col-md-3">
+                <table>
+                  <thead>
+                    <tr>
+                        <th>Name</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td>Administ</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <div class="col-md-3">
+                <table>
+                  <thead>
+                    <tr>
+                        <th>Name</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td>Administ</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+              <div class="col-md-3">
+                <table>
+                  <thead>
+                    <tr>
+                        <th>Name</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr>
+                      <td>Administ</td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </ng-container>
+        </tr> -->
+      </tbody>
+    </table>
+  </div>
 </div>

From b3a99abb58b76da403477d424373ba56dc5bc191 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 6 Jun 2024 10:11:21 +0300
Subject: [PATCH 06/50] Added data

---
 .../prepdaily-register.component.html         | 303 ++++--------------
 .../prepdaily-register.component.ts           | 107 ++++---
 .../registers-resource.service.spec.ts        |  18 ++
 src/app/etl-api/registers-resource.service.ts |  38 +++
 4 files changed, 171 insertions(+), 295 deletions(-)
 create mode 100644 src/app/etl-api/registers-resource.service.spec.ts
 create mode 100644 src/app/etl-api/registers-resource.service.ts

diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
index 70eaf9048..11909e88a 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
@@ -51,7 +51,24 @@ <h4 *ngIf="!statusError">
   This report is likely to change without warning.
 </div>
 
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+<div
+  class="btn-group pull-left"
+  *ngIf="prepRegisterData && prepRegisterData.length > 0"
+>
+  <button
+    class="btn btn-primary"
+    (click)="takeSnapshotAndExport()"
+    [disabled]="prepRegisterData.length == 0"
+  >
+    <i class="fa fa-download"> </i> Download Pdf
+  </button>
+</div>
+<br />
+<div
+  *ngIf="prepRegisterData && prepRegisterData.length > 0"
+  style="padding: 20px; font-size: 12px !important"
+  #prepcontentToSnapshot
+>
   <div class="table-responsive">
     <div class="row">
       <div class="col-md-4">
@@ -69,7 +86,9 @@ <h4 *ngIf="!statusError">
         <tr>
           <th rowspan="2" colspan="2">PrEP No</th>
           <th rowspan="2" colspan="2">Date of Visit</th>
-          <th colspan="3">National Identification Number</th>
+          <th colspan="3" style="max-width: 120px">
+            National Identification Number
+          </th>
           <th rowspan="2" colspan="2">Age</th>
           <th rowspan="2" colspan="2">
             Sex <br />
@@ -111,7 +130,9 @@ <h4 *ngIf="!statusError">
           <th rowspan="2" colspan="4">Remarks</th>
         </tr>
         <tr>
-          <th colspan="3">National Unique Patient Identifier (NUPI)</th>
+          <th colspan="3" style="max-width: 120px">
+            National Unique Patient Identifier (NUPI)
+          </th>
         </tr>
         <tr>
           <th colspan="2" class="text-center">(a)</th>
@@ -128,185 +149,43 @@ <h4 *ngIf="!statusError">
         </tr>
       </thead>
       <tbody>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="3" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="2" rowspan="2" class="text-center"></td>
-          <td colspan="4" rowspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
+        <ng-container *ngFor="let data of prepRegisterData; let i = index">
+          <tr>
+            <td colspan="2" rowspan="2">
+              {{ data.PrEP_Number }}
+            </td>
+            <td colspan="2" rowspan="2">
+              {{ transformDate(data.Date_Of_Visit) }}
+            </td>
+            <td colspan="3">{{ data.National_ID }}</td>
+            <td colspan="2" rowspan="2">{{ data.Age }}</td>
+            <td colspan="2" rowspan="2">{{ data.Sex }}</td>
+            <td colspan="3" rowspan="2">
+              {{ data.population_type }}
+            </td>
+            <td colspan="2" rowspan="2">
+              {{ data.client_prep_status }}
+            </td>
+            <td colspan="3" rowspan="2">
+              {{ data.prep_method }}
+            </td>
+            <td colspan="2" rowspan="2">
+              {{ data.HIV_result }}
+            </td>
+            <td colspan="2" rowspan="2">
+              {{ data.with_STI }}
+            </td>
+            <td colspan="4" rowspan="2" style="max-width: 200px">
+              {{ data.remarks }}
+            </td>
+          </tr>
+          <tr>
+            <td colspan="3">{{ data.NUPI }}</td>
+          </tr>
+        </ng-container>
         <tr>
           <td colspan="7"><b>TOTAL this Page</b></td>
-          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center">{{ prepRegisterData.length }}</td>
           <td colspan="2" class="text-center"></td>
           <td colspan="3" class="text-center"></td>
           <td colspan="2" class="text-center"></td>
@@ -317,7 +196,7 @@ <h4 *ngIf="!statusError">
         </tr>
         <tr>
           <td colspan="7"><b>TOTAL this Month</b></td>
-          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center">{{ prepRegisterData.length }}</td>
           <td colspan="2" class="text-center"></td>
           <td colspan="3" class="text-center"></td>
           <td colspan="2" class="text-center"></td>
@@ -326,68 +205,6 @@ <h4 *ngIf="!statusError">
           <td colspan="2" class="text-center"></td>
           <td colspan="4" class="text-center"></td>
         </tr>
-        <!-- <tr>
-          <ng-container style="padding: 20px;">
-            <div class="row">
-              <div class="col-md-3">
-                <table>
-                  <thead>
-                    <tr>
-                        <th>Name</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td>Administ</td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <div class="col-md-3">
-                <table>
-                  <thead>
-                    <tr>
-                        <th>Name</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td>Administ</td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <div class="col-md-3">
-                <table>
-                  <thead>
-                    <tr>
-                        <th>Name</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td>Administ</td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-              <div class="col-md-3">
-                <table>
-                  <thead>
-                    <tr>
-                        <th>Name</th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <tr>
-                      <td>Administ</td>
-                    </tr>
-                  </tbody>
-                </table>
-              </div>
-            </div>
-          </ng-container>
-        </tr> -->
       </tbody>
     </table>
   </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
index c982e94bd..90cab6a0c 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
@@ -1,7 +1,19 @@
-import { Component, OnInit, Output } from '@angular/core';
+import { DatePipe } from '@angular/common';
+import {
+  Component,
+  OnInit,
+  Output,
+  Input,
+  OnDestroy,
+  ViewChild,
+  ElementRef
+} from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
 @Component({
   selector: 'app-prepdaily-register',
   templateUrl: './prepdaily-register.component.html',
@@ -12,7 +24,7 @@ export class PrepdailyRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public txnewReportSummaryData: any = [];
+  public prepRegisterData: any = [];
   public columnDefs: any = [];
   public reportName = 'PrEP Daily Activity Register';
   public currentView = 'monthly';
@@ -32,6 +44,7 @@ export class PrepdailyRegisterComponent implements OnInit {
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  @ViewChild('prepcontentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
   public get locationUuids(): Array<string> {
@@ -48,7 +61,12 @@ export class PrepdailyRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(public router: Router, public route: ActivatedRoute) {
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public register: RegistersResourceService,
+    private datePipe: DatePipe
+  ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -71,8 +89,8 @@ export class PrepdailyRegisterComponent implements OnInit {
     this.route.parent.parent.params.subscribe((params: any) => {
       this.storeParamsInUrl(params.location_uuid);
     });
-    this.txnewReportSummaryData = [];
-    // this.getTxNewReport(this.params);
+    this.prepRegisterData = [];
+    this.getPrEPRegisterReport(this.params);
   }
 
   public storeParamsInUrl(param) {
@@ -89,54 +107,22 @@ export class PrepdailyRegisterComponent implements OnInit {
     });
   }
 
-  // public getTxNewReport(params: any) {
-  //   this.isLoading = true;
-  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
-  //     if (data.error) {
-  //       this.showInfoMessage = true;
-  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
-  //       this.isLoading = false;
-  //     } else {
-  //       this.showInfoMessage = false;
-  //       this.columnDefs = data.sectionDefinitions;
-  //       this.txnewReportSummaryData = data.result;
-  //       this.calculateTotalSummary();
-  //       this.isLoading = false;
-  //       this.showDraftReportAlert(this._month);
-  //     }
-  //   });
-  // }
-
-  public calculateTotalSummary() {
-    const totalsRow = [];
-    if (this.txnewReportSummaryData.length > 0) {
-      const totalObj = {
-        location: 'Totals'
-      };
-      _.each(this.txnewReportSummaryData, (row) => {
-        Object.keys(row).map((key) => {
-          if (Number.isInteger(row[key]) === true) {
-            if (totalObj[key]) {
-              totalObj[key] = row[key] + totalObj[key];
-            } else {
-              totalObj[key] = row[key];
-            }
-          } else {
-            if (Number.isNaN(totalObj[key])) {
-              totalObj[key] = 0;
-            }
-            if (totalObj[key] === null) {
-              totalObj[key] = 0;
-            }
-            totalObj[key] = 0 + totalObj[key];
-          }
-        });
-      });
-      totalObj.location = 'Totals';
-      totalsRow.push(totalObj);
-      this.pinnedBottomRowData = totalsRow;
-    }
+  public getPrEPRegisterReport(params: any) {
+    this.isLoading = true;
+    this.register.getPrEPRegisterReport(params).subscribe((data) => {
+      if (data.error) {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      } else {
+        this.showInfoMessage = false;
+        this.prepRegisterData = data;
+        this.isLoading = false;
+        this.showDraftReportAlert(this._month);
+      }
+    });
   }
+
   public onIndicatorSelected(value) {
     this.router.navigate(['patient-list'], {
       relativeTo: this.route,
@@ -158,4 +144,21 @@ export class PrepdailyRegisterComponent implements OnInit {
       this.isReleased = true;
     }
   }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH 267 PrEP Daily Activity Register.pdf');
+    });
+  }
 }
diff --git a/src/app/etl-api/registers-resource.service.spec.ts b/src/app/etl-api/registers-resource.service.spec.ts
new file mode 100644
index 000000000..35c519fe1
--- /dev/null
+++ b/src/app/etl-api/registers-resource.service.spec.ts
@@ -0,0 +1,18 @@
+import { TestBed, inject } from '@angular/core/testing';
+
+import { RegistersResourceService } from './registers-resource.service';
+
+describe('RegistersResourceService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [RegistersResourceService]
+    });
+  });
+
+  it('should be created', inject(
+    [RegistersResourceService],
+    (service: RegistersResourceService) => {
+      expect(service).toBeTruthy();
+    }
+  ));
+});
diff --git a/src/app/etl-api/registers-resource.service.ts b/src/app/etl-api/registers-resource.service.ts
new file mode 100644
index 000000000..140bb39e9
--- /dev/null
+++ b/src/app/etl-api/registers-resource.service.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+import { AppSettingsService } from '../app-settings/app-settings.service';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import * as Moment from 'moment';
+import { catchError, map } from 'rxjs/operators';
+@Injectable({
+  providedIn: 'root'
+})
+export class RegistersResourceService {
+  public get url(): string {
+    return this.appSettingsService.getEtlRestbaseurl().trim();
+  }
+  constructor(
+    public http: HttpClient,
+    public appSettingsService: AppSettingsService
+  ) {}
+  public getPrEPRegisterReport(params: any): Observable<any> {
+    // tslint:disable-next-line: max-line-length
+    return this.http
+      .get(
+        `${this.url}prepregisterdata?month=${params.month}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+}

From 8b4a90bb6851641efa82907a4f3cb63d7e6637d1 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 2 May 2024 16:22:17 +0300
Subject: [PATCH 07/50] Initial MOH731 template

---
 .../moh-731-report-pdf-view.component.html    | 382 +++++++++++++++++-
 1 file changed, 380 insertions(+), 2 deletions(-)

diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index e62f3113b..21fc3e2e7 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -20,7 +20,7 @@
       </strong>
     </div>
     <div class="panel-body" style="background-color: #ecf0f5">
-      <pdf-viewer
+      <!-- <pdf-viewer
         [src]="pdfSrc"
         [page]="page"
         (after-load-complete)="afterLoadCompletes($event)"
@@ -29,8 +29,386 @@
         [render-text]="false"
         [show-all]="false"
       >
-      </pdf-viewer>
+      </pdf-viewer> -->
       <!--<object  type="application/pdf" width="100%" height="800" [data]="securedUrl" type="application/pdf"></object>-->
+
+
+      <div class="row" style="padding:20px 20px 0px 20px;">
+        <div class="col-md-6 text-left">
+          <b>Ministry of Health</b>
+        </div>
+        <div class="col-md-6 text-right">
+          <b>Ver. July 2023</b>
+        </div>
+        <div class="col-md-12" style="border: 2px solid black; padding-bottom: 20px;">
+          <div style="text-align: center;">
+            <b style="font-size: 16px;">National AIDS & STI Control Program - NASCOP</b>
+            <span style="float: right !important; border: 1px dotted black; font-size: 10px;"><b>MOH 731-Ver. July 2023</b></span><br>
+            <b>Comprehensive HIV/AIDS reporting form</b>
+          </div>
+        </div>
+        <div class="col-md-12" style="border: 2px solid black; border-top: none; text-align: center">
+          <span>County________________________Sub County__________________________Facility______________________MFL_________Month_______Year__________</span>
+        </div>
+        <div class="col-md-12" style="border: 2px solid black; border-top: none; padding: 5px;"></div>
+      </div>      
+      <div class="row" style="padding: 10px 20px 20px 20px;">
+        <div class="col-md-12" style="border: 2px solid black; background-color: lightgrey; border-bottom: 1px solid black;">
+          <b>1. HIV Testing Services & Pre exposure Prophylaxis</b>
+        </div>
+        <div class="col-md-12" style="border: 2px solid black; border-top: none; border-bottom: 1px solid black;">
+          <div class="row">
+            <div class="col-md-6">
+              <div style="padding: 20px 0px; font-size: 12px;">
+                <b>1.1 HIV Tests</b>
+                <br>
+                <div class="row">
+                  <div class="col-md-5"></div>
+                  <div class="col-md-3">
+                    <span>Male</span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Female(including PMTCT)</span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Tests</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-01 <i style="padding: 2px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-02 <i style="padding: 2px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                </div>
+                <div class="row" style="padding-top:20px;">
+                  <div class="col-md-4">
+                    <span>Tests-Facility</span>
+                  </div>
+                  <div class="col-md-8">
+                    <span>HV01-03 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Tests-Community</span>
+                  </div>
+                  <div class="col-md-8">
+                    <span>HV01-04 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                </div>
+                <div class="row" style="padding-top: 20px;">
+                  <div class="col-md-4">
+                    <span>Tested KVP</span>
+                  </div>
+                  <div class="col-md-8">
+                    <span>HV01-05 <i style="padding: 2px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                </div>
+              </div>
+              <div style="padding: 20px 0px; font-size: 12px;">
+                <b>1.2 HIV Positive Results</b>
+                <br>
+                <div class="row">
+                  <div class="col-md-5"></div>
+                  <div class="col-md-3">
+                    <span>Male</span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Female(including PMTCT)</span>
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="col-md-4">
+                    <span>Positive_2-9</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-06 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-07 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Positive_10-14</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-08 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-09 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Positive_15-19</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-10 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-11 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Positive_20-24</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-12 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-13 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Positive_25+</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-14 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-15 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Positive_KVP</span>
+                  </div>
+                  <div class="col-md-8">
+                    <span>HV01-16 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                </div>
+                <div class="row" style="padding-top: 20px;">
+                  <div class="col-md-4">
+                    <span>Discordant</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-17 <i style="padding: 2px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-18 <i style="padding: 2px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                </div>
+              </div>
+              <div style="padding: 20px 0px; font-size: 12px;">
+                <b>1.3 No. Seroconverted while on PrEP</b>
+                <br>
+                <div class="row">
+                  <div class="col-md-5"></div>
+                  <div class="col-md-3">
+                    <span>Male</span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Female</span>
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="col-md-4">
+                    <span>HIV Positive</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-19 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-20 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+              </div>
+            </div>
+          </div>
+            <div class="col-md-6">
+              <div style="padding: 20px 0px; font-size: 12px;">
+                <b>1.4 No. Initiated on PrEP(NEW)</b>
+                <br>
+                <div class="row">
+                  <div class="col-md-5"></div>
+                  <div class="col-md-3">
+                    <span>Male</span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Female</span>
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="col-md-4">
+                    <span>General popn</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-21 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-22 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>MSM/MSW</span>
+                  </div>
+                  <div class="col-md-8">
+                    <span>HV01-23 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-7">
+                    <span>PSW</span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-24 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>PWID/PWUD</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-25 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-26 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Discordant Couple</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-27 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-28 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Vulnerable Pop</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-29 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-30 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>AYP (15-24yrs)</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-31 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-32 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-7">
+                    <span>Pregnant and breastfeeding women</span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-33 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                </div>
+              </div>
+              <div style="padding: 20px 0px; font-size: 12px;">
+                <b>1.5 No. on Prep Diagnosed with STI</b>
+                <br>
+                <div class="row">
+                  <div class="col-md-5"></div>
+                  <div class="col-md-3">
+                    <span>Male</span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Female</span>
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="col-md-4">
+                    <span>General popn</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-34 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-35 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>MSM/MSW</span>
+                  </div>
+                  <div class="col-md-8">
+                    <span>HV01-36 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-7">
+                    <span>PSW</span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-37 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>PWID/PWUD</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-38 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-39 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Discordant Couple</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-40 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-41 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>Vulnerable Pop</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-42 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-43 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-4">
+                    <span>AYP (15-24yrs)</span>
+                  </div>
+                  <div class="col-md-3">
+                    <span>HV01-44 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                  <div class="col-md-5">
+                    <span>HV01-45 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="col-md-12" style="border: 2px solid black; border-top: none; background-color: lightgrey; border-bottom: 1px solid black;">
+          <b>2. Elimination of Mother-To-Child Transmission(EMTCT)</b>
+        </div>
+        <div class="col-md-12" style="border: 2px solid black; border-top: none; border-bottom: 1px solid black;">
+          <b>sdfghjk</b>
+        </div>
+        <div class="col-md-12" style="border: 2px solid black; border-top: none; background-color: lightgrey; border-bottom: 1px solid black;">
+          <b>3. HIV and TB Treatment</b>
+        </div>
+        <div class="col-md-12" style="border: 2px solid black; border-top: none;">
+          <div class="row">
+            <div class="col-md-9">
+              <div class="row">
+                <div class="col-md-7" style="border-right: 1px dotted black;">
+                  <b>sdfghjk</b>
+                </div>
+                <div class="col-md-5">
+                  <b>sdfghjk</b>
+                </div>
+                <div class="col-md-12" style="border-top: 1px dotted black;">
+                  <b>sdfghjk</b>
+                </div>
+              </div>
+            </div>
+            <div class="col-md-3" style="border-left: 1px dotted black;">
+             <div class="row">
+              <div class="col-md-12">                  
+                <b>kdthfjklh</b>
+              </div>
+              <div class="col-md-12" style="border-top: 1px solid black; background-color: lightgrey; border-bottom: 1px solid black;">
+                <b>4. Medical Male Circumcision</b>
+              </div>
+              <div class="col-md-12">
+                <b>sdfghjk</b>
+              </div>
+              <div class="col-md-12" style="border-top: 1px solid black; background-color: lightgrey; border-bottom: 1px solid black;">
+                <b>5. Post Exposure Prophylaxis</b>
+              </div>
+              <div class="col-md-12">
+                <b>sdfghjk</b>
+              </div>
+             </div>
+              
+            </div>
+          </div>
+        </div>
+      </div>
+
+
+
     </div>
     <div class="panel-footer" style="min-height: 50px">
       <button

From 218d363e0ee638b3089fd416afd675e448810684 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 2 May 2024 16:23:25 +0300
Subject: [PATCH 08/50] Initial MOH731 template

---
 .../moh-731-report-pdf-view.component.html    | 565 +++++++++++++++---
 1 file changed, 466 insertions(+), 99 deletions(-)

diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index 21fc3e2e7..8d11941b3 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -32,36 +32,70 @@
       </pdf-viewer> -->
       <!--<object  type="application/pdf" width="100%" height="800" [data]="securedUrl" type="application/pdf"></object>-->
 
-
-      <div class="row" style="padding:20px 20px 0px 20px;">
+      <div class="row" style="padding: 20px 20px 0px 20px">
         <div class="col-md-6 text-left">
           <b>Ministry of Health</b>
         </div>
         <div class="col-md-6 text-right">
           <b>Ver. July 2023</b>
         </div>
-        <div class="col-md-12" style="border: 2px solid black; padding-bottom: 20px;">
-          <div style="text-align: center;">
-            <b style="font-size: 16px;">National AIDS & STI Control Program - NASCOP</b>
-            <span style="float: right !important; border: 1px dotted black; font-size: 10px;"><b>MOH 731-Ver. July 2023</b></span><br>
+        <div
+          class="col-md-12"
+          style="border: 2px solid black; padding-bottom: 20px"
+        >
+          <div style="text-align: center">
+            <b style="font-size: 16px"
+              >National AIDS & STI Control Program - NASCOP</b
+            >
+            <span
+              style="
+                float: right !important;
+                border: 1px dotted black;
+                font-size: 10px;
+              "
+              ><b>MOH 731-Ver. July 2023</b></span
+            ><br />
             <b>Comprehensive HIV/AIDS reporting form</b>
           </div>
         </div>
-        <div class="col-md-12" style="border: 2px solid black; border-top: none; text-align: center">
-          <span>County________________________Sub County__________________________Facility______________________MFL_________Month_______Year__________</span>
+        <div
+          class="col-md-12"
+          style="border: 2px solid black; border-top: none; text-align: center"
+        >
+          <span
+            >County________________________Sub
+            County__________________________Facility______________________MFL_________Month_______Year__________</span
+          >
         </div>
-        <div class="col-md-12" style="border: 2px solid black; border-top: none; padding: 5px;"></div>
-      </div>      
-      <div class="row" style="padding: 10px 20px 20px 20px;">
-        <div class="col-md-12" style="border: 2px solid black; background-color: lightgrey; border-bottom: 1px solid black;">
+        <div
+          class="col-md-12"
+          style="border: 2px solid black; border-top: none; padding: 5px"
+        ></div>
+      </div>
+      <div class="row" style="padding: 10px 20px 20px 20px">
+        <div
+          class="col-md-12"
+          style="
+            border: 2px solid black;
+            background-color: lightgrey;
+            border-bottom: 1px solid black;
+          "
+        >
           <b>1. HIV Testing Services & Pre exposure Prophylaxis</b>
         </div>
-        <div class="col-md-12" style="border: 2px solid black; border-top: none; border-bottom: 1px solid black;">
+        <div
+          class="col-md-12"
+          style="
+            border: 2px solid black;
+            border-top: none;
+            border-bottom: 1px solid black;
+          "
+        >
           <div class="row">
             <div class="col-md-6">
-              <div style="padding: 20px 0px; font-size: 12px;">
+              <div style="padding: 20px 0px; font-size: 12px">
                 <b>1.1 HIV Tests</b>
-                <br>
+                <br />
                 <div class="row">
                   <div class="col-md-5"></div>
                   <div class="col-md-3">
@@ -74,38 +108,59 @@
                     <span>Tests</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-01 <i style="padding: 2px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-01
+                      <i style="padding: 2px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-02 <i style="padding: 2px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-02
+                      <i style="padding: 2px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                 </div>
-                <div class="row" style="padding-top:20px;">
+                <div class="row" style="padding-top: 20px">
                   <div class="col-md-4">
                     <span>Tests-Facility</span>
                   </div>
                   <div class="col-md-8">
-                    <span>HV01-03 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-03
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>Tests-Community</span>
                   </div>
                   <div class="col-md-8">
-                    <span>HV01-04 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-04
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                 </div>
-                <div class="row" style="padding-top: 20px;">
+                <div class="row" style="padding-top: 20px">
                   <div class="col-md-4">
                     <span>Tested KVP</span>
                   </div>
                   <div class="col-md-8">
-                    <span>HV01-05 <i style="padding: 2px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-05
+                      <i style="padding: 2px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                 </div>
               </div>
-              <div style="padding: 20px 0px; font-size: 12px;">
+              <div style="padding: 20px 0px; font-size: 12px">
                 <b>1.2 HIV Positive Results</b>
-                <br>
+                <br />
                 <div class="row">
                   <div class="col-md-5"></div>
                   <div class="col-md-3">
@@ -120,69 +175,162 @@
                     <span>Positive_2-9</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-06 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-06
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-07 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-07
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>Positive_10-14</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-08 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-08
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-09 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-09
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>Positive_15-19</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-10 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-10
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-11 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-11
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>Positive_20-24</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-12 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-12
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-13 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-13
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>Positive_25+</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-14 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-14
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-15 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-15
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>Positive_KVP</span>
                   </div>
                   <div class="col-md-8">
-                    <span>HV01-16 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-16
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                 </div>
-                <div class="row" style="padding-top: 20px;">
+                <div class="row" style="padding-top: 20px">
                   <div class="col-md-4">
                     <span>Discordant</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-17 <i style="padding: 2px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-17
+                      <i style="padding: 2px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-18 <i style="padding: 2px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-18
+                      <i style="padding: 2px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                 </div>
               </div>
-              <div style="padding: 20px 0px; font-size: 12px;">
+              <div style="padding: 20px 0px; font-size: 12px">
                 <b>1.3 No. Seroconverted while on PrEP</b>
-                <br>
+                <br />
                 <div class="row">
                   <div class="col-md-5"></div>
                   <div class="col-md-3">
@@ -197,18 +345,24 @@
                     <span>HIV Positive</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-19 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-19
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-20 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-20
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
+                </div>
               </div>
             </div>
-          </div>
             <div class="col-md-6">
-              <div style="padding: 20px 0px; font-size: 12px;">
+              <div style="padding: 20px 0px; font-size: 12px">
                 <b>1.4 No. Initiated on PrEP(NEW)</b>
-                <br>
+                <br />
                 <div class="row">
                   <div class="col-md-5"></div>
                   <div class="col-md-3">
@@ -223,70 +377,163 @@
                     <span>General popn</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-21 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-21
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-22 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-22
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>MSM/MSW</span>
                   </div>
                   <div class="col-md-8">
-                    <span>HV01-23 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-23
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-7">
                     <span>PSW</span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-24 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-24
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>PWID/PWUD</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-25 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-25
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-26 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-26
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>Discordant Couple</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-27 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-27
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-28 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-28
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>Vulnerable Pop</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-29 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-29
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-30 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-30
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>AYP (15-24yrs)</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-31 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-31
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-32 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-32
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-7">
                     <span>Pregnant and breastfeeding women</span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-33 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-33
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                 </div>
               </div>
-              <div style="padding: 20px 0px; font-size: 12px;">
+              <div style="padding: 20px 0px; font-size: 12px">
                 <b>1.5 No. on Prep Diagnosed with STI</b>
-                <br>
+                <br />
                 <div class="row">
                   <div class="col-md-5"></div>
                   <div class="col-md-3">
@@ -301,114 +548,234 @@
                     <span>General popn</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-34 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-34
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-35 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-35
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>MSM/MSW</span>
                   </div>
                   <div class="col-md-8">
-                    <span>HV01-36 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-36
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-7">
                     <span>PSW</span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-37 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-37
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>PWID/PWUD</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-38 <i style="padding: 0px 50px; border: 1px solid black;"></i></span>
+                    <span
+                      >HV01-38
+                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-39 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-39
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>Discordant Couple</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-40 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-40
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-41 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-41
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>Vulnerable Pop</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-42 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-42
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-43 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-43
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-4">
                     <span>AYP (15-24yrs)</span>
                   </div>
                   <div class="col-md-3">
-                    <span>HV01-44 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-44
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                   <div class="col-md-5">
-                    <span>HV01-45 <i style="padding: 0px 50px; border: 1px solid black; border-top: none;"></i></span>
+                    <span
+                      >HV01-45
+                      <i
+                        style="
+                          padding: 0px 50px;
+                          border: 1px solid black;
+                          border-top: none;
+                        "
+                      ></i
+                    ></span>
                   </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
-        <div class="col-md-12" style="border: 2px solid black; border-top: none; background-color: lightgrey; border-bottom: 1px solid black;">
+        <div
+          class="col-md-12"
+          style="
+            border: 2px solid black;
+            border-top: none;
+            background-color: lightgrey;
+            border-bottom: 1px solid black;
+          "
+        >
           <b>2. Elimination of Mother-To-Child Transmission(EMTCT)</b>
         </div>
-        <div class="col-md-12" style="border: 2px solid black; border-top: none; border-bottom: 1px solid black;">
+        <div
+          class="col-md-12"
+          style="
+            border: 2px solid black;
+            border-top: none;
+            border-bottom: 1px solid black;
+          "
+        >
           <b>sdfghjk</b>
         </div>
-        <div class="col-md-12" style="border: 2px solid black; border-top: none; background-color: lightgrey; border-bottom: 1px solid black;">
+        <div
+          class="col-md-12"
+          style="
+            border: 2px solid black;
+            border-top: none;
+            background-color: lightgrey;
+            border-bottom: 1px solid black;
+          "
+        >
           <b>3. HIV and TB Treatment</b>
         </div>
-        <div class="col-md-12" style="border: 2px solid black; border-top: none;">
+        <div
+          class="col-md-12"
+          style="border: 2px solid black; border-top: none"
+        >
           <div class="row">
             <div class="col-md-9">
               <div class="row">
-                <div class="col-md-7" style="border-right: 1px dotted black;">
+                <div class="col-md-7" style="border-right: 1px dotted black">
                   <b>sdfghjk</b>
                 </div>
                 <div class="col-md-5">
                   <b>sdfghjk</b>
                 </div>
-                <div class="col-md-12" style="border-top: 1px dotted black;">
+                <div class="col-md-12" style="border-top: 1px dotted black">
                   <b>sdfghjk</b>
                 </div>
               </div>
             </div>
-            <div class="col-md-3" style="border-left: 1px dotted black;">
-             <div class="row">
-              <div class="col-md-12">                  
-                <b>kdthfjklh</b>
-              </div>
-              <div class="col-md-12" style="border-top: 1px solid black; background-color: lightgrey; border-bottom: 1px solid black;">
-                <b>4. Medical Male Circumcision</b>
-              </div>
-              <div class="col-md-12">
-                <b>sdfghjk</b>
-              </div>
-              <div class="col-md-12" style="border-top: 1px solid black; background-color: lightgrey; border-bottom: 1px solid black;">
-                <b>5. Post Exposure Prophylaxis</b>
-              </div>
-              <div class="col-md-12">
-                <b>sdfghjk</b>
+            <div class="col-md-3" style="border-left: 1px dotted black">
+              <div class="row">
+                <div class="col-md-12">
+                  <b>kdthfjklh</b>
+                </div>
+                <div
+                  class="col-md-12"
+                  style="
+                    border-top: 1px solid black;
+                    background-color: lightgrey;
+                    border-bottom: 1px solid black;
+                  "
+                >
+                  <b>4. Medical Male Circumcision</b>
+                </div>
+                <div class="col-md-12">
+                  <b>sdfghjk</b>
+                </div>
+                <div
+                  class="col-md-12"
+                  style="
+                    border-top: 1px solid black;
+                    background-color: lightgrey;
+                    border-bottom: 1px solid black;
+                  "
+                >
+                  <b>5. Post Exposure Prophylaxis</b>
+                </div>
+                <div class="col-md-12">
+                  <b>sdfghjk</b>
+                </div>
               </div>
-             </div>
-              
             </div>
           </div>
         </div>
       </div>
-
-
-
     </div>
     <div class="panel-footer" style="min-height: 50px">
       <button

From e5bf3717e9de9a8c8b7657e51600d5984465af20 Mon Sep 17 00:00:00 2001
From: Faith Kamau <121166087+hiqedme@users.noreply.github.com>
Date: Fri, 3 May 2024 17:19:20 +0300
Subject: [PATCH 09/50] MOH-731 added section 2 and 5

---
 .../moh-731-report-pdf-view.component.html    | 552 +++++++++++++++++-
 1 file changed, 550 insertions(+), 2 deletions(-)

diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index 8d11941b3..36f8fceee 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -709,7 +709,504 @@
             border-bottom: 1px solid black;
           "
         >
-          <b>sdfghjk</b>
+          <div class="col-md-6">
+            <div style="padding: 20px 0px; font-size: 12px">
+              <b>2.1 Maternal HIV Testing</b>
+              <br />
+              <div class="row" style="padding: 10px 0px">
+                <div class="col-md-4">
+                  <span>Known Positive at 1st ANC </span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-01
+                    <i style="padding: 2px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-md-5"></div>
+                <div class="col-md-3">
+                  <span>Initial</span>
+                </div>
+                <div class="col-md-4">
+                  <span>Retest</span>
+                </div>
+              </div>
+              <div class="row">
+                <div class="col-md-4">
+                  <span>Tested at ANC </span>
+                </div>
+                <div class="col-md-3">
+                  <span
+                    >HV02-02
+                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+                <div class="col-md-5">
+                  <span
+                    >HV02-03
+                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Tested at L&D</span>
+                </div>
+                <div class="col-md-3">
+                  <span
+                    >HV02-04
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-5">
+                  <span
+                    >HV02-05
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Tested at PNC_<=6 weeks</span>
+                </div>
+                <div class="col-md-3">
+                  <span
+                    >HV02-06
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-5">
+                  <span
+                    >HV02-07
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Tested at PNC_>=6 weeks</span>
+                </div>
+                <div class="col-md-3">
+                  <span
+                    >HV02-08
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-5">
+                  <span
+                    >HV02-09
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+              </div>
+            </div>
+            <div style="padding: 20px 0px; font-size: 12px">
+              <b>2.2 HIV Positive Results</b>
+              <br />
+              <div class="row">
+                <div class="col-md-4">
+                  <span>Postive Results_ANC</span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-10
+                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Postive Results_L&D</span>
+                </div>
+                <div class="col-md-8">
+                  <span style="padding-right: 5px"
+                    >HV02-11
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Postive Results_PNC_<=6 weeks</span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-12
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Postive Results_PNC_>=6 weeks</span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-13
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+              </div>
+            </div>
+            <div style="padding: 20px 0px; font-size: 12px">
+              <b>2.3 Maternal HAART</b>
+              <br />
+              <div class="row">
+                <div class="col-md-4">
+                  <span>on HAART at 1st ANC</span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-14
+                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Start HAART_ANC</span>
+                </div>
+                <div class="col-md-8">
+                  <span style="padding-right: 5px"
+                    >HV02-15
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Start HAART_L&D</span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-16
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Start HAART_PNC_<=6 weeks</span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-17
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Start HAART_PNC_>=6 weeks</span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-18
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="col-md-6">
+            <div style="padding: 20px 0px; font-size: 12px">
+              <b>2.4 HBV Screening at ANC</b>
+              <br />
+              <div class="row">
+                <div class="col-md-4">
+                  <span>Screened_ HBV_ANC </span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-19
+                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>HBV Screened_Positive</span>
+                </div>
+                <div class="col-md-8">
+                  <span style="padding-right: 5px"
+                    >HV02-20
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+              </div>
+            </div>
+            <div style="padding: 20px 0px; font-size: 12px">
+              <b
+                >2.5 Adolescents girls & Young Women (10-24 Yrs) testing &
+                results</b
+              >
+              <br />
+              <div class="row">
+                <div class="col-md-5"></div>
+                <div class="col-md-3">
+                  <span>10-19yrs</span>
+                </div>
+                <div class="col-md-4">
+                  <span>20-24yrs</span>
+                </div>
+              </div>
+
+              <div class="row">
+                <div class="col-md-4">
+                  <span>1st ANC KP</span>
+                </div>
+                <div class="col-md-3">
+                  <span
+                    >HV02-21
+                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+                <div class="col-md-5">
+                  <span
+                    >HV02-22
+                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>New HIV Positive</span>
+                </div>
+                <div class="col-md-3">
+                  <span
+                    >HV02-23
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-5">
+                  <span
+                    >HV02-24
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>on HAART 1st ANC KP</span>
+                </div>
+                <div class="col-md-3">
+                  <span
+                    >HV02-25
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-5">
+                  <span
+                    >HV02-26
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Started HAART New</span>
+                </div>
+                <div class="col-md-3">
+                  <span
+                    >HV02-27
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-5">
+                  <span
+                    >HV02-28
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+              </div>
+            </div>
+            <div style="padding: 20px 0px; font-size: 12px">
+              <b>2.6 Infant Prophylaxis</b>
+              <br />
+              <div class="row">
+                <div class="col-md-4">
+                  <span>Infant ARV Prophylaxis_ANC</span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-29
+                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Infant ARV Prophylaxis_L&D</span>
+                </div>
+                <div class="col-md-8">
+                  <span style="padding-right: 5px"
+                    >HV02-30
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Infant ARV Prophylaxis_PNC</span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-31
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+              </div>
+            </div>
+            <div style="padding: 20px 0px; font-size: 12px">
+              <b>2.7 Infant Feeding</b>
+              <br />
+              <b>Below 6months</b>
+              <br />
+              <div class="row">
+                <div class="col-md-4">
+                  <span>Exclusive Breastfeeding(EBF) </span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-32
+                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+              </div>
+              <b>6 to 24 months</b>
+              <br />
+              <div class="row">
+                <div class="col-md-4">
+                  <span>Breastfeeding(BF)</span>
+                </div>
+                <div class="col-md-8">
+                  <span
+                    >HV02-33
+                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                  ></span>
+                </div>
+                <div class="col-md-4">
+                  <span>Not Breastfeeding(NBF) </span>
+                </div>
+                <div class="col-md-8">
+                  <span style="padding-right: 5px"
+                    >HV02-34
+                    <i
+                      style="
+                        padding: 0px 50px;
+                        border: 1px solid black;
+                        border-top: none;
+                      "
+                    ></i
+                  ></span>
+                </div>
+              </div>
+            </div>
+
+
+          </div>
         </div>
         <div
           class="col-md-12"
@@ -769,7 +1266,58 @@
                   <b>5. Post Exposure Prophylaxis</b>
                 </div>
                 <div class="col-md-12">
-                  <b>sdfghjk</b>
+                  <div class="row">
+                    <div class="col-md-7">
+                      <span>Exposed_Occupational</span>
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV05-01
+                        <i style="padding: 0px 50px; border: 1px solid black"></i
+                      ></span>
+                    </div>
+                    <div class="col-md-7">
+                      <span>Exposed_Other </span>
+                    </div>
+                    <div class="col-md-5">
+                      <span style="padding-right: 5px"
+                        >HV05-02
+                        <i
+                          style="
+                            padding: 0px 50px;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                        ></i
+                      ></span>
+                    </div>
+                  </div>
+                  <div class="row" style="padding-top: 20px;">
+                    <div class="col-md-7">
+                      <span>PEP_Occupational</span>
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV05-03
+                        <i style="padding: 0px 50px; border: 1px solid black"></i
+                      ></span>
+                    </div>
+                    <div class="col-md-7">
+                      <span>PEP_Other</span>
+                    </div>
+                    <div class="col-md-5">
+                      <span style="padding-right: 5px"
+                        >HV05-04
+                        <i
+                          style="
+                            padding: 0px 50px;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                        ></i
+                      ></span>
+                    </div>
+                  </div>
                 </div>
               </div>
             </div>

From 7915583882bb607768cd8ce7d1bf4f910c4c3194 Mon Sep 17 00:00:00 2001
From: Faith Kamau <121166087+hiqedme@users.noreply.github.com>
Date: Fri, 3 May 2024 17:27:45 +0300
Subject: [PATCH 10/50] MOH-731 added section 4.3

---
 .../moh-731-report-pdf-view.component.html    | 76 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index 36f8fceee..f7108aa41 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -1253,7 +1253,81 @@
                   <b>4. Medical Male Circumcision</b>
                 </div>
                 <div class="col-md-12">
-                  <b>sdfghjk</b>
+                  <div style="padding: 20px 0px; font-size: 12px">
+                    <b>4.3 Circumcision Adverse Events</b>
+                    <br />
+                    <div class="row">
+                      <div class="col-md-7">
+                        <span>AE_During_Moderate</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV04-09
+                          <i style="padding: 0px 50px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-7">
+                        <span>AE_During_Severe</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span style="padding-right: 5px"
+                          >HV04-10
+                          <i
+                            style="
+                              padding: 0px 50px;
+                              border: 1px solid black;
+                              border-top: none;
+                            "
+                          ></i
+                        ></span>
+                      </div>
+                      <div class="col-md-7">
+                        <span>IAE_Post_Moderate</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV04-11
+                          <i
+                            style="
+                              padding: 0px 50px;
+                              border: 1px solid black;
+                              border-top: none;
+                            "
+                          ></i
+                        ></span>
+                      </div>
+                      <div class="col-md-7">
+                        <span>AE_Post_Severe</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV04-12
+                          <i
+                            style="
+                              padding: 0px 50px;
+                              border: 1px solid black;
+                              border-top: none;
+                            "
+                          ></i
+                        ></span>
+                      </div>
+                      <div class="col-md-7">
+                        <span>Follow up visit less than 14d</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV04-13
+                          <i
+                            style="
+                              padding: 0px 50px;
+                              border: 1px solid black;
+                              border-top: none;
+                            "
+                          ></i
+                        ></span>
+                      </div>
+                    </div>
+                  </div>
                 </div>
                 <div
                   class="col-md-12"

From c72f059358304a2c5a72a0b058fd44c5a5d8b96a Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Mon, 6 May 2024 12:51:33 +0300
Subject: [PATCH 11/50] Updated MOH template

---
 .../moh-731-report-pdf-view.component.html    | 952 +++++++++++++++---
 1 file changed, 818 insertions(+), 134 deletions(-)

diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index f7108aa41..1153a53f1 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -110,13 +110,13 @@
                   <div class="col-md-3">
                     <span
                       >HV01-01
-                      <i style="padding: 2px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-5">
                     <span
                       >HV01-02
-                      <i style="padding: 2px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                 </div>
@@ -127,7 +127,7 @@
                   <div class="col-md-8">
                     <span
                       >HV01-03
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-4">
@@ -138,7 +138,7 @@
                       >HV01-04
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -153,7 +153,7 @@
                   <div class="col-md-8">
                     <span
                       >HV01-05
-                      <i style="padding: 2px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                 </div>
@@ -177,13 +177,13 @@
                   <div class="col-md-3">
                     <span
                       >HV01-06
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-5">
                     <span
                       >HV01-07
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-4">
@@ -194,7 +194,7 @@
                       >HV01-08
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -206,7 +206,7 @@
                       >HV01-09
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -221,7 +221,7 @@
                       >HV01-10
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -233,7 +233,7 @@
                       >HV01-11
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -248,7 +248,7 @@
                       >HV01-12
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -260,7 +260,7 @@
                       >HV01-13
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -275,7 +275,7 @@
                       >HV01-14
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -287,7 +287,7 @@
                       >HV01-15
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -302,7 +302,7 @@
                       >HV01-16
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -317,13 +317,13 @@
                   <div class="col-md-3">
                     <span
                       >HV01-17
-                      <i style="padding: 2px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-5">
                     <span
                       >HV01-18
-                      <i style="padding: 2px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                 </div>
@@ -347,13 +347,13 @@
                   <div class="col-md-3">
                     <span
                       >HV01-19
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-5">
                     <span
                       >HV01-20
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                 </div>
@@ -379,13 +379,13 @@
                   <div class="col-md-3">
                     <span
                       >HV01-21
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-5">
                     <span
                       >HV01-22
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-4">
@@ -396,7 +396,7 @@
                       >HV01-23
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -409,7 +409,7 @@
                   <div class="col-md-5">
                     <span
                       >HV01-24
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-4">
@@ -418,7 +418,7 @@
                   <div class="col-md-3">
                     <span
                       >HV01-25
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-5">
@@ -426,7 +426,7 @@
                       >HV01-26
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -441,7 +441,7 @@
                       >HV01-27
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -453,7 +453,7 @@
                       >HV01-28
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -468,7 +468,7 @@
                       >HV01-29
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -480,7 +480,7 @@
                       >HV01-30
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -495,7 +495,7 @@
                       >HV01-31
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -507,7 +507,7 @@
                       >HV01-32
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -522,7 +522,7 @@
                       >HV01-33
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -550,13 +550,13 @@
                   <div class="col-md-3">
                     <span
                       >HV01-34
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-5">
                     <span
                       >HV01-35
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-4">
@@ -567,7 +567,7 @@
                       >HV01-36
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -580,7 +580,7 @@
                   <div class="col-md-5">
                     <span
                       >HV01-37
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-4">
@@ -589,7 +589,7 @@
                   <div class="col-md-3">
                     <span
                       >HV01-38
-                      <i style="padding: 0px 50px; border: 1px solid black"></i
+                      <i style="padding: 2px 40px; border: 1px solid black"></i
                     ></span>
                   </div>
                   <div class="col-md-5">
@@ -597,7 +597,7 @@
                       >HV01-39
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -612,7 +612,7 @@
                       >HV01-40
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -624,7 +624,7 @@
                       >HV01-41
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -639,7 +639,7 @@
                       >HV01-42
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -651,7 +651,7 @@
                       >HV01-43
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -666,7 +666,7 @@
                       >HV01-44
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -678,7 +678,7 @@
                       >HV01-45
                       <i
                         style="
-                          padding: 0px 50px;
+                          padding: 2px 40px;
                           border: 1px solid black;
                           border-top: none;
                         "
@@ -720,7 +720,7 @@
                 <div class="col-md-8">
                   <span
                     >HV02-01
-                    <i style="padding: 2px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
               </div>
@@ -740,13 +740,13 @@
                 <div class="col-md-3">
                   <span
                     >HV02-02
-                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
                 <div class="col-md-5">
                   <span
                     >HV02-03
-                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
                 <div class="col-md-4">
@@ -757,7 +757,7 @@
                     >HV02-04
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -769,7 +769,7 @@
                     >HV02-05
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -784,7 +784,7 @@
                     >HV02-06
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -796,7 +796,7 @@
                     >HV02-07
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -811,7 +811,7 @@
                     >HV02-08
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -823,7 +823,7 @@
                     >HV02-09
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -842,7 +842,7 @@
                 <div class="col-md-8">
                   <span
                     >HV02-10
-                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
                 <div class="col-md-4">
@@ -853,7 +853,7 @@
                     >HV02-11
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -868,7 +868,7 @@
                     >HV02-12
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -883,7 +883,7 @@
                     >HV02-13
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -902,7 +902,7 @@
                 <div class="col-md-8">
                   <span
                     >HV02-14
-                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
                 <div class="col-md-4">
@@ -913,7 +913,7 @@
                     >HV02-15
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -928,7 +928,7 @@
                     >HV02-16
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -943,7 +943,7 @@
                     >HV02-17
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -958,7 +958,7 @@
                     >HV02-18
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -979,7 +979,7 @@
                 <div class="col-md-8">
                   <span
                     >HV02-19
-                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
                 <div class="col-md-4">
@@ -990,7 +990,7 @@
                     >HV02-20
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -1022,13 +1022,13 @@
                 <div class="col-md-3">
                   <span
                     >HV02-21
-                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
                 <div class="col-md-5">
                   <span
                     >HV02-22
-                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
                 <div class="col-md-4">
@@ -1039,7 +1039,7 @@
                     >HV02-23
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -1051,7 +1051,7 @@
                     >HV02-24
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -1066,7 +1066,7 @@
                     >HV02-25
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -1078,7 +1078,7 @@
                     >HV02-26
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -1093,7 +1093,7 @@
                     >HV02-27
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -1105,7 +1105,7 @@
                     >HV02-28
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -1124,7 +1124,7 @@
                 <div class="col-md-8">
                   <span
                     >HV02-29
-                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
                 <div class="col-md-4">
@@ -1135,7 +1135,7 @@
                     >HV02-30
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -1150,7 +1150,7 @@
                     >HV02-31
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -1171,7 +1171,7 @@
                 <div class="col-md-8">
                   <span
                     >HV02-32
-                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
               </div>
@@ -1184,7 +1184,7 @@
                 <div class="col-md-8">
                   <span
                     >HV02-33
-                    <i style="padding: 0px 50px; border: 1px solid black"></i
+                    <i style="padding: 2px 40px; border: 1px solid black"></i
                   ></span>
                 </div>
                 <div class="col-md-4">
@@ -1195,7 +1195,7 @@
                     >HV02-34
                     <i
                       style="
-                        padding: 0px 50px;
+                        padding: 2px 40px;
                         border: 1px solid black;
                         border-top: none;
                       "
@@ -1224,23 +1224,621 @@
           style="border: 2px solid black; border-top: none"
         >
           <div class="row">
-            <div class="col-md-9">
+            <div class="col-md-8">
               <div class="row">
                 <div class="col-md-7" style="border-right: 1px dotted black">
-                  <b>sdfghjk</b>
+                  <div style="padding: 20px 0px; font-size: 12px; border-bottom: 1px dotted black">
+                    <b>3.1 Starting ART</b>
+                    <br />
+                    <div class="row">
+                      <div class="col-md-4">
+                        <span>Start ART_< 1 </span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-01
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-02
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_1-4 </span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-03
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-04
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_5-9 </span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-05
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-06
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_10-14</span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-07
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-08
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_15-19</span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-09
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-10
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_20-24</span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-11
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-12
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_25+</span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-13
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-14
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>
+                  </div>
+                  <div style="padding: 20px 0px; font-size: 12px; border-bottom: 1px dotted black">
+                    <b>3.2 Currently on ART([All])</b>
+                    <br />
+                    <div class="row">
+                      <div class="col-md-4">
+                        <span>Start ART_< 1 </span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-015
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-016
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_1-4 </span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-017
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-018
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_5-9 </span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-019
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-020
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_10-14</span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-021
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-022
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_15-19</span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-023
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-024
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_20-24</span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-025
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-026
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start ART_25+</span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(M)HV03-027
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span
+                          >(F)HV03-028
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>
+                  </div>
+                  <div style="padding: 20px 0px; font-size: 12px;">
+                    <b>3.3 TB Screening</b>
+                    <br />
+                    <div class="row">
+                      <div class="col-md-4">
+                        <span>Screen for TB_< 15 </span>
+                      </div>
+                      <div class="col-md-8">
+                        <span
+                          >HV03-029
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Screen for TB_15+ </span>
+                      </div>
+                      <div class="col-md-8">
+                        <span
+                          >HV03-030
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>
+                  </div>
+                  <div style="padding: 20px 0px; font-size: 12px;">
+                    <b>3.4 Starting TPT</b>
+                    <br />
+                    <div class="row">
+                      <div class="col-md-4">
+                        <span>Start TPT_< 15 </span>
+                      </div>
+                      <div class="col-md-8">
+                        <span
+                          >HV03-031
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Start TPT_15+ </span>
+                      </div>
+                      <div class="col-md-8">
+                        <span
+                          >HV03-032
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>
+                  </div>
+                  <div style="padding: 20px 0px; font-size: 12px;">
+                    <b>3.5 Differentiated Service Delivery</b>
+                    <br />
+                    <div class="row">
+                      <div class="col-md-4">
+                        <span>Established</span>
+                      </div>
+                      <div class="col-md-8">
+                        <span
+                          >HV03-033
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Not Established</span>
+                      </div>
+                      <div class="col-md-8">
+                        <span
+                          >HV03-034
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Community</span>
+                      </div>
+                      <div class="col-md-8">
+                        <span
+                          >HV03-035
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-4">
+                        <span>Facility</span>
+                      </div>
+                      <div class="col-md-8">
+                        <span
+                          >HV03-036
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>
+                  </div>
                 </div>
                 <div class="col-md-5">
-                  <b>sdfghjk</b>
-                </div>
-                <div class="col-md-12" style="border-top: 1px dotted black">
-                  <b>sdfghjk</b>
+                  <div style="padding: 20px 0px; font-size: 12px;">
+                    <b>3.6 Nutrition and HIV</b>
+                    <br />
+                    <div class="row">
+                      <div class="col-md-12">
+                        <span>Number SAM +</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>0-59Months</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-037
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>5-9Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-038
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>10-14Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-039
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>15-19Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-040
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>20+</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-041
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>Pregnant & Lactating</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-042
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>
+                    <div class="row" style="padding-top: 20px;">
+                      <div class="col-md-12">
+                        <span>Number MAM +</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>0-59Months</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-043
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>5-9Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-044
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>10-14Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-045
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>15-19Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-046
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>20+</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-047
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>Pregnant & Lactating</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-048
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>
+                    <div class="row" style="padding-top: 20px;">
+                      <div class="col-md-12">
+                        <span>Number SAM+ receiving therapeutic foods</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>0-59Months</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-049
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>5-9Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-050
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>10-14Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-051
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>15-19Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-052
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>20+</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-053
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>Pregnant & Lactating</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-054
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>
+                    <div class="row" style="padding-top: 20px;">
+                      <div class="col-md-12">
+                        <span>Number MAM + receiving Supplemental foods</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>0-59Months</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-055
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>5-9Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-056
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>10-14Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-057
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>15-19Years</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-058
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>20+</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-059
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-6">
+                        <span>Pregnant & Lactating</span>
+                      </div>
+                      <div class="col-md-6">
+                        <span
+                          >HV03-060
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>
+                  </div>
                 </div>
+                <div class="col-md-12" style="border-top: 1px dotted black; height: 50px;"></div>
               </div>
             </div>
-            <div class="col-md-3" style="border-left: 1px dotted black">
+            <div class="col-md-4" style="border-left: 1px dotted black">
               <div class="row">
                 <div class="col-md-12">
-                  <b>kdthfjklh</b>
+                  <div style="padding: 20px 0px; font-size: 12px;">
+                    <b>3.7 HIV in TB Clinic</b>
+                    <br />
+                    <div class="row">
+                      <div class="col-md-7">
+                        <span>TB cases _New</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV03-061
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-7">
+                        <span>TB New_Known HIV Positive(KPs)</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV03-062
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-7">
+                        <span>TB_New HIV Positive</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV03-063
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-7">
+                        <span>TB_New_Known HIV Positive(KP) </span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV03-064
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                      <div class="col-md-7">
+                        <span>TB New_Start_HAART</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV03-065
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>
+                  </div>
                 </div>
                 <div
                   class="col-md-12"
@@ -1253,79 +1851,165 @@
                   <b>4. Medical Male Circumcision</b>
                 </div>
                 <div class="col-md-12">
-                  <div style="padding: 20px 0px; font-size: 12px">
-                    <b>4.3 Circumcision Adverse Events</b>
+                  <div style="padding: 20px 0px; font-size: 12px;">
+                    <b>4.1 Number circumcised</b>
                     <br />
                     <div class="row">
                       <div class="col-md-7">
-                        <span>AE_During_Moderate</span>
+                        <span>Circumcised_0-60 days</span>
                       </div>
                       <div class="col-md-5">
                         <span
-                          >HV04-09
-                          <i style="padding: 0px 50px; border: 1px solid black"></i
+                          >HV04-01
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
                         ></span>
                       </div>
                       <div class="col-md-7">
-                        <span>AE_During_Severe</span>
+                        <span>Circumcised_61 days-9 yrs</span>
                       </div>
                       <div class="col-md-5">
-                        <span style="padding-right: 5px"
-                          >HV04-10
-                          <i
-                            style="
-                              padding: 0px 50px;
-                              border: 1px solid black;
-                              border-top: none;
-                            "
-                          ></i
+                        <span
+                          >HV04-02
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
                         ></span>
                       </div>
                       <div class="col-md-7">
-                        <span>IAE_Post_Moderate</span>
+                        <span>Circumcised_10-14</span>
                       </div>
                       <div class="col-md-5">
                         <span
-                          >HV04-11
-                          <i
-                            style="
-                              padding: 0px 50px;
-                              border: 1px solid black;
-                              border-top: none;
-                            "
-                          ></i
+                          >HV04-03
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
                         ></span>
                       </div>
                       <div class="col-md-7">
-                        <span>AE_Post_Severe</span>
+                        <span>Circumcised_15+</span>
                       </div>
                       <div class="col-md-5">
                         <span
-                          >HV04-12
-                          <i
-                            style="
-                              padding: 0px 50px;
-                              border: 1px solid black;
-                              border-top: none;
-                            "
-                          ></i
+                          >HV04-04
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
                         ></span>
                       </div>
+                    </div>
+                    <div class="row" style="padding-top: 20px;">
                       <div class="col-md-7">
-                        <span>Follow up visit less than 14d</span>
+                        <span>Tested_ HIV+</span>
                       </div>
                       <div class="col-md-5">
                         <span
-                          >HV04-13
-                          <i
-                            style="
-                              padding: 0px 50px;
-                              border: 1px solid black;
-                              border-top: none;
-                            "
-                          ></i
+                          >HV04-05
+                          <i style="padding: 2px 40px; border: 1px solid black"></i
                         ></span>
                       </div>
+                      <div class="col-md-7">
+                        <span>Tested_ HIV-</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV04-06
+                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                        ></span>
+                      </div>
+                    </div>                     
+                    <div style="padding-top: 20px;">                   
+                      <b>4.2 Type of circumcision</b>
+                      <br />
+                      <div class="row">
+                        <div class="col-md-7">
+                          <span>Surgical</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span
+                            >HV04-07
+                            <i style="padding: 2px 40px; border: 1px solid black"></i
+                          ></span>
+                        </div>
+                        <div class="col-md-7">
+                          <span>Devices</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span
+                            >HV04-08
+                            <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
+                          ></span>
+                        </div>
+                      </div>
+                    </div>
+                    <div style="padding: 20px 0px; font-size: 12px">
+                      <b>4.3 Circumcision Adverse Events</b>
+                      <br />
+                      <div class="row">
+                        <div class="col-md-7">
+                          <span>AE_During_Moderate</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span
+                            >HV04-09
+                            <i style="padding: 2px 40px; border: 1px solid black"></i
+                          ></span>
+                        </div>
+                        <div class="col-md-7">
+                          <span>AE_During_Severe</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span style="padding-right: 5px"
+                            >HV04-10
+                            <i
+                              style="
+                                padding: 2px 40px;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                            ></i
+                          ></span>
+                        </div>
+                        <div class="col-md-7">
+                          <span>IAE_Post_Moderate</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span
+                            >HV04-11
+                            <i
+                              style="
+                                padding: 2px 40px;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                            ></i
+                          ></span>
+                        </div>
+                        <div class="col-md-7">
+                          <span>AE_Post_Severe</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span
+                            >HV04-12
+                            <i
+                              style="
+                                padding: 2px 40px;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                            ></i
+                          ></span>
+                        </div>
+                        <div class="col-md-7">
+                          <span>Follow up visit less than 14d</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span
+                            >HV04-13
+                            <i
+                              style="
+                                padding: 2px 40px;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                            ></i
+                          ></span>
+                        </div>
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -1339,7 +2023,7 @@
                 >
                   <b>5. Post Exposure Prophylaxis</b>
                 </div>
-                <div class="col-md-12">
+                <div class="col-md-12" style="padding: 20px; font-size: 12px">
                   <div class="row">
                     <div class="col-md-7">
                       <span>Exposed_Occupational</span>
@@ -1347,7 +2031,7 @@
                     <div class="col-md-5">
                       <span
                         >HV05-01
-                        <i style="padding: 0px 50px; border: 1px solid black"></i
+                        <i style="padding: 2px 40px; border: 1px solid black"></i
                       ></span>
                     </div>
                     <div class="col-md-7">
@@ -1358,7 +2042,7 @@
                         >HV05-02
                         <i
                           style="
-                            padding: 0px 50px;
+                            padding: 2px 40px;
                             border: 1px solid black;
                             border-top: none;
                           "
@@ -1373,7 +2057,7 @@
                     <div class="col-md-5">
                       <span
                         >HV05-03
-                        <i style="padding: 0px 50px; border: 1px solid black"></i
+                        <i style="padding: 2px 40px; border: 1px solid black"></i
                       ></span>
                     </div>
                     <div class="col-md-7">
@@ -1384,7 +2068,7 @@
                         >HV05-04
                         <i
                           style="
-                            padding: 0px 50px;
+                            padding: 2px 40px;
                             border: 1px solid black;
                             border-top: none;
                           "

From fa59b0a54626d04ab1e85c70a6da5ed8c5053a74 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Wed, 8 May 2024 11:26:25 +0300
Subject: [PATCH 12/50] MOH-731: Updated report

---
 .../moh-731-report-pdf-view.component.html    | 4876 ++++++++++-------
 .../moh-731-report-pdf-view.component.ts      |   57 +-
 2 files changed, 2984 insertions(+), 1949 deletions(-)

diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index 1153a53f1..80678a74b 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -11,7 +11,7 @@
         <div class="btn-group pull-right">
           <button
             class="btn btn-primary"
-            (click)="downloadPdf()"
+            (click)="takeSnapshotAndExport()"
             [disabled]="!pdfMakeProxy"
           >
             <i class="fa fa-download"> </i> Download Pdf
@@ -31,2049 +31,3047 @@
       >
       </pdf-viewer> -->
       <!--<object  type="application/pdf" width="100%" height="800" [data]="securedUrl" type="application/pdf"></object>-->
-
-      <div class="row" style="padding: 20px 20px 0px 20px">
-        <div class="col-md-6 text-left">
-          <b>Ministry of Health</b>
-        </div>
-        <div class="col-md-6 text-right">
-          <b>Ver. July 2023</b>
-        </div>
-        <div
-          class="col-md-12"
-          style="border: 2px solid black; padding-bottom: 20px"
-        >
-          <div style="text-align: center">
-            <b style="font-size: 16px"
-              >National AIDS & STI Control Program - NASCOP</b
-            >
+      <div
+        *ngIf="location != null"
+        style="width: 1350px; padding: 20px"
+        #contentToSnapshot
+      >
+        <div class="row" style="padding: 20px 20px 0px 20px">
+          <div class="col-md-6 text-left">
+            <b>Ministry of Health</b>
+          </div>
+          <div class="col-md-6 text-right">
+            <b>Ver. July 2023</b>
+          </div>
+          <div
+            class="col-md-12"
+            style="border: 2px solid black; padding-bottom: 20px"
+          >
+            <div style="text-align: center">
+              <b style="font-size: 16px"
+                ><b style="font-size: 16px; display: inline-block; width: 100px; text-align: center;">&nbsp;</b>National AIDS & STI Control Program - NASCOP</b
+              >
+              <span
+                style="
+                  float: right !important;
+                  border: 1px dotted black;
+                  font-size: 10px;
+                "
+                ><b>MOH 731-Ver. July 2023</b></span
+              ><br />
+              <b>Comprehensive HIV/AIDS reporting form</b>
+            </div>
+          </div>
+          <div
+            class="col-md-12"
+            style="
+              border: 2px solid black;
+              border-top: none;
+              text-align: center;
+            "
+          >
             <span
-              style="
-                float: right !important;
-                border: 1px dotted black;
-                font-size: 10px;
-              "
-              ><b>MOH 731-Ver. July 2023</b></span
-            ><br />
-            <b>Comprehensive HIV/AIDS reporting form</b>
+              >County _<b
+                ><u>{{ location[0]?.county }}</u></b
+              >___________ Sub County _<b
+                ><u>{{ location[0]?.district }}</u></b
+              >________ Facility _<b
+                ><u>{{ location[0]?.facility }}</u></b
+              >________ MFL_________Month_<b
+                ><u>{{ month }}</u></b
+              >_____Year_<b
+                ><u>{{ year }}</u></b
+              >_____</span
+            >
           </div>
+          <div
+            class="col-md-12"
+            style="border: 2px solid black; border-top: none; padding: 5px"
+          ></div>
         </div>
-        <div
-          class="col-md-12"
-          style="border: 2px solid black; border-top: none; text-align: center"
-        >
-          <span
-            >County________________________Sub
-            County__________________________Facility______________________MFL_________Month_______Year__________</span
+        <div class="row" style="padding: 10px 20px 20px 20px">
+          <div
+            class="col-md-12"
+            style="
+              border: 2px solid black;
+              background-color: lightgrey;
+              border-bottom: 1px solid black;
+            "
           >
-        </div>
-        <div
-          class="col-md-12"
-          style="border: 2px solid black; border-top: none; padding: 5px"
-        ></div>
-      </div>
-      <div class="row" style="padding: 10px 20px 20px 20px">
-        <div
-          class="col-md-12"
-          style="
-            border: 2px solid black;
-            background-color: lightgrey;
-            border-bottom: 1px solid black;
-          "
-        >
-          <b>1. HIV Testing Services & Pre exposure Prophylaxis</b>
-        </div>
-        <div
-          class="col-md-12"
-          style="
-            border: 2px solid black;
-            border-top: none;
-            border-bottom: 1px solid black;
-          "
-        >
-          <div class="row">
-            <div class="col-md-6">
-              <div style="padding: 20px 0px; font-size: 12px">
-                <b>1.1 HIV Tests</b>
-                <br />
-                <div class="row">
-                  <div class="col-md-5"></div>
-                  <div class="col-md-3">
-                    <span>Male</span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Female(including PMTCT)</span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Tests</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-01
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-02
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                </div>
-                <div class="row" style="padding-top: 20px">
-                  <div class="col-md-4">
-                    <span>Tests-Facility</span>
-                  </div>
-                  <div class="col-md-8">
-                    <span
-                      >HV01-03
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Tests-Community</span>
-                  </div>
-                  <div class="col-md-8">
-                    <span
-                      >HV01-04
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                </div>
-                <div class="row" style="padding-top: 20px">
-                  <div class="col-md-4">
-                    <span>Tested KVP</span>
-                  </div>
-                  <div class="col-md-8">
-                    <span
-                      >HV01-05
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                </div>
-              </div>
-              <div style="padding: 20px 0px; font-size: 12px">
-                <b>1.2 HIV Positive Results</b>
-                <br />
-                <div class="row">
-                  <div class="col-md-5"></div>
-                  <div class="col-md-3">
-                    <span>Male</span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Female(including PMTCT)</span>
-                  </div>
-                </div>
-                <div class="row">
-                  <div class="col-md-4">
-                    <span>Positive_2-9</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-06
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-07
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Positive_10-14</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-08
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-09
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Positive_15-19</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-10
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-11
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Positive_20-24</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-12
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-13
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Positive_25+</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-14
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-15
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
+            <b>1. HIV Testing Services & Pre exposure Prophylaxis</b>
+          </div>
+          <div
+            class="col-md-12"
+            style="
+              border: 2px solid black;
+              border-top: none;
+              border-bottom: 1px solid black;
+            "
+          >
+            <div class="row">
+              <div class="col-md-6">
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>1.1 HIV Tests</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-5"></div>
+                    <div class="col-md-3">
+                      <span>Male</span>
+                    </div>
+                    <div class="col-md-4">
+                      <span>Female(including PMTCT)</span>
+                    </div>
+                    <div class="col-md-4">
+                      <span>Tests</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-01
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-02
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
                   </div>
-                  <div class="col-md-4">
-                    <span>Positive_KVP</span>
+                  <div class="row" style="padding-top: 20px">
+                    <div class="col-md-4">
+                      <span>Tests-Facility</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV01-03
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Tests-Community</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV01-04
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
                   </div>
-                  <div class="col-md-8">
-                    <span
-                      >HV01-16
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
+                  <div class="row" style="padding-top: 20px">
+                    <div class="col-md-4">
+                      <span>Tested KVP</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV01-05
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
                   </div>
                 </div>
-                <div class="row" style="padding-top: 20px">
-                  <div class="col-md-4">
-                    <span>Discordant</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-17
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-18
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>1.2 HIV Positive Results</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-5"></div>
+                    <div class="col-md-3">
+                      <span>Male</span>
+                    </div>
+                    <div class="col-md-4">
+                      <span>Female(including PMTCT)</span>
+                    </div>
                   </div>
-                </div>
-              </div>
-              <div style="padding: 20px 0px; font-size: 12px">
-                <b>1.3 No. Seroconverted while on PrEP</b>
-                <br />
-                <div class="row">
-                  <div class="col-md-5"></div>
-                  <div class="col-md-3">
-                    <span>Male</span>
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>Positive_2-9</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-06
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-07
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Positive_10-14</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-08
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-09
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Positive_15-19</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-10
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-11
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Positive_20-24</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-12
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-13
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Positive_25+</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-14
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-15
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Positive_KVP</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV01-16
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
                   </div>
-                  <div class="col-md-4">
-                    <span>Female</span>
+                  <div class="row" style="padding-top: 20px">
+                    <div class="col-md-4">
+                      <span>Discordant</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-17
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-18
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
                   </div>
                 </div>
-                <div class="row">
-                  <div class="col-md-4">
-                    <span>HIV Positive</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-19
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>1.3 No. Seroconverted while on PrEP</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-5"></div>
+                    <div class="col-md-3">
+                      <span>Male</span>
+                    </div>
+                    <div class="col-md-4">
+                      <span>Female</span>
+                    </div>
                   </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-20
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>HIV Positive</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-19
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-20
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
-            <div class="col-md-6">
-              <div style="padding: 20px 0px; font-size: 12px">
-                <b>1.4 No. Initiated on PrEP(NEW)</b>
-                <br />
-                <div class="row">
-                  <div class="col-md-5"></div>
-                  <div class="col-md-3">
-                    <span>Male</span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Female</span>
-                  </div>
-                </div>
-                <div class="row">
-                  <div class="col-md-4">
-                    <span>General popn</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-21
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-22
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>MSM/MSW</span>
-                  </div>
-                  <div class="col-md-8">
-                    <span
-                      >HV01-23
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-7">
-                    <span>PSW</span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-24
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>PWID/PWUD</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-25
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-26
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Discordant Couple</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-27
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-28
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Vulnerable Pop</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-29
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
+              <div class="col-md-6">
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>1.4 No. Initiated on PrEP(NEW)</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-5"></div>
+                    <div class="col-md-3">
+                      <span>Male</span>
+                    </div>
+                    <div class="col-md-4">
+                      <span>Female</span>
+                    </div>
                   </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-30
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>AYP (15-24yrs)</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-31
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-32
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-7">
-                    <span>Pregnant and breastfeeding women</span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-33
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                </div>
-              </div>
-              <div style="padding: 20px 0px; font-size: 12px">
-                <b>1.5 No. on Prep Diagnosed with STI</b>
-                <br />
-                <div class="row">
-                  <div class="col-md-5"></div>
-                  <div class="col-md-3">
-                    <span>Male</span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Female</span>
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>General popn</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-21
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-22
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>MSM/MSW</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV01-23
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-7">
+                      <span>PSW</span>
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-24
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>PWID/PWUD</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-25
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            height: 10px;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                        ></i
+                      ></span>
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-26
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Discordant Couple</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-27
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-28
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Vulnerable Pop</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-29
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-30
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>AYP (15-24yrs)</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-31
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-32
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-7">
+                      <span>Pregnant and breastfeeding women</span>
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-33
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
                   </div>
                 </div>
-                <div class="row">
-                  <div class="col-md-4">
-                    <span>General popn</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-34
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-35
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>MSM/MSW</span>
-                  </div>
-                  <div class="col-md-8">
-                    <span
-                      >HV01-36
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-7">
-                    <span>PSW</span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-37
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>PWID/PWUD</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-38
-                      <i style="padding: 2px 40px; border: 1px solid black"></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-39
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Discordant Couple</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-40
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-41
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>Vulnerable Pop</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-42
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-43
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
-                  </div>
-                  <div class="col-md-4">
-                    <span>AYP (15-24yrs)</span>
-                  </div>
-                  <div class="col-md-3">
-                    <span
-                      >HV01-44
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>1.5 No. on Prep Diagnosed with STI</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-5"></div>
+                    <div class="col-md-3">
+                      <span>Male</span>
+                    </div>
+                    <div class="col-md-4">
+                      <span>Female</span>
+                    </div>
                   </div>
-                  <div class="col-md-5">
-                    <span
-                      >HV01-45
-                      <i
-                        style="
-                          padding: 2px 40px;
-                          border: 1px solid black;
-                          border-top: none;
-                        "
-                      ></i
-                    ></span>
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>General popn</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-34
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-35
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>MSM/MSW</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV01-36
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-7">
+                      <span>PSW</span>
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-37
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>PWID/PWUD</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-38
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            height: 10px;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                        ></i
+                      ></span>
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-39
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Discordant Couple</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-40
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-41
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Vulnerable Pop</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-42
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-43
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>AYP (15-24yrs)</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV01-44
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-45
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
-        </div>
-        <div
-          class="col-md-12"
-          style="
-            border: 2px solid black;
-            border-top: none;
-            background-color: lightgrey;
-            border-bottom: 1px solid black;
-          "
-        >
-          <b>2. Elimination of Mother-To-Child Transmission(EMTCT)</b>
-        </div>
-        <div
-          class="col-md-12"
-          style="
-            border: 2px solid black;
-            border-top: none;
-            border-bottom: 1px solid black;
-          "
-        >
-          <div class="col-md-6">
-            <div style="padding: 20px 0px; font-size: 12px">
-              <b>2.1 Maternal HIV Testing</b>
-              <br />
-              <div class="row" style="padding: 10px 0px">
-                <div class="col-md-4">
-                  <span>Known Positive at 1st ANC </span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-01
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-              </div>
-              <div class="row">
-                <div class="col-md-5"></div>
-                <div class="col-md-3">
-                  <span>Initial</span>
-                </div>
-                <div class="col-md-4">
-                  <span>Retest</span>
-                </div>
-              </div>
-              <div class="row">
-                <div class="col-md-4">
-                  <span>Tested at ANC </span>
-                </div>
-                <div class="col-md-3">
-                  <span
-                    >HV02-02
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-                <div class="col-md-5">
-                  <span
-                    >HV02-03
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Tested at L&D</span>
-                </div>
-                <div class="col-md-3">
-                  <span
-                    >HV02-04
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-5">
-                  <span
-                    >HV02-05
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Tested at PNC_<=6 weeks</span>
-                </div>
-                <div class="col-md-3">
-                  <span
-                    >HV02-06
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-5">
-                  <span
-                    >HV02-07
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Tested at PNC_>=6 weeks</span>
-                </div>
-                <div class="col-md-3">
-                  <span
-                    >HV02-08
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-5">
-                  <span
-                    >HV02-09
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-              </div>
-            </div>
-            <div style="padding: 20px 0px; font-size: 12px">
-              <b>2.2 HIV Positive Results</b>
-              <br />
-              <div class="row">
-                <div class="col-md-4">
-                  <span>Postive Results_ANC</span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-10
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Postive Results_L&D</span>
-                </div>
-                <div class="col-md-8">
-                  <span style="padding-right: 5px"
-                    >HV02-11
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Postive Results_PNC_<=6 weeks</span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-12
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Postive Results_PNC_>=6 weeks</span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-13
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-              </div>
-            </div>
-            <div style="padding: 20px 0px; font-size: 12px">
-              <b>2.3 Maternal HAART</b>
-              <br />
-              <div class="row">
-                <div class="col-md-4">
-                  <span>on HAART at 1st ANC</span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-14
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Start HAART_ANC</span>
-                </div>
-                <div class="col-md-8">
-                  <span style="padding-right: 5px"
-                    >HV02-15
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Start HAART_L&D</span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-16
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Start HAART_PNC_<=6 weeks</span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-17
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Start HAART_PNC_>=6 weeks</span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-18
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="col-md-6">
-            <div style="padding: 20px 0px; font-size: 12px">
-              <b>2.4 HBV Screening at ANC</b>
-              <br />
-              <div class="row">
-                <div class="col-md-4">
-                  <span>Screened_ HBV_ANC </span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-19
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>HBV Screened_Positive</span>
-                </div>
-                <div class="col-md-8">
-                  <span style="padding-right: 5px"
-                    >HV02-20
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-              </div>
-            </div>
-            <div style="padding: 20px 0px; font-size: 12px">
-              <b
-                >2.5 Adolescents girls & Young Women (10-24 Yrs) testing &
-                results</b
-              >
-              <br />
-              <div class="row">
-                <div class="col-md-5"></div>
-                <div class="col-md-3">
-                  <span>10-19yrs</span>
-                </div>
-                <div class="col-md-4">
-                  <span>20-24yrs</span>
-                </div>
-              </div>
-
-              <div class="row">
-                <div class="col-md-4">
-                  <span>1st ANC KP</span>
-                </div>
-                <div class="col-md-3">
-                  <span
-                    >HV02-21
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-                <div class="col-md-5">
-                  <span
-                    >HV02-22
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>New HIV Positive</span>
-                </div>
-                <div class="col-md-3">
-                  <span
-                    >HV02-23
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-5">
-                  <span
-                    >HV02-24
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>on HAART 1st ANC KP</span>
-                </div>
-                <div class="col-md-3">
-                  <span
-                    >HV02-25
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-5">
-                  <span
-                    >HV02-26
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Started HAART New</span>
-                </div>
-                <div class="col-md-3">
-                  <span
-                    >HV02-27
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-5">
-                  <span
-                    >HV02-28
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-              </div>
-            </div>
-            <div style="padding: 20px 0px; font-size: 12px">
-              <b>2.6 Infant Prophylaxis</b>
-              <br />
-              <div class="row">
-                <div class="col-md-4">
-                  <span>Infant ARV Prophylaxis_ANC</span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-29
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Infant ARV Prophylaxis_L&D</span>
-                </div>
-                <div class="col-md-8">
-                  <span style="padding-right: 5px"
-                    >HV02-30
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Infant ARV Prophylaxis_PNC</span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-31
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-              </div>
-            </div>
-            <div style="padding: 20px 0px; font-size: 12px">
-              <b>2.7 Infant Feeding</b>
-              <br />
-              <b>Below 6months</b>
-              <br />
-              <div class="row">
-                <div class="col-md-4">
-                  <span>Exclusive Breastfeeding(EBF) </span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-32
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-              </div>
-              <b>6 to 24 months</b>
-              <br />
-              <div class="row">
-                <div class="col-md-4">
-                  <span>Breastfeeding(BF)</span>
-                </div>
-                <div class="col-md-8">
-                  <span
-                    >HV02-33
-                    <i style="padding: 2px 40px; border: 1px solid black"></i
-                  ></span>
-                </div>
-                <div class="col-md-4">
-                  <span>Not Breastfeeding(NBF) </span>
-                </div>
-                <div class="col-md-8">
-                  <span style="padding-right: 5px"
-                    >HV02-34
-                    <i
-                      style="
-                        padding: 2px 40px;
-                        border: 1px solid black;
-                        border-top: none;
-                      "
-                    ></i
-                  ></span>
-                </div>
-              </div>
-            </div>
-
-
+          <div
+            class="col-md-12"
+            style="
+              border: 2px solid black;
+              border-top: none;
+              background-color: lightgrey;
+              border-bottom: 1px solid black;
+            "
+          >
+            <b>2. Elimination of Mother-To-Child Transmission(EMTCT)</b>
           </div>
-        </div>
-        <div
-          class="col-md-12"
-          style="
-            border: 2px solid black;
-            border-top: none;
-            background-color: lightgrey;
-            border-bottom: 1px solid black;
-          "
-        >
-          <b>3. HIV and TB Treatment</b>
-        </div>
-        <div
-          class="col-md-12"
-          style="border: 2px solid black; border-top: none"
-        >
-          <div class="row">
-            <div class="col-md-8">
-              <div class="row">
-                <div class="col-md-7" style="border-right: 1px dotted black">
-                  <div style="padding: 20px 0px; font-size: 12px; border-bottom: 1px dotted black">
-                    <b>3.1 Starting ART</b>
-                    <br />
-                    <div class="row">
-                      <div class="col-md-4">
-                        <span>Start ART_< 1 </span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-01
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-02
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_1-4 </span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-03
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-04
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_5-9 </span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-05
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-06
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_10-14</span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-07
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-08
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_15-19</span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-09
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-10
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_20-24</span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-11
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-12
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_25+</span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-13
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-14
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
+          <div
+            class="col-md-12"
+            style="
+              border: 2px solid black;
+              border-top: none;
+              border-bottom: 1px solid black;
+            "
+          >
+            <div class="row">
+              <div class="col-md-6">
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>2.1 Maternal HIV Testing</b>
+                  <br />
+                  <div class="row" style="padding: 10px 0px">
+                    <div class="col-md-4">
+                      <span>Known Positive at 1st ANC </span>
                     </div>
-                  </div>
-                  <div style="padding: 20px 0px; font-size: 12px; border-bottom: 1px dotted black">
-                    <b>3.2 Currently on ART([All])</b>
-                    <br />
-                    <div class="row">
-                      <div class="col-md-4">
-                        <span>Start ART_< 1 </span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-015
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-016
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_1-4 </span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-017
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-018
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_5-9 </span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-019
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-020
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_10-14</span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-021
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-022
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_15-19</span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-023
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-024
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_20-24</span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-025
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-026
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start ART_25+</span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(M)HV03-027
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span
-                          >(F)HV03-028
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none;"></i
-                        ></span>
-                      </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-01
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
                     </div>
                   </div>
-                  <div style="padding: 20px 0px; font-size: 12px;">
-                    <b>3.3 TB Screening</b>
-                    <br />
-                    <div class="row">
-                      <div class="col-md-4">
-                        <span>Screen for TB_< 15 </span>
-                      </div>
-                      <div class="col-md-8">
-                        <span
-                          >HV03-029
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Screen for TB_15+ </span>
-                      </div>
-                      <div class="col-md-8">
-                        <span
-                          >HV03-030
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
+                  <div class="row">
+                    <div class="col-md-5"></div>
+                    <div class="col-md-3">
+                      <span>Initial</span>
                     </div>
-                  </div>
-                  <div style="padding: 20px 0px; font-size: 12px;">
-                    <b>3.4 Starting TPT</b>
-                    <br />
-                    <div class="row">
-                      <div class="col-md-4">
-                        <span>Start TPT_< 15 </span>
-                      </div>
-                      <div class="col-md-8">
-                        <span
-                          >HV03-031
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Start TPT_15+ </span>
-                      </div>
-                      <div class="col-md-8">
-                        <span
-                          >HV03-032
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
+                    <div class="col-md-4">
+                      <span>Retest</span>
                     </div>
                   </div>
-                  <div style="padding: 20px 0px; font-size: 12px;">
-                    <b>3.5 Differentiated Service Delivery</b>
-                    <br />
-                    <div class="row">
-                      <div class="col-md-4">
-                        <span>Established</span>
-                      </div>
-                      <div class="col-md-8">
-                        <span
-                          >HV03-033
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Not Established</span>
-                      </div>
-                      <div class="col-md-8">
-                        <span
-                          >HV03-034
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Community</span>
-                      </div>
-                      <div class="col-md-8">
-                        <span
-                          >HV03-035
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-4">
-                        <span>Facility</span>
-                      </div>
-                      <div class="col-md-8">
-                        <span
-                          >HV03-036
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>Tested at ANC </span>
                     </div>
-                  </div>
-                </div>
-                <div class="col-md-5">
-                  <div style="padding: 20px 0px; font-size: 12px;">
-                    <b>3.6 Nutrition and HIV</b>
-                    <br />
-                    <div class="row">
-                      <div class="col-md-12">
-                        <span>Number SAM +</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>0-59Months</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-037
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>5-9Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-038
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>10-14Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-039
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>15-19Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-040
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>20+</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-041
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>Pregnant & Lactating</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-042
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV02-02
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV02-03
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Tested at L&D</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV02-04
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV02-05
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Tested at PNC_<=6 weeks</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV02-06
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV02-07
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Tested at PNC_>=6 weeks</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV02-08
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV02-09
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                  </div>
+                </div>
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>2.2 HIV Positive Results</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>Postive Results_ANC</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-10
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Postive Results_L&D</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span style="padding-right: 5px"
+                        >HV02-11
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Postive Results_PNC_<=6 weeks</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-12
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Postive Results_PNC_>=6 weeks</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-13
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                  </div>
+                </div>
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>2.3 Maternal HAART</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>on HAART at 1st ANC</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-14
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Start HAART_ANC</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span style="padding-right: 5px"
+                        >HV02-15
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Start HAART_L&D</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-16
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Start HAART_PNC_<=6 weeks</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-17
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Start HAART_PNC_>=6 weeks</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-18
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                  </div>
+                </div>
+              </div>
+              <div class="col-md-6">
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>2.4 HBV Screening at ANC</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>Screened_ HBV_ANC </span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-19
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>HBV Screened_Positive</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span style="padding-right: 5px"
+                        >HV02-20
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                  </div>
+                </div>
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b
+                    >2.5 Adolescents girls & Young Women (10-24 Yrs) testing &
+                    results</b
+                  >
+                  <br />
+                  <div class="row">
+                    <div class="col-md-5"></div>
+                    <div class="col-md-3">
+                      <span>10-19yrs</span>
+                    </div>
+                    <div class="col-md-4">
+                      <span>20-24yrs</span>
+                    </div>
+                  </div>
+
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>1st ANC KP</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV02-21
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV02-22
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>New HIV Positive</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV02-23
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV02-24
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>on HAART 1st ANC KP</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV02-25
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV02-26
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Started HAART New</span>
+                    </div>
+                    <div class="col-md-3">
+                      <span
+                        >HV02-27
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV02-28
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                  </div>
+                </div>
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>2.6 Infant Prophylaxis</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>Infant ARV Prophylaxis_ANC</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-29
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Infant ARV Prophylaxis_L&D</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span style="padding-right: 5px"
+                        >HV02-30
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Infant ARV Prophylaxis_PNC</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-31
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                  </div>
+                </div>
+                <div style="padding: 15px 0px; font-size: 12px">
+                  <b>2.7 Infant Feeding</b>
+                  <br />
+                  <b>Below 6months</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>Exclusive Breastfeeding(EBF) </span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-32
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                  </div>
+                  <b>6 to 24 months</b>
+                  <br />
+                  <div class="row">
+                    <div class="col-md-4">
+                      <span>Breastfeeding(BF)</span>
+                    </div>
+                    <div class="col-md-8">
+                      <span
+                        >HV02-33
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-4">
+                      <span>Not Breastfeeding(NBF) </span>
+                    </div>
+                    <div class="col-md-8">
+                      <span style="padding-right: 5px"
+                        >HV02-34
+                        <i
+                          style="
+                            width: 55px; text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                            border-top: none;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
                     </div>
-                    <div class="row" style="padding-top: 20px;">
-                      <div class="col-md-12">
-                        <span>Number MAM +</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>0-59Months</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-043
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>5-9Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-044
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>10-14Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-045
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>15-19Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-046
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>20+</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-047
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>Pregnant & Lactating</span>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="col-md-12"
+            style="
+              border: 2px solid black;
+              border-top: none;
+              background-color: lightgrey;
+              border-bottom: 1px solid black;
+            "
+          >
+            <b>3. HIV and TB Treatment</b>
+          </div>
+          <div
+            class="col-md-12"
+            style="border: 2px solid black; border-top: none"
+          >
+            <div class="row">
+              <div class="col-md-8">
+                <div class="row">
+                  <div class="col-md-7" style="border-right: 1px dotted black">
+                    <div
+                      style="
+                        padding: 15px 0px;
+                        font-size: 12px;
+                        border-bottom: 1px dotted black;
+                      "
+                    >
+                      <b>3.1 Starting ART</b>
+                      <br />
+                      <div class="row">
+                        <div class="col-md-4">
+                          <span>Start ART_< 1 </span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-01
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-02
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_1-4 </span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-03
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-04
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_5-9 </span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-05
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-06
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_10-14</span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-07
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-08
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_15-19</span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-09
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-10
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_20-24</span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-11
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-12
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_25+</span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-13
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-14
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
                       </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-048
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
+                    </div>
+                    <div
+                      style="
+                        padding: 15px 0px;
+                        font-size: 12px;
+                        border-bottom: 1px dotted black;
+                      "
+                    >
+                      <b>3.2 Currently on ART([All])</b>
+                      <br />
+                      <div class="row">
+                        <div class="col-md-4">
+                          <span>Start ART_< 1 </span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-015
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-016
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_1-4 </span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-017
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-018
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_5-9 </span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-019
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-020
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_10-14</span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-021
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-022
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_15-19</span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-023
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-024
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_20-24</span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-025
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-026
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start ART_25+</span>
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(M)HV03-027
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span
+                            >(F)HV03-028
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
                       </div>
                     </div>
-                    <div class="row" style="padding-top: 20px;">
-                      <div class="col-md-12">
-                        <span>Number SAM+ receiving therapeutic foods</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>0-59Months</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-049
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>5-9Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-050
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>10-14Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-051
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>15-19Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-052
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>20+</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-053
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>Pregnant & Lactating</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-054
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
+                    <div style="padding: 15px 0px; font-size: 12px">
+                      <b>3.3 TB Screening</b>
+                      <br />
+                      <div class="row">
+                        <div class="col-md-4">
+                          <span>Screen for TB_< 15 </span>
+                        </div>
+                        <div class="col-md-8">
+                          <span
+                            >HV03-029
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Screen for TB_15+ </span>
+                        </div>
+                        <div class="col-md-8">
+                          <span
+                            >HV03-030
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
                       </div>
                     </div>
-                    <div class="row" style="padding-top: 20px;">
-                      <div class="col-md-12">
-                        <span>Number MAM + receiving Supplemental foods</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>0-59Months</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-055
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>5-9Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-056
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>10-14Years</span>
-                      </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-057
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-6">
-                        <span>15-19Years</span>
+                    <div style="padding: 15px 0px; font-size: 12px">
+                      <b>3.4 Starting TPT</b>
+                      <br />
+                      <div class="row">
+                        <div class="col-md-4">
+                          <span>Start TPT_< 15 </span>
+                        </div>
+                        <div class="col-md-8">
+                          <span
+                            >HV03-031
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Start TPT_15+ </span>
+                        </div>
+                        <div class="col-md-8">
+                          <span
+                            >HV03-032
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
                       </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-058
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
+                    </div>
+                    <div style="padding: 15px 0px; font-size: 12px">
+                      <b>3.5 Differentiated Service Delivery</b>
+                      <br />
+                      <div class="row">
+                        <div class="col-md-4">
+                          <span>Established</span>
+                        </div>
+                        <div class="col-md-8">
+                          <span
+                            >HV03-033
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Not Established</span>
+                        </div>
+                        <div class="col-md-8">
+                          <span
+                            >HV03-034
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Community</span>
+                        </div>
+                        <div class="col-md-8">
+                          <span
+                            >HV03-035
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-4">
+                          <span>Facility</span>
+                        </div>
+                        <div class="col-md-8">
+                          <span
+                            >HV03-036
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
                       </div>
-                      <div class="col-md-6">
-                        <span>20+</span>
+                    </div>
+                  </div>
+                  <div class="col-md-5">
+                    <div style="padding: 15px 0px; font-size: 12px">
+                      <b>3.6 Nutrition and HIV</b>
+                      <br />
+                      <div class="row">
+                        <div class="col-md-12">
+                          <span>Number SAM +</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span>0-59Months</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-037
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>5-9Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-038
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>10-14Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-039
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>15-19Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-040
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>20+</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-041
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>Pregnant & Lactating</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-042
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
                       </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-059
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
+                      <div class="row" style="padding-top: 20px">
+                        <div class="col-md-12">
+                          <span>Number MAM +</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span>0-59Months</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-043
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>5-9Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-044
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>10-14Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-045
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>15-19Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-046
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>20+</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-047
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>Pregnant & Lactating</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-048
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
                       </div>
-                      <div class="col-md-6">
-                        <span>Pregnant & Lactating</span>
+                      <div class="row" style="padding-top: 20px">
+                        <div class="col-md-12">
+                          <span>Number SAM+ receiving therapeutic foods</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span>0-59Months</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-049
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>5-9Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-050
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>10-14Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-051
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>15-19Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-052
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>20+</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-053
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>Pregnant & Lactating</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-054
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
                       </div>
-                      <div class="col-md-6">
-                        <span
-                          >HV03-060
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
+                      <div class="row" style="padding-top: 20px">
+                        <div class="col-md-12">
+                          <span>Number MAM + receiving Supplemental foods</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span>0-59Months</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-055
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>5-9Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-056
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>10-14Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-057
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>15-19Years</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-058
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>20+</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-059
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-6">
+                          <span>Pregnant & Lactating</span>
+                        </div>
+                        <div class="col-md-6">
+                          <span
+                            >HV03-060
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
                       </div>
                     </div>
                   </div>
+                  <div
+                    class="col-md-12"
+                    style="border-top: 1px dotted black; height: 50px"
+                  ></div>
                 </div>
-                <div class="col-md-12" style="border-top: 1px dotted black; height: 50px;"></div>
               </div>
-            </div>
-            <div class="col-md-4" style="border-left: 1px dotted black">
-              <div class="row">
-                <div class="col-md-12">
-                  <div style="padding: 20px 0px; font-size: 12px;">
-                    <b>3.7 HIV in TB Clinic</b>
-                    <br />
-                    <div class="row">
-                      <div class="col-md-7">
-                        <span>TB cases _New</span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV03-061
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-7">
-                        <span>TB New_Known HIV Positive(KPs)</span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV03-062
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-7">
-                        <span>TB_New HIV Positive</span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV03-063
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-7">
-                        <span>TB_New_Known HIV Positive(KP) </span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV03-064
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-7">
-                        <span>TB New_Start_HAART</span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV03-065
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="col-md-12"
-                  style="
-                    border-top: 1px solid black;
-                    background-color: lightgrey;
-                    border-bottom: 1px solid black;
-                  "
-                >
-                  <b>4. Medical Male Circumcision</b>
-                </div>
-                <div class="col-md-12">
-                  <div style="padding: 20px 0px; font-size: 12px;">
-                    <b>4.1 Number circumcised</b>
-                    <br />
-                    <div class="row">
-                      <div class="col-md-7">
-                        <span>Circumcised_0-60 days</span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV04-01
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-7">
-                        <span>Circumcised_61 days-9 yrs</span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV04-02
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-7">
-                        <span>Circumcised_10-14</span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV04-03
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-7">
-                        <span>Circumcised_15+</span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV04-04
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                    </div>
-                    <div class="row" style="padding-top: 20px;">
-                      <div class="col-md-7">
-                        <span>Tested_ HIV+</span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV04-05
-                          <i style="padding: 2px 40px; border: 1px solid black"></i
-                        ></span>
-                      </div>
-                      <div class="col-md-7">
-                        <span>Tested_ HIV-</span>
-                      </div>
-                      <div class="col-md-5">
-                        <span
-                          >HV04-06
-                          <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                        ></span>
-                      </div>
-                    </div>                     
-                    <div style="padding-top: 20px;">                   
-                      <b>4.2 Type of circumcision</b>
+              <div class="col-md-4" style="border-left: 1px dotted black">
+                <div class="row">
+                  <div class="col-md-12">
+                    <div style="padding: 15px 0px; font-size: 12px">
+                      <b>3.7 HIV in TB Clinic</b>
                       <br />
                       <div class="row">
                         <div class="col-md-7">
-                          <span>Surgical</span>
+                          <span>TB cases _New</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span
+                            >HV03-061
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-7">
+                          <span>TB New_Known HIV Positive(KPs)</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span
+                            >HV03-062
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-7">
+                          <span>TB_New HIV Positive</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span
+                            >HV03-063
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                        <div class="col-md-7">
+                          <span>TB_New_Known HIV Positive(KP) </span>
                         </div>
                         <div class="col-md-5">
                           <span
-                            >HV04-07
-                            <i style="padding: 2px 40px; border: 1px solid black"></i
-                          ></span>
+                            >HV03-064
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
                         </div>
                         <div class="col-md-7">
-                          <span>Devices</span>
+                          <span>TB New_Start_HAART</span>
                         </div>
                         <div class="col-md-5">
                           <span
-                            >HV04-08
-                            <i style="padding: 2px 40px; border: 1px solid black; border-top: none; border-top: none;"></i
-                          ></span>
+                            >HV03-065
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                                border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
                         </div>
                       </div>
                     </div>
-                    <div style="padding: 20px 0px; font-size: 12px">
-                      <b>4.3 Circumcision Adverse Events</b>
+                  </div>
+                  <div
+                    class="col-md-12"
+                    style="
+                      border-top: 1px solid black;
+                      background-color: lightgrey;
+                      border-bottom: 1px solid black;
+                    "
+                  >
+                    <b>4. Medical Male Circumcision</b>
+                  </div>
+                  <div class="col-md-12">
+                    <div style="padding: 15px 0px; font-size: 12px">
+                      <b>4.1 Number circumcised</b>
                       <br />
                       <div class="row">
                         <div class="col-md-7">
-                          <span>AE_During_Moderate</span>
+                          <span>Circumcised_0-60 days</span>
                         </div>
                         <div class="col-md-5">
                           <span
-                            >HV04-09
-                            <i style="padding: 2px 40px; border: 1px solid black"></i
-                          ></span>
+                            >HV04-01
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
                         </div>
                         <div class="col-md-7">
-                          <span>AE_During_Severe</span>
+                          <span>Circumcised_61 days-9 yrs</span>
                         </div>
                         <div class="col-md-5">
-                          <span style="padding-right: 5px"
-                            >HV04-10
+                          <span
+                            >HV04-02
                             <i
                               style="
-                                padding: 2px 40px;
+                                width: 55px; text-align: center;
+                                display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
+                                border-top: none;
                               "
-                            ></i
-                          ></span>
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
                         </div>
                         <div class="col-md-7">
-                          <span>IAE_Post_Moderate</span>
+                          <span>Circumcised_10-14</span>
                         </div>
                         <div class="col-md-5">
                           <span
-                            >HV04-11
+                            >HV04-03
                             <i
                               style="
-                                padding: 2px 40px;
+                                width: 55px; text-align: center;
+                                display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
+                                border-top: none;
                               "
-                            ></i
-                          ></span>
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
                         </div>
                         <div class="col-md-7">
-                          <span>AE_Post_Severe</span>
+                          <span>Circumcised_15+</span>
                         </div>
                         <div class="col-md-5">
                           <span
-                            >HV04-12
+                            >HV04-04
                             <i
                               style="
-                                padding: 2px 40px;
+                                width: 55px; text-align: center;
+                                display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
+                                border-top: none;
+                              "
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                      </div>
+                      <div class="row" style="padding-top: 20px">
+                        <div class="col-md-7">
+                          <span>Tested_ HIV+</span>
+                        </div>
+                        <div class="col-md-5">
+                          <span
+                            >HV04-05
+                            <i
+                              style="
+                                width: 55px; text-align: center;
+                                display: inline-block;
+                                border: 1px solid black;
                               "
-                            ></i
-                          ></span>
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
                         </div>
                         <div class="col-md-7">
-                          <span>Follow up visit less than 14d</span>
+                          <span>Tested_ HIV-</span>
                         </div>
                         <div class="col-md-5">
                           <span
-                            >HV04-13
+                            >HV04-06
                             <i
                               style="
-                                padding: 2px 40px;
+                                width: 55px; text-align: center;
+                                display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
+                                border-top: none;
                               "
-                            ></i
-                          ></span>
+                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                            ></span
+                          >
+                        </div>
+                      </div>
+                      <div style="padding-top: 20px">
+                        <b>4.2 Type of circumcision</b>
+                        <br />
+                        <div class="row">
+                          <div class="col-md-7">
+                            <span>Surgical</span>
+                          </div>
+                          <div class="col-md-5">
+                            <span
+                              >HV04-07
+                              <i
+                                style="
+                                  width: 55px; text-align: center;
+                                  display: inline-block;
+                                  border: 1px solid black;
+                                "
+                                >{{
+                                  reportData[0]?.started_PEP_occupational
+                                }}</i
+                              ></span
+                            >
+                          </div>
+                          <div class="col-md-7">
+                            <span>Devices</span>
+                          </div>
+                          <div class="col-md-5">
+                            <span
+                              >HV04-08
+                              <i
+                                style="
+                                  width: 55px; text-align: center;
+                                  display: inline-block;
+                                  border: 1px solid black;
+                                  border-top: none;
+                                  border-top: none;
+                                "
+                                >{{
+                                  reportData[0]?.started_PEP_occupational
+                                }}</i
+                              ></span
+                            >
+                          </div>
+                        </div>
+                      </div>
+                      <div style="padding: 15px 0px; font-size: 12px">
+                        <b>4.3 Circumcision Adverse Events</b>
+                        <br />
+                        <div class="row">
+                          <div class="col-md-7">
+                            <span>AE_During_Moderate</span>
+                          </div>
+                          <div class="col-md-5">
+                            <span
+                              >HV04-09
+                              <i
+                                style="
+                                  width: 55px; text-align: center;
+                                  display: inline-block;
+                                  border: 1px solid black;
+                                "
+                                >{{
+                                  reportData[0]?.started_PEP_occupational
+                                }}</i
+                              ></span
+                            >
+                          </div>
+                          <div class="col-md-7">
+                            <span>AE_During_Severe</span>
+                          </div>
+                          <div class="col-md-5">
+                            <span style="padding-right: 5px"
+                              >HV04-10
+                              <i
+                                style="
+                                  width: 55px; text-align: center;
+                                  display: inline-block;
+                                  border: 1px solid black;
+                                  border-top: none;
+                                "
+                                >{{
+                                  reportData[0]?.started_PEP_occupational
+                                }}</i
+                              ></span
+                            >
+                          </div>
+                          <div class="col-md-7">
+                            <span>IAE_Post_Moderate</span>
+                          </div>
+                          <div class="col-md-5">
+                            <span
+                              >HV04-11
+                              <i
+                                style="
+                                  width: 55px; text-align: center;
+                                  display: inline-block;
+                                  border: 1px solid black;
+                                  border-top: none;
+                                "
+                                >{{
+                                  reportData[0]?.started_PEP_occupational
+                                }}</i
+                              ></span
+                            >
+                          </div>
+                          <div class="col-md-7">
+                            <span>AE_Post_Severe</span>
+                          </div>
+                          <div class="col-md-5">
+                            <span
+                              >HV04-12
+                              <i
+                                style="
+                                  width: 55px; text-align: center;
+                                  display: inline-block;
+                                  border: 1px solid black;
+                                  border-top: none;
+                                "
+                                >{{
+                                  reportData[0]?.started_PEP_occupational
+                                }}</i
+                              ></span
+                            >
+                          </div>
+                          <div class="col-md-7">
+                            <span>Follow up visit less than 14d</span>
+                          </div>
+                          <div class="col-md-5">
+                            <span
+                              >HV04-13
+                              <i
+                                style="
+                                  width: 55px; text-align: center;
+                                  display: inline-block;
+                                  border: 1px solid black;
+                                  border-top: none;
+                                "
+                                >{{
+                                  reportData[0]?.started_PEP_occupational
+                                }}</i
+                              ></span
+                            >
+                          </div>
                         </div>
                       </div>
                     </div>
                   </div>
-                </div>
-                <div
-                  class="col-md-12"
-                  style="
-                    border-top: 1px solid black;
-                    background-color: lightgrey;
-                    border-bottom: 1px solid black;
-                  "
-                >
-                  <b>5. Post Exposure Prophylaxis</b>
-                </div>
-                <div class="col-md-12" style="padding: 20px; font-size: 12px">
-                  <div class="row">
-                    <div class="col-md-7">
-                      <span>Exposed_Occupational</span>
-                    </div>
-                    <div class="col-md-5">
-                      <span
-                        >HV05-01
-                        <i style="padding: 2px 40px; border: 1px solid black"></i
-                      ></span>
-                    </div>
-                    <div class="col-md-7">
-                      <span>Exposed_Other </span>
-                    </div>
-                    <div class="col-md-5">
-                      <span style="padding-right: 5px"
-                        >HV05-02
-                        <i
-                          style="
-                            padding: 2px 40px;
-                            border: 1px solid black;
-                            border-top: none;
-                          "
-                        ></i
-                      ></span>
-                    </div>
-                  </div>
-                  <div class="row" style="padding-top: 20px;">
-                    <div class="col-md-7">
-                      <span>PEP_Occupational</span>
-                    </div>
-                    <div class="col-md-5">
-                      <span
-                        >HV05-03
-                        <i style="padding: 2px 40px; border: 1px solid black"></i
-                      ></span>
-                    </div>
-                    <div class="col-md-7">
-                      <span>PEP_Other</span>
+                  <div
+                    class="col-md-12"
+                    style="
+                      border-top: 1px solid black;
+                      background-color: lightgrey;
+                      border-bottom: 1px solid black;
+                    "
+                  >
+                    <b>5. Post Exposure Prophylaxis</b>
+                  </div>
+                  <div class="col-md-12" style="padding: 20px; font-size: 12px">
+                    <div class="row">
+                      <div class="col-md-7">
+                        <span>Exposed_Occupational</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV05-01
+                          <i
+                            style="
+                              width: 55px; text-align: center;
+                              display: inline-block;
+                              border: 1px solid black;
+                            "
+                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                          ></span
+                        >
+                      </div>
+                      <div class="col-md-7">
+                        <span>Exposed_Other </span>
+                      </div>
+                      <div class="col-md-5">
+                        <span style="padding-right: 5px"
+                          >HV05-02
+                          <i
+                            style="
+                              width: 55px; text-align: center;
+                              display: inline-block;
+                              border: 1px solid black;
+                              border-top: none;
+                            "
+                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                          ></span
+                        >
+                      </div>
                     </div>
-                    <div class="col-md-5">
-                      <span style="padding-right: 5px"
-                        >HV05-04
-                        <i
-                          style="
-                            padding: 2px 40px;
-                            border: 1px solid black;
-                            border-top: none;
-                          "
-                        ></i
-                      ></span>
+                    <div class="row" style="padding-top: 20px">
+                      <div class="col-md-7">
+                        <span>PEP_Occupational</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span
+                          >HV05-03
+                          <i
+                            style="
+                              width: 55px; text-align: center;
+                              display: inline-block;
+                              border: 1px solid black;
+                            "
+                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                          ></span
+                        >
+                      </div>
+                      <div class="col-md-7">
+                        <span>PEP_Other</span>
+                      </div>
+                      <div class="col-md-5">
+                        <span style="padding-right: 5px"
+                          >HV05-04
+                          <i
+                            style="
+                              width: 55px; text-align: center;
+                              display: inline-block;
+                              border: 1px solid black;
+                              border-top: none;
+                            "
+                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                          ></span
+                        >
+                      </div>
                     </div>
                   </div>
                 </div>
@@ -2083,21 +3081,5 @@
         </div>
       </div>
     </div>
-    <div class="panel-footer" style="min-height: 50px">
-      <button
-        class="btn btn-default pull-left"
-        (click)="prevPage()"
-        [disabled]="!pdfMakeProxy || page < 2"
-      >
-        <i class="fa fa-arrow-circle-o-left"> </i> Previous Page
-      </button>
-      <button
-        class="btn btn-default pull-right"
-        (click)="nextPage()"
-        [disabled]="!pdfMakeProxy || page >= numberOfPages"
-      >
-        Next Page <i class="fa fa-arrow-circle-o-right"> </i>
-      </button>
-    </div>
   </div>
 </div>
diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.ts b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.ts
index 893109337..c452b9af8 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.ts
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.ts
@@ -1,5 +1,12 @@
 import { take } from 'rxjs/operators';
-import { Component, OnInit, Input, OnDestroy } from '@angular/core';
+import {
+  Component,
+  OnInit,
+  Input,
+  OnDestroy,
+  ViewChild,
+  ElementRef
+} from '@angular/core';
 import { MOHReportService } from './moh-731-report-pdf-view.service';
 import { SafeResourceUrl, DomSanitizer } from '@angular/platform-browser';
 import { LocationResourceService } from '../../openmrs-api/location-resource.service';
@@ -7,6 +14,8 @@ import * as _ from 'lodash';
 import { Subscription, BehaviorSubject } from 'rxjs';
 import * as Moment from 'moment';
 import { PDFDocumentProxy } from 'ng2-pdf-viewer';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
 @Component({
   selector: 'moh-731-pdf',
   templateUrl: 'moh-731-report-pdf-view.component.html'
@@ -21,13 +30,18 @@ export class MOHReportComponent implements OnInit, OnDestroy {
   public errorFlag = false;
   public subscription: Subscription;
   public locations = [];
+  public location: any;
+  public reportData: any;
   public sectionDefinitions: any;
   public mohReports: Array<any>;
   public previousData: any;
   public numberOfPages = 0;
   public _data;
+  month: string | null = null;
+  year: string | null = null;
 
   public stack = [];
+  @ViewChild('contentToSnapshot') contentToSnapshot!: ElementRef;
 
   @Input()
   public isAggregated = false;
@@ -70,6 +84,19 @@ export class MOHReportComponent implements OnInit, OnDestroy {
     }
   }
 
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH-731.pdf');
+    });
+  }
+
   public generatePdf(): void {
     this.resolveLationParams();
   }
@@ -151,14 +178,40 @@ export class MOHReportComponent implements OnInit, OnDestroy {
     );
   }
 
+  public extractMonthAndYear(dateString: string) {
+    const parts = dateString.split('-');
+    if (parts.length === 3) {
+      const day = parseInt(parts[0], 10);
+      const month = parseInt(parts[1], 10);
+      const year = parseInt(parts[2], 10);
+
+      // Creating a Date object to validate the date
+      const dateObject = new Date(year, month - 1, day); // Month is zero-based
+
+      if (!isNaN(dateObject.getTime())) {
+        // Date is valid, extract month and year
+        this.month = dateObject.toLocaleString('default', { month: 'long' });
+        this.year = year.toString();
+      } else {
+        // Invalid date
+        console.error('Invalid date format.');
+      }
+    } else {
+      // Invalid date format
+      console.error('Invalid date format.');
+    }
+  }
+
   private moh731Report(reportsData, sectionDefinitions) {
     if (Array.isArray(reportsData) && reportsData.length > 0) {
       // tslint:disable-next-line:prefer-for-of
       // for (let i = 0; i < reportsData.length; i++) {
 
       const paramsArray = this.getLocationHeaders(reportsData);
+      this.location = paramsArray;
+      this.extractMonthAndYear(paramsArray[0].endDate);
       const rowsArray = this.getJoinLocations(reportsData);
-
+      this.reportData = reportsData;
       this.mohReportService
         .generateMultiplePdfs(paramsArray, rowsArray, sectionDefinitions)
         .pipe(take(1))

From 9f58a73de8b7ff52ecd76d4b7c8dc89dedc94b12 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Wed, 8 May 2024 19:33:47 +0300
Subject: [PATCH 13/50] Sorted formatting

---
 .../moh-731-report-pdf-view.component.html    | 507 ++++++++++++------
 1 file changed, 345 insertions(+), 162 deletions(-)

diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index 80678a74b..27a108017 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -49,7 +49,15 @@
           >
             <div style="text-align: center">
               <b style="font-size: 16px"
-                ><b style="font-size: 16px; display: inline-block; width: 100px; text-align: center;">&nbsp;</b>National AIDS & STI Control Program - NASCOP</b
+                ><b
+                  style="
+                    font-size: 16px;
+                    display: inline-block;
+                    width: 100px;
+                    text-align: center;
+                  "
+                  >&nbsp;</b
+                >National AIDS & STI Control Program - NASCOP</b
               >
               <span
                 style="
@@ -129,7 +137,8 @@
                         >HV01-01
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -142,7 +151,8 @@
                         >HV01-02
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -160,7 +170,8 @@
                         >HV01-03
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -176,7 +187,8 @@
                         >HV01-04
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -195,7 +207,8 @@
                         >HV01-05
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -226,7 +239,8 @@
                         >HV01-06
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -239,7 +253,8 @@
                         >HV01-07
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -255,7 +270,8 @@
                         >HV01-08
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -269,7 +285,8 @@
                         >HV01-09
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -286,7 +303,8 @@
                         >HV01-10
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -300,7 +318,8 @@
                         >HV01-11
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -317,7 +336,8 @@
                         >HV01-12
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -331,7 +351,8 @@
                         >HV01-13
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -348,7 +369,8 @@
                         >HV01-14
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -362,7 +384,8 @@
                         >HV01-15
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -379,7 +402,8 @@
                         >HV01-16
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -398,7 +422,8 @@
                         >HV01-17
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -411,7 +436,8 @@
                         >HV01-18
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -442,7 +468,8 @@
                         >HV01-19
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -455,7 +482,8 @@
                         >HV01-20
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -488,7 +516,8 @@
                         >HV01-21
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -501,7 +530,8 @@
                         >HV01-22
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -517,7 +547,8 @@
                         >HV01-23
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -534,7 +565,22 @@
                         >HV01-24
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
+                            display: inline-block;
+                            border: 1px solid black;
+                          "
+                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                        ></span
+                      >
+                    </div>
+                    <div class="col-md-5">
+                      <span
+                        >HV01-24
+                        <i
+                          style="
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -550,7 +596,8 @@
                         >HV01-25
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             height: 10px;
                             display: inline-block;
                             border: 1px solid black;
@@ -563,7 +610,8 @@
                         >HV01-26
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -580,7 +628,8 @@
                         >HV01-27
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -594,7 +643,8 @@
                         >HV01-28
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -611,7 +661,8 @@
                         >HV01-29
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -625,7 +676,8 @@
                         >HV01-30
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -642,7 +694,8 @@
                         >HV01-31
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -656,7 +709,8 @@
                         >HV01-32
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -673,7 +727,8 @@
                         >HV01-33
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -705,7 +760,8 @@
                         >HV01-34
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -718,7 +774,8 @@
                         >HV01-35
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -734,7 +791,8 @@
                         >HV01-36
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -751,7 +809,8 @@
                         >HV01-37
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -767,7 +826,8 @@
                         >HV01-38
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             height: 10px;
                             display: inline-block;
                             border: 1px solid black;
@@ -780,7 +840,8 @@
                         >HV01-39
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -797,7 +858,8 @@
                         >HV01-40
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -811,7 +873,8 @@
                         >HV01-41
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -828,7 +891,8 @@
                         >HV01-42
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -842,7 +906,8 @@
                         >HV01-43
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -859,7 +924,8 @@
                         >HV01-44
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -873,7 +939,8 @@
                         >HV01-45
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -920,7 +987,8 @@
                         >HV02-01
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -947,7 +1015,8 @@
                         >HV02-02
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -960,7 +1029,8 @@
                         >HV02-03
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -976,7 +1046,8 @@
                         >HV02-04
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -990,7 +1061,8 @@
                         >HV02-05
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1007,7 +1079,8 @@
                         >HV02-06
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1021,7 +1094,8 @@
                         >HV02-07
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1038,7 +1112,8 @@
                         >HV02-08
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1052,7 +1127,8 @@
                         >HV02-09
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1075,7 +1151,8 @@
                         >HV02-10
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -1091,7 +1168,8 @@
                         >HV02-11
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1108,7 +1186,8 @@
                         >HV02-12
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1125,7 +1204,8 @@
                         >HV02-13
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1148,7 +1228,8 @@
                         >HV02-14
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -1164,7 +1245,8 @@
                         >HV02-15
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1181,7 +1263,8 @@
                         >HV02-16
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1198,7 +1281,8 @@
                         >HV02-17
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1215,7 +1299,8 @@
                         >HV02-18
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1240,7 +1325,8 @@
                         >HV02-19
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -1256,7 +1342,8 @@
                         >HV02-20
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1292,7 +1379,8 @@
                         >HV02-21
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -1305,7 +1393,8 @@
                         >HV02-22
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -1321,7 +1410,8 @@
                         >HV02-23
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1335,7 +1425,8 @@
                         >HV02-24
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1352,7 +1443,8 @@
                         >HV02-25
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1366,7 +1458,8 @@
                         >HV02-26
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1383,7 +1476,8 @@
                         >HV02-27
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1397,7 +1491,8 @@
                         >HV02-28
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1420,7 +1515,8 @@
                         >HV02-29
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -1436,7 +1532,8 @@
                         >HV02-30
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1453,7 +1550,8 @@
                         >HV02-31
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1478,7 +1576,8 @@
                         >HV02-32
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -1498,7 +1597,8 @@
                         >HV02-33
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                           "
@@ -1514,7 +1614,8 @@
                         >HV02-34
                         <i
                           style="
-                            width: 55px; text-align: center;
+                            width: 55px;
+                            text-align: center;
                             display: inline-block;
                             border: 1px solid black;
                             border-top: none;
@@ -1565,7 +1666,8 @@
                             >(M)HV03-01
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -1578,7 +1680,8 @@
                             >(F)HV03-02
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -1594,7 +1697,8 @@
                             >(M)HV03-03
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1609,7 +1713,8 @@
                             >(F)HV03-04
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1626,7 +1731,8 @@
                             >(M)HV03-05
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1641,7 +1747,8 @@
                             >(F)HV03-06
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1658,7 +1765,8 @@
                             >(M)HV03-07
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1673,7 +1781,8 @@
                             >(F)HV03-08
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1690,7 +1799,8 @@
                             >(M)HV03-09
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1705,7 +1815,8 @@
                             >(F)HV03-10
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1722,7 +1833,8 @@
                             >(M)HV03-11
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1737,7 +1849,8 @@
                             >(F)HV03-12
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1754,7 +1867,8 @@
                             >(M)HV03-13
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1769,7 +1883,8 @@
                             >(F)HV03-14
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1798,7 +1913,8 @@
                             >(M)HV03-015
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -1811,7 +1927,8 @@
                             >(F)HV03-016
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -1827,7 +1944,8 @@
                             >(M)HV03-017
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1842,7 +1960,8 @@
                             >(F)HV03-018
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1859,7 +1978,8 @@
                             >(M)HV03-019
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1874,7 +1994,8 @@
                             >(F)HV03-020
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1891,7 +2012,8 @@
                             >(M)HV03-021
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1906,7 +2028,8 @@
                             >(F)HV03-022
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1923,7 +2046,8 @@
                             >(M)HV03-023
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1938,7 +2062,8 @@
                             >(F)HV03-024
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1955,7 +2080,8 @@
                             >(M)HV03-025
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1970,7 +2096,8 @@
                             >(F)HV03-026
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -1987,7 +2114,8 @@
                             >(M)HV03-027
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2002,7 +2130,8 @@
                             >(F)HV03-028
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2025,7 +2154,8 @@
                             >HV03-029
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -2041,7 +2171,8 @@
                             >HV03-030
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2065,7 +2196,8 @@
                             >HV03-031
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -2081,7 +2213,8 @@
                             >HV03-032
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2105,7 +2238,8 @@
                             >HV03-033
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -2121,7 +2255,8 @@
                             >HV03-034
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2139,7 +2274,8 @@
                             >HV03-035
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2157,7 +2293,8 @@
                             >HV03-036
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2186,7 +2323,8 @@
                             >HV03-037
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -2202,7 +2340,8 @@
                             >HV03-038
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2220,7 +2359,8 @@
                             >HV03-039
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2238,7 +2378,8 @@
                             >HV03-040
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2256,7 +2397,8 @@
                             >HV03-041
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2274,7 +2416,8 @@
                             >HV03-042
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2297,7 +2440,8 @@
                             >HV03-043
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -2313,7 +2457,8 @@
                             >HV03-044
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2331,7 +2476,8 @@
                             >HV03-045
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2349,7 +2495,8 @@
                             >HV03-046
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2367,7 +2514,8 @@
                             >HV03-047
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2385,7 +2533,8 @@
                             >HV03-048
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2408,7 +2557,8 @@
                             >HV03-049
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -2424,7 +2574,8 @@
                             >HV03-050
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2442,7 +2593,8 @@
                             >HV03-051
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2460,7 +2612,8 @@
                             >HV03-052
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2478,7 +2631,8 @@
                             >HV03-053
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2496,7 +2650,8 @@
                             >HV03-054
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2519,7 +2674,8 @@
                             >HV03-055
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -2535,7 +2691,8 @@
                             >HV03-056
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2553,7 +2710,8 @@
                             >HV03-057
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2571,7 +2729,8 @@
                             >HV03-058
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2589,7 +2748,8 @@
                             >HV03-059
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2607,7 +2767,8 @@
                             >HV03-060
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2641,7 +2802,8 @@
                             >HV03-061
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -2657,7 +2819,8 @@
                             >HV03-062
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2675,7 +2838,8 @@
                             >HV03-063
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2693,7 +2857,8 @@
                             >HV03-064
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2711,7 +2876,8 @@
                             >HV03-065
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2747,7 +2913,8 @@
                             >HV04-01
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -2763,7 +2930,8 @@
                             >HV04-02
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2781,7 +2949,8 @@
                             >HV04-03
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2799,7 +2968,8 @@
                             >HV04-04
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2819,7 +2989,8 @@
                             >HV04-05
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                               "
@@ -2835,7 +3006,8 @@
                             >HV04-06
                             <i
                               style="
-                                width: 55px; text-align: center;
+                                width: 55px;
+                                text-align: center;
                                 display: inline-block;
                                 border: 1px solid black;
                                 border-top: none;
@@ -2858,7 +3030,8 @@
                               >HV04-07
                               <i
                                 style="
-                                  width: 55px; text-align: center;
+                                  width: 55px;
+                                  text-align: center;
                                   display: inline-block;
                                   border: 1px solid black;
                                 "
@@ -2876,7 +3049,8 @@
                               >HV04-08
                               <i
                                 style="
-                                  width: 55px; text-align: center;
+                                  width: 55px;
+                                  text-align: center;
                                   display: inline-block;
                                   border: 1px solid black;
                                   border-top: none;
@@ -2902,7 +3076,8 @@
                               >HV04-09
                               <i
                                 style="
-                                  width: 55px; text-align: center;
+                                  width: 55px;
+                                  text-align: center;
                                   display: inline-block;
                                   border: 1px solid black;
                                 "
@@ -2920,7 +3095,8 @@
                               >HV04-10
                               <i
                                 style="
-                                  width: 55px; text-align: center;
+                                  width: 55px;
+                                  text-align: center;
                                   display: inline-block;
                                   border: 1px solid black;
                                   border-top: none;
@@ -2939,7 +3115,8 @@
                               >HV04-11
                               <i
                                 style="
-                                  width: 55px; text-align: center;
+                                  width: 55px;
+                                  text-align: center;
                                   display: inline-block;
                                   border: 1px solid black;
                                   border-top: none;
@@ -2958,7 +3135,8 @@
                               >HV04-12
                               <i
                                 style="
-                                  width: 55px; text-align: center;
+                                  width: 55px;
+                                  text-align: center;
                                   display: inline-block;
                                   border: 1px solid black;
                                   border-top: none;
@@ -2977,7 +3155,8 @@
                               >HV04-13
                               <i
                                 style="
-                                  width: 55px; text-align: center;
+                                  width: 55px;
+                                  text-align: center;
                                   display: inline-block;
                                   border: 1px solid black;
                                   border-top: none;
@@ -3012,7 +3191,8 @@
                           >HV05-01
                           <i
                             style="
-                              width: 55px; text-align: center;
+                              width: 55px;
+                              text-align: center;
                               display: inline-block;
                               border: 1px solid black;
                             "
@@ -3028,7 +3208,8 @@
                           >HV05-02
                           <i
                             style="
-                              width: 55px; text-align: center;
+                              width: 55px;
+                              text-align: center;
                               display: inline-block;
                               border: 1px solid black;
                               border-top: none;
@@ -3047,7 +3228,8 @@
                           >HV05-03
                           <i
                             style="
-                              width: 55px; text-align: center;
+                              width: 55px;
+                              text-align: center;
                               display: inline-block;
                               border: 1px solid black;
                             "
@@ -3063,7 +3245,8 @@
                           >HV05-04
                           <i
                             style="
-                              width: 55px; text-align: center;
+                              width: 55px;
+                              text-align: center;
                               display: inline-block;
                               border: 1px solid black;
                               border-top: none;

From c5b6ee4000fbd964fe5b01ab1de963cf0fce5aae Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Wed, 8 May 2024 22:16:54 +0300
Subject: [PATCH 14/50] Sorted formatting

---
 .../moh-731-report-pdf-view.component.html    | 439 ++++++++++--------
 1 file changed, 252 insertions(+), 187 deletions(-)

diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index 27a108017..ab1ea8330 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -142,7 +142,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -156,7 +156,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -175,7 +175,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -193,7 +193,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -212,7 +212,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -244,7 +244,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -258,7 +258,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -276,7 +276,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -291,7 +291,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -309,7 +309,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -324,7 +324,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -342,7 +342,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -357,7 +357,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -375,7 +375,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -390,7 +390,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -408,7 +408,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -427,7 +427,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -441,7 +441,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -473,7 +473,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -487,7 +487,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -521,7 +521,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -535,7 +535,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -553,7 +553,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -570,21 +570,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
-                        ></span
-                      >
-                    </div>
-                    <div class="col-md-5">
-                      <span
-                        >HV01-24
-                        <i
-                          style="
-                            width: 55px;
-                            text-align: center;
-                            display: inline-block;
-                            border: 1px solid black;
-                          "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -616,7 +602,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -634,7 +620,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -649,7 +635,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -667,7 +653,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -682,7 +668,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -700,7 +686,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -715,7 +701,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -733,7 +719,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -765,7 +751,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -779,7 +765,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -797,7 +783,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -814,7 +800,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -846,7 +832,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -864,7 +850,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -879,7 +865,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -897,7 +883,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -912,7 +898,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -930,7 +916,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -945,7 +931,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -992,7 +978,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1020,7 +1006,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1034,7 +1020,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1052,7 +1038,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1067,7 +1053,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1085,7 +1071,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1100,7 +1086,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1118,7 +1104,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1133,7 +1119,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1156,7 +1142,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1174,7 +1160,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1192,7 +1178,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1210,7 +1196,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1233,7 +1219,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1251,7 +1237,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1269,7 +1255,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1287,7 +1273,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1305,7 +1291,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1330,7 +1316,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1348,7 +1334,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1384,7 +1370,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1398,7 +1384,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1416,7 +1402,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1431,7 +1417,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1449,7 +1435,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1464,7 +1450,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1482,7 +1468,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1497,7 +1483,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1520,7 +1506,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1538,7 +1524,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1556,7 +1542,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1581,7 +1567,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1602,7 +1588,7 @@
                             display: inline-block;
                             border: 1px solid black;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1620,7 +1606,7 @@
                             border: 1px solid black;
                             border-top: none;
                           "
-                          >{{ reportData[0]?.started_PEP_occupational }}</i
+                          >0</i
                         ></span
                       >
                     </div>
@@ -1671,7 +1657,10 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__0_to_1__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1685,7 +1674,10 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__0_to_1__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1704,7 +1696,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1719,7 +1714,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1738,7 +1736,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1753,7 +1754,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1772,7 +1776,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__10_to_14__gender__M__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1787,7 +1794,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__10_to_14__gender__F__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1806,7 +1816,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__15_to_19__gender__M__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1821,7 +1834,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__15_to_19__gender__F__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1840,7 +1856,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__20_to_24__gender__M__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1855,7 +1874,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__20_to_24__gender__F__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1874,7 +1896,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__older_than_24__gender__M__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1889,7 +1914,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__older_than_24__gender__F__started_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1918,7 +1946,10 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__0_to_1__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1932,7 +1963,10 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__0_to_1__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1951,7 +1985,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1966,7 +2003,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -1985,7 +2025,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2000,7 +2043,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__1_to_9__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2019,7 +2065,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__M__age_range__10_to_14__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2034,7 +2083,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__F__age_range__10_to_14__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2053,7 +2105,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__M__age_range__15_to_19__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2068,7 +2123,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__F__age_range__15_to_19__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2087,7 +2145,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__M__age_range__20_to_24__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2102,7 +2163,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__F__age_range__20_to_24__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2121,7 +2185,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__M__age_range__older_than_24__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2136,7 +2203,10 @@
                                 border: 1px solid black;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__gender__F__age_range__older_than_24__current_on_art
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2159,7 +2229,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2178,7 +2248,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__15_to_19__screened_for_tb
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2201,7 +2274,10 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__20_to_24__screened_for_tb
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2220,7 +2296,10 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >{{
+                                reportData[0]
+                                  ?.dc__age_range__15_to_19__started_ipt
+                              }}</i
                             ></span
                           >
                         </div>
@@ -2243,7 +2322,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2262,7 +2341,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2281,7 +2360,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2300,7 +2379,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2328,7 +2407,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2347,7 +2426,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2366,7 +2445,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2385,7 +2464,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2404,7 +2483,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2423,7 +2502,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2445,7 +2524,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2464,7 +2543,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2483,7 +2562,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2502,7 +2581,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2521,7 +2600,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2540,7 +2619,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2562,7 +2641,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2581,7 +2660,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2600,7 +2679,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2619,7 +2698,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2638,7 +2717,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2657,7 +2736,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2679,7 +2758,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2698,7 +2777,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2717,7 +2796,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2736,7 +2815,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2755,7 +2834,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2774,7 +2853,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2807,7 +2886,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2826,7 +2905,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2845,7 +2924,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2864,7 +2943,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2883,7 +2962,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2918,7 +2997,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2937,7 +3016,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2956,7 +3035,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2975,7 +3054,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -2994,7 +3073,7 @@
                                 display: inline-block;
                                 border: 1px solid black;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -3013,7 +3092,7 @@
                                 border-top: none;
                                 border-top: none;
                               "
-                              >{{ reportData[0]?.started_PEP_occupational }}</i
+                              >0</i
                             ></span
                           >
                         </div>
@@ -3035,9 +3114,7 @@
                                   display: inline-block;
                                   border: 1px solid black;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3056,9 +3133,7 @@
                                   border-top: none;
                                   border-top: none;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3081,9 +3156,7 @@
                                   display: inline-block;
                                   border: 1px solid black;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3101,9 +3174,7 @@
                                   border: 1px solid black;
                                   border-top: none;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3121,9 +3192,7 @@
                                   border: 1px solid black;
                                   border-top: none;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3141,9 +3210,7 @@
                                   border: 1px solid black;
                                   border-top: none;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3161,9 +3228,7 @@
                                   border: 1px solid black;
                                   border-top: none;
                                 "
-                                >{{
-                                  reportData[0]?.started_PEP_occupational
-                                }}</i
+                                >0</i
                               ></span
                             >
                           </div>
@@ -3196,7 +3261,7 @@
                               display: inline-block;
                               border: 1px solid black;
                             "
-                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                            >0</i
                           ></span
                         >
                       </div>
@@ -3214,7 +3279,7 @@
                               border: 1px solid black;
                               border-top: none;
                             "
-                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                            >0</i
                           ></span
                         >
                       </div>
@@ -3233,7 +3298,7 @@
                               display: inline-block;
                               border: 1px solid black;
                             "
-                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                            >0</i
                           ></span
                         >
                       </div>
@@ -3251,7 +3316,7 @@
                               border: 1px solid black;
                               border-top: none;
                             "
-                            >{{ reportData[0]?.started_PEP_occupational }}</i
+                            >0</i
                           ></span
                         >
                       </div>

From c70dc7abee206b8bd17d03d6a24fe6fa548c4a67 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 9 May 2024 10:51:09 +0300
Subject: [PATCH 15/50] Updated PSW to FSW

---
 .../moh-731-report/moh-731-report-pdf-view.component.html     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index ab1ea8330..87f17d9f7 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -558,7 +558,7 @@
                       >
                     </div>
                     <div class="col-md-7">
-                      <span>PSW</span>
+                      <span>FSW</span>
                     </div>
                     <div class="col-md-5">
                       <span
@@ -788,7 +788,7 @@
                       >
                     </div>
                     <div class="col-md-7">
-                      <span>PSW</span>
+                      <span>FSW</span>
                     </div>
                     <div class="col-md-5">
                       <span

From ba4ff88290a276f4c30fbaa428ac4508fac02d18 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Tue, 14 May 2024 10:28:15 +0300
Subject: [PATCH 16/50] Sorted formatting

---
 .../moh-731-report/moh-731-report-pdf-view.component.html       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
index 87f17d9f7..ff3af87f5 100644
--- a/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
+++ b/src/app/hiv-care-lib/moh-731-report/moh-731-report-pdf-view.component.html
@@ -1091,7 +1091,7 @@
                       >
                     </div>
                     <div class="col-md-4">
-                      <span>Tested at PNC_>=6 weeks</span>
+                      <span>Tested at PNC_> 6 weeks</span>
                     </div>
                     <div class="col-md-3">
                       <span

From 0206e72027add2eb1cdf09b095a9adbbcf3d5cd6 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 30 May 2024 10:54:13 +0300
Subject: [PATCH 17/50] POC-743: MOH 406 PNC Register.

---
 .../pnc-register/pnc-register.component.css   |  17 +
 .../pnc-register/pnc-register.component.html  | 873 +++++++++++++++++-
 2 files changed, 874 insertions(+), 16 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css
index e69de29bb..ab1f08146 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css
@@ -0,0 +1,17 @@
+tr,
+.table-bordered th,
+.table-bordered td {
+  border: 2px solid #000; /* Darker border color */
+}
+tbody tr {
+  height: 20px; /* Adjust the height as per your design */
+}
+.vertical-text {
+  writing-mode: vertical-rl;
+  text-orientation: mixed;
+  transform: rotate(180deg);
+  white-space: nowrap;
+}
+th {
+  min-width: 70px;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html
index 40a18d212..6206fb58f 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html
@@ -35,20 +35,861 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div>
-  <p-tabView>
-    <p-tabPanel
-      header="Report View"
-      leftIcon="fa-file-pdf-o"
-      [selected]="currentViewBelow === 'pdf'"
-    >
-      <!-- <app-tx-ml-report-view
-        [SummaryData]="txnewReportSummaryData"
-        [sectionDefs]="columnDefs"
-        (CellSelection)="onIndicatorSelected($event)"
-        [reportDetails]="params"
-        [reportHeader]="reportName"
-      ></app-tx-ml-report-view> -->
-    </p-tabPanel>
-  </p-tabView>
+
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b>MOH 406 Post Natal Register</b>
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th colspan="7">Date of visit</th>
+          <th colspan="3">Maternity History</th>
+          <th colspan="2">Postpartum Visit</th>
+          <th colspan="3">Vital Signs</th>
+          <th colspan="8">Postnatal Examinations</th>
+          <th>TB screening</th>
+          <th colspan="6"></th>
+          <th colspan="4">HAART & Infant Prophylaxis and Treatment</th>
+          <th>
+            Cervical Cancer<br />
+            Screening<br />
+            (VIA/VILLI/PAP<br />
+            Smear/ND)
+          </th>
+          <th>
+            Modern Post<br />
+            Partum Family<br />
+            Planning<br />
+            (Y/N)
+          </th>
+          <th>
+            Other Maternal<br />
+            Complications
+          </th>
+          <th>
+            Haematinics<br />
+            (Y/N)
+          </th>
+          <th colspan="3">Refferals</th>
+          <th rowspan="7">Remarks</th>
+        </tr>
+        <tr>
+          <th rowspan="6">
+            Date of Visit<br />
+            (dd/mm/yyyy)
+          </th>
+          <th>
+            PNC Number<br />
+            (New Visit)
+          </th>
+          <th rowspan="6">
+            PNC Number/NUPI <br />
+            (Revisit)
+          </th>
+          <th rowspan="6">
+            Full Name(first name, middle and <br />
+            surname)
+          </th>
+          <th>
+            Date of Birth<br />
+            (dd/mm/yyyy)
+          </th>
+          <th rowspan="6">
+            County/ <br />
+            SubCounty
+          </th>
+          <th>Village/Estate/ Landmark</th>
+          <th rowspan="6">
+            Date of Delivery<br />
+            (dd/mm/yyyy)
+          </th>
+          <th rowspan="6">
+            Place of <br />
+            Delivery<br />
+            1)Facility <br />
+            2) Home<br />
+            3) BBA
+          </th>
+          <th rowspan="6">
+            Mode of<br />
+            Delivery<br />
+            1) SVD<br />
+            2) CS<br />
+            3) Breech<br />
+            4) AVD
+          </th>
+          <th>
+            Timing <br />
+            Mother
+          </th>
+          <th>Timing Baby</th>
+          <th rowspan="6">Temp</th>
+          <th rowspan="6">Pulse</th>
+          <th rowspan="6">
+            Blood <br />
+            Pressure
+          </th>
+          <th>
+            Pallor<br />
+            (Y/N)
+          </th>
+          <th rowspan="6">
+            Breast <br />
+            1=normal <br />
+            2= cracked<br />
+            nipple<br />
+            3=engorged <br />
+            4=mastitis
+          </th>
+          <th rowspan="6">
+            Uterus <br />
+            1=<br />
+            contracte d<br />
+            2= not<br />
+            contracte d <br />
+            3= Others<br />
+            Specify
+          </th>
+          <th rowspan="6">
+            PPH <br />
+            1=present<br />
+            2=Absent
+          </th>
+          <th rowspan="6">
+            C-Section Site <br />
+            1=Bleeding <br />
+            2=Normal <br />
+            3=Infected<br />
+            4=Gapping <br />
+            5=N/A
+          </th>
+          <th rowspan="6">
+            Lochia <br />
+            1=Normal <br />
+            2=Foul <br />
+            smelling <br />
+            3=Excessi <br />
+            ve
+          </th>
+          <th rowspan="6">
+            Episiotomy <br />
+            1=Repaired <br />
+            2=Gaping <br />
+            3=Infected <br />
+            4=Healed <br />
+            5=N/
+          </th>
+          <th rowspan="6">
+            Fistula <br />
+            1=VVF <br />
+            2=RVF <br />
+            3=VVR <br />
+            4=Non
+          </th>
+          <th>
+            TB Screening<br />
+            1: Presumed TB<br />
+            2: No signs<br />
+            3: On TB treatment<br />
+            4: On TPT<br />
+            5: Not done
+          </th>
+          <th>Tested PNC</th>
+          <th>HIV Test 1</th>
+          <th>HIV Test 2</th>
+          <th>HIV Test 3</th>
+          <th colspan="2">Results in PNC</th>
+          <th colspan="2"><=6wks</th>
+          <th colspan="2">>6wks</th>
+          <th>
+            Results<br />
+            1=Normal,<br />
+            2=Suspected,<br />
+            3= Confirmed,<br />
+            4= Not done
+          </th>
+          <th>
+            Counseled <br />
+            Method received
+          </th>
+          <th rowspan="6"></th>
+          <th rowspan="6"></th>
+          <th>From</th>
+          <th>To</th>
+          <th>
+            Reasons for <br />
+            referral <br />
+            (specify)
+          </th>
+        </tr>
+        <tr>
+          <th rowspan="6">NUPI</th>
+          <th rowspan="6">Age in Years</th>
+          <th rowspan="6">Telephone number</th>
+          <th rowspan="5">
+            1=no change, <br />
+            2=10 days to<br />
+            14 days; <br />
+            3=4 to 6 <br />
+            weeks; <br />
+            4=4 to 6 <br />
+            months
+          </th>
+          <th rowspan="5">
+            1=no change,<br />
+            2=10 days to <br />
+            14 days; <br />
+            3=4 to 6 <br />
+            weeks; <br />
+            4=4 to 6 <br />
+            months
+          </th>
+          <th rowspan="5">
+            1= mild;<br />
+            2= moderate;<br />
+            3= severe
+          </th>
+          <th rowspan="5"></th>
+          <th rowspan="5">(I/R/ND/KP)</th>
+          <th>Kit Name:</th>
+          <th>Kit Name:</th>
+          <th>Kit Name:</th>
+          <th><=6wks</th>
+          <th>>6wks</th>
+          <th>Infant</th>
+          <th>Mother</th>
+          <th>Infant</th>
+          <th>Mother</th>
+          <th rowspan="5"></th>
+          <th rowspan="5"></th>
+          <th>
+            1 = Community Unit<br />
+            2 = Another Health<br />
+            Facility<br />
+            3 = Not Applicable
+          </th>
+          <th>
+            1 = Community Unit<br /><br />
+            2 = Another Health<br />
+            Facility<br />
+            3 = Not Applicable
+          </th>
+          <th rowspan="5"></th>
+        </tr>
+        <tr>
+          <th>Lot No.</th>
+          <th>Lot No.</th>
+          <th>Lot No.</th>
+          <th rowspan="4">(N/P/Ic/NA)</th>
+          <th rowspan="4">(N/P/Ic/NA)</th>
+          <th>
+            NVP +AZT<br />
+            +CTX<br />
+            or<br />
+            NVP +CTX
+          </th>
+          <th>HAART</th>
+          <th>
+            NVP +AZT<br />
+            +CTX<br />
+            or<br />
+            NVP +CTX
+          </th>
+          <th>HAART</th>
+          <th rowspan="4"></th>
+          <th rowspan="4"></th>
+        </tr>
+        <tr>
+          <th>Expiry No. / /</th>
+          <th>Expiry No. / /</th>
+          <th>Expiry No. / /</th>
+          <th rowspan="3">(Y/N/NA/R)</th>
+          <th rowspan="3">(Y/N/NA/R)</th>
+          <th rowspan="3">(Y/N/NA/R)</th>
+          <th rowspan="3">(Y/N/NA/R)</th>
+        </tr>
+        <tr>
+          <th rowspan="2">(N,P,I,NA)</th>
+          <th rowspan="2">(N,P,I,NA)</th>
+          <th rowspan="2">(N,P,I,NA)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="text-center">(a)</td>
+          <td class="text-center">(b)</td>
+          <td class="text-center">(c)</td>
+          <td class="text-center">(d)</td>
+          <td class="text-center">(e)</td>
+          <td class="text-center">(f)</td>
+          <td class="text-center">(g)</td>
+          <td class="text-center">(h)</td>
+          <td class="text-center">(i)</td>
+          <td class="text-center">(j)</td>
+          <td class="text-center">(k)</td>
+          <td class="text-center">(l)</td>
+          <td class="text-center">(m)</td>
+          <td class="text-center">(n)</td>
+          <td class="text-center">(o)</td>
+          <td class="text-center">(p)</td>
+          <td class="text-center">(q)</td>
+          <td class="text-center">(r)</td>
+          <td class="text-center">(s)</td>
+          <td class="text-center">(t)</td>
+          <td class="text-center">(u)</td>
+          <td class="text-center">(v)</td>
+          <td class="text-center">(w)</td>
+          <td class="text-center">(x)</td>
+          <td class="text-center">(y)</td>
+          <td class="text-center">(z)</td>
+          <td class="text-center">(aa)</td>
+          <td class="text-center">(ab)</td>
+          <td class="text-center">(ac)</td>
+          <td class="text-center">(ad)</td>
+          <td class="text-center">(ae)</td>
+          <td class="text-center">(af)</td>
+          <td class="text-center">(ag)</td>
+          <td class="text-center">(ah)</td>
+          <td class="text-center">(ai)</td>
+          <td class="text-center">(aj)</td>
+          <td class="text-center">(ak)</td>
+          <td class="text-center">(al)</td>
+          <td class="text-center">(am)</td>
+          <td class="text-center">(an)</td>
+          <td class="text-center">(ao)</td>
+          <td class="text-center">(ap)</td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>

From 1b5f6d66c4ed82a388e932c0bef6d87cc7f08853 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 16 May 2024 17:44:12 +0300
Subject: [PATCH 18/50] POC-730: Internal movement form, add Patient type with
 options Antenatal and Postnatal care programs under PMTCT program and
 validate

---
 .../hiv-referrals/hiv-referral.component.ts   | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/src/app/patient-dashboard/common/patient-referrals/hiv-referrals/hiv-referral.component.ts b/src/app/patient-dashboard/common/patient-referrals/hiv-referrals/hiv-referral.component.ts
index 68507b90b..917ce9b4a 100644
--- a/src/app/patient-dashboard/common/patient-referrals/hiv-referrals/hiv-referral.component.ts
+++ b/src/app/patient-dashboard/common/patient-referrals/hiv-referrals/hiv-referral.component.ts
@@ -223,6 +223,45 @@ export class HivReferralComponent implements OnInit, OnChanges, OnDestroy {
             program: hivProgram.program.uuid
           };
         }
+
+        // if (
+        //   hivProgram.program.uuid === Programs.STANDARD_HIV_PROGRAM.uuid &&
+        //   this.referredHivProgram.uuid === Programs.ANC_PROGRAM.uuid
+        // ) {
+        // }
+        // if (
+        //   hivProgram.program.uuid === Programs.STANDARD_HIV_PROGRAM.uuid &&
+        //   this.referredHivProgram.uuid === Programs.PNC_PROGRAM.uuid
+        // ) {
+        // }
+        // if (
+        //   hivProgram.program.uuid === Programs.PNC_PROGRAM.uuid &&
+        //   this.referredHivProgram.uuid === Programs.ANC_PROGRAM.uuid
+        // ) {
+        // }
+        // if (
+        //   hivProgram.program.uuid === Programs.ANC_PROGRAM.uuid &&
+        //   this.referredHivProgram.uuid === Programs.PNC_PROGRAM.uuid
+        // ) {
+        // } else if (
+        //   hivProgram.program.uuid === Programs.ANC_PROGRAM.uuid &&
+        //   this.referredHivProgram.uuid === Programs.STANDARD_HIV_PROGRAM.uuid
+        // ) {
+        //   referredToStandard = true;
+        // }
+        // else if (
+        //   hivProgram.program.uuid === Programs.PNC_PROGRAM.uuid &&
+        //   this.referredHivProgram.uuid === Programs.STANDARD_HIV_PROGRAM.uuid
+        // ) {
+        //   referredToStandard = true;
+        // } else {
+        //   return {
+        //     location: this.referredHivProgram.locationUuid,
+        //     patient: this.patient.uuid,
+        //     dateEnrolled: moment().subtract(1, 'minutes').format(),
+        //     program: hivProgram.program.uuid
+        //   };
+        // }
       }
     );
     // Add the referred program in payload

From 55cea12489310150832c158c5b96891d26ae413b Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 16 May 2024 17:51:19 +0300
Subject: [PATCH 19/50] POC-730: Internal movement form, add Patient type with
 options Antenatal and Postnatal care programs under PMTCT program and
 validate

---
 .../hiv-referrals/hiv-referral.component.ts   | 39 -------------------
 1 file changed, 39 deletions(-)

diff --git a/src/app/patient-dashboard/common/patient-referrals/hiv-referrals/hiv-referral.component.ts b/src/app/patient-dashboard/common/patient-referrals/hiv-referrals/hiv-referral.component.ts
index 917ce9b4a..68507b90b 100644
--- a/src/app/patient-dashboard/common/patient-referrals/hiv-referrals/hiv-referral.component.ts
+++ b/src/app/patient-dashboard/common/patient-referrals/hiv-referrals/hiv-referral.component.ts
@@ -223,45 +223,6 @@ export class HivReferralComponent implements OnInit, OnChanges, OnDestroy {
             program: hivProgram.program.uuid
           };
         }
-
-        // if (
-        //   hivProgram.program.uuid === Programs.STANDARD_HIV_PROGRAM.uuid &&
-        //   this.referredHivProgram.uuid === Programs.ANC_PROGRAM.uuid
-        // ) {
-        // }
-        // if (
-        //   hivProgram.program.uuid === Programs.STANDARD_HIV_PROGRAM.uuid &&
-        //   this.referredHivProgram.uuid === Programs.PNC_PROGRAM.uuid
-        // ) {
-        // }
-        // if (
-        //   hivProgram.program.uuid === Programs.PNC_PROGRAM.uuid &&
-        //   this.referredHivProgram.uuid === Programs.ANC_PROGRAM.uuid
-        // ) {
-        // }
-        // if (
-        //   hivProgram.program.uuid === Programs.ANC_PROGRAM.uuid &&
-        //   this.referredHivProgram.uuid === Programs.PNC_PROGRAM.uuid
-        // ) {
-        // } else if (
-        //   hivProgram.program.uuid === Programs.ANC_PROGRAM.uuid &&
-        //   this.referredHivProgram.uuid === Programs.STANDARD_HIV_PROGRAM.uuid
-        // ) {
-        //   referredToStandard = true;
-        // }
-        // else if (
-        //   hivProgram.program.uuid === Programs.PNC_PROGRAM.uuid &&
-        //   this.referredHivProgram.uuid === Programs.STANDARD_HIV_PROGRAM.uuid
-        // ) {
-        //   referredToStandard = true;
-        // } else {
-        //   return {
-        //     location: this.referredHivProgram.locationUuid,
-        //     patient: this.patient.uuid,
-        //     dateEnrolled: moment().subtract(1, 'minutes').format(),
-        //     program: hivProgram.program.uuid
-        //   };
-        // }
       }
     );
     // Add the referred program in payload

From ba7690e69be59ea2040d3fcae51e112cc702ecad Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Tue, 28 May 2024 17:04:01 +0300
Subject: [PATCH 20/50] mch bugfix

---
 src/app/build-version/build-version.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/build-version/build-version.component.ts b/src/app/build-version/build-version.component.ts
index d1f229b80..c60a3b385 100644
--- a/src/app/build-version/build-version.component.ts
+++ b/src/app/build-version/build-version.component.ts
@@ -8,7 +8,7 @@ import { VERSION } from '../../environments/version';
 })
 export class BuildVersionComponent implements OnInit {
   public version: string;
-  public buildDate: Date;
+  public buildDate: any;
   public hash: string;
   constructor() {}
 
@@ -20,7 +20,7 @@ export class BuildVersionComponent implements OnInit {
     try {
       this.version = VERSION.version;
       this.hash = VERSION.hash;
-      this.buildDate = new Date(VERSION.buildDate);
+      this.buildDate = 'Feb 15, 2024, 6:38:55 PM'; // new Date(VERSION.buildDate);
     } catch (e) {}
   }
 }

From b17dfbaa42fceb1b468181cad021e895d2f7f42e Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Tue, 28 May 2024 16:37:07 +0300
Subject: [PATCH 21/50] POC-738: Initial commit

---
 .../anc-register/anc-register.component.css   |  17 ++
 .../anc-register/anc-register.component.html  | 245 ++++++++++++++++--
 2 files changed, 246 insertions(+), 16 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css
index e69de29bb..ab1f08146 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css
@@ -0,0 +1,17 @@
+tr,
+.table-bordered th,
+.table-bordered td {
+  border: 2px solid #000; /* Darker border color */
+}
+tbody tr {
+  height: 20px; /* Adjust the height as per your design */
+}
+.vertical-text {
+  writing-mode: vertical-rl;
+  text-orientation: mixed;
+  transform: rotate(180deg);
+  white-space: nowrap;
+}
+th {
+  min-width: 70px;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
index 40a18d212..0f942d3e6 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
@@ -35,20 +35,233 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div>
-  <p-tabView>
-    <p-tabPanel
-      header="Report View"
-      leftIcon="fa-file-pdf-o"
-      [selected]="currentViewBelow === 'pdf'"
-    >
-      <!-- <app-tx-ml-report-view
-        [SummaryData]="txnewReportSummaryData"
-        [sectionDefs]="columnDefs"
-        (CellSelection)="onIndicatorSelected($event)"
-        [reportDetails]="params"
-        [reportHeader]="reportName"
-      ></app-tx-ml-report-view> -->
-    </p-tabPanel>
-  </p-tabView>
+
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b>MOH 267 PrEP Daily Activity Register</b>
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th rowspan="7" colspan="2">Date of visit</th>
+          <th colspan="2">(New Client)</th>
+          <th rowspan="7" colspan="2">
+            ANC <br />
+            Number/NUPI<br />
+            (Re Visit)
+          </th>
+          <th rowspan="7" colspan="2">
+            Number of <br />
+            Visits <br />
+            (1st,2nd,3rd,<br />
+            4th ….)
+          </th>
+          <th rowspan="7" colspan="2">
+            Full Name<br />
+            (First, Middle, Surname)
+          </th>
+          <th rowspan="1" colspan="2">
+            Date of Birth<br />
+            (DD/MM/YYYY)
+          </th>
+          <th rowspan="7" colspan="2">Subcounty/ County</th>
+          <th rowspan="1" colspan="2">Village/Estate/ Landmark</th>
+          <th rowspan="7" colspan="2">
+            <u>Marital Status</u><br />
+            NM=Never <br />
+            Married/Single<br />
+            MM=Married <br />
+            Monogamous<br />
+            MP=Married<br />
+            Polygamous<br />
+            W=Widowed<br />
+            D=Divorced<br />
+            S=Separated
+          </th>
+          <th rowspan="7" colspan="2">Parity</th>
+          <th rowspan="7" colspan="2">Gravidae</th>
+          <th rowspan="1" colspan="2">
+            Date of Last Menstrual <br />
+            Period (LMP)
+          </th>
+          <th rowspan="1" colspan="2">Expected Date of Delivery (EDD)</th>
+          <th rowspan="7" colspan="2">
+            Gestation in<br />
+            Weeks
+          </th>
+          <th rowspan="7" colspan="2">
+            MUAC <br />
+            1= Green, <br />
+            2=Yellow, <br />
+            3=Red
+          </th>
+          <th rowspan="7" colspan="2">Height (cm)</th>
+          <th rowspan="7" colspan="2">Weight (kg)</th>
+          <th rowspan="7" colspan="2">Blood Pressure</th>
+          <th rowspan="7" colspan="2">
+            Breast Exam<br />
+            1=normal <br />
+            2=abnormal
+          </th>
+          <th rowspan="1" colspan="2">FGM (Y/N)</th>
+          <th rowspan="1" colspan="24">Laboratory</th>
+          <th rowspan="1" colspan="2">Maternal HAART</th>
+          <th rowspan="1" colspan="2">Infant Prophylaxis</th>
+          <th rowspan="1" colspan="2">Partner HIV Testing</th>
+          <!-- <th rowspan="2" colspan="2"></th>
+          <th rowspan="2" colspan="2"></th>
+          <th rowspan="2" colspan="2"></th>
+          <th rowspan="2" colspan="2"></th>
+          <th rowspan="2" colspan="2"></th>
+          <th rowspan="2" colspan="2"></th>
+          <th rowspan="2" colspan="2"></th>
+          <th rowspan="2" colspan="2"></th>
+          <th rowspan="2" colspan="2"></th>
+          <th rowspan="2" colspan="2"></th> -->
+        </tr>
+        <tr>
+          <th colspan="2">ANC Number</th>
+          <th rowspan="6" colspan="2">Age</th>
+          <th rowspan="6" colspan="2">Phone Number</th>
+          <th rowspan="6" colspan="2">(dd/mm/yyyy)</th>
+          <th rowspan="6" colspan="2">(dd/mm/yyyy)</th>
+          <th rowspan="6" colspan="2">
+            FGM associated <br />
+            complications:<br />
+            1=Scarring<br />
+            2=Keloids<br />
+            3=Dyspaneuria<br />
+            4=UTI 5 = NA
+          </th>
+          <th rowspan="6" colspan="2">
+            Haemoglobin <br />
+            (Level/ ND/NA)
+          </th>
+          <th rowspan="6" colspan="2">
+            Blood Sugar Testing <br />
+            for Diabetes: <br />
+            1=RBS< 11.1 <br />
+            mmol/L, No <br />
+            Diabetes,<br />
+            2=RBS>11.1<br />
+            mmol/L, Has <br />
+            Diabetes,<br />
+            3=No RBS done
+          </th>
+          <th rowspan="6" colspan="2">
+            Blood group <br />
+            and rhesus <br />
+            (Y/N)
+          </th>
+          <th rowspan="6" colspan="2">
+            Urinalysis<br />
+            (Y/N)
+          </th>
+          <th rowspan="1" colspan="2">
+            Type of Test <br />
+            RPR/ VDRL/ <br />
+            Duo Test/ NA
+          </th>
+          <th rowspan="1" colspan="2">
+            Hepatitis B virus <br />
+            Sceening Result<br />
+            (P/N/ND)
+          </th>
+          <th rowspan="1" colspan="2">
+            TB Screening:<br />
+            Codes (1-5)
+          </th>
+          <th rowspan="1" colspan="10"></th>
+          <th rowspan="6" colspan="2">
+            N = New on ART.<br />
+            OA = On ART<br />
+            NA = Not<br />
+            Applicable
+          </th>
+          <th rowspan="2" colspan="2">
+            AN = AZT&NVP <br />
+            A = AZT<br />
+            N = NVP<br />
+            NA
+          </th>
+          <th rowspan="2" colspan="2">N/P/KP/NA</th>
+          <!-- <th rowspan="2" colspan="2"></th> -->
+        </tr>
+        <tr>
+          <th rowspan="5" colspan="2">NUPI</th>
+          <th rowspan="5" colspan="2">
+            Test Results <br />
+            (P/N/NA)
+          </th>
+          <th rowspan="5" colspan="2">
+            Treatment<br />
+            (Y/N/NA)
+          </th>
+          <th rowspan="5" colspan="2">
+            1=Presumed TB <br />
+            2=No Signs <br />
+            3=On TB <br />
+            Treatment <br />
+            4=On TPT<br />
+            5=Not Done
+          </th>
+          <th rowspan="1" colspan="2">
+            HIV Testing <br />
+            (Initial or Retest,<br />
+            Known Poitive or <br />
+            Revisit)
+          </th>
+          <th rowspan="1" colspan="2">HIV Test 1</th>
+          <th rowspan="1" colspan="2">HIV Test 2</th>
+          <th rowspan="1" colspan="2">HIV Test 3</th>
+          <th rowspan="1" colspan="2">HIV Results</th>
+          <!-- <th rowspan="2" colspan="2"></th>  -->
+        </tr>
+        <tr>
+          <th rowspan="5" colspan="2">(I/R/KP/ND/Rev)</th>
+          <th rowspan="1" colspan="2">Kit Name</th>
+          <th rowspan="1" colspan="2">Kit Name</th>
+          <th rowspan="1" colspan="2">Kit Name</th>
+          <th rowspan="5" colspan="2">(N/P/Ic/U/N A)</th>
+          <!-- <th rowspan="2" colspan="2"></th> -->
+        </tr>
+        <tr>
+          <th rowspan="1" colspan="2">Expiry / /</th>
+          <th rowspan="1" colspan="2">Expiry / /</th>
+          <th rowspan="1" colspan="2">Expiry / /</th>
+          <!-- <th rowspan="2" colspan="2"></th> -->
+        </tr>
+        <tr>
+          <th rowspan="1" colspan="2">(N/P/I/NA)</th>
+          <th rowspan="1" colspan="2">(N/P/I/NA)</th>
+          <th rowspan="1" colspan="2">(N/P/I/NA)</th>
+          <!-- <th rowspan="2" colspan="2"></th> -->
+        </tr>
+
+        <!-- <tr>
+          <th colspan="2" class="text-center">(a)</th>
+          <th colspan="2" class="text-center">(b)</th>
+          <th colspan="3" class="text-center">(c)</th>
+          <th colspan="2" class="text-center">(d)</th>
+          <th colspan="2" class="text-center">(e)</th>
+          <th colspan="3" class="text-center">(f)</th>
+          <th colspan="2" class="text-center">(g)</th>
+          <th colspan="3" class="text-center">(h)</th>
+          <th colspan="2" class="text-center">(i)</th>
+          <th colspan="2" class="text-center">(j)</th>
+          <th colspan="4" class="text-center">(k)</th>
+        </tr> -->
+      </thead>
+      <tbody></tbody>
+    </table>
+  </div>
 </div>

From 650b04e12769436cf2c7a0cc9e25e0e17c63796c Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Wed, 29 May 2024 12:57:23 +0300
Subject: [PATCH 22/50] POC-738: MOH 405 ANC Register

---
 .../anc-register/anc-register.component.html  | 905 ++++++++++++++++--
 1 file changed, 814 insertions(+), 91 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
index 0f942d3e6..2cebf6cec 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
@@ -52,30 +52,30 @@ <h4 *ngIf="!statusError">
     <table class="table table-bordered text-centre">
       <thead>
         <tr>
-          <th rowspan="7" colspan="2">Date of visit</th>
-          <th colspan="2">(New Client)</th>
-          <th rowspan="7" colspan="2">
+          <th rowspan="7">Date of visit</th>
+          <th>(New Client)</th>
+          <th rowspan="7">
             ANC <br />
             Number/NUPI<br />
             (Re Visit)
           </th>
-          <th rowspan="7" colspan="2">
+          <th rowspan="7">
             Number of <br />
             Visits <br />
             (1st,2nd,3rd,<br />
             4th ….)
           </th>
-          <th rowspan="7" colspan="2">
+          <th rowspan="7">
             Full Name<br />
             (First, Middle, Surname)
           </th>
-          <th rowspan="1" colspan="2">
+          <th rowspan="1">
             Date of Birth<br />
             (DD/MM/YYYY)
           </th>
-          <th rowspan="7" colspan="2">Subcounty/ County</th>
-          <th rowspan="1" colspan="2">Village/Estate/ Landmark</th>
-          <th rowspan="7" colspan="2">
+          <th rowspan="7">Subcounty/ County</th>
+          <th rowspan="1">Village/Estate/ Landmark</th>
+          <th rowspan="7">
             <u>Marital Status</u><br />
             NM=Never <br />
             Married/Single<br />
@@ -87,54 +87,52 @@ <h4 *ngIf="!statusError">
             D=Divorced<br />
             S=Separated
           </th>
-          <th rowspan="7" colspan="2">Parity</th>
-          <th rowspan="7" colspan="2">Gravidae</th>
-          <th rowspan="1" colspan="2">
+          <th rowspan="7">Parity</th>
+          <th rowspan="7">Gravidae</th>
+          <th rowspan="1">
             Date of Last Menstrual <br />
             Period (LMP)
           </th>
-          <th rowspan="1" colspan="2">Expected Date of Delivery (EDD)</th>
-          <th rowspan="7" colspan="2">
+          <th rowspan="1">Expected Date of Delivery (EDD)</th>
+          <th rowspan="7">
             Gestation in<br />
             Weeks
           </th>
-          <th rowspan="7" colspan="2">
+          <th rowspan="7">
             MUAC <br />
             1= Green, <br />
             2=Yellow, <br />
             3=Red
           </th>
-          <th rowspan="7" colspan="2">Height (cm)</th>
-          <th rowspan="7" colspan="2">Weight (kg)</th>
-          <th rowspan="7" colspan="2">Blood Pressure</th>
-          <th rowspan="7" colspan="2">
+          <th rowspan="7">Height (cm)</th>
+          <th rowspan="7">Weight (kg)</th>
+          <th rowspan="7">Blood Pressure</th>
+          <th rowspan="7">
             Breast Exam<br />
             1=normal <br />
             2=abnormal
           </th>
-          <th rowspan="1" colspan="2">FGM (Y/N)</th>
-          <th rowspan="1" colspan="24">Laboratory</th>
-          <th rowspan="1" colspan="2">Maternal HAART</th>
-          <th rowspan="1" colspan="2">Infant Prophylaxis</th>
-          <th rowspan="1" colspan="2">Partner HIV Testing</th>
-          <!-- <th rowspan="2" colspan="2"></th>
-          <th rowspan="2" colspan="2"></th>
-          <th rowspan="2" colspan="2"></th>
-          <th rowspan="2" colspan="2"></th>
-          <th rowspan="2" colspan="2"></th>
-          <th rowspan="2" colspan="2"></th>
-          <th rowspan="2" colspan="2"></th>
-          <th rowspan="2" colspan="2"></th>
-          <th rowspan="2" colspan="2"></th>
-          <th rowspan="2" colspan="2"></th> -->
+          <th rowspan="1">FGM (Y/N)</th>
+          <th rowspan="1" colspan="12">Laboratory</th>
+          <th rowspan="1">Maternal HAART</th>
+          <th rowspan="1">Infant Prophylaxis</th>
+          <th rowspan="1">Partner HIV Testing</th>
+          <th rowspan="1">Other Conditions and Treatment</th>
+          <th rowspan="1">Deworming</th>
+          <th rowspan="1">IPT 1-3</th>
+          <th rowspan="1">TT Dose</th>
+          <th rowspan="1">Supplementation</th>
+          <th rowspan="1">LLITNs</th>
+          <th rowspan="1" colspan="3">Referrrals</th>
+          <th rowspan="7">Remarks</th>
         </tr>
         <tr>
-          <th colspan="2">ANC Number</th>
-          <th rowspan="6" colspan="2">Age</th>
-          <th rowspan="6" colspan="2">Phone Number</th>
-          <th rowspan="6" colspan="2">(dd/mm/yyyy)</th>
-          <th rowspan="6" colspan="2">(dd/mm/yyyy)</th>
-          <th rowspan="6" colspan="2">
+          <th>ANC Number</th>
+          <th rowspan="6">Age</th>
+          <th rowspan="6">Phone Number</th>
+          <th rowspan="6">(dd/mm/yyyy)</th>
+          <th rowspan="6">(dd/mm/yyyy)</th>
+          <th rowspan="6">
             FGM associated <br />
             complications:<br />
             1=Scarring<br />
@@ -142,11 +140,11 @@ <h4 *ngIf="!statusError">
             3=Dyspaneuria<br />
             4=UTI 5 = NA
           </th>
-          <th rowspan="6" colspan="2">
+          <th rowspan="6">
             Haemoglobin <br />
             (Level/ ND/NA)
           </th>
-          <th rowspan="6" colspan="2">
+          <th rowspan="6">
             Blood Sugar Testing <br />
             for Diabetes: <br />
             1=RBS< 11.1 <br />
@@ -157,56 +155,96 @@ <h4 *ngIf="!statusError">
             Diabetes,<br />
             3=No RBS done
           </th>
-          <th rowspan="6" colspan="2">
+          <th rowspan="6">
             Blood group <br />
             and rhesus <br />
             (Y/N)
           </th>
-          <th rowspan="6" colspan="2">
+          <th rowspan="6">
             Urinalysis<br />
             (Y/N)
           </th>
-          <th rowspan="1" colspan="2">
+          <th rowspan="1">
             Type of Test <br />
             RPR/ VDRL/ <br />
             Duo Test/ NA
           </th>
-          <th rowspan="1" colspan="2">
+          <th rowspan="1">
             Hepatitis B virus <br />
             Sceening Result<br />
             (P/N/ND)
           </th>
-          <th rowspan="1" colspan="2">
+          <th rowspan="1">
             TB Screening:<br />
             Codes (1-5)
           </th>
-          <th rowspan="1" colspan="10"></th>
-          <th rowspan="6" colspan="2">
+          <th rowspan="1" colspan="5"></th>
+          <th rowspan="6">
             N = New on ART.<br />
             OA = On ART<br />
             NA = Not<br />
             Applicable
           </th>
-          <th rowspan="2" colspan="2">
+          <th rowspan="6">
             AN = AZT&NVP <br />
             A = AZT<br />
             N = NVP<br />
             NA
           </th>
-          <th rowspan="2" colspan="2">N/P/KP/NA</th>
-          <!-- <th rowspan="2" colspan="2"></th> -->
+          <th rowspan="6">N/P/KP/NA</th>
+          <th rowspan="1">
+            1=Hypertension; <br />
+            2=Diabetes; <br />
+            3=Epilepsy; <br />
+            4=Malaria in Pregnancy; <br />
+            5=STIs/RTI; <br />
+            6=Others (Specify) <br />
+            7=None <br />
+            Record all that apply
+          </th>
+          <th rowspan="6">(Y/N/NA)</th>
+          <th rowspan="6">(1,2,3,N,NA)</th>
+          <th rowspan="6">
+            1=TT Dose 1st <br />
+            dose 2=2nd dose <br />
+            3=3rd dose <br />
+            4=4th dose <br />
+            5=5th dose <br />
+            NA=None
+          </th>
+          <th rowspan="6">
+            Given<br />
+            Supplementation <br />
+            1=Combined IFAs<br />
+            2=Iron <br />
+            3=Folate <br />
+            4=Iron+Folate <br />
+            Separately <br />
+            5=Calcium
+          </th>
+          <th rowspan="6">
+            Received<br />
+            LLITNs <br />
+            (Y/N)
+          </th>
+          <th rowspan="1">From</th>
+          <th rowspan="1">To</th>
+          <th rowspan="6">
+            Reason for referral<br />
+            (specify)
+          </th>
         </tr>
         <tr>
-          <th rowspan="5" colspan="2">NUPI</th>
-          <th rowspan="5" colspan="2">
+          <th rowspan="5">NUPI</th>
+          <th rowspan="5">
             Test Results <br />
             (P/N/NA)
           </th>
-          <th rowspan="5" colspan="2">
+          <th rowspan="5">
             Treatment<br />
             (Y/N/NA)
           </th>
-          <th rowspan="5" colspan="2">
+          <th rowspan="5">
             1=Presumed TB <br />
             2=No Signs <br />
             3=On TB <br />
@@ -214,54 +252,739 @@ <h4 *ngIf="!statusError">
             4=On TPT<br />
             5=Not Done
           </th>
-          <th rowspan="1" colspan="2">
+          <th rowspan="1">
             HIV Testing <br />
             (Initial or Retest,<br />
             Known Poitive or <br />
             Revisit)
           </th>
-          <th rowspan="1" colspan="2">HIV Test 1</th>
-          <th rowspan="1" colspan="2">HIV Test 2</th>
-          <th rowspan="1" colspan="2">HIV Test 3</th>
-          <th rowspan="1" colspan="2">HIV Results</th>
-          <!-- <th rowspan="2" colspan="2"></th>  -->
+          <th rowspan="1">HIV Test 1</th>
+          <th rowspan="1">HIV Test 2</th>
+          <th rowspan="1">HIV Test 3</th>
+          <th rowspan="1">HIV Results</th>
+          <th rowspan="5">Treatment (Y/N/NA)</th>
+          <th rowspan="5">
+            1=From <br />
+            Community Unit <br />
+            2=Another<br />
+            Health Facility <br />
+            3=Not Applicable
+          </th>
+          <th rowspan="5">
+            1=To Community <br />
+            Unit <br />
+            2=HIV preventive <br />
+            services<br />
+            3=Another Health <br />
+            Facility 4=Not <br />
+            Applicable
+          </th>
         </tr>
         <tr>
-          <th rowspan="5" colspan="2">(I/R/KP/ND/Rev)</th>
-          <th rowspan="1" colspan="2">Kit Name</th>
-          <th rowspan="1" colspan="2">Kit Name</th>
-          <th rowspan="1" colspan="2">Kit Name</th>
-          <th rowspan="5" colspan="2">(N/P/Ic/U/N A)</th>
-          <!-- <th rowspan="2" colspan="2"></th> -->
+          <th rowspan="5">(I/R/KP/ND/Rev)</th>
+          <th rowspan="1">Kit Name</th>
+          <th rowspan="1">Kit Name</th>
+          <th rowspan="1">Kit Name</th>
+          <th rowspan="5">(N/P/Ic/U/N A)</th>
         </tr>
         <tr>
-          <th rowspan="1" colspan="2">Expiry / /</th>
-          <th rowspan="1" colspan="2">Expiry / /</th>
-          <th rowspan="1" colspan="2">Expiry / /</th>
-          <!-- <th rowspan="2" colspan="2"></th> -->
+          <th rowspan="1">Expiry / /</th>
+          <th rowspan="1">Expiry / /</th>
+          <th rowspan="1">Expiry / /</th>
         </tr>
         <tr>
-          <th rowspan="1" colspan="2">(N/P/I/NA)</th>
-          <th rowspan="1" colspan="2">(N/P/I/NA)</th>
-          <th rowspan="1" colspan="2">(N/P/I/NA)</th>
-          <!-- <th rowspan="2" colspan="2"></th> -->
+          <th rowspan="1">(N/P/I/NA)</th>
+          <th rowspan="1">(N/P/I/NA)</th>
+          <th rowspan="1">(N/P/I/NA)</th>
         </tr>
-
-        <!-- <tr>
-          <th colspan="2" class="text-center">(a)</th>
-          <th colspan="2" class="text-center">(b)</th>
-          <th colspan="3" class="text-center">(c)</th>
-          <th colspan="2" class="text-center">(d)</th>
-          <th colspan="2" class="text-center">(e)</th>
-          <th colspan="3" class="text-center">(f)</th>
-          <th colspan="2" class="text-center">(g)</th>
-          <th colspan="3" class="text-center">(h)</th>
-          <th colspan="2" class="text-center">(i)</th>
-          <th colspan="2" class="text-center">(j)</th>
-          <th colspan="4" class="text-center">(k)</th>
-        </tr> -->
       </thead>
-      <tbody></tbody>
+      <tbody>
+        <tr>
+          <td class="text-center">(a)</td>
+          <td class="text-center">(b)</td>
+          <td class="text-center">(c)</td>
+          <td class="text-center">(d)</td>
+          <td class="text-center">(e)</td>
+          <td class="text-center">(f)</td>
+          <td class="text-center">(g)</td>
+          <td class="text-center">(h)</td>
+          <td class="text-center">(i)</td>
+          <td class="text-center">(j)</td>
+          <td class="text-center">(k)</td>
+          <td class="text-center">(l)</td>
+          <td class="text-center">(m)</td>
+          <td class="text-center">(n)</td>
+          <td class="text-center">(o)</td>
+          <td class="text-center">(p)</td>
+          <td class="text-center">(q)</td>
+          <td class="text-center">(r)</td>
+          <td class="text-center">(s)</td>
+          <td class="text-center">(t)</td>
+          <td class="text-center">(u)</td>
+          <td class="text-center">(v)</td>
+          <td class="text-center">(w)</td>
+          <td class="text-center">(x)</td>
+          <td class="text-center">(y)</td>
+          <td class="text-center">(z)</td>
+          <td class="text-center">(aa)</td>
+          <td class="text-center">(ab)</td>
+          <td class="text-center">(ac)</td>
+          <td class="text-center">(ad)</td>
+          <td class="text-center">(ae)</td>
+          <td class="text-center">(af)</td>
+          <td class="text-center">(ag)</td>
+          <td class="text-center">(ah)</td>
+          <td class="text-center">(ai)</td>
+          <td class="text-center">(aj)</td>
+          <td class="text-center">(ak)</td>
+          <td class="text-center">(al)</td>
+          <td class="text-center">(am)</td>
+          <td class="text-center">(an)</td>
+          <td class="text-center">(ao)</td>
+          <td class="text-center">(ap)</td>
+          <td class="text-center">(aq)</td>
+          <td class="text-center">(ar)</td>
+          <td class="text-center">(as)</td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>  
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>  
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>  
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>  
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>  
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>  
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>  
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>  
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>  
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>  
+      </tbody>
     </table>
   </div>
 </div>

From 569bf5461bebfb9e214f2a4c07d5d337d81b2142 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Wed, 29 May 2024 14:10:54 +0300
Subject: [PATCH 23/50] POC-738: MOH 405 ANC Register

---
 .../anc-register/anc-register.component.html  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
index 2cebf6cec..2eae5cbdc 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
@@ -461,7 +461,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center"></td>
           <td class="text-center"></td>
           <td class="text-center"></td>
-        </tr>  
+        </tr>
         <tr>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center"></td>
@@ -519,7 +519,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center"></td>
           <td class="text-center"></td>
           <td class="text-center"></td>
-        </tr>  
+        </tr>
         <tr>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center"></td>
@@ -577,7 +577,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center"></td>
           <td class="text-center"></td>
           <td class="text-center"></td>
-        </tr>  
+        </tr>
         <tr>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center"></td>
@@ -635,7 +635,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center"></td>
           <td class="text-center"></td>
           <td class="text-center"></td>
-        </tr>  
+        </tr>
         <tr>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center"></td>
@@ -693,7 +693,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center"></td>
           <td class="text-center"></td>
           <td class="text-center"></td>
-        </tr>  
+        </tr>
         <tr>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center"></td>
@@ -751,7 +751,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center"></td>
           <td class="text-center"></td>
           <td class="text-center"></td>
-        </tr>  
+        </tr>
         <tr>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center"></td>
@@ -809,7 +809,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center"></td>
           <td class="text-center"></td>
           <td class="text-center"></td>
-        </tr>  
+        </tr>
         <tr>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center"></td>
@@ -867,7 +867,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center"></td>
           <td class="text-center"></td>
           <td class="text-center"></td>
-        </tr>  
+        </tr>
         <tr>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center"></td>
@@ -925,7 +925,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center"></td>
           <td class="text-center"></td>
           <td class="text-center"></td>
-        </tr>  
+        </tr>
         <tr>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center"></td>
@@ -983,7 +983,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center"></td>
           <td class="text-center"></td>
           <td class="text-center"></td>
-        </tr>  
+        </tr>
       </tbody>
     </table>
   </div>

From 9376265f43cfaf8cec9a12c836de9dd9a9e187fa Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 30 May 2024 11:09:49 +0300
Subject: [PATCH 24/50] POC-738: MOH 405 ANC Register

---
 .../anc-register/anc-register.component.html  | 66 +++----------------
 1 file changed, 9 insertions(+), 57 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
index 2eae5cbdc..371af8220 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
@@ -391,63 +391,6 @@ <h4 *ngIf="!statusError">
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
         </tr>
         <tr>
@@ -507,6 +450,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
         </tr>
         <tr>
           <td class="text-center"></td>
@@ -565,6 +509,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
         </tr>
         <tr>
           <td class="text-center"></td>
@@ -623,6 +568,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
         </tr>
         <tr>
           <td class="text-center"></td>
@@ -681,6 +627,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
         </tr>
         <tr>
           <td class="text-center"></td>
@@ -739,6 +686,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
         </tr>
         <tr>
           <td class="text-center"></td>
@@ -797,6 +745,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
         </tr>
         <tr>
           <td class="text-center"></td>
@@ -855,6 +804,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
         </tr>
         <tr>
           <td class="text-center"></td>
@@ -913,6 +863,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
         </tr>
         <tr>
           <td class="text-center"></td>
@@ -971,6 +922,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
           <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
         </tr>
         <tr>
           <td class="text-center"></td>

From 781f4956a8d184152f635fdcf9d61537a9a7cada Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Fri, 24 May 2024 15:29:39 +0300
Subject: [PATCH 25/50] POC-746: MOH 366 Care and Treatment Daily Activity

---
 .../cntdaily-register.component.html          | 1012 +++++++++++++++++
 1 file changed, 1012 insertions(+)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index e69de29bb..0dfc1180d 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -0,0 +1,1012 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        [monthString]="_month"
+        (onMonthChange)="onMonthChange($event)"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b>HIV Care Treatment Daily Activity Register MOH 366</b>
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th rowspan="4">No</th>
+          <th colspan="2" rowspan="4">Date</th>
+          <th colspan="3">National Identification Number</th>
+          <th colspan="3" rowspan="4">Client CCC Number</th>
+          <th rowspan="4">Age</th>
+          <th colspan="14" class="text-centre">Starting ART</th>
+          <th colspan="4" class="text-centre">
+            TB in HIV Care <br />(Newly Initiated on ART)
+          </th>
+          <th colspan="14" class="text-centre">
+            Currently on ART (Starting and Continuing ART)
+          </th>
+          <th colspan="4" class="text-centre">DSD</th>
+          <th colspan="4" rowspan="4" class="text-centre">Remarks</th>
+        </tr>
+        <tr>
+          <th colspan="3" rowspan="3">Client Unique Number (NUPI)</th>
+          <th colspan="14" rowspan="2" class="text-centre">
+            Tick as appropriate for age
+          </th>
+          <th colspan="2">Screened for TB</th>
+          <th colspan="2">Started TPT</th>
+          <th colspan="14" rowspan="2" class="text-centre">
+            Indicate No. of months of till next appointment or <br />
+            "R"for patients making unscheduled visits
+          </th>
+          <th colspan="2">Status</th>
+          <th colspan="2">Type</th>
+        </tr>
+        <tr>
+          <th colspan="4" class="text-centre">Indicate Y/N/NA</th>
+          <th colspan="2" rowspan="2" class="text-center vertical-text">
+            E=Established <br />
+            NE=Not Established
+          </th>
+          <th colspan="2" rowspan="2" class="text-center">
+            C<br />
+            FT<br />
+            HFAG<br />
+            PFAG<br />
+            HCAG<br />
+            PCAG<br />
+            CP<br />
+            CADP<br />
+            IACD
+          </th>
+        </tr>
+        <tr>
+          <th class="text-center vertical-text">< 1 yrs (M)</th>
+          <th class="text-center vertical-text">< 1 yrs (F)</th>
+          <th class="text-center vertical-text">1-4 yrs (M)</th>
+          <th class="text-center vertical-text">1-4 yrs (F)</th>
+          <th class="text-center vertical-text">5-9 yrs (M)</th>
+          <th class="text-center vertical-text">5-9 yrs (F)</th>
+          <th class="text-center vertical-text">10-14 yrs (M)</th>
+          <th class="text-center vertical-text">10-14 yrs (F)</th>
+          <th class="text-center vertical-text">15-19 yrs (M)</th>
+          <th class="text-center vertical-text">15-19 yrs (F)</th>
+          <th class="text-center vertical-text">20-24 yrs(M)</th>
+          <th class="text-center vertical-text">20-24 yrs (F)</th>
+          <th class="text-center vertical-text">25+ yrs (M)</th>
+          <th class="text-center vertical-text">25+ yrs (F)</th>
+          <th class="text-center vertical-text">< 15 yrs</th>
+          <th class="text-center vertical-text">15+ yrs</th>
+          <th class="text-center vertical-text">< 15 yrs</th>
+          <th class="text-center vertical-text">15+ yrs</th>
+          <th class="text-center vertical-text">< 1 yrs (M)</th>
+          <th class="text-center vertical-text">< 1 yrs (F)</th>
+          <th class="text-center vertical-text">1-4 yrs (M)</th>
+          <th class="text-center vertical-text">1-4 yrs (F)</th>
+          <th class="text-center vertical-text">5-9 yrs (M)</th>
+          <th class="text-center vertical-text">5-9 yrs (F)</th>
+          <th class="text-center vertical-text">10-14 yrs (M)</th>
+          <th class="text-center vertical-text">10-14 yrs (F)</th>
+          <th class="text-center vertical-text">15-19 yrs (M)</th>
+          <th class="text-center vertical-text">15-19 yrs (F)</th>
+          <th class="text-center vertical-text">20-24 yrs(M)</th>
+          <th class="text-center vertical-text">20-24 yrs (F)</th>
+          <th class="text-center vertical-text">25+ yrs (M)</th>
+          <th class="text-center vertical-text">25+ yrs (F)</th>
+        </tr>
+        <tr>
+          <th class="text-center">(a)</th>
+          <th colspan="2" class="text-center">(b)</th>
+          <th colspan="3" class="text-center">(c)</th>
+          <th colspan="3" class="text-center">(d)</th>
+          <th class="text-center">(e)</th>
+          <th class="text-center">(f)</th>
+          <th class="text-center">(g)</th>
+          <th class="text-center">(h)</th>
+          <th class="text-center">(i)</th>
+          <th class="text-center">(j)</th>
+          <th class="text-center">(k)</th>
+          <th class="text-center">(l)</th>
+          <th class="text-center">(m)</th>
+          <th class="text-center">(n)</th>
+          <th class="text-center">(o)</th>
+          <th class="text-center">(q)</th>
+          <th class="text-center">(r)</th>
+          <th class="text-center">(s)</th>
+          <th class="text-center">(t)</th>
+          <th class="text-center">(u)</th>
+          <th class="text-center">(v)</th>
+          <th class="text-center">(w)</th>
+          <th class="text-center">(x)</th>
+          <th class="text-center">(y)</th>
+          <th class="text-center">(z)</th>
+          <th class="text-center">(aa)</th>
+          <th class="text-center">(ab)</th>
+          <th class="text-center">(ac)</th>
+          <th class="text-center">(ad)</th>
+          <th class="text-center">(ae)</th>
+          <th class="text-center">(af)</th>
+          <th class="text-center">(ag)</th>
+          <th class="text-center">(ah)</th>
+          <th class="text-center">(ai)</th>
+          <th class="text-center">(aj)</th>
+          <th class="text-center">(ak)</th>
+          <th class="text-center">(al)</th>
+          <th colspan="2" class="text-center">(am)</th>
+          <th colspan="2" class="text-center">(an)</th>
+          <th colspan="4" class="text-center">(ao)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="6" class="text-left"><b>Data element CODE</b></td>
+          <td colspan="3" class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center vertical-text">HV03-01</td>
+          <td class="text-center vertical-text">HV03-02</td>
+          <td class="text-center vertical-text">HV03-03</td>
+          <td class="text-center vertical-text">HV03-04</td>
+          <td class="text-center vertical-text">HV03-05</td>
+          <td class="text-center vertical-text">HV03-06</td>
+          <td class="text-center vertical-text">HV03-07</td>
+          <td class="text-center vertical-text">HV03-08</td>
+          <td class="text-center vertical-text">HV03-09</td>
+          <td class="text-center vertical-text">HV03-10</td>
+          <td class="text-center vertical-text">HV03-11</td>
+          <td class="text-center vertical-text">HV03-12</td>
+          <td class="text-center vertical-text">HV03-13</td>
+          <td class="text-center vertical-text">HV03-14</td>
+          <td class="text-center vertical-text">HV03-15</td>
+          <td class="text-center vertical-text">HV03-16</td>
+          <td class="text-center vertical-text">HV03-17</td>
+          <td class="text-center vertical-text">HV03-18</td>
+          <td class="text-center vertical-text">HV03-19</td>
+          <td class="text-center vertical-text">HV03-20</td>
+          <td class="text-center vertical-text">HV03-21</td>
+          <td class="text-center vertical-text">HV03-22</td>
+          <td class="text-center vertical-text">HV03-23</td>
+          <td class="text-center vertical-text">HV03-24</td>
+          <td class="text-center vertical-text">HV03-25</td>
+          <td class="text-center vertical-text">HV03-26</td>
+          <td class="text-center vertical-text">HV03-27</td>
+          <td class="text-center vertical-text">HV03-28</td>
+          <td class="text-center vertical-text">HV03-29</td>
+          <td class="text-center vertical-text">HV03-30</td>
+          <td class="text-center vertical-text">HV03-31</td>
+          <td class="text-center vertical-text">HV03-32</td>
+          <td colspan="2" class="text-center vertical-text">HV03-33</td>
+          <td colspan="2" class="text-center vertical-text">HV03-34</td>
+          <td colspan="4" class="text-center vertical-text"></td>
+        </tr>
+        <tr>
+          <td colspan="6" class="text-left"><b>TOTAL this Page</b></td>
+          <td colspan="3" class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="6" class="text-left"><b>TOTAL this Page</b></td>
+          <td colspan="3" class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="6" class="text-center"><b>TOTAL this Month</b></td>
+          <td colspan="3" class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="6" class="text-center"></td>
+          <td colspan="3" class="text-center"></td>
+          <td class="text-center">(e)</td>
+          <td class="text-center">(f)</td>
+          <td class="text-center">(g)</td>
+          <td class="text-center">(h)</td>
+          <td class="text-center">(i)</td>
+          <td class="text-center">(j)</td>
+          <td class="text-center">(k)</td>
+          <td class="text-center">(l)</td>
+          <td class="text-center">(m)</td>
+          <td class="text-center">(n)</td>
+          <td class="text-center">(o)</td>
+          <td class="text-center">(q)</td>
+          <td class="text-center">(r)</td>
+          <td class="text-center">(s)</td>
+          <td class="text-center">(t)</td>
+          <td class="text-center">(u)</td>
+          <td class="text-center">(v)</td>
+          <td class="text-center">(w)</td>
+          <td class="text-center">(x)</td>
+          <td class="text-center">(y)</td>
+          <td class="text-center">(z)</td>
+          <td class="text-center">(aa)</td>
+          <td class="text-center">(ab)</td>
+          <td class="text-center">(ac)</td>
+          <td class="text-center">(ad)</td>
+          <td class="text-center">(ae)</td>
+          <td class="text-center">(af)</td>
+          <td class="text-center">(ag)</td>
+          <td class="text-center">(ah)</td>
+          <td class="text-center">(ai)</td>
+          <td class="text-center">(aj)</td>
+          <td class="text-center">(ak)</td>
+          <td class="text-center">(al)</td>
+          <td colspan="2" class="text-center">(am)</td>
+          <td colspan="2" class="text-center">(an)</td>
+          <td colspan="4" class="text-center">(ao)</td>
+        </tr>
+        <tr>
+          <td colspan="10" rowspan="10" class="text-center">
+            <b>Summary of clinical visits</b>
+          </td>
+          <td colspan="14" class="text-right">
+            Count of clients with 2 months appointment
+          </td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td colspan="8" rowspan="10" class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right"><b>Total this Month (2s)</b></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right">
+            Count of clients with 3 months appointment
+          </td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right"><b>Total this Month (3s)</b></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right">
+            Count of clients with 4 months appointment
+          </td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right"><b>Total this Month (4s)</b></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right">
+            Count of clients with 5 months appointment
+          </td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right"><b>Total this Month (5s)</b></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right">
+            Count of clients with 6 months appointment
+          </td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td colspan="14" class="text-right"><b>Total this Month (6s)</b></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>

From 49cecce055485407787b758b28e0272e037c5f14 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 23 May 2024 15:27:01 +0300
Subject: [PATCH 26/50] POC-739: MOH 408 HIV Exposed Infant Registers

---
 .../hei-register/hei-register.component.html  | 336 +++++++++++++++++-
 1 file changed, 320 insertions(+), 16 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
index 40a18d212..abed1fc6c 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
@@ -35,20 +35,324 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div>
-  <p-tabView>
-    <p-tabPanel
-      header="Report View"
-      leftIcon="fa-file-pdf-o"
-      [selected]="currentViewBelow === 'pdf'"
-    >
-      <!-- <app-tx-ml-report-view
-        [SummaryData]="txnewReportSummaryData"
-        [sectionDefs]="columnDefs"
-        (CellSelection)="onIndicatorSelected($event)"
-        [reportDetails]="params"
-        [reportHeader]="reportName"
-      ></app-tx-ml-report-view> -->
-    </p-tabPanel>
-  </p-tabView>
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b>HIV EXPOSED INFANT REGISTER MOH 408</b>
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th colspan="58">
+            Cohort: Month/Year
+            (MMM-YYYY).........................../..............................................
+          </th>
+        </tr>
+        <tr>
+          <th colspan="25">Infant and Mother/Guardian Information</th>
+          <th colspan="5" rowspan="2">
+            First HIV DNA PCR Test at Birth, 6 weeks or First Contact
+          </th>
+          <th colspan="4" rowspan="2">Second HIV DNA PCR Tes</th>
+          <th colspan="4" rowspan="2">Third HIV DNA PCR Test</th>
+          <th colspan="4" rowspan="2">HEI Outcomes at 12 months</th>
+          <th colspan="4" rowspan="2">Confirmatory PCR</th>
+          <th colspan="4" rowspan="2">Antibody test (18 to 24 months)</th>
+          <th colspan="4" rowspan="2">HEI Outcomes at 24 months</th>
+          <th colspan="4" rowspan="4">Comments</th>
+        </tr>
+        <tr>
+          <th colspan="10">Registration Information</th>
+          <th colspan="11">Infant's information</th>
+          <th colspan="4">Parent's information</th>
+        </tr>
+        <tr>
+          <th colspan="1" rowspan="2">Serial No.</th>
+          <th colspan="3" rowspan="2">
+            Date of Collected enrollment (DD/MM/YYYY)
+          </th>
+          <th colspan="3">HEI ID (MFL-YYYY-NNNN)</th>
+          <th colspan="3" rowspan="2">Infant's Name</th>
+          <th colspan="4" rowspan="2">DOB (DD/MM/YYYY)</th>
+          <th colspan="2" rowspan="2">Header</th>
+          <th colspan="2">Sex</th>
+          <th colspan="3">
+            Infant Prophylaxis 1=NVP, 2=AZT, 3=NVP &AZT, 4=None,
+          </th>
+          <th colspan="4">Father's/Mother's/Guardian's Name</th>
+          <th colspan="1" rowspan="2">Age at Test (in wks)</th>
+          <th colspan="2" rowspan="2">
+            Type of Test 1=At Birth 2=at 6 weeks 3=at First Contact
+          </th>
+          <th colspan="2">Date Sample Collected</th>
+          <th colspan="2" rowspan="2">Age at Test (in months)</th>
+          <th colspan="2">Date Sample Collected</th>
+          <th colspan="2" rowspan="2">Age at Test (in months)</th>
+          <th colspan="2">Date Sample Collected</th>
+          <th colspan="2">Infant Feeding</th>
+          <th colspan="2" rowspan="2">
+            1=Infected 2= Uninfected 3=Lost to Follow 4=Transfer Out 5=Dead
+          </th>
+          <th colspan="2" rowspan="2">Age at Test (in months)</th>
+          <th colspan="2">Date Sample Collected</th>
+          <th colspan="2" rowspan="2">Age at Test (in months)</th>
+          <th colspan="2">Date Sample Collected</th>
+          <th colspan="2">Infant Feeding</th>
+          <th colspan="2" rowspan="2">
+            1=Infected 2= Uninfected 3=Lost to Follow 4=Transfer Out 5=Dead
+          </th>
+        </tr>
+        <tr>
+          <th colspan="3">Client Unique Number (NUPI)</th>
+          <th colspan="2">(M/F)</th>
+          <th colspan="3">(M/F)</th>
+          <th colspan="4">Telephone number</th>
+          <th colspan="2">Test result (P,N)</th>
+          <th colspan="2">Test result (P,N)</th>
+          <th colspan="2">Test result (P,N)</th>
+          <th colspan="2">BF=Breastfeeding NBF=Not Breastfeeding</th>
+          <th colspan="2">Test result (P,N)</th>
+          <th colspan="2">Test result (P,N)</th>
+          <th colspan="2">BF=Breastfeeding NBF=Not Breastfeeding</th>
+        </tr>
+        <tr>
+          <th class="text-center">(a)</th>
+          <th colspan="3" class="text-center">(b)</th>
+          <th colspan="3" class="text-center">(c)</th>
+          <th colspan="3" class="text-center">(d)</th>
+          <th colspan="4" class="text-center">(e)</th>
+          <th colspan="2" class="text-center">(f)</th>
+          <th colspan="2" class="text-center">(g)</th>
+          <th colspan="3" class="text-center">(h)</th>
+          <th colspan="4" class="text-center">(i)</th>
+          <th class="text-center">(j)</th>
+          <th colspan="2" class="text-center">(k)</th>
+          <th colspan="2" class="text-center">(l)</th>
+          <th colspan="2" class="text-center">(m)</th>
+          <th colspan="2" class="text-center">(n)</th>
+          <th colspan="2" class="text-center">(o)</th>
+          <th colspan="2" class="text-center">(p)</th>
+          <th colspan="2" class="text-center">(q)</th>
+          <th colspan="2" class="text-center">(r)</th>
+          <th colspan="2" class="text-center">(s)</th>
+          <th colspan="2" class="text-center">(t)</th>
+          <th colspan="2" class="text-center">(u)</th>
+          <th colspan="2" class="text-center">(v)</th>
+          <th colspan="2" class="text-center">(w)</th>
+          <th colspan="2" class="text-center">(x)</th>
+          <th colspan="4" class="text-center">(y)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="3" class="text-center" rowspan="2"></td>
+          <td colspan="4" class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center" rowspan="2"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td colspan="3" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="4" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+          <td colspan="2" class="text-center"></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>

From f3756382afa2baa3e59b04e3e8134a2d06d5c74f Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 30 May 2024 14:41:12 +0300
Subject: [PATCH 27/50] POC-741: MOH 333 Maternity Register

---
 .../maternity-register.component.css          |   17 +
 .../maternity-register.component.html         | 1183 ++++++++++++++++-
 2 files changed, 1184 insertions(+), 16 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css
index e69de29bb..ab1f08146 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css
@@ -0,0 +1,17 @@
+tr,
+.table-bordered th,
+.table-bordered td {
+  border: 2px solid #000; /* Darker border color */
+}
+tbody tr {
+  height: 20px; /* Adjust the height as per your design */
+}
+.vertical-text {
+  writing-mode: vertical-rl;
+  text-orientation: mixed;
+  transform: rotate(180deg);
+  white-space: nowrap;
+}
+th {
+  min-width: 70px;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
index 40a18d212..8ec57b795 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
@@ -35,20 +35,1171 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div>
-  <p-tabView>
-    <p-tabPanel
-      header="Report View"
-      leftIcon="fa-file-pdf-o"
-      [selected]="currentViewBelow === 'pdf'"
-    >
-      <!-- <app-tx-ml-report-view
-        [SummaryData]="txnewReportSummaryData"
-        [sectionDefs]="columnDefs"
-        (CellSelection)="onIndicatorSelected($event)"
-        [reportDetails]="params"
-        [reportHeader]="reportName"
-      ></app-tx-ml-report-view> -->
-    </p-tabPanel>
-  </p-tabView>
+
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b>MOH 333 Maternity Register</b>
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th rowspan="6">
+            Date of<br />
+            Admission <br />
+            (dd/mm/yyyy)
+          </th>
+          <th>Admission number (yyyy-mm-nnnn)</th>
+          <th rowspan="6">
+            Full Name<br />
+            (First, Middle, surname)
+          </th>
+          <th>
+            Date of Birth <br />
+            (dd/mm/yyyy)
+          </th>
+          <th rowspan="6">
+            County/ <br />
+            Subcounty
+          </th>
+          <th>
+            Village/<br />
+            Estate/<br />
+            Land mark
+          </th>
+          <th rowspan="6">
+            Marital Status <br />
+            1 = Married<br />
+            2 = Widowed <br />
+            3 = Single<br />
+            4 = Divorced<br />
+            5 = Separated
+          </th>
+          <th rowspan="6">
+            Parity<br />
+            (X+Y)
+          </th>
+          <th rowspan="6">Gravidae</th>
+          <th rowspan="6">
+            No. of <br />
+            ANC <br />
+            visits
+          </th>
+          <th rowspan="6">
+            Date of Last<br />
+            Menstrual<br />
+            Period (LMP) <br />
+            (dd/mm/yyyy)
+          </th>
+          <th rowspan="6">
+            Estimated Date <br />
+            of Delivery<br />
+            (EDD)<br />
+            (dd/mm/yyyy)
+          </th>
+          <th rowspan="6">Diagnosis</th>
+          <th colspan="13">Delivery</th>
+          <th colspan="9"></th>
+          <th>
+            VDRL/<br />
+            RPR<br />
+            Results<br />
+            (Specify<br />
+            1-VDRL<br />
+            2-RPR<br />
+            3-Duo<br />
+            testing)
+          </th>
+          <th colspan="4">Baby</th>
+          <th>
+            Maternal <br />
+            HAART
+          </th>
+          <th>
+            Infant <br />
+            Prophylaxis
+          </th>
+          <th>
+            Partner <br />
+            Tested for <br />
+            HIV
+          </th>
+          <th rowspan="6">
+            Counselled <br />
+            on infant <br />
+            feeding <br />
+            (Y/N/NA)
+          </th>
+          <th rowspan="6">
+            Delivery <br />
+            Conducted by <br />
+            (Enter Name)
+          </th>
+          <th rowspan="6">
+            Birth <br />
+            Notification <br />
+            Number
+          </th>
+          <th colspan="2">Discharge</th>
+          <th colspan="3">Referral</th>
+          <th rowspan="6">Comments</th>
+        </tr>
+        <tr>
+          <th rowspan="5">NUPI</th>
+          <th rowspan="5">Age</th>
+          <th rowspan="5">Phone number</th>
+          <th rowspan="5">
+            Duration of <br />
+            labour<br />
+            (hours)
+          </th>
+          <th rowspan="5">
+            Date of<br />
+            Delivery <br />
+            (dd/mm/yyyy)
+          </th>
+          <th rowspan="5">
+            Time of<br />
+            Delivery
+          </th>
+          <th rowspan="5">
+            Gestation<br />
+            at Birth<br />
+            (wks)
+          </th>
+          <th rowspan="5">
+            Mode of <br />
+            Delivery <br />
+            1) SVD<br />
+            2) CS<br />
+            3) Breech<br />
+            4) AVD
+          </th>
+          <th rowspan="5">
+            No.of babies <br />
+            delivered
+          </th>
+          <th rowspan="5">
+            Placenta<br />
+            Complete <br />
+            1=Yes<br />
+            2=No<br />
+            3=BBA
+          </th>
+          <th rowspan="5">
+            Uterotonic <br />
+            given <br />
+            1=oxytocin <br />
+            2=Carbetocin <br />
+            3=Others <br />
+            Specify<br />
+            4= None
+          </th>
+          <th rowspan="5">
+            Vaginal<br />
+            Examination<br />
+            1= Normal<br />
+            2=Episiotomy<br />
+            3=Vaginal tear<br />
+            4=FGM<br />
+            5=Vaginal warts
+          </th>
+          <th rowspan="5">
+            Blood<br />
+            loss<br />
+            (mls)
+          </th>
+          <th rowspan="5">
+            Mother's <br />
+            status after <br />
+            Delivery<br />
+            (Alive/ <br />
+            Dead)
+          </th>
+          <th>
+            Maternal deaths <br />
+            Notified <br />
+            (Y/N/NA)
+          </th>
+          <th rowspan="5">
+            Delivery<br />
+            Complications<br />
+            1=A.P.H. (Ante Partum <br />
+            Haemorrhage); <br />
+            2=P.P.H. (Post Partum <br />
+            Haemorrhage); <br />
+            3= Eclampsia; <br />
+            4=Ruptured Uterus;<br />
+            5=Obstructed labour; <br />
+            6=Sepsis <br />
+            7= NA
+          </th>
+          <th rowspan="5">
+            APGAR <br />
+            Score
+          </th>
+          <th rowspan="5">
+            Birth<br />
+            Outcome<br />
+            (LB/FSB/ <br />
+            MSB)
+          </th>
+          <th rowspan="5">
+            Birth <br />
+            Weight<br />
+            (grams)
+          </th>
+          <th rowspan="5">
+            Sex <br />
+            (M/F)
+          </th>
+          <th>
+            Initiated on <br />
+            BF in<br />
+            < 1hr<br />
+            (Y/N)
+          </th>
+          <th rowspan="5">
+            TEO<br />
+            given at<br />
+            birth? <br />
+            (Y/N)
+          </th>
+          <th rowspan="5">
+            Chlorhexidine <br />
+            applied on <br />
+            cord stump<br />
+            (Y/N)
+          </th>
+          <th>
+            Birth with <br />
+            deformity <br />
+            (Y/N)
+          </th>
+          <th rowspan="5">
+            Given<br />
+            Vitamin <br />
+            K <br />
+            (Y/N)
+          </th>
+          <th rowspan="5">(P/N/ND)</th>
+          <th>HIV Test 1</th>
+          <th>HIV Test 2</th>
+          <th>HIV Test 3</th>
+          <th>
+            HIV Result <br />
+            Maternity <br />
+            (N/P/Inc/U/NA)
+          </th>
+          <th>
+            Start at <br />
+            Maternity
+          </th>
+          <th rowspan="5">(Y/N/NA)</th>
+          <th rowspan="5">(Y/N/NA)</th>
+          <th rowspan="5">
+            Date <br />
+            (dd/mm/yyyy)
+          </th>
+          <th rowspan="5">
+            Status of <br />
+            Baby<br />
+            A= Alive<br />
+            D= Dead
+          </th>
+          <th>From</th>
+          <th>To</th>
+          <th rowspan="5">Reason for referral</th>
+        </tr>
+        <tr>
+          <th rowspan="4">
+            Date Death <br />
+            notified
+          </th>
+          <th rowspan="4">
+            Kangaroo <br />
+            Mother <br />
+            Care <br />
+            (Y/N)
+          </th>
+          <th rowspan="4">
+            1- congenital <br />
+            syphilis.<br />
+            2- spina bifida, <br />
+            3- Hydrocephalus,<br />
+            4- Talipes
+          </th>
+          <th>Kit Name:</th>
+          <th>Kit Name:</th>
+          <th>Kit Name:</th>
+          <th rowspan="4">
+            Initial/Retest/<br />
+            NA
+          </th>
+          <th rowspan="4">(Y/N/NA)</th>
+          <th rowspan="4">
+            1= From Community <br />
+            Unit,<br />
+            2= From Another<br />
+            Health Facility, <br />
+            3=Not Applicable
+          </th>
+          <th rowspan="4">
+            1= To Community<br />
+            Unit, <br />
+            2=Referred to HIV <br />
+            preventive services<br />
+            3=Another Health <br />
+            Facility,<br />
+            4=Not Applicable
+          </th>
+        </tr>
+        <tr>
+          <th>Lot No.</th>
+          <th>Lot No.</th>
+          <th>Lot No.</th>
+        </tr>
+        <tr>
+          <th>Expiry / /</th>
+          <th>Expiry / /</th>
+          <th>Expiry / /</th>
+        </tr>
+        <tr>
+          <th>(N/P/I/NA)</th>
+          <th>(N/P/I/NA)</th>
+          <th>(N/P/I/NA)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="text-center">(a)</td>
+          <td class="text-center">(b)</td>
+          <td class="text-center">(c)</td>
+          <td class="text-center">(d)</td>
+          <td class="text-center">(e)</td>
+          <td class="text-center">(f)</td>
+          <td class="text-center">(g)</td>
+          <td class="text-center">(h)</td>
+          <td class="text-center">(i)</td>
+          <td class="text-center">(j)</td>
+          <td class="text-center">(k)</td>
+          <td class="text-center">(l)</td>
+          <td class="text-center">(m)</td>
+          <td class="text-center">(n)</td>
+          <td class="text-center">(o)</td>
+          <td class="text-center">(p)</td>
+          <td class="text-center">(q)</td>
+          <td class="text-center">(r)</td>
+          <td class="text-center">(s)</td>
+          <td class="text-center">(t)</td>
+          <td class="text-center">(u)</td>
+          <td class="text-center">(v)</td>
+          <td class="text-center">(w)</td>
+          <td class="text-center">(x)</td>
+          <td class="text-center">(y)</td>
+          <td class="text-center">(z)</td>
+          <td class="text-center">(aa)</td>
+          <td class="text-center">(ab)</td>
+          <td class="text-center">(ac)</td>
+          <td class="text-center">(ad)</td>
+          <td class="text-center">(ae)</td>
+          <td class="text-center">(af)</td>
+          <td class="text-center">(ag)</td>
+          <td class="text-center">(ah)</td>
+          <td class="text-center">(ai)</td>
+          <td class="text-center">(aj)</td>
+          <td colspan="3" class="text-center">(ak)</td>
+          <td class="text-center">(al)</td>
+          <td class="text-center">(am)</td>
+          <td class="text-center">(an)</td>
+          <td class="text-center">(ao)</td>
+          <td class="text-center">(ap)</td>
+          <td class="text-center">(aq)</td>
+          <td class="text-center">(ar)</td>
+          <td class="text-center">(as)</td>
+          <td class="text-center">(at)</td>
+          <td class="text-center">(au)</td>
+          <td class="text-center">(av)</td>
+          <td class="text-center">(aw)</td>
+          <td class="text-center">(ax)</td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+      </tbody>
+    </table>
+    <tr>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+    </tr>
+    <tr>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+    </tr>
+    <tr>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+      <td class="text-center" rowspan="2"></td>
+    </tr>
+    <tr>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+      <td class="text-center"></td>
+    </tr>
+  </div>
 </div>

From 873a555f53eef61e8df29c9e964d0df14a69d337 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Thu, 30 May 2024 17:41:39 +0300
Subject: [PATCH 28/50] POC-742: MOH 362 HTS Lab Refferal & Linkage Register.

---
 .../htsrefferallinkage-register.component.css |  17 +
 ...htsrefferallinkage-register.component.html | 639 +++++++++++++++++-
 2 files changed, 640 insertions(+), 16 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css
index e69de29bb..ab1f08146 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css
@@ -0,0 +1,17 @@
+tr,
+.table-bordered th,
+.table-bordered td {
+  border: 2px solid #000; /* Darker border color */
+}
+tbody tr {
+  height: 20px; /* Adjust the height as per your design */
+}
+.vertical-text {
+  writing-mode: vertical-rl;
+  text-orientation: mixed;
+  transform: rotate(180deg);
+  white-space: nowrap;
+}
+th {
+  min-width: 70px;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
index 40a18d212..e5d188bea 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
@@ -35,20 +35,627 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div>
-  <p-tabView>
-    <p-tabPanel
-      header="Report View"
-      leftIcon="fa-file-pdf-o"
-      [selected]="currentViewBelow === 'pdf'"
-    >
-      <!-- <app-tx-ml-report-view
-        [SummaryData]="txnewReportSummaryData"
-        [sectionDefs]="columnDefs"
-        (CellSelection)="onIndicatorSelected($event)"
-        [reportDetails]="params"
-        [reportHeader]="reportName"
-      ></app-tx-ml-report-view> -->
-    </p-tabPanel>
-  </p-tabView>
+
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot1>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b
+          >MOH 362 HTS LAB, REFERRAL AND LINKAGE REGISTER <br />
+          MOH 362: HTS LAB REGISTER</b
+        >
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th rowspan="5" class="text-center">
+            Serial <br />
+            Number
+          </th>
+          <th class="text-center">
+            National <br />
+            Identification <br />
+            Number
+          </th>
+          <th rowspan="5" class="text-center">
+            Date of visit <br />
+            (DD/MM/YYYY)
+          </th>
+          <th rowspan="5" class="text-center">
+            Client Name <br />
+            (First, Middle, Last)
+          </th>
+          <th rowspan="5" class="text-center">Age</th>
+          <th rowspan="5" class="text-center">
+            Sex<br />
+            (M/F)
+          </th>
+          <th rowspan="5" class="text-center">Telephone Number</th>
+          <th rowspan="5" class="text-center">
+            Marital<br />
+            Status <br />
+            1=Married<br />
+            2=Widowed <br />
+            3=Single<br />
+            4=Divorced<br />
+            5=Separated
+          </th>
+          <th rowspan="5" class="text-center">
+            Population Type <br />
+            1. Gen Pop<br />
+            2. Key and <br />
+            Vulnerable Pop. <br />
+            Codes for KVP<br />
+            - DC<br />
+            - MSM/MSW<br />
+            - FSW<br />
+            - PWID/PWUD<br />
+            - VP
+          </th>
+          <th rowspan="5" class="text-center">
+            Setting <br />
+            (1=Facility<br />
+            2=Community)
+          </th>
+          <th class="text-center">HIV Test 1</th>
+          <th class="text-center">HIV Test 2</th>
+          <th class="text-center">HIV Test 3</th>
+          <th class="text-center">
+            Final HIV <br />
+            Result
+          </th>
+          <th class="text-center">
+            Discordant <br />
+            Couple
+          </th>
+          <th rowspan="5" class="text-center">
+            Referred for <br />
+            Prevention <br />
+            Services<br />
+            1. PrEP<br />
+            2. PEP<br />
+            3. VMMC<br />
+            4. PMTCT<br />
+            5.NA
+          </th>
+          <th rowspan="5" class="text-center">
+            HTS Provider <br />
+            (Name)
+          </th>
+          <th rowspan="5" class="text-center">Remarks</th>
+        </tr>
+        <tr>
+          <th rowspan="4" class="text-center">
+            National Unique <br />
+            Patient Identifier <br />
+            (NUPI) Number
+          </th>
+          <th class="text-center">Kit Name:</th>
+          <th class="text-center">Kit Name:</th>
+          <th class="text-center">Kit Name:</th>
+          <th rowspan="4" class="text-center">(N,P,Ic)</th>
+          <th rowspan="4" class="text-center">(Y/N/NA)</th>
+        </tr>
+        <tr>
+          <th class="text-center">Lot No.</th>
+          <th class="text-center">Lot No.</th>
+          <th class="text-center">Lot No.</th>
+        </tr>
+        <tr>
+          <th class="text-center">Expiry Date / /</th>
+          <th class="text-center">Expiry Date / /</th>
+          <th class="text-center">Expiry Date / /</th>
+        </tr>
+        <tr>
+          <th class="text-center">(N,P,I)</th>
+          <th class="text-center">(N,P,I,NA)</th>
+          <th class="text-center">(N,P,I,NA)</th>
+        </tr>
+        <tr>
+          <th class="text-center">(a)</th>
+          <th class="text-center">(b)</th>
+          <th class="text-center">(c)</th>
+          <th class="text-center">(d)</th>
+          <th class="text-center">(e)</th>
+          <th class="text-center">(f)</th>
+          <th class="text-center">(g)</th>
+          <th class="text-center">(h)</th>
+          <th class="text-center">(i)</th>
+          <th class="text-center">(j)</th>
+          <th class="text-center">(k)</th>
+          <th class="text-center">(l)</th>
+          <th class="text-center">(m)</th>
+          <th class="text-center">(n)</th>
+          <th class="text-center">(o)</th>
+          <th class="text-center">(p)</th>
+          <th class="text-center">(q)</th>
+          <th class="text-center">(r)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+<br />
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b
+          >MOH 362 HTS LAB, REFERRAL AND LINKAGE REGISTER <br />
+          REFERRAL AND LINKAGE REGISTER</b
+        >
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th rowspan="2">
+            Serial<br />
+            Number
+          </th>
+          <th>
+            National Identification<br />
+            Number
+          </th>
+          <th rowspan="2">Client Names</th>
+          <th>Telephone Number</th>
+          <th rowspan="2">
+            Identification <br />
+            Strategy <br />
+            (VCT/IT/HIVST<br />
+            /SNS)
+          </th>
+          <th rowspan="2">Patient referred to</th>
+          <th rowspan="2">
+            Handed over to: <br />
+            (Indicate Name (upper cell) <br />
+            and Cadre (lower cell)
+          </th>
+          <th rowspan="2">
+            Date started on <br />
+            ART
+          </th>
+          <th rowspan="2">CCC Number</th>
+          <th rowspan="2">Remarks</th>
+        </tr>
+        <tr>
+          <th>
+            National Unique <br />
+            Patient Identifier <br />
+            (NUPI) Number
+          </th>
+          <th>Residence</th>
+        </tr>
+        <tr>
+          <th class="text-centre">(a)</th>
+          <th class="text-centre">(b)</th>
+          <th class="text-centre">(c)</th>
+          <th class="text-centre">(d)</th>
+          <th class="text-centre">(e)</th>
+          <th class="text-centre">(f)</th>
+          <th class="text-centre">(g)</th>
+          <th class="text-centre">(h)</th>
+          <th class="text-centre">(i)</th>
+          <th class="text-centre">(j)</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="16"></td>
+          <td></td>
+          <td rowspan="16"></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td colspan="9"><b>Totals Clients Linked</b></td>
+          <td></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>

From ace9d149959b10dc473681fe2bbe5bbe305fad79 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Fri, 31 May 2024 12:02:31 +0300
Subject: [PATCH 29/50] POC-740: MOH 407 Nutrition Service RegisterMOH 407
 Nutrition Service Register

---
 .../nutrition-register.component.css          |  17 +
 .../nutrition-register.component.html         | 784 +++++++++++++++++-
 2 files changed, 785 insertions(+), 16 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css
index e69de29bb..ab1f08146 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css
@@ -0,0 +1,17 @@
+tr,
+.table-bordered th,
+.table-bordered td {
+  border: 2px solid #000; /* Darker border color */
+}
+tbody tr {
+  height: 20px; /* Adjust the height as per your design */
+}
+.vertical-text {
+  writing-mode: vertical-rl;
+  text-orientation: mixed;
+  transform: rotate(180deg);
+  white-space: nowrap;
+}
+th {
+  min-width: 70px;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
index 40a18d212..44301cd7a 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
@@ -35,20 +35,772 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div>
-  <p-tabView>
-    <p-tabPanel
-      header="Report View"
-      leftIcon="fa-file-pdf-o"
-      [selected]="currentViewBelow === 'pdf'"
-    >
-      <!-- <app-tx-ml-report-view
-        [SummaryData]="txnewReportSummaryData"
-        [sectionDefs]="columnDefs"
-        (CellSelection)="onIndicatorSelected($event)"
-        [reportDetails]="params"
-        [reportHeader]="reportName"
-      ></app-tx-ml-report-view> -->
-    </p-tabPanel>
-  </p-tabView>
+
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b>NUTRITION SERVICE REGISTER MOH 407 </b>
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th class="text-center" rowspan="2">NO</th>
+          <th class="text-center" rowspan="2">
+            Date:<br />
+            (dd/mm/yyyy)
+          </th>
+          <th class="text-center">
+            National<br />
+            Identification<br />
+            Number
+          </th>
+          <th class="text-center" rowspan="2">CCC Number</th>
+          <th class="text-center" rowspan="2">
+            Patient Names<br />
+            (First/Middle/Last)
+          </th>
+          <th class="text-center" rowspan="2">
+            Patient visit<br />
+            type:<br />
+            1=New,<br />
+            2=Revisit
+          </th>
+          <th class="text-center" rowspan="2">
+            Residence:<br />
+            Village/Estate
+          </th>
+          <th class="text-center" rowspan="2">
+            Sex:<br />
+            M=Male,<br />
+            F=Female
+          </th>
+          <th class="text-center" colspan="2">AGE</th>
+          <th class="text-center" rowspan="2">
+            Pregnant<br />
+            and<br />
+            Lactating<br />
+            (Y/N/NA)
+          </th>
+          <th class="text-center" rowspan="2">
+            Nutrition assessment<br />
+            1. Weight for Height (Under 5’s)<br />
+            2. Weight for Age (Under 5’s)<br />
+            3. MUAC (6-59months),<br />
+            Pregnant, Lactating, and any<br />
+            other bedridden client.<br />
+            4. BMI for Age(5-17Years)<br />
+            5. BMI Kg/m(18+Years)
+          </th>
+          <th class="text-center" rowspan="2">
+            Nutrition<br />
+            Status<br />
+            (Indicate codes)<br />
+            1. SAM<br />
+            2. MAM<br />
+            3. Mild/At risk 4.<br />
+            Normal<br />
+            5. Overweight<br />
+            /Obese
+          </th>
+          <th class="text-center" rowspan="2">
+            Serostatus<br />
+            (N/P/HEI/U)
+          </th>
+          <th class="text-center" rowspan="2">
+            Comorbidities<br />
+            1-TB<br />
+            2-Diabetes<br />
+            3-Hypertenstion<br />
+            4-Others specify<br />
+            5-None
+          </th>
+          <th class="text-center" rowspan="2">
+            Food<br />
+            Secure<br />
+            1-Yes<br />
+            2-No
+          </th>
+          <th class="text-center" rowspan="2">Remarks</th>
+        </tr>
+        <tr>
+          <th class="text-center">
+            Client Unique<br />
+            Number<br />
+            (NUPI)
+          </th>
+          <th class="text-center">Years</th>
+          <th class="text-center">Months</th>
+        </tr>
+        <tr>
+          <th class="text-centre"></th>
+          <th class="text-centre">A</th>
+          <th class="text-centre">B</th>
+          <th class="text-centre">C</th>
+          <th class="text-centre">D</th>
+          <th class="text-centre">E</th>
+          <th class="text-centre">F</th>
+          <th class="text-centre">G</th>
+          <th class="text-centre" colspan="2">H</th>
+          <th class="text-centre">I</th>
+          <th class="text-centre">J</th>
+          <th class="text-centre">K</th>
+          <th class="text-centre">L</th>
+          <th class="text-centre">M</th>
+          <th class="text-centre">N</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-center"></td>
+          <td class="text-center"></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+<br />
+<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot1>
+  <div class="table-responsive">
+    <div class="row">
+      <div class="col-md-4">
+        <b>Ministry Of Health</b>
+      </div>
+      <div class="col-md-4 text-center">
+        <b>NUTRITION SERVICE REGISTER MOH 407</b>
+      </div>
+      <div class="col-md-4 text-right">
+        <b>Ver. July 2023</b>
+      </div>
+    </div>
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th class="text-center" colspan="79">Client's follow up Register</th>
+        </tr>
+        <tr>
+          <th class="text-center" rowspan="2" colspan="12">Clients' Details</th>
+          <th class="text-center" rowspan="2" colspan="6">On Admission</th>
+          <th class="text-center" colspan="42"></th>
+          <th class="text-center" colspan="9"></th>
+          <th class="text-center" rowspan="2" colspan="5">
+            Discharge/Transfer <br />
+            Measurements
+          </th>
+          <th class="text-center" rowspan="2" colspan="5">Outcome</th>
+        </tr>
+        <tr>
+          <th class="text-center" colspan="4">week1</th>
+          <th class="text-center" colspan="4">Week2</th>
+          <th class="text-center" colspan="4">week3</th>
+          <th class="text-center" colspan="5">week4</th>
+          <th class="text-center" colspan="4">week5</th>
+          <th class="text-center" colspan="4">week6</th>
+          <th class="text-center" colspan="4">week7</th>
+          <th class="text-center" colspan="5">week8</th>
+          <th class="text-center" colspan="4">week9</th>
+          <th class="text-center" colspan="4">week10</th>
+          <th class="text-center" colspan="4">week11</th>
+          <th class="text-center" colspan="5">week12</th>
+        </tr>
+        <tr>
+          <th class="text-center" rowspan="2">SNO.</th>
+          <th class="text-center" rowspan="2">
+            Date:<br />
+            dd/mm/yyyy
+          </th>
+          <th class="text-center">
+            National <br />
+            Identification <br />
+            Number
+          </th>
+          <th class="text-center" rowspan="2">CCC Number</th>
+          <th class="text-center" rowspan="2">Client's Name</th>
+          <th class="text-center" rowspan="2">Village/Estate/Landmark</th>
+          <th class="text-center" rowspan="2">Mobile number</th>
+          <th class="text-center" colspan="2">AGE</th>
+          <th class="text-center" rowspan="2">
+            Sex <br />
+            (M/F)
+          </th>
+          <th class="text-center" rowspan="2">
+            Type of Admission <br />
+            1. new-admission <br />
+            2. relapse <br />
+            3. returned <br />
+            defaulter
+          </th>
+          <th class="text-center" rowspan="2">Pregnant/ lactating (Y/N/NA)</th>
+          <th class="text-center" rowspan="2">
+            Serostatus <br />
+            (P/N/HEI/U)
+          </th>
+          <th class="text-center" rowspan="2">
+            Admission<br />
+            Criteria <br />
+            1. WFH Z-score <br />
+            2. MUAC <br />
+            3. BMI <br />
+            for age <br />
+            4. BMI <br />
+            kg/m2
+          </th>
+          <th class="text-center" rowspan="2">
+            Weight<br />
+            (Kg)
+          </th>
+          <th class="text-center" rowspan="2">
+            Height<br />
+            (cm)
+          </th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2 (1-3)
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Height/Length(cm)
+          </th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Height/Length(cm)
+          </th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Height/Length(cm)
+          </th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center vertical-text" rowspan="2">Weight(Kg)</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Height/Length(cm)
+          </th>
+          <th class="text-center vertical-text" rowspan="2">
+            W/H Zscore/BMI For Age/BMIKg/m2
+          </th>
+          <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <th class="text-center vertical-text" rowspan="2">
+            Nutrition Intervention
+          </th>
+          <th class="text-center" rowspan="2">
+            Exit<br />
+            dd/mm/yyyy
+          </th>
+          <th class="text-center vertical-text" rowspan="2">
+            Length of stay in days
+          </th>
+          <th class="text-center" rowspan="2" colspan="2">
+            Exit Outcome<br />
+            1-Cured,<br />
+            2-Defaulter,<br />
+            3-Non -<br />
+            Respondant,<br />
+            4-Referral ,<br />
+            5-Transfer,<br />
+            6- Death
+          </th>
+        </tr>
+        <tr>
+          <th class="text-center">
+            Client Unique <br />
+            Number<br />
+            (NUPI)
+          </th>
+          <th class="text-center">Years</th>
+          <th class="text-center">Months</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td class="text-centre"></td>
+          <td class="text-centre">(a)</td>
+          <td class="text-centre">(b)</td>
+          <td class="text-centre">(c)</td>
+          <td class="text-centre">(d)</td>
+          <td class="text-centre">(e)</td>
+          <td class="text-centre">(f)</td>
+          <td class="text-centre" colspan="2">(g)</td>
+          <td class="text-centre">(h)</td>
+          <td class="text-centre">(i)</td>
+          <td class="text-centre">(j)</td>
+          <td class="text-centre">(k)</td>
+          <td class="text-centre">(l)</td>
+          <td class="text-centre">(m)</td>
+          <td class="text-centre">(n)</td>
+          <td class="text-centre">(o)</td>
+          <td class="text-centre">(p)</td>
+          <td class="text-centre">(q)</td>
+          <td class="text-centre">(r)</td>
+          <td class="text-centre">(s)</td>
+          <td class="text-centre">(t)</td>
+          <td class="text-centre">(u)</td>
+          <td class="text-centre">(v)</td>
+          <td class="text-centre">(w)</td>
+          <td class="text-centre">(x)</td>
+          <td class="text-centre">(y)</td>
+          <td class="text-centre">(z)</td>
+          <td class="text-centre">(aa)</td>
+          <td class="text-centre">(ab)</td>
+          <td class="text-centre">(ac)</td>
+          <td class="text-centre">(ad)</td>
+          <td class="text-centre">(ae)</td>
+          <td class="text-centre">(af)</td>
+          <td class="text-centre">(ag)</td>
+          <td class="text-centre">(ah)</td>
+          <td class="text-centre">(ai)</td>
+          <td class="text-centre">(aj)</td>
+          <td class="text-centre">(ak)</td>
+          <td class="text-centre">(al)</td>
+          <td class="text-centre">(am)</td>
+          <td class="text-centre">(an)</td>
+          <td class="text-centre">(ao)</td>
+          <td class="text-centre">(ap)</td>
+          <td class="text-centre">(aq)</td>
+          <td class="text-centre">(ar)</td>
+          <td class="text-centre">(as)</td>
+          <td class="text-centre">(at)</td>
+          <td class="text-centre">(au)</td>
+          <td class="text-centre">(av)</td>
+          <td class="text-centre">(aw)</td>
+          <td class="text-centre">(ax)</td>
+          <td class="text-centre">(ay)</td>
+          <td class="text-centre">(az)</td>
+          <td class="text-centre">(ba)</td>
+          <td class="text-centre">(bb)</td>
+          <td class="text-centre">(bc)</td>
+          <td class="text-centre">(bd)</td>
+          <td class="text-centre">(be)</td>
+          <td class="text-centre">(bf)</td>
+          <td class="text-centre">(bg)</td>
+          <td class="text-centre">(bh)</td>
+          <td class="text-centre">(bi)</td>
+          <td class="text-centre">(bj)</td>
+          <td class="text-centre">(bk)</td>
+          <td class="text-centre">(bl)</td>
+          <td class="text-centre">(bm)</td>
+          <td class="text-centre">(bn)</td>
+          <td class="text-centre">(bo)</td>
+          <td class="text-centre">(bp)</td>
+          <td class="text-centre">(bq)</td>
+          <td class="text-centre">(br)</td>
+          <td class="text-centre">(bs)</td>
+          <td class="text-centre">(bt)</td>
+          <td class="text-centre">(bu)</td>
+          <td class="text-centre">(bv)</td>
+          <td class="text-centre">(bw)</td>
+          <td class="text-centre">(bx)</td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
 </div>

From 005bb21cb928ed0ffa4d0caa4e8ca11de79c0f9d Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Fri, 31 May 2024 12:08:12 +0300
Subject: [PATCH 30/50] POC-740: MOH 407 Nutrition Service RegisterMOH 407
 Nutrition Service Register

---
 .../nutrition-register.component.html         | 664 ++++++++++++++++++
 1 file changed, 664 insertions(+)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
index 44301cd7a..aa9f35a0b 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
@@ -798,7 +798,671 @@ <h4 *ngIf="!statusError">
           <td class="text-centre" rowspan="2"></td>
         </tr>
         <tr>
+          <td class="text-centre"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-centre"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-centre"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-centre"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-centre"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
           <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-centre"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-centre"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-centre"></td>
+        </tr>
+        <tr>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+          <td class="text-centre" rowspan="2"></td>
+        </tr>
+        <tr>
+          <td class="text-centre"></td>
         </tr>
       </tbody>
     </table>

From 81793ef5cf3eb6aced85ad8c5bc5e95e39e724cd Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Wed, 12 Jun 2024 11:44:22 +0300
Subject: [PATCH 31/50] Updated registers

---
 .../cntdaily-register.component.html          | 901 ++----------------
 .../cntdaily-register.component.ts            | 107 ++-
 .../defaultertracing-register.component.css   |  14 +
 .../defaultertracing-register.component.html  | 205 +++-
 .../defaultertracing-register.component.ts    | 133 +--
 .../hei-register/hei-register.component.html  | 307 ++----
 .../hei-register/hei-register.component.ts    | 104 +-
 .../prepdaily-register.component.html         |   5 +-
 .../prepdaily-register.component.ts           |  27 +-
 9 files changed, 621 insertions(+), 1182 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index 0dfc1180d..729a9afb1 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -36,7 +36,24 @@ <h4 *ngIf="!statusError">
   This report is likely to change without warning.
 </div>
 
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+<div
+  class="btn-group pull-left"
+  *ngIf="careTreatmentRegisterData && careTreatmentRegisterData.length > 0"
+>
+  <button
+    class="btn btn-primary"
+    (click)="takeSnapshotAndExport()"
+    [disabled]="careTreatmentRegisterData.length == 0"
+  >
+    <i class="fa fa-download"> </i> Download Pdf
+  </button>
+</div>
+<br />
+<div
+  style="padding: 20px; font-size: 12px !important"
+  #cntdarcontentToSnapshot
+  *ngIf="careTreatmentRegisterData && careTreatmentRegisterData.length > 0"
+>
   <div class="table-responsive">
     <div class="row">
       <div class="col-md-4">
@@ -177,836 +194,58 @@ <h4 *ngIf="!statusError">
         </tr>
       </thead>
       <tbody>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="6" class="text-left"><b>Data element CODE</b></td>
-          <td colspan="3" class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center vertical-text">HV03-01</td>
-          <td class="text-center vertical-text">HV03-02</td>
-          <td class="text-center vertical-text">HV03-03</td>
-          <td class="text-center vertical-text">HV03-04</td>
-          <td class="text-center vertical-text">HV03-05</td>
-          <td class="text-center vertical-text">HV03-06</td>
-          <td class="text-center vertical-text">HV03-07</td>
-          <td class="text-center vertical-text">HV03-08</td>
-          <td class="text-center vertical-text">HV03-09</td>
-          <td class="text-center vertical-text">HV03-10</td>
-          <td class="text-center vertical-text">HV03-11</td>
-          <td class="text-center vertical-text">HV03-12</td>
-          <td class="text-center vertical-text">HV03-13</td>
-          <td class="text-center vertical-text">HV03-14</td>
-          <td class="text-center vertical-text">HV03-15</td>
-          <td class="text-center vertical-text">HV03-16</td>
-          <td class="text-center vertical-text">HV03-17</td>
-          <td class="text-center vertical-text">HV03-18</td>
-          <td class="text-center vertical-text">HV03-19</td>
-          <td class="text-center vertical-text">HV03-20</td>
-          <td class="text-center vertical-text">HV03-21</td>
-          <td class="text-center vertical-text">HV03-22</td>
-          <td class="text-center vertical-text">HV03-23</td>
-          <td class="text-center vertical-text">HV03-24</td>
-          <td class="text-center vertical-text">HV03-25</td>
-          <td class="text-center vertical-text">HV03-26</td>
-          <td class="text-center vertical-text">HV03-27</td>
-          <td class="text-center vertical-text">HV03-28</td>
-          <td class="text-center vertical-text">HV03-29</td>
-          <td class="text-center vertical-text">HV03-30</td>
-          <td class="text-center vertical-text">HV03-31</td>
-          <td class="text-center vertical-text">HV03-32</td>
-          <td colspan="2" class="text-center vertical-text">HV03-33</td>
-          <td colspan="2" class="text-center vertical-text">HV03-34</td>
-          <td colspan="4" class="text-center vertical-text"></td>
-        </tr>
-        <tr>
-          <td colspan="6" class="text-left"><b>TOTAL this Page</b></td>
-          <td colspan="3" class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="6" class="text-left"><b>TOTAL this Page</b></td>
-          <td colspan="3" class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="6" class="text-center"><b>TOTAL this Month</b></td>
-          <td colspan="3" class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="6" class="text-center"></td>
-          <td colspan="3" class="text-center"></td>
-          <td class="text-center">(e)</td>
-          <td class="text-center">(f)</td>
-          <td class="text-center">(g)</td>
-          <td class="text-center">(h)</td>
-          <td class="text-center">(i)</td>
-          <td class="text-center">(j)</td>
-          <td class="text-center">(k)</td>
-          <td class="text-center">(l)</td>
-          <td class="text-center">(m)</td>
-          <td class="text-center">(n)</td>
-          <td class="text-center">(o)</td>
-          <td class="text-center">(q)</td>
-          <td class="text-center">(r)</td>
-          <td class="text-center">(s)</td>
-          <td class="text-center">(t)</td>
-          <td class="text-center">(u)</td>
-          <td class="text-center">(v)</td>
-          <td class="text-center">(w)</td>
-          <td class="text-center">(x)</td>
-          <td class="text-center">(y)</td>
-          <td class="text-center">(z)</td>
-          <td class="text-center">(aa)</td>
-          <td class="text-center">(ab)</td>
-          <td class="text-center">(ac)</td>
-          <td class="text-center">(ad)</td>
-          <td class="text-center">(ae)</td>
-          <td class="text-center">(af)</td>
-          <td class="text-center">(ag)</td>
-          <td class="text-center">(ah)</td>
-          <td class="text-center">(ai)</td>
-          <td class="text-center">(aj)</td>
-          <td class="text-center">(ak)</td>
-          <td class="text-center">(al)</td>
-          <td colspan="2" class="text-center">(am)</td>
-          <td colspan="2" class="text-center">(an)</td>
-          <td colspan="4" class="text-center">(ao)</td>
-        </tr>
-        <tr>
-          <td colspan="10" rowspan="10" class="text-center">
-            <b>Summary of clinical visits</b>
-          </td>
-          <td colspan="14" class="text-right">
-            Count of clients with 2 months appointment
-          </td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td colspan="8" rowspan="10" class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right"><b>Total this Month (2s)</b></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right">
-            Count of clients with 3 months appointment
-          </td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right"><b>Total this Month (3s)</b></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right">
-            Count of clients with 4 months appointment
-          </td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right"><b>Total this Month (4s)</b></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right">
-            Count of clients with 5 months appointment
-          </td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right"><b>Total this Month (5s)</b></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right">
-            Count of clients with 6 months appointment
-          </td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td colspan="14" class="text-right"><b>Total this Month (6s)</b></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
+        <ng-container
+          *ngFor="let data of careTreatmentRegisterData; let a = index"
+        >
+          <tr>
+            <td rowspan="2">{{ a + 1 }}</td>
+            <td colspan="2" rowspan="2">{{ data.DATE }}</td>
+            <td colspan="3">{{ data.National_ID }}</td>
+            <td colspan="3" rowspan="2">
+              {{ data.CCC_Number }}
+            </td>
+            <td rowspan="2">{{ data.Age }}</td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td colspan="2" rowspan="2"></td>
+            <td colspan="2" rowspan="2"></td>
+            <td colspan="4" rowspan="2"></td>
+          </tr>
+          <tr>
+            <td colspan="3">{{ data.NUPI }}</td>
+          </tr>
+        </ng-container>
       </tbody>
     </table>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
index ac6aed7de..9b5fe26cd 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
@@ -1,7 +1,18 @@
-import { Component, OnInit, Output } from '@angular/core';
+import { DatePipe } from '@angular/common';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
+import { CareTreatmentResourceService } from 'src/app/etl-api/care-treatment-resource.service';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
 @Component({
   selector: 'app-cntdaily-register',
   templateUrl: './cntdaily-register.component.html',
@@ -12,7 +23,7 @@ export class CntdailyRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public txnewReportSummaryData: any = [];
+  public careTreatmentRegisterData: any = [];
   public columnDefs: any = [];
   public reportName = 'Care and Treatment Daily Activity';
   public currentView = 'monthly';
@@ -22,6 +33,7 @@ export class CntdailyRegisterComponent implements OnInit {
   public quarter: string;
   public eDate: string;
   public sDate: string;
+  public jointLocationUuids: string;
 
   public statusError = false;
   public errorMessage = '';
@@ -32,6 +44,7 @@ export class CntdailyRegisterComponent implements OnInit {
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  @ViewChild('cntdarcontentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
   public get locationUuids(): Array<string> {
@@ -48,7 +61,13 @@ export class CntdailyRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(public router: Router, public route: ActivatedRoute) {
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public careTreatmentRegisterService: CareTreatmentResourceService,
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -68,20 +87,26 @@ export class CntdailyRegisterComponent implements OnInit {
   }
 
   public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `'${location.value}'`
+        );
+        this.jointLocationUuids = locationValues.join(', ');
+      });
+
     this.route.parent.parent.params.subscribe((params: any) => {
-      this.storeParamsInUrl(params.location_uuid);
+      this.storeParamsInUrl();
     });
-    this.txnewReportSummaryData = [];
-    // this.getTxNewReport(this.params);
+    this.careTreatmentRegisterData = [];
+    this.getCareTreatmentRegisterData(this.params);
   }
 
-  public storeParamsInUrl(param) {
+  public storeParamsInUrl() {
     this.params = {
-      locationUuids: param,
-      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      reportName: this.reportName,
-      _date: Moment(this._month).format('DD-MM-YYYY')
+      locationUuids: this.jointLocationUuids,
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -89,31 +114,34 @@ export class CntdailyRegisterComponent implements OnInit {
     });
   }
 
-  // public getTxNewReport(params: any) {
-  //   this.isLoading = true;
-  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
-  //     if (data.error) {
-  //       this.showInfoMessage = true;
-  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
-  //       this.isLoading = false;
-  //     } else {
-  //       this.showInfoMessage = false;
-  //       this.columnDefs = data.sectionDefinitions;
-  //       this.txnewReportSummaryData = data.result;
-  //       this.calculateTotalSummary();
-  //       this.isLoading = false;
-  //       this.showDraftReportAlert(this._month);
-  //     }
-  //   });
-  // }
+  public getCareTreatmentRegisterData(params: any) {
+    this.isLoading = true;
+    this.careTreatmentRegisterService
+      .getCareTreatmentRegister(params)
+      .subscribe((data) => {
+        if (data.error) {
+          this.showInfoMessage = true;
+          this.errorMessage = `There has been an error while loading the report, please retry again`;
+          this.isLoading = false;
+        } else {
+          console.log('Care&Treatment', data);
+          this.showInfoMessage = false;
+          this.columnDefs = data.sectionDefinitions;
+          this.careTreatmentRegisterData = data;
+          this.calculateTotalSummary();
+          this.isLoading = false;
+          this.showDraftReportAlert(this._month);
+        }
+      });
+  }
 
   public calculateTotalSummary() {
     const totalsRow = [];
-    if (this.txnewReportSummaryData.length > 0) {
+    if (this.careTreatmentRegisterData.length > 0) {
       const totalObj = {
         location: 'Totals'
       };
-      _.each(this.txnewReportSummaryData, (row) => {
+      _.each(this.careTreatmentRegisterData, (row) => {
         Object.keys(row).map((key) => {
           if (Number.isInteger(row[key]) === true) {
             if (totalObj[key]) {
@@ -158,4 +186,21 @@ export class CntdailyRegisterComponent implements OnInit {
       this.isReleased = true;
     }
   }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH 366 Care and Treatment Daily Activity.pdf');
+    });
+  }
 }
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.css
index e69de29bb..7d7e743ba 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.css
@@ -0,0 +1,14 @@
+tr,
+.table-bordered th,
+.table-bordered td {
+  border: 2px solid #000; /* Darker border color */
+}
+tbody tr {
+  height: 20px; /* Adjust the height as per your design */
+}
+.vertical-text {
+  writing-mode: vertical-rl;
+  text-orientation: mixed;
+  transform: rotate(180deg);
+  white-space: nowrap;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
index 40a18d212..596aa0a99 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
@@ -35,20 +35,193 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div>
-  <p-tabView>
-    <p-tabPanel
-      header="Report View"
-      leftIcon="fa-file-pdf-o"
-      [selected]="currentViewBelow === 'pdf'"
-    >
-      <!-- <app-tx-ml-report-view
-        [SummaryData]="txnewReportSummaryData"
-        [sectionDefs]="columnDefs"
-        (CellSelection)="onIndicatorSelected($event)"
-        [reportDetails]="params"
-        [reportHeader]="reportName"
-      ></app-tx-ml-report-view> -->
-    </p-tabPanel>
-  </p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div *ngIf="!isReleased" class="alert alert-warning">
+  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
+  This report is likely to change without warning.
+</div>
+
+<div
+  class="btn-group pull-left"
+  *ngIf="
+    defaulterTracingRegisterData && defaulterTracingRegisterData.length > 0
+  "
+>
+  <button
+    class="btn btn-primary"
+    (click)="takeSnapshotAndExport()"
+    [disabled]="defaulterTracingRegisterData.length == 0"
+  >
+    <i class="fa fa-download"> </i> Download Pdf
+  </button>
+</div>
+<br />
+<div
+  *ngIf="defaulterTracingRegisterData && defaulterTracingRegisterData.length > 0 && generated"
+  style="padding: 20px; font-size: 12px !important"
+  #defaulterTracingcontentToSnapshot
+>
+<div
+  style="padding: 20px; font-size: 12px !important"
+  #defaulterTracingcontentToSnapshot
+>
+  <div class="table-responsive">
+    <table class="table table-bordered text-centre">
+      <thead>
+        <tr>
+          <th colspan="9" class="text-center">
+            Defaulter Tracing Register<br />
+            Enter all current clients that did not come for their scheduled
+            appointment
+          </th>
+        </tr>
+        <tr>
+          <th colspan="5" class="text-center">Section A</th>
+          <th></th>
+          <th colspan="2" class="text-center">Section B</th>
+          <th></th>
+        </tr>
+        <tr>
+          <th colspan="5" class="text-center">Client Tracking Information</th>
+          <th></th>
+          <th colspan="2" class="text-center">Defaulter Tracing Outcomes</th>
+          <th></th>
+        </tr>
+        <tr>
+          <th class="text-center">(a)</th>
+          <th class="text-center">(b)</th>
+          <th class="text-center">(c)</th>
+          <th class="text-center">(d)</th>
+          <th class="text-center">(e)</th>
+          <th class="text-center">(f)</th>
+          <th class="text-center">(g)</th>
+          <th class="text-center">(h)</th>
+          <th class="text-center">(i)</th>
+        </tr>
+        <tr>
+          <th rowspan="2" class="text-center">S/No.</th>
+          <th class="text-center">
+            Client Identification /<br />
+            Number
+          </th>
+          <th rowspan="2" class="text-center">
+            Client Name<br />
+            (First,Middle,Last)
+          </th>
+          <th rowspan="2" class="text-center">
+            Village/Estate/<br />
+            Landmark
+          </th>
+          <th rowspan="2" class="text-center">Telephone number</th>
+          <th rowspan="2" class="text-center">
+            Date of missed<br />
+            appointment
+          </th>
+          <th rowspan="2" class="text-center">
+            Return to Care/<br />
+            Dead/<br />
+            Transferred/<br />
+            Stopped Treatment/<br />
+            On follow up
+          </th>
+          <th rowspan="2" class="text-center">
+            Date of outcome<br />
+            (dd/mm/yyyy)
+          </th>
+          <th rowspan="2" class="text-center">Remarks</th>
+        </tr>
+        <tr>
+          <th class="text-center">
+            Unique Patient<br />
+            Number (NUPI)
+          </th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+        </tr>
+        <tr>
+          <td rowspan="2"></td>
+          <td></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+          <td rowspan="2"></td>
+        </tr>
+        <tr>
+          <td></td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
+<div *ngIf="defaulterTracingRegisterData.length == 0 && generated">
+  <i class="alert alert-danger">No record found</i>
 </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
index 83b012c91..c9a90b99e 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
@@ -1,7 +1,20 @@
-import { Component, OnInit, Output } from '@angular/core';
+import { DatePipe } from '@angular/common';
+import {
+  Component,
+  OnInit,
+  Output,
+  Input,
+  OnDestroy,
+  ViewChild,
+  ElementRef
+} from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
 @Component({
   selector: 'app-defaultertracing-register',
   templateUrl: './defaultertracing-register.component.html',
@@ -12,7 +25,7 @@ export class DefaultertracingRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public txnewReportSummaryData: any = [];
+  public defaulterTracingRegisterData: any = [];
   public columnDefs: any = [];
   public reportName = 'Defaulter Tracing Register';
   public currentView = 'monthly';
@@ -22,6 +35,7 @@ export class DefaultertracingRegisterComponent implements OnInit {
   public quarter: string;
   public eDate: string;
   public sDate: string;
+  public jointLocationUuids: string;
 
   public statusError = false;
   public errorMessage = '';
@@ -32,6 +46,9 @@ export class DefaultertracingRegisterComponent implements OnInit {
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  public generated = false;
+  @ViewChild('defaulterTracingcontentToSnapshot')
+  contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
   public get locationUuids(): Array<string> {
@@ -48,7 +65,13 @@ export class DefaultertracingRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(public router: Router, public route: ActivatedRoute) {
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public register: RegistersResourceService,
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -68,20 +91,27 @@ export class DefaultertracingRegisterComponent implements OnInit {
   }
 
   public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `'${location.value}'`
+        );
+        this.jointLocationUuids = locationValues.join(', ');
+      });
+
     this.route.parent.parent.params.subscribe((params: any) => {
-      this.storeParamsInUrl(params.location_uuid);
+      this.storeParamsInUrl();
     });
-    this.txnewReportSummaryData = [];
-    // this.getTxNewReport(this.params);
+    this.defaulterTracingRegisterData = [];
+    this.getPrEPRegisterReport(this.params);
+    this.generated = true;
   }
 
-  public storeParamsInUrl(param) {
+  public storeParamsInUrl() {
     this.params = {
-      locationUuids: param,
-      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      reportName: this.reportName,
-      _date: Moment(this._month).format('DD-MM-YYYY')
+      locationUuids: this.jointLocationUuids,
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -89,54 +119,22 @@ export class DefaultertracingRegisterComponent implements OnInit {
     });
   }
 
-  // public getTxNewReport(params: any) {
-  //   this.isLoading = true;
-  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
-  //     if (data.error) {
-  //       this.showInfoMessage = true;
-  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
-  //       this.isLoading = false;
-  //     } else {
-  //       this.showInfoMessage = false;
-  //       this.columnDefs = data.sectionDefinitions;
-  //       this.txnewReportSummaryData = data.result;
-  //       this.calculateTotalSummary();
-  //       this.isLoading = false;
-  //       this.showDraftReportAlert(this._month);
-  //     }
-  //   });
-  // }
-
-  public calculateTotalSummary() {
-    const totalsRow = [];
-    if (this.txnewReportSummaryData.length > 0) {
-      const totalObj = {
-        location: 'Totals'
-      };
-      _.each(this.txnewReportSummaryData, (row) => {
-        Object.keys(row).map((key) => {
-          if (Number.isInteger(row[key]) === true) {
-            if (totalObj[key]) {
-              totalObj[key] = row[key] + totalObj[key];
-            } else {
-              totalObj[key] = row[key];
-            }
-          } else {
-            if (Number.isNaN(totalObj[key])) {
-              totalObj[key] = 0;
-            }
-            if (totalObj[key] === null) {
-              totalObj[key] = 0;
-            }
-            totalObj[key] = 0 + totalObj[key];
-          }
-        });
-      });
-      totalObj.location = 'Totals';
-      totalsRow.push(totalObj);
-      this.pinnedBottomRowData = totalsRow;
-    }
+  public getPrEPRegisterReport(params: any) {
+    this.isLoading = true;
+    this.register.getPrEPRegisterReport(params).subscribe((data) => {
+      if (data.error) {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      } else {
+        this.showInfoMessage = false;
+        this.defaulterTracingRegisterData = data;
+        this.isLoading = false;
+        this.showDraftReportAlert(this._month);
+      }
+    });
   }
+
   public onIndicatorSelected(value) {
     this.router.navigate(['patient-list'], {
       relativeTo: this.route,
@@ -158,4 +156,21 @@ export class DefaultertracingRegisterComponent implements OnInit {
       this.isReleased = true;
     }
   }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('Defaulter Tracing Register.pdf');
+    });
+  }
 }
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
index abed1fc6c..8db3480f3 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
@@ -35,7 +35,25 @@ <h4 *ngIf="!statusError">
   <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
   This report is likely to change without warning.
 </div>
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+
+<div
+  class="btn-group pull-left"
+  *ngIf="heiRegisterData && heiRegisterData.length > 0"
+>
+  <button
+    class="btn btn-primary"
+    (click)="takeSnapshotAndExport()"
+    [disabled]="heiRegisterData.length == 0"
+  >
+    <i class="fa fa-download"> </i> Download Pdf
+  </button>
+</div>
+<br />
+<div
+  *ngIf="heiRegisterData && heiRegisterData.length > 0"
+  style="padding: 20px; font-size: 12px !important"
+  #heicontentToSnapshot
+>
   <div class="table-responsive">
     <div class="row">
       <div class="col-md-4">
@@ -79,10 +97,11 @@ <h4 *ngIf="!statusError">
           <th colspan="3" rowspan="2">
             Date of Collected enrollment (DD/MM/YYYY)
           </th>
-          <th colspan="3">HEI ID (MFL-YYYY-NNNN)</th>
-          <th colspan="3" rowspan="2">Infant's Name</th>
-          <th colspan="4" rowspan="2">DOB (DD/MM/YYYY)</th>
-          <th colspan="2" rowspan="2">Header</th>
+          <th colspan="3">Birth Certificate<br>
+            Number</th>
+          <th colspan="3" rowspan="2">HEI ID (MFL-YYYY-NNNN)</th>
+          <th colspan="4" rowspan="2">Infant's Name</th>
+          <th colspan="2" rowspan="2">DOB (DD/MM/YYYY)</th>
           <th colspan="2">Sex</th>
           <th colspan="3">
             Infant Prophylaxis 1=NVP, 2=AZT, 3=NVP &AZT, 4=None,
@@ -152,206 +171,84 @@ <h4 *ngIf="!statusError">
         </tr>
       </thead>
       <tbody>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="3" class="text-center" rowspan="2"></td>
-          <td colspan="4" class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center" rowspan="2"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td colspan="3" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="4" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-          <td colspan="2" class="text-center"></td>
-        </tr>
+        <ng-container *ngFor="let data of heiRegisterData; let a = index">
+          <tr>
+            <td rowspan="2">{{ a + 1 }}</td>
+            <td colspan="3" rowspan="2">
+              {{ transformDate(data.date_enrolled) }}
+            </td>
+            <td colspan="3">
+              {{ data.Birth_Certificate_number }}
+            </td>
+            <td colspan="3" rowspan="2">
+              {{ data.HEI_ID }}
+            </td>
+            <td colspan="4" rowspan="2">
+              {{ data.Infant_name }}
+            </td>
+            <td colspan="2" rowspan="2">
+              {{ transformDate(data.birth_date) }}
+            </td>
+            <td colspan="2">Sex</td>
+            <td colspan="3" rowspan="2">{{ null }}</td>
+            <td colspan="4">{{ data.parent_name }}</td>
+            <td rowspan="2">
+              {{ data.age_in_weeks_on_first_pcr }}
+            </td>
+            <td colspan="2" rowspan="2">
+              {{ date_enrolled }}
+            </td>
+            <td colspan="2">{{ transformDate(data.first_pcr_date) }}</td>
+            <td colspan="2" rowspan="2">
+              {{ data.age_in_months_on_second_pcr }}
+            </td>
+            <td colspan="2">{{ transformDate(data.second_pcr_date) }}</td>
+            <td colspan="2" rowspan="2">
+              {{ data.age_in_months_on_third_pcr }}
+            </td>
+            <td colspan="2">{{ transformDate(data.third_pcr_date) }}</td>
+            <td colspan="2">Infant Feeding</td>
+            <td colspan="2" rowspan="2">
+              {{ data.hei_outcome }}
+            </td>
+            <td colspan="2" rowspan="2">
+              {{ data.age_in_months_on_confirm_pcr }}
+            </td>
+            <td colspan="2">{{ transformDate(data.confirm_pcr_date) }}</td>
+            <td colspan="2" rowspan="2">
+              {{ data.age_in_months_on_first_antibody }}
+            </td>
+            <td colspan="2">
+              {{ transformDate(data.first_antibody_date) }}
+            </td>
+            <td colspan="2">{{ null }}</td>
+            <td colspan="2">{{ null }}</td>
+            <td colspan="4" rowspan="2">{{ null }}</td>
+          </tr>
+          <tr>
+            <td colspan="3">{{ data.NUPI }}</td>
+            <td colspan="2">{{ data.gender }}</td>
+            <td colspan="4">{{ data.Phone_Number }}</td>
+            <td colspan="2">
+              {{ data.results_pcr_first_pcr }}
+            </td>
+            <td colspan="2">
+              {{ data.results_pcr_second_pcr }}
+            </td>
+            <td colspan="2">
+              {{ data.results_pcr_third_pcr }}
+            </td>
+            <td colspan="2">{{ data.infant_feeding }}</td>
+            <td colspan="2">
+              {{ data.results_confirm_pcr }}
+            </td>
+            <td colspan="2">
+              {{ data.results_first_antibody }}
+            </td>
+            <td colspan="2">{{ null }}</td>
+            <td colspan="2">{{ null }}</td>
+          </tr>
+        </ng-container>
       </tbody>
     </table>
   </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
index 2a9de1b47..747442537 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
@@ -1,7 +1,19 @@
-import { Component, OnInit, Output } from '@angular/core';
+import { DatePipe } from '@angular/common';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
+import { HeiRegisterResourceService } from 'src/app/etl-api/hei-register-resource.service';
+import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
 @Component({
   selector: 'app-hei-register',
   templateUrl: './hei-register.component.html',
@@ -12,7 +24,7 @@ export class HeiRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public txnewReportSummaryData: any = [];
+  public heiRegisterData: any = [];
   public columnDefs: any = [];
   public reportName = 'HEI Register';
   public currentView = 'monthly';
@@ -22,6 +34,7 @@ export class HeiRegisterComponent implements OnInit {
   public quarter: string;
   public eDate: string;
   public sDate: string;
+  public jointLocationUuids: string;
 
   public statusError = false;
   public errorMessage = '';
@@ -32,6 +45,7 @@ export class HeiRegisterComponent implements OnInit {
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  @ViewChild('heicontentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
   public get locationUuids(): Array<string> {
@@ -48,7 +62,13 @@ export class HeiRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(public router: Router, public route: ActivatedRoute) {
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public heiRegisterService: HeiRegisterResourceService,
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -68,20 +88,26 @@ export class HeiRegisterComponent implements OnInit {
   }
 
   public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `'${location.value}'`
+        );
+        this.jointLocationUuids = locationValues.join(', ');
+      });
+
     this.route.parent.parent.params.subscribe((params: any) => {
-      this.storeParamsInUrl(params.location_uuid);
+      this.storeParamsInUrl();
     });
-    this.txnewReportSummaryData = [];
-    // this.getTxNewReport(this.params);
+    this.heiRegisterData = [];
+    this.getHeiRegisterData(this.params);
   }
 
-  public storeParamsInUrl(param) {
+  public storeParamsInUrl() {
     this.params = {
-      locationUuids: param,
-      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      reportName: this.reportName,
-      _date: Moment(this._month).format('DD-MM-YYYY')
+      locationUuids: this.jointLocationUuids,
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -89,31 +115,30 @@ export class HeiRegisterComponent implements OnInit {
     });
   }
 
-  // public getTxNewReport(params: any) {
-  //   this.isLoading = true;
-  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
-  //     if (data.error) {
-  //       this.showInfoMessage = true;
-  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
-  //       this.isLoading = false;
-  //     } else {
-  //       this.showInfoMessage = false;
-  //       this.columnDefs = data.sectionDefinitions;
-  //       this.txnewReportSummaryData = data.result;
-  //       this.calculateTotalSummary();
-  //       this.isLoading = false;
-  //       this.showDraftReportAlert(this._month);
-  //     }
-  //   });
-  // }
+  public getHeiRegisterData(params: any) {
+    this.isLoading = true;
+    this.heiRegisterService.getHeiRegister(params).subscribe((data) => {
+      if (data.error) {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      } else {
+        this.showInfoMessage = false;
+        this.columnDefs = data.sectionDefinitions;
+        this.heiRegisterData = data;
+        this.isLoading = false;
+        this.showDraftReportAlert(this._month);
+      }
+    });
+  }
 
   public calculateTotalSummary() {
     const totalsRow = [];
-    if (this.txnewReportSummaryData.length > 0) {
+    if (this.heiRegisterData.length > 0) {
       const totalObj = {
         location: 'Totals'
       };
-      _.each(this.txnewReportSummaryData, (row) => {
+      _.each(this.heiRegisterData, (row) => {
         Object.keys(row).map((key) => {
           if (Number.isInteger(row[key]) === true) {
             if (totalObj[key]) {
@@ -158,4 +183,21 @@ export class HeiRegisterComponent implements OnInit {
       this.isReleased = true;
     }
   }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH 408 HIV Exposed Infant Register.pdf');
+    });
+  }
 }
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
index 11909e88a..6172fe377 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
@@ -65,7 +65,7 @@ <h4 *ngIf="!statusError">
 </div>
 <br />
 <div
-  *ngIf="prepRegisterData && prepRegisterData.length > 0"
+  *ngIf="prepRegisterData && prepRegisterData.length > 0 && generated"
   style="padding: 20px; font-size: 12px !important"
   #prepcontentToSnapshot
 >
@@ -209,3 +209,6 @@ <h4 *ngIf="!statusError">
     </table>
   </div>
 </div>
+<div *ngIf="prepRegisterData.length == 0 && generated">
+  <i class="alert alert-danger" style="width: 100%;">No record found</i>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
index 90cab6a0c..7bec31d46 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
@@ -14,6 +14,7 @@ import * as Moment from 'moment';
 import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
 import * as html2canvas from 'html2canvas';
 import * as jsPDF from 'jspdf';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
 @Component({
   selector: 'app-prepdaily-register',
   templateUrl: './prepdaily-register.component.html',
@@ -34,6 +35,7 @@ export class PrepdailyRegisterComponent implements OnInit {
   public quarter: string;
   public eDate: string;
   public sDate: string;
+  public jointLocationUuids: string;
 
   public statusError = false;
   public errorMessage = '';
@@ -44,6 +46,7 @@ export class PrepdailyRegisterComponent implements OnInit {
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  public generated = false;
   @ViewChild('prepcontentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
@@ -65,7 +68,8 @@ export class PrepdailyRegisterComponent implements OnInit {
     public router: Router,
     public route: ActivatedRoute,
     public register: RegistersResourceService,
-    private datePipe: DatePipe
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
   ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
@@ -86,20 +90,27 @@ export class PrepdailyRegisterComponent implements OnInit {
   }
 
   public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `'${location.value}'`
+        );
+        this.jointLocationUuids = locationValues.join(', ');
+      });
+
     this.route.parent.parent.params.subscribe((params: any) => {
-      this.storeParamsInUrl(params.location_uuid);
+      this.storeParamsInUrl();
     });
     this.prepRegisterData = [];
     this.getPrEPRegisterReport(this.params);
+    this.generated = true;
   }
 
-  public storeParamsInUrl(param) {
+  public storeParamsInUrl() {
     this.params = {
-      locationUuids: param,
-      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      reportName: this.reportName,
-      _date: Moment(this._month).format('DD-MM-YYYY')
+      locationUuids: this.jointLocationUuids,
+      month: Moment(this._month).endOf('month').format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,

From 73720ea89f3418a2fc71b68b3737b30f22fce26f Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Wed, 12 Jun 2024 11:52:08 +0300
Subject: [PATCH 32/50] Updated registers

---
 src/app/build-version/build-version.component.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/build-version/build-version.component.ts b/src/app/build-version/build-version.component.ts
index c60a3b385..d1f229b80 100644
--- a/src/app/build-version/build-version.component.ts
+++ b/src/app/build-version/build-version.component.ts
@@ -8,7 +8,7 @@ import { VERSION } from '../../environments/version';
 })
 export class BuildVersionComponent implements OnInit {
   public version: string;
-  public buildDate: any;
+  public buildDate: Date;
   public hash: string;
   constructor() {}
 
@@ -20,7 +20,7 @@ export class BuildVersionComponent implements OnInit {
     try {
       this.version = VERSION.version;
       this.hash = VERSION.hash;
-      this.buildDate = 'Feb 15, 2024, 6:38:55 PM'; // new Date(VERSION.buildDate);
+      this.buildDate = new Date(VERSION.buildDate);
     } catch (e) {}
   }
 }

From e16d27e53a27fccc8798f8e5eaa6fdf43cbd7064 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Wed, 12 Jun 2024 13:06:43 +0300
Subject: [PATCH 33/50] Updated registers

---
 .../cntdaily-register.component.html          |   2 +-
 .../defaultertracing-register.component.html  | 311 +++++++++---------
 .../hei-register/hei-register.component.html  |   6 +-
 .../prepdaily-register.component.html         |   2 +-
 4 files changed, 164 insertions(+), 157 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index 729a9afb1..bea9419a2 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -248,4 +248,4 @@ <h4 *ngIf="!statusError">
       </tbody>
     </table>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
index 596aa0a99..5b49af7a1 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
@@ -67,161 +67,166 @@ <h4 *ngIf="!statusError">
 </div>
 <br />
 <div
-  *ngIf="defaulterTracingRegisterData && defaulterTracingRegisterData.length > 0 && generated"
-  style="padding: 20px; font-size: 12px !important"
-  #defaulterTracingcontentToSnapshot
->
-<div
+  *ngIf="
+    defaulterTracingRegisterData &&
+    defaulterTracingRegisterData.length > 0 &&
+    generated
+  "
   style="padding: 20px; font-size: 12px !important"
   #defaulterTracingcontentToSnapshot
 >
-  <div class="table-responsive">
-    <table class="table table-bordered text-centre">
-      <thead>
-        <tr>
-          <th colspan="9" class="text-center">
-            Defaulter Tracing Register<br />
-            Enter all current clients that did not come for their scheduled
-            appointment
-          </th>
-        </tr>
-        <tr>
-          <th colspan="5" class="text-center">Section A</th>
-          <th></th>
-          <th colspan="2" class="text-center">Section B</th>
-          <th></th>
-        </tr>
-        <tr>
-          <th colspan="5" class="text-center">Client Tracking Information</th>
-          <th></th>
-          <th colspan="2" class="text-center">Defaulter Tracing Outcomes</th>
-          <th></th>
-        </tr>
-        <tr>
-          <th class="text-center">(a)</th>
-          <th class="text-center">(b)</th>
-          <th class="text-center">(c)</th>
-          <th class="text-center">(d)</th>
-          <th class="text-center">(e)</th>
-          <th class="text-center">(f)</th>
-          <th class="text-center">(g)</th>
-          <th class="text-center">(h)</th>
-          <th class="text-center">(i)</th>
-        </tr>
-        <tr>
-          <th rowspan="2" class="text-center">S/No.</th>
-          <th class="text-center">
-            Client Identification /<br />
-            Number
-          </th>
-          <th rowspan="2" class="text-center">
-            Client Name<br />
-            (First,Middle,Last)
-          </th>
-          <th rowspan="2" class="text-center">
-            Village/Estate/<br />
-            Landmark
-          </th>
-          <th rowspan="2" class="text-center">Telephone number</th>
-          <th rowspan="2" class="text-center">
-            Date of missed<br />
-            appointment
-          </th>
-          <th rowspan="2" class="text-center">
-            Return to Care/<br />
-            Dead/<br />
-            Transferred/<br />
-            Stopped Treatment/<br />
-            On follow up
-          </th>
-          <th rowspan="2" class="text-center">
-            Date of outcome<br />
-            (dd/mm/yyyy)
-          </th>
-          <th rowspan="2" class="text-center">Remarks</th>
-        </tr>
-        <tr>
-          <th class="text-center">
-            Unique Patient<br />
-            Number (NUPI)
-          </th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-        </tr>
-      </tbody>
-    </table>
+  <div
+    style="padding: 20px; font-size: 12px !important"
+    #defaulterTracingcontentToSnapshot
+  >
+    <div class="table-responsive">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr>
+            <th colspan="9" class="text-center">
+              Defaulter Tracing Register<br />
+              Enter all current clients that did not come for their scheduled
+              appointment
+            </th>
+          </tr>
+          <tr>
+            <th colspan="5" class="text-center">Section A</th>
+            <th></th>
+            <th colspan="2" class="text-center">Section B</th>
+            <th></th>
+          </tr>
+          <tr>
+            <th colspan="5" class="text-center">Client Tracking Information</th>
+            <th></th>
+            <th colspan="2" class="text-center">Defaulter Tracing Outcomes</th>
+            <th></th>
+          </tr>
+          <tr>
+            <th class="text-center">(a)</th>
+            <th class="text-center">(b)</th>
+            <th class="text-center">(c)</th>
+            <th class="text-center">(d)</th>
+            <th class="text-center">(e)</th>
+            <th class="text-center">(f)</th>
+            <th class="text-center">(g)</th>
+            <th class="text-center">(h)</th>
+            <th class="text-center">(i)</th>
+          </tr>
+          <tr>
+            <th rowspan="2" class="text-center">S/No.</th>
+            <th class="text-center">
+              Client Identification /<br />
+              Number
+            </th>
+            <th rowspan="2" class="text-center">
+              Client Name<br />
+              (First,Middle,Last)
+            </th>
+            <th rowspan="2" class="text-center">
+              Village/Estate/<br />
+              Landmark
+            </th>
+            <th rowspan="2" class="text-center">Telephone number</th>
+            <th rowspan="2" class="text-center">
+              Date of missed<br />
+              appointment
+            </th>
+            <th rowspan="2" class="text-center">
+              Return to Care/<br />
+              Dead/<br />
+              Transferred/<br />
+              Stopped Treatment/<br />
+              On follow up
+            </th>
+            <th rowspan="2" class="text-center">
+              Date of outcome<br />
+              (dd/mm/yyyy)
+            </th>
+            <th rowspan="2" class="text-center">Remarks</th>
+          </tr>
+          <tr>
+            <th class="text-center">
+              Unique Patient<br />
+              Number (NUPI)
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td rowspan="2"></td>
+            <td></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+          </tr>
+          <tr>
+            <td></td>
+          </tr>
+          <tr>
+            <td rowspan="2"></td>
+            <td></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+          </tr>
+          <tr>
+            <td></td>
+          </tr>
+          <tr>
+            <td rowspan="2"></td>
+            <td></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+          </tr>
+          <tr>
+            <td></td>
+          </tr>
+          <tr>
+            <td rowspan="2"></td>
+            <td></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+          </tr>
+          <tr>
+            <td></td>
+          </tr>
+          <tr>
+            <td rowspan="2"></td>
+            <td></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2"></td>
+          </tr>
+          <tr>
+            <td></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div *ngIf="defaulterTracingRegisterData.length == 0 && generated">
+    <i class="alert alert-danger">No record found</i>
   </div>
-</div>
-<div *ngIf="defaulterTracingRegisterData.length == 0 && generated">
-  <i class="alert alert-danger">No record found</i>
 </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
index 8db3480f3..8f90e37ae 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
@@ -97,8 +97,10 @@ <h4 *ngIf="!statusError">
           <th colspan="3" rowspan="2">
             Date of Collected enrollment (DD/MM/YYYY)
           </th>
-          <th colspan="3">Birth Certificate<br>
-            Number</th>
+          <th colspan="3">
+            Birth Certificate<br />
+            Number
+          </th>
           <th colspan="3" rowspan="2">HEI ID (MFL-YYYY-NNNN)</th>
           <th colspan="4" rowspan="2">Infant's Name</th>
           <th colspan="2" rowspan="2">DOB (DD/MM/YYYY)</th>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
index 6172fe377..5ff82d48e 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
@@ -210,5 +210,5 @@ <h4 *ngIf="!statusError">
   </div>
 </div>
 <div *ngIf="prepRegisterData.length == 0 && generated">
-  <i class="alert alert-danger" style="width: 100%;">No record found</i>
+  <i class="alert alert-danger" style="width: 100%">No record found</i>
 </div>

From f09f9cbeadb1effe0600962d343d166885260d64 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Fri, 25 Oct 2024 12:30:26 +0300
Subject: [PATCH 34/50] POC-737: Initial commit

---
 .../anc-register/anc-register.component.html  | 674 +++---------------
 .../anc-register/anc-register.component.ts    | 117 ++-
 .../cntdaily-register.component.html          |  30 +-
 .../cntdaily-register.component.ts            |  13 +-
 .../defaultertracing-register.component.html  |  92 +--
 .../defaultertracing-register.component.ts    |  19 +-
 .../hei-register/hei-register.component.html  |  10 +-
 .../hei-register/hei-register.component.ts    |  13 +-
 .../prepdaily-register.component.html         |  12 +-
 .../prepdaily-register.component.ts           |  13 +-
 .../etl-api/anc-register-resource.service.ts  |  37 +
 .../care-treatment-resource.service.ts        |   2 +-
 .../etl-api/hei-register-resource.service.ts  |   2 +-
 src/app/etl-api/registers-resource.service.ts |  22 +-
 .../report-filters.component.html             |   2 +-
 15 files changed, 275 insertions(+), 783 deletions(-)
 create mode 100644 src/app/etl-api/anc-register-resource.service.ts

diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
index 371af8220..644e6514e 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
@@ -11,8 +11,8 @@ <h4 class="component-title text-success">
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
         [enabledControls]="enabledControls"
-        [monthString]="_month"
-        (onMonthChange)="onMonthChange($event)"
+        (startDateChange)="onMonthChange($event)"
+        [startDate]="_month"
         [reportName]="reportName"
         (generateReport)="generateReport()"
       >
@@ -31,19 +31,32 @@ <h4 *ngIf="!statusError">
     <small>{{ errorMessage }}</small>
   </p>
 </div>
-<div *ngIf="!isReleased" class="alert alert-warning">
-  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
-  This report is likely to change without warning.
-</div>
 
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+<div
+  class="btn-group pull-left"
+  *ngIf="ancRegisterData && ancRegisterData.length > 0"
+>
+  <button
+    class="btn btn-primary"
+    (click)="takeSnapshotAndExport()"
+    [disabled]="ancRegisterData.length == 0"
+  >
+    <i class="fa fa-download"> </i> Download Pdf
+  </button>
+</div>
+<br />
+<div
+  style="padding: 20px; font-size: 12px !important"
+  #cntdarcontentToSnapshot
+  *ngIf="ancRegisterData && ancRegisterData.length > 0"
+>
   <div class="table-responsive">
     <div class="row">
       <div class="col-md-4">
         <b>Ministry Of Health</b>
       </div>
       <div class="col-md-4 text-center">
-        <b>MOH 267 PrEP Daily Activity Register</b>
+        <b>AnteNatal (ANC) Register MOH 405</b>
       </div>
       <div class="col-md-4 text-right">
         <b>Ver. July 2023</b>
@@ -346,596 +359,69 @@ <h4 *ngIf="!statusError">
           <td class="text-center">(ar)</td>
           <td class="text-center">(as)</td>
         </tr>
+        <ng-container
+          *ngFor="let data of ancRegisterData; let a = index"
+        >
         <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
+          <td class="text-center" rowspan="2">{{data.date_of_visit | date:'dd/MM/yyyy' }}</td>
+          <td class="text-center">{{data.anc_number}}</td>
+          <td class="text-center" rowspan="2">{{data.anc_number_NUPI}}</td>
+          <td class="text-center" rowspan="2">{{data.number_of_anc_visits}}</td>
+          <td class="text-center" rowspan="2">{{data.full_names}}</td>
+          <td class="text-center">{{data.date_of_birth | date:'dd/MM/yyyy'}}</td>
+          <td class="text-center" rowspan="2">{{data.subcounty_county}}</td>
+          <td class="text-center">{{data.village_estate_landmark}}</td>
+          <td class="text-center" rowspan="2">{{data.marital_status}}</td>
+          <td class="text-center" rowspan="2">{{data.parity}}</td>
+          <td class="text-center" rowspan="2">{{data.gravidae}}</td>
+          <td class="text-center" rowspan="2">{{data.last_lmp_date | date:'dd/MM/yyyy'}}</td>
+          <td class="text-center" rowspan="2">{{data.edd | date:'dd/MM/yyyy'}}</td>
+          <td class="text-center" rowspan="2">{{data.gestation_in_weeks}}</td>
+          <td class="text-center" rowspan="2">{{data.muac}}</td>
+          <td class="text-center" rowspan="2">{{data.height}}</td>
+          <td class="text-center" rowspan="2">{{data.weight}}</td>
+          <td class="text-center" rowspan="2">{{data.blood_pressure}}</td>
+          <td class="text-center" rowspan="2">{{data.breast_exam}}</td>
+          <td class="text-center">{{data.fgm}}</td>
+          <td class="text-center" rowspan="2">{{data.haemoglobin}}</td>
+          <td class="text-center" rowspan="2">{{data.blood_sugar_test}}</td>
+          <td class="text-center" rowspan="2">{{data.blood_group_rhesus}}</td>
+          <td class="text-center" rowspan="2">{{data.urinalysis}}</td>
+          <td class="text-center">{{data.rpr_vdrl_duo}}</td>
+          <td class="text-center">{{data.hepatitisB}}</td>
+          <td class="text-center" rowspan="2">{{data.tb_screening}}</td>
+          <td class="text-center" rowspan="2">{{data.hiv_test_type}}</td>
+          <td class="text-center">{{data.hiv_test_1_kit_name}}</td>
+          <td class="text-center">{{data.hiv_test_2_kit_name}}</td>
+          <td class="text-center">{{data.hiv_test_3_kit_name}}</td>
+          <td class="text-center" rowspan="2">{{data.hiv_results}}</td>
+          <td class="text-center" rowspan="2">{{data.maternal_haart}}</td>
+          <td class="text-center" rowspan="2">{{data.infant_prophylaxis}}</td>
+          <td class="text-center" rowspan="2">{{data.partner_hiv_testing}}</td>
+          <td class="text-center">{{data.other_conditions}}</td>
+          <td class="text-center" rowspan="2">{{data.deworming}}</td>
+          <td class="text-center" rowspan="2">{{data.ipt_1_3}}</td>
+          <td class="text-center" rowspan="2">{{data.tt_dose}}</td>
+          <td class="text-center" rowspan="2">{{data.supplementation}}</td>
+          <td class="text-center" rowspan="2">{{data.llitns}}</td>
+          <td class="text-center" rowspan="2">{{data.referrals_from}}</td>
+          <td class="text-center" rowspan="2">{{data.referrals_to}}</td>
+          <td class="text-center" rowspan="2">{{data.reason_for_referral}}</td>
+          <td class="text-center" rowspan="2">{{data.remarks}}</td>
         </tr>
         <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
+          <td class="text-center">{{data.NUPI}}</td>
+          <td class="text-center">{{data.age}}</td>
+          <td class="text-center">{{data.phone_number}}</td>
+          <td class="text-center">{{data.fgm_complications}}</td>
+          <td class="text-center">{{data.rpr_vdrl_duo_results}}</td>
+          <td class="text-center">{{data.hepatitisB_treatment}}</td>
+          <td class="text-center">{{data.hiv_test_1_expiry_date | date:'dd/MM/yyyy'}}</td>
+          <td class="text-center">{{data.hiv_test_2_expiry_date | date:'dd/MM/yyyy'}}</td>
+          <td class="text-center">{{data.hiv_test_3_expiry_date | date:'dd/MM/yyyy'}}</td>
+          <td class="text-center">{{data.other_conditions_treatment}}</td>
         </tr>
+        </ng-container>
       </tbody>
     </table>
   </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
index 661cc2895..c90889c56 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
@@ -1,7 +1,18 @@
-import { Component, OnInit, Output } from '@angular/core';
+import { DatePipe } from '@angular/common';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
+import { ANCRegisterResourceService } from 'src/app/etl-api/anc-register-resource.service';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
 @Component({
   selector: 'app-anc-register',
   templateUrl: './anc-register.component.html',
@@ -12,9 +23,9 @@ export class AncRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public txnewReportSummaryData: any = [];
+  public ancRegisterData: any = [];
   public columnDefs: any = [];
-  public reportName = 'ANC Register';
+  public reportName = 'AnteNatal (ANC) Register MOH 405';
   public currentView = 'monthly';
   public currentViewBelow = 'pdf';
   public month: string;
@@ -22,16 +33,18 @@ export class AncRegisterComponent implements OnInit {
   public quarter: string;
   public eDate: string;
   public sDate: string;
+  public jointLocationUuids: string;
 
   public statusError = false;
   public errorMessage = '';
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,monthControl';
+  public enabledControls = 'locationControl,dayControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  @ViewChild('cntdarcontentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
   public get locationUuids(): Array<string> {
@@ -48,13 +61,16 @@ export class AncRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(public router: Router, public route: ActivatedRoute) {
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public ancRegisterService: ANCRegisterResourceService,
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
-        ? (this._month = Moment()
-            .subtract(1, 'M')
-            .endOf('month')
-            .format('YYYY-MM-DD'))
+        ? (this._month = Moment().format('YYYY-MM-DD'))
         : (this._month = data.month);
 
       this.showDraftReportAlert(this._month);
@@ -64,24 +80,30 @@ export class AncRegisterComponent implements OnInit {
   ngOnInit() {}
 
   public onMonthChange(value): any {
-    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+    this._month = Moment(value).format('YYYY-MM-DD');
   }
 
   public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `'${location.value}'`
+        );
+        this.jointLocationUuids = locationValues.join(', ');
+      });
+
     this.route.parent.parent.params.subscribe((params: any) => {
-      this.storeParamsInUrl(params.location_uuid);
+      this.storeParamsInUrl();
     });
-    this.txnewReportSummaryData = [];
-    // this.getTxNewReport(this.params);
+    this.ancRegisterData = [];
+    this.getANCRegisterData(this.params);
   }
 
-  public storeParamsInUrl(param) {
+  public storeParamsInUrl() {
     this.params = {
-      locationUuids: param,
-      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      reportName: this.reportName,
-      _date: Moment(this._month).format('DD-MM-YYYY')
+      locationUuids: this.jointLocationUuids,
+      month: Moment(this._month).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -89,31 +111,31 @@ export class AncRegisterComponent implements OnInit {
     });
   }
 
-  // public getTxNewReport(params: any) {
-  //   this.isLoading = true;
-  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
-  //     if (data.error) {
-  //       this.showInfoMessage = true;
-  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
-  //       this.isLoading = false;
-  //     } else {
-  //       this.showInfoMessage = false;
-  //       this.columnDefs = data.sectionDefinitions;
-  //       this.txnewReportSummaryData = data.result;
-  //       this.calculateTotalSummary();
-  //       this.isLoading = false;
-  //       this.showDraftReportAlert(this._month);
-  //     }
-  //   });
-  // }
+  public getANCRegisterData(params: any) {
+    this.isLoading = true;
+    this.ancRegisterService.getANCRegisterRegister(params).subscribe((data) => {
+      if (data.error) {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      } else {
+        this.showInfoMessage = false;
+        this.columnDefs = data.sectionDefinitions;
+        this.ancRegisterData = data;
+        this.calculateTotalSummary();
+        this.isLoading = false;
+        this.showDraftReportAlert(this._month);
+      }
+    });
+  }
 
   public calculateTotalSummary() {
     const totalsRow = [];
-    if (this.txnewReportSummaryData.length > 0) {
+    if (this.ancRegisterData.length > 0) {
       const totalObj = {
         location: 'Totals'
       };
-      _.each(this.txnewReportSummaryData, (row) => {
+      _.each(this.ancRegisterData, (row) => {
         Object.keys(row).map((key) => {
           if (Number.isInteger(row[key]) === true) {
             if (totalObj[key]) {
@@ -152,10 +174,27 @@ export class AncRegisterComponent implements OnInit {
   }
 
   public showDraftReportAlert(date) {
-    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+    if (date != null && date >= Moment().format('YYYY-MM-DD')) {
       this.isReleased = false;
     } else {
       this.isReleased = true;
     }
   }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH 405 ANC Register.pdf');
+    });
+  }
 }
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index bea9419a2..9fa86f769 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -11,8 +11,8 @@ <h4 class="component-title text-success">
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
         [enabledControls]="enabledControls"
-        [monthString]="_month"
-        (onMonthChange)="onMonthChange($event)"
+        (startDateChange)="onMonthChange($event)"
+        [startDate]="_month"
         [reportName]="reportName"
         (generateReport)="generateReport()"
       >
@@ -31,10 +31,6 @@ <h4 *ngIf="!statusError">
     <small>{{ errorMessage }}</small>
   </p>
 </div>
-<div *ngIf="!isReleased" class="alert alert-warning">
-  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
-  This report is likely to change without warning.
-</div>
 
 <div
   class="btn-group pull-left"
@@ -199,16 +195,13 @@ <h4 *ngIf="!statusError">
         >
           <tr>
             <td rowspan="2">{{ a + 1 }}</td>
-            <td colspan="2" rowspan="2">{{ data.DATE }}</td>
-            <td colspan="3">{{ data.National_ID }}</td>
+            <td colspan="2" rowspan="2">{{ data.date | date:'dd/MM/yyyy' }}</td>
+            <td colspan="3">{{ data.national_id_number }}</td>
             <td colspan="3" rowspan="2">
-              {{ data.CCC_Number }}
+              {{ data.ccc_number }}
             </td>
-            <td rowspan="2">{{ data.Age }}</td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
+            <td rowspan="2">{{ data.age }}</td>
+            <td rowspan="2">{{data.started_on_art}}</td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
@@ -222,8 +215,11 @@ <h4 *ngIf="!statusError">
             <td rowspan="2"></td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
+            <td rowspan="2">{{data.screened_for_tb}}</td>
             <td rowspan="2"></td>
+            <td rowspan="2">{{data.started_on_tpt}}</td>
             <td rowspan="2"></td>
+            <td rowspan="2">{{data.current_on_art}}</td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
@@ -237,9 +233,9 @@ <h4 *ngIf="!statusError">
             <td rowspan="2"></td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
-            <td colspan="2" rowspan="2"></td>
-            <td colspan="2" rowspan="2"></td>
-            <td colspan="4" rowspan="2"></td>
+            <td colspan="2" rowspan="2">{{data.dsd_status}}</td>
+            <td colspan="2" rowspan="2">{{data.dsd_type}}</td>
+            <td colspan="4" rowspan="2">{{data.remarks}}</td>
           </tr>
           <tr>
             <td colspan="3">{{ data.NUPI }}</td>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
index 9b5fe26cd..f94ae500f 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
@@ -40,7 +40,7 @@ export class CntdailyRegisterComponent implements OnInit {
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,monthControl';
+  public enabledControls = 'locationControl,dayControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
@@ -70,10 +70,7 @@ export class CntdailyRegisterComponent implements OnInit {
   ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
-        ? (this._month = Moment()
-            .subtract(1, 'M')
-            .endOf('month')
-            .format('YYYY-MM-DD'))
+        ? (this._month = Moment().format('YYYY-MM-DD'))
         : (this._month = data.month);
 
       this.showDraftReportAlert(this._month);
@@ -83,7 +80,7 @@ export class CntdailyRegisterComponent implements OnInit {
   ngOnInit() {}
 
   public onMonthChange(value): any {
-    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+    this._month = Moment(value).format('YYYY-MM-DD');
   }
 
   public generateReport(): any {
@@ -106,7 +103,7 @@ export class CntdailyRegisterComponent implements OnInit {
   public storeParamsInUrl() {
     this.params = {
       locationUuids: this.jointLocationUuids,
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD')
+      month: Moment(this._month).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -180,7 +177,7 @@ export class CntdailyRegisterComponent implements OnInit {
   }
 
   public showDraftReportAlert(date) {
-    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+    if (date != null && date >= Moment().format('YYYY-MM-DD')) {
       this.isReleased = false;
     } else {
       this.isReleased = true;
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
index 5b49af7a1..cfb6026be 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
@@ -11,8 +11,8 @@ <h4 class="component-title text-success">
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
         [enabledControls]="enabledControls"
-        [monthString]="_month"
-        (onMonthChange)="onMonthChange($event)"
+        (startDateChange)="onMonthChange($event)"
+        [startDate]="_month"
         [reportName]="reportName"
         (generateReport)="generateReport()"
       >
@@ -31,10 +31,6 @@ <h4 *ngIf="!statusError">
     <small>{{ errorMessage }}</small>
   </p>
 </div>
-<div *ngIf="!isReleased" class="alert alert-warning">
-  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
-  This report is likely to change without warning.
-</div>
 
 <div class="alert alert-danger fade in" *ngIf="showInfoMessage">
   <a href="#" class="close" data-dismiss="alert">&times;</a>
@@ -46,10 +42,6 @@ <h4 *ngIf="!statusError">
     <small>{{ errorMessage }}</small>
   </p>
 </div>
-<div *ngIf="!isReleased" class="alert alert-warning">
-  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
-  This report is likely to change without warning.
-</div>
 
 <div
   class="btn-group pull-left"
@@ -152,76 +144,24 @@ <h4 *ngIf="!statusError">
           </tr>
         </thead>
         <tbody>
+          <ng-container
+            *ngFor="let data of defaulterTracingRegisterData; let a = index"
+          >
           <tr>
-            <td rowspan="2"></td>
-            <td></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-          </tr>
-          <tr>
-            <td></td>
-          </tr>
-          <tr>
-            <td rowspan="2"></td>
-            <td></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-          </tr>
-          <tr>
-            <td></td>
-          </tr>
-          <tr>
-            <td rowspan="2"></td>
-            <td></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-          </tr>
-          <tr>
-            <td></td>
-          </tr>
-          <tr>
-            <td rowspan="2"></td>
-            <td></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-          </tr>
-          <tr>
-            <td></td>
-          </tr>
-          <tr>
-            <td rowspan="2"></td>
-            <td></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
+            <td rowspan="2">{{ a + 1 }}</td>
+            <td>{{ data.client_id_No }}</td>
+            <td rowspan="2">{{ data.first_name }} {{ data.middle }} {{ data.last_name }}</td>
+            <td rowspan="2" style="max-width: 250px">{{ data.village }}</td>
+            <td rowspan="2">{{ data.telephone_number }}</td>
+            <td rowspan="2">{{ data.date_of_missed_appointment | date:'dd/MM/yyyy' }}</td>
+            <td rowspan="2">{{ data.defaulter_tracing_outcomes }}</td>
+            <td rowspan="2">{{ data.date_of_outcomes | date:'dd/MM/yyyy' }}</td>
+            <td rowspan="2" style="max-width: 350px">{{ data.outcomes }}</td>
           </tr>
           <tr>
-            <td></td>
+            <td>{{ data.nupi }}</td>
           </tr>
+          </ng-container>
         </tbody>
       </table>
     </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
index c9a90b99e..f7666f45f 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
@@ -42,7 +42,7 @@ export class DefaultertracingRegisterComponent implements OnInit {
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,monthControl';
+  public enabledControls = 'locationControl,dayControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
@@ -74,10 +74,7 @@ export class DefaultertracingRegisterComponent implements OnInit {
   ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
-        ? (this._month = Moment()
-            .subtract(1, 'M')
-            .endOf('month')
-            .format('YYYY-MM-DD'))
+        ? (this._month = Moment().format('YYYY-MM-DD'))
         : (this._month = data.month);
 
       this.showDraftReportAlert(this._month);
@@ -87,7 +84,7 @@ export class DefaultertracingRegisterComponent implements OnInit {
   ngOnInit() {}
 
   public onMonthChange(value): any {
-    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+    this._month = Moment(value).format('YYYY-MM-DD');
   }
 
   public generateReport(): any {
@@ -104,14 +101,14 @@ export class DefaultertracingRegisterComponent implements OnInit {
       this.storeParamsInUrl();
     });
     this.defaulterTracingRegisterData = [];
-    this.getPrEPRegisterReport(this.params);
+    this.getDefaulterTracingRegister(this.params);
     this.generated = true;
   }
 
   public storeParamsInUrl() {
     this.params = {
       locationUuids: this.jointLocationUuids,
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD')
+      month: Moment(this._month).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -119,9 +116,9 @@ export class DefaultertracingRegisterComponent implements OnInit {
     });
   }
 
-  public getPrEPRegisterReport(params: any) {
+  public getDefaulterTracingRegister(params: any) {
     this.isLoading = true;
-    this.register.getPrEPRegisterReport(params).subscribe((data) => {
+    this.register.getDefaulterTracingRegister(params).subscribe((data) => {
       if (data.error) {
         this.showInfoMessage = true;
         this.errorMessage = `There has been an error while loading the report, please retry again`;
@@ -150,7 +147,7 @@ export class DefaultertracingRegisterComponent implements OnInit {
   }
 
   public showDraftReportAlert(date) {
-    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+    if (date != null && date >= Moment().format('YYYY-MM-DD')) {
       this.isReleased = false;
     } else {
       this.isReleased = true;
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
index 8f90e37ae..8f305ccc1 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
@@ -11,8 +11,8 @@ <h4 class="component-title text-success">
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
         [enabledControls]="enabledControls"
-        [monthString]="_month"
-        (onMonthChange)="onMonthChange($event)"
+        (startDateChange)="onMonthChange($event)"
+        [startDate]="_month"
         [reportName]="reportName"
         (generateReport)="generateReport()"
       >
@@ -31,10 +31,6 @@ <h4 *ngIf="!statusError">
     <small>{{ errorMessage }}</small>
   </p>
 </div>
-<div *ngIf="!isReleased" class="alert alert-warning">
-  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
-  This report is likely to change without warning.
-</div>
 
 <div
   class="btn-group pull-left"
@@ -182,7 +178,7 @@ <h4 *ngIf="!statusError">
             <td colspan="3">
               {{ data.Birth_Certificate_number }}
             </td>
-            <td colspan="3" rowspan="2">
+            <td colspan="3" rowspan="2" style="max-width: 150px;">
               {{ data.HEI_ID }}
             </td>
             <td colspan="4" rowspan="2">
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
index 747442537..06a7aceb8 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
@@ -41,7 +41,7 @@ export class HeiRegisterComponent implements OnInit {
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,monthControl';
+  public enabledControls = 'locationControl,dayControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
@@ -71,10 +71,7 @@ export class HeiRegisterComponent implements OnInit {
   ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
-        ? (this._month = Moment()
-            .subtract(1, 'M')
-            .endOf('month')
-            .format('YYYY-MM-DD'))
+        ? (this._month = Moment().format('YYYY-MM-DD'))
         : (this._month = data.month);
 
       this.showDraftReportAlert(this._month);
@@ -84,7 +81,7 @@ export class HeiRegisterComponent implements OnInit {
   ngOnInit() {}
 
   public onMonthChange(value): any {
-    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+    this._month = Moment(value).format('YYYY-MM-DD');
   }
 
   public generateReport(): any {
@@ -107,7 +104,7 @@ export class HeiRegisterComponent implements OnInit {
   public storeParamsInUrl() {
     this.params = {
       locationUuids: this.jointLocationUuids,
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD')
+      month: Moment(this._month).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -177,7 +174,7 @@ export class HeiRegisterComponent implements OnInit {
   }
 
   public showDraftReportAlert(date) {
-    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+    if (date != null && date >= Moment().format('YYYY-MM-DD')) {
       this.isReleased = false;
     } else {
       this.isReleased = true;
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
index 5ff82d48e..03028642c 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
@@ -11,8 +11,8 @@ <h4 class="component-title text-success">
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
         [enabledControls]="enabledControls"
-        [monthString]="_month"
-        (onMonthChange)="onMonthChange($event)"
+        (startDateChange)="onMonthChange($event)"
+        [startDate]="_month"
         [reportName]="reportName"
         (generateReport)="generateReport()"
       >
@@ -31,10 +31,6 @@ <h4 *ngIf="!statusError">
     <small>{{ errorMessage }}</small>
   </p>
 </div>
-<div *ngIf="!isReleased" class="alert alert-warning">
-  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
-  This report is likely to change without warning.
-</div>
 
 <div class="alert alert-danger fade in" *ngIf="showInfoMessage">
   <a href="#" class="close" data-dismiss="alert">&times;</a>
@@ -46,10 +42,6 @@ <h4 *ngIf="!statusError">
     <small>{{ errorMessage }}</small>
   </p>
 </div>
-<div *ngIf="!isReleased" class="alert alert-warning">
-  <strong>Viewing a Draft Version of the Report for the chosen month. </strong>
-  This report is likely to change without warning.
-</div>
 
 <div
   class="btn-group pull-left"
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
index 7bec31d46..4ef32df74 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
@@ -42,7 +42,7 @@ export class PrepdailyRegisterComponent implements OnInit {
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,monthControl';
+  public enabledControls = 'locationControl,dayControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
@@ -73,10 +73,7 @@ export class PrepdailyRegisterComponent implements OnInit {
   ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
-        ? (this._month = Moment()
-            .subtract(1, 'M')
-            .endOf('month')
-            .format('YYYY-MM-DD'))
+        ? (this._month = Moment().format('YYYY-MM-DD'))
         : (this._month = data.month);
 
       this.showDraftReportAlert(this._month);
@@ -86,7 +83,7 @@ export class PrepdailyRegisterComponent implements OnInit {
   ngOnInit() {}
 
   public onMonthChange(value): any {
-    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+    this._month = Moment(value).format('MM-DD-YYYY');
   }
 
   public generateReport(): any {
@@ -110,7 +107,7 @@ export class PrepdailyRegisterComponent implements OnInit {
   public storeParamsInUrl() {
     this.params = {
       locationUuids: this.jointLocationUuids,
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD')
+      month: Moment(this._month).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -149,7 +146,7 @@ export class PrepdailyRegisterComponent implements OnInit {
   }
 
   public showDraftReportAlert(date) {
-    if (date != null && date >= Moment().endOf('month').format('YYYY-MM-DD')) {
+    if (date != null && date >= Moment().format('YYYY-MM-DD')) {
       this.isReleased = false;
     } else {
       this.isReleased = true;
diff --git a/src/app/etl-api/anc-register-resource.service.ts b/src/app/etl-api/anc-register-resource.service.ts
new file mode 100644
index 000000000..7e966f10a
--- /dev/null
+++ b/src/app/etl-api/anc-register-resource.service.ts
@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import { AppSettingsService } from '../app-settings/app-settings.service';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import * as Moment from 'moment';
+import { catchError, map } from 'rxjs/operators';
+@Injectable({
+  providedIn: 'root'
+})
+export class ANCRegisterResourceService {
+  public get url(): string {
+    return this.appSettingsService.getEtlRestbaseurl().trim();
+  }
+  constructor(
+    public http: HttpClient,
+    public appSettingsService: AppSettingsService
+  ) {}
+  public getANCRegisterRegister(params: any): Observable<any> {
+    return this.http
+      .get(
+        `${this.url}registers/ancregister?endDate=${params.month}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+}
diff --git a/src/app/etl-api/care-treatment-resource.service.ts b/src/app/etl-api/care-treatment-resource.service.ts
index 77e76f6fd..a4708492d 100644
--- a/src/app/etl-api/care-treatment-resource.service.ts
+++ b/src/app/etl-api/care-treatment-resource.service.ts
@@ -19,7 +19,7 @@ export class CareTreatmentResourceService {
     // tslint:disable-next-line: max-line-length
     return this.http
       .get(
-        `${this.url}care-and-treatment-register?endDate=${params.month}&locationUuids=${params.locationUuids}`
+        `${this.url}registers/cntregister?endDate=${params.month}&locationUuids=${params.locationUuids}`
       )
       .pipe(
         catchError((err: any) => {
diff --git a/src/app/etl-api/hei-register-resource.service.ts b/src/app/etl-api/hei-register-resource.service.ts
index 9fe930f89..b16ee1913 100644
--- a/src/app/etl-api/hei-register-resource.service.ts
+++ b/src/app/etl-api/hei-register-resource.service.ts
@@ -19,7 +19,7 @@ export class HeiRegisterResourceService {
     // tslint:disable-next-line: max-line-length
     return this.http
       .get(
-        `${this.url}hei-register?endDate=${params.month}&locationUuids=${params.locationUuids}`
+        `${this.url}registers/heiregister?endDate=${params.month}&locationUuids=${params.locationUuids}`
       )
       .pipe(
         catchError((err: any) => {
diff --git a/src/app/etl-api/registers-resource.service.ts b/src/app/etl-api/registers-resource.service.ts
index 140bb39e9..50b28d775 100644
--- a/src/app/etl-api/registers-resource.service.ts
+++ b/src/app/etl-api/registers-resource.service.ts
@@ -16,10 +16,28 @@ export class RegistersResourceService {
     public appSettingsService: AppSettingsService
   ) {}
   public getPrEPRegisterReport(params: any): Observable<any> {
-    // tslint:disable-next-line: max-line-length
     return this.http
       .get(
-        `${this.url}prepregisterdata?month=${params.month}&locationUuids=${params.locationUuids}`
+        `${this.url}registers/prepregisterdata?month=${params.month}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+  public getDefaulterTracingRegister(params: any): Observable<any> {
+    return this.http
+      .get(
+        `${this.url}registers/defaultertracing?month=${params.month}&locationUuids=${params.locationUuids}`
       )
       .pipe(
         catchError((err: any) => {
diff --git a/src/app/shared/report-filters/report-filters.component.html b/src/app/shared/report-filters/report-filters.component.html
index cd43126a6..0f37045cf 100644
--- a/src/app/shared/report-filters/report-filters.component.html
+++ b/src/app/shared/report-filters/report-filters.component.html
@@ -124,7 +124,7 @@
       <div class="date-range" *ngIf="isEnabled('dayControl')">
         <div class="form-group col-md-12">
           <div class="form-row">
-            <label for="startDate">Start Date:</label>
+            <label for="startDate">Date:</label>
             <input
               id="startDate"
               type="date"

From bed258716a0035e18b9d3a598360e71696e151e8 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Fri, 25 Oct 2024 13:12:44 +0300
Subject: [PATCH 35/50] POC-737: Initial commit

---
 .github/workflows/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 60ad180a8..665845d9b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -48,4 +48,4 @@ jobs:
       # - name: Run headless tests
       #   uses: GabrielBB/xvfb-action@v1
       #   with:
-      #     run: npm run test
+      #     run: npm run test
\ No newline at end of file

From 5abdcd1604663776027ad296fdbd848dbb33a538 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Fri, 25 Oct 2024 13:15:00 +0300
Subject: [PATCH 36/50] POC-737: Initial commit

updated github workflows main.yaml file upload-artifact to version 4
---
 .github/workflows/main.yml                                  | 2 +-
 .../hiv/data-analytics-hiv.module.ts                        | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 665845d9b..60ad180a8 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -48,4 +48,4 @@ jobs:
       # - name: Run headless tests
       #   uses: GabrielBB/xvfb-action@v1
       #   with:
-      #     run: npm run test
\ No newline at end of file
+      #     run: npm run test
diff --git a/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.module.ts b/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.module.ts
index d370a3a9e..41cebb599 100644
--- a/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.module.ts
+++ b/src/app/data-analytics-dashboard/hiv/data-analytics-hiv.module.ts
@@ -54,6 +54,8 @@ import { PncRegisterComponent } from './registers/pnc-register/pnc-register.comp
 import { DefaultertracingRegisterComponent } from './registers/defaultertracing-register/defaultertracing-register.component';
 import { PrepdailyRegisterComponent } from './registers/prepdaily-register/prepdaily-register.component';
 import { CntdailyRegisterComponent } from './registers/cntdaily-register/cntdaily-register.component';
+import { OtzRegisterComponent } from './registers/otz-register/otz-register.component';
+import { Moh731RegisterComponent } from './registers/moh731-register/moh731-register.component';
 
 @NgModule({
   imports: [
@@ -117,7 +119,9 @@ import { CntdailyRegisterComponent } from './registers/cntdaily-register/cntdail
     PncRegisterComponent,
     DefaultertracingRegisterComponent,
     PrepdailyRegisterComponent,
-    CntdailyRegisterComponent
+    CntdailyRegisterComponent,
+    OtzRegisterComponent,
+    Moh731RegisterComponent
   ],
   providers: [
     DataAnalyticsDashboardService,

From 84c25933960fb646ad32b70a606d85e3606544b7 Mon Sep 17 00:00:00 2001
From: Alfred-Mutai <mutaialfr@gmail.com>
Date: Fri, 25 Oct 2024 13:28:40 +0300
Subject: [PATCH 37/50] POC-737: Initial commit

---
 .../anc-register/anc-register.component.html  | 148 ++++++++++--------
 .../cntdaily-register.component.html          |  18 ++-
 .../defaultertracing-register.component.html  |  34 ++--
 .../hei-register/hei-register.component.html  |   2 +-
 4 files changed, 117 insertions(+), 85 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
index 644e6514e..cddb9adfb 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
@@ -359,68 +359,92 @@ <h4 *ngIf="!statusError">
           <td class="text-center">(ar)</td>
           <td class="text-center">(as)</td>
         </tr>
-        <ng-container
-          *ngFor="let data of ancRegisterData; let a = index"
-        >
-        <tr>
-          <td class="text-center" rowspan="2">{{data.date_of_visit | date:'dd/MM/yyyy' }}</td>
-          <td class="text-center">{{data.anc_number}}</td>
-          <td class="text-center" rowspan="2">{{data.anc_number_NUPI}}</td>
-          <td class="text-center" rowspan="2">{{data.number_of_anc_visits}}</td>
-          <td class="text-center" rowspan="2">{{data.full_names}}</td>
-          <td class="text-center">{{data.date_of_birth | date:'dd/MM/yyyy'}}</td>
-          <td class="text-center" rowspan="2">{{data.subcounty_county}}</td>
-          <td class="text-center">{{data.village_estate_landmark}}</td>
-          <td class="text-center" rowspan="2">{{data.marital_status}}</td>
-          <td class="text-center" rowspan="2">{{data.parity}}</td>
-          <td class="text-center" rowspan="2">{{data.gravidae}}</td>
-          <td class="text-center" rowspan="2">{{data.last_lmp_date | date:'dd/MM/yyyy'}}</td>
-          <td class="text-center" rowspan="2">{{data.edd | date:'dd/MM/yyyy'}}</td>
-          <td class="text-center" rowspan="2">{{data.gestation_in_weeks}}</td>
-          <td class="text-center" rowspan="2">{{data.muac}}</td>
-          <td class="text-center" rowspan="2">{{data.height}}</td>
-          <td class="text-center" rowspan="2">{{data.weight}}</td>
-          <td class="text-center" rowspan="2">{{data.blood_pressure}}</td>
-          <td class="text-center" rowspan="2">{{data.breast_exam}}</td>
-          <td class="text-center">{{data.fgm}}</td>
-          <td class="text-center" rowspan="2">{{data.haemoglobin}}</td>
-          <td class="text-center" rowspan="2">{{data.blood_sugar_test}}</td>
-          <td class="text-center" rowspan="2">{{data.blood_group_rhesus}}</td>
-          <td class="text-center" rowspan="2">{{data.urinalysis}}</td>
-          <td class="text-center">{{data.rpr_vdrl_duo}}</td>
-          <td class="text-center">{{data.hepatitisB}}</td>
-          <td class="text-center" rowspan="2">{{data.tb_screening}}</td>
-          <td class="text-center" rowspan="2">{{data.hiv_test_type}}</td>
-          <td class="text-center">{{data.hiv_test_1_kit_name}}</td>
-          <td class="text-center">{{data.hiv_test_2_kit_name}}</td>
-          <td class="text-center">{{data.hiv_test_3_kit_name}}</td>
-          <td class="text-center" rowspan="2">{{data.hiv_results}}</td>
-          <td class="text-center" rowspan="2">{{data.maternal_haart}}</td>
-          <td class="text-center" rowspan="2">{{data.infant_prophylaxis}}</td>
-          <td class="text-center" rowspan="2">{{data.partner_hiv_testing}}</td>
-          <td class="text-center">{{data.other_conditions}}</td>
-          <td class="text-center" rowspan="2">{{data.deworming}}</td>
-          <td class="text-center" rowspan="2">{{data.ipt_1_3}}</td>
-          <td class="text-center" rowspan="2">{{data.tt_dose}}</td>
-          <td class="text-center" rowspan="2">{{data.supplementation}}</td>
-          <td class="text-center" rowspan="2">{{data.llitns}}</td>
-          <td class="text-center" rowspan="2">{{data.referrals_from}}</td>
-          <td class="text-center" rowspan="2">{{data.referrals_to}}</td>
-          <td class="text-center" rowspan="2">{{data.reason_for_referral}}</td>
-          <td class="text-center" rowspan="2">{{data.remarks}}</td>
-        </tr>
-        <tr>
-          <td class="text-center">{{data.NUPI}}</td>
-          <td class="text-center">{{data.age}}</td>
-          <td class="text-center">{{data.phone_number}}</td>
-          <td class="text-center">{{data.fgm_complications}}</td>
-          <td class="text-center">{{data.rpr_vdrl_duo_results}}</td>
-          <td class="text-center">{{data.hepatitisB_treatment}}</td>
-          <td class="text-center">{{data.hiv_test_1_expiry_date | date:'dd/MM/yyyy'}}</td>
-          <td class="text-center">{{data.hiv_test_2_expiry_date | date:'dd/MM/yyyy'}}</td>
-          <td class="text-center">{{data.hiv_test_3_expiry_date | date:'dd/MM/yyyy'}}</td>
-          <td class="text-center">{{data.other_conditions_treatment}}</td>
-        </tr>
+        <ng-container *ngFor="let data of ancRegisterData; let a = index">
+          <tr>
+            <td class="text-center" rowspan="2">
+              {{ data.date_of_visit | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center">{{ data.anc_number }}</td>
+            <td class="text-center" rowspan="2">{{ data.anc_number_NUPI }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.number_of_anc_visits }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.full_names }}</td>
+            <td class="text-center">
+              {{ data.date_of_birth | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.subcounty_county }}</td>
+            <td class="text-center">{{ data.village_estate_landmark }}</td>
+            <td class="text-center" rowspan="2">{{ data.marital_status }}</td>
+            <td class="text-center" rowspan="2">{{ data.parity }}</td>
+            <td class="text-center" rowspan="2">{{ data.gravidae }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.last_lmp_date | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.edd | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.gestation_in_weeks }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.muac }}</td>
+            <td class="text-center" rowspan="2">{{ data.height }}</td>
+            <td class="text-center" rowspan="2">{{ data.weight }}</td>
+            <td class="text-center" rowspan="2">{{ data.blood_pressure }}</td>
+            <td class="text-center" rowspan="2">{{ data.breast_exam }}</td>
+            <td class="text-center">{{ data.fgm }}</td>
+            <td class="text-center" rowspan="2">{{ data.haemoglobin }}</td>
+            <td class="text-center" rowspan="2">{{ data.blood_sugar_test }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.blood_group_rhesus }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.urinalysis }}</td>
+            <td class="text-center">{{ data.rpr_vdrl_duo }}</td>
+            <td class="text-center">{{ data.hepatitisB }}</td>
+            <td class="text-center" rowspan="2">{{ data.tb_screening }}</td>
+            <td class="text-center" rowspan="2">{{ data.hiv_test_type }}</td>
+            <td class="text-center">{{ data.hiv_test_1_kit_name }}</td>
+            <td class="text-center">{{ data.hiv_test_2_kit_name }}</td>
+            <td class="text-center">{{ data.hiv_test_3_kit_name }}</td>
+            <td class="text-center" rowspan="2">{{ data.hiv_results }}</td>
+            <td class="text-center" rowspan="2">{{ data.maternal_haart }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.infant_prophylaxis }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.partner_hiv_testing }}
+            </td>
+            <td class="text-center">{{ data.other_conditions }}</td>
+            <td class="text-center" rowspan="2">{{ data.deworming }}</td>
+            <td class="text-center" rowspan="2">{{ data.ipt_1_3 }}</td>
+            <td class="text-center" rowspan="2">{{ data.tt_dose }}</td>
+            <td class="text-center" rowspan="2">{{ data.supplementation }}</td>
+            <td class="text-center" rowspan="2">{{ data.llitns }}</td>
+            <td class="text-center" rowspan="2">{{ data.referrals_from }}</td>
+            <td class="text-center" rowspan="2">{{ data.referrals_to }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.reason_for_referral }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.remarks }}</td>
+          </tr>
+          <tr>
+            <td class="text-center">{{ data.NUPI }}</td>
+            <td class="text-center">{{ data.age }}</td>
+            <td class="text-center">{{ data.phone_number }}</td>
+            <td class="text-center">{{ data.fgm_complications }}</td>
+            <td class="text-center">{{ data.rpr_vdrl_duo_results }}</td>
+            <td class="text-center">{{ data.hepatitisB_treatment }}</td>
+            <td class="text-center">
+              {{ data.hiv_test_1_expiry_date | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center">
+              {{ data.hiv_test_2_expiry_date | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center">
+              {{ data.hiv_test_3_expiry_date | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center">{{ data.other_conditions_treatment }}</td>
+          </tr>
         </ng-container>
       </tbody>
     </table>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index 9fa86f769..037df4e32 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -195,13 +195,15 @@ <h4 *ngIf="!statusError">
         >
           <tr>
             <td rowspan="2">{{ a + 1 }}</td>
-            <td colspan="2" rowspan="2">{{ data.date | date:'dd/MM/yyyy' }}</td>
+            <td colspan="2" rowspan="2">
+              {{ data.date | date: 'dd/MM/yyyy' }}
+            </td>
             <td colspan="3">{{ data.national_id_number }}</td>
             <td colspan="3" rowspan="2">
               {{ data.ccc_number }}
             </td>
             <td rowspan="2">{{ data.age }}</td>
-            <td rowspan="2">{{data.started_on_art}}</td>
+            <td rowspan="2">{{ data.started_on_art }}</td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
@@ -215,11 +217,11 @@ <h4 *ngIf="!statusError">
             <td rowspan="2"></td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
-            <td rowspan="2">{{data.screened_for_tb}}</td>
+            <td rowspan="2">{{ data.screened_for_tb }}</td>
             <td rowspan="2"></td>
-            <td rowspan="2">{{data.started_on_tpt}}</td>
+            <td rowspan="2">{{ data.started_on_tpt }}</td>
             <td rowspan="2"></td>
-            <td rowspan="2">{{data.current_on_art}}</td>
+            <td rowspan="2">{{ data.current_on_art }}</td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
@@ -233,9 +235,9 @@ <h4 *ngIf="!statusError">
             <td rowspan="2"></td>
             <td rowspan="2"></td>
             <td rowspan="2"></td>
-            <td colspan="2" rowspan="2">{{data.dsd_status}}</td>
-            <td colspan="2" rowspan="2">{{data.dsd_type}}</td>
-            <td colspan="4" rowspan="2">{{data.remarks}}</td>
+            <td colspan="2" rowspan="2">{{ data.dsd_status }}</td>
+            <td colspan="2" rowspan="2">{{ data.dsd_type }}</td>
+            <td colspan="4" rowspan="2">{{ data.remarks }}</td>
           </tr>
           <tr>
             <td colspan="3">{{ data.NUPI }}</td>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
index cfb6026be..267576e6e 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
@@ -147,20 +147,26 @@ <h4 *ngIf="!statusError">
           <ng-container
             *ngFor="let data of defaulterTracingRegisterData; let a = index"
           >
-          <tr>
-            <td rowspan="2">{{ a + 1 }}</td>
-            <td>{{ data.client_id_No }}</td>
-            <td rowspan="2">{{ data.first_name }} {{ data.middle }} {{ data.last_name }}</td>
-            <td rowspan="2" style="max-width: 250px">{{ data.village }}</td>
-            <td rowspan="2">{{ data.telephone_number }}</td>
-            <td rowspan="2">{{ data.date_of_missed_appointment | date:'dd/MM/yyyy' }}</td>
-            <td rowspan="2">{{ data.defaulter_tracing_outcomes }}</td>
-            <td rowspan="2">{{ data.date_of_outcomes | date:'dd/MM/yyyy' }}</td>
-            <td rowspan="2" style="max-width: 350px">{{ data.outcomes }}</td>
-          </tr>
-          <tr>
-            <td>{{ data.nupi }}</td>
-          </tr>
+            <tr>
+              <td rowspan="2">{{ a + 1 }}</td>
+              <td>{{ data.client_id_No }}</td>
+              <td rowspan="2">
+                {{ data.first_name }} {{ data.middle }} {{ data.last_name }}
+              </td>
+              <td rowspan="2" style="max-width: 250px">{{ data.village }}</td>
+              <td rowspan="2">{{ data.telephone_number }}</td>
+              <td rowspan="2">
+                {{ data.date_of_missed_appointment | date: 'dd/MM/yyyy' }}
+              </td>
+              <td rowspan="2">{{ data.defaulter_tracing_outcomes }}</td>
+              <td rowspan="2">
+                {{ data.date_of_outcomes | date: 'dd/MM/yyyy' }}
+              </td>
+              <td rowspan="2" style="max-width: 350px">{{ data.outcomes }}</td>
+            </tr>
+            <tr>
+              <td>{{ data.nupi }}</td>
+            </tr>
           </ng-container>
         </tbody>
       </table>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
index 8f305ccc1..b7bd1a5a7 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
@@ -178,7 +178,7 @@ <h4 *ngIf="!statusError">
             <td colspan="3">
               {{ data.Birth_Certificate_number }}
             </td>
-            <td colspan="3" rowspan="2" style="max-width: 150px;">
+            <td colspan="3" rowspan="2" style="max-width: 150px">
               {{ data.HEI_ID }}
             </td>
             <td colspan="4" rowspan="2">

From ffe6b89d9fc6d6e0b5f44befd95608736a3877d2 Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Wed, 14 May 2025 10:30:36 +0300
Subject: [PATCH 38/50] POC-737: Updated registers

---
 .../anc-register/anc-register.component.html  |   3 +-
 .../anc-register/anc-register.component.ts    |  23 +-
 .../cntdaily-register.component.html          | 235 +++++++++++++++---
 .../cntdaily-register.component.ts            |  24 +-
 .../defaultertracing-register.component.html  |   4 +-
 .../defaultertracing-register.component.ts    |  23 +-
 .../hei-register/hei-register.component.html  |   3 +-
 .../hei-register/hei-register.component.ts    |  24 +-
 .../maternity-register.component.html         |   3 +-
 .../maternity-register.component.ts           |  24 +-
 .../prepdaily-register.component.html         |  13 +-
 .../prepdaily-register.component.ts           |  27 +-
 .../etl-api/anc-register-resource.service.ts  |   2 +-
 .../care-treatment-resource.service.ts        |   2 +-
 .../etl-api/hei-register-resource.service.ts  |   2 +-
 src/app/etl-api/registers-resource.service.ts |   4 +-
 16 files changed, 357 insertions(+), 59 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
index cddb9adfb..aaaf31c18 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
@@ -12,7 +12,8 @@ <h4 class="component-title text-success">
       <report-filters
         [enabledControls]="enabledControls"
         (startDateChange)="onMonthChange($event)"
-        [startDate]="_month"
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
         [reportName]="reportName"
         (generateReport)="generateReport()"
       >
diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
index c90889c56..31628171c 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
@@ -40,7 +40,7 @@ export class AncRegisterComponent implements OnInit {
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,dayControl';
+  public enabledControls = 'datesControl, locationControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
@@ -61,6 +61,24 @@ export class AncRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
+  private _startDate: Date = Moment().toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = new Date();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
   constructor(
     public router: Router,
     public route: ActivatedRoute,
@@ -103,7 +121,8 @@ export class AncRegisterComponent implements OnInit {
   public storeParamsInUrl() {
     this.params = {
       locationUuids: this.jointLocationUuids,
-      month: Moment(this._month).format('YYYY-MM-DD')
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index 037df4e32..3cd1ffdce 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -12,7 +12,8 @@ <h4 class="component-title text-success">
       <report-filters
         [enabledControls]="enabledControls"
         (startDateChange)="onMonthChange($event)"
-        [startDate]="_month"
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
         [reportName]="reportName"
         (generateReport)="generateReport()"
       >
@@ -203,38 +204,206 @@ <h4 *ngIf="!statusError">
               {{ data.ccc_number }}
             </td>
             <td rowspan="2">{{ data.age }}</td>
-            <td rowspan="2">{{ data.started_on_art }}</td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2">{{ data.screened_for_tb }}</td>
-            <td rowspan="2"></td>
-            <td rowspan="2">{{ data.started_on_tpt }}</td>
-            <td rowspan="2"></td>
-            <td rowspan="2">{{ data.current_on_art }}</td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
-            <td rowspan="2"></td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age < 1 && data.gender == 'M'">
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age < 1 && data.gender == 'F'">
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 1 && data.age <= 4 && data.gender == 'M'"
+              >
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 1 && data.age <= 4 && data.gender == 'F'"
+              >
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 5 && data.age <= 9 && data.gender == 'M'"
+              >
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 5 && data.age <= 9 && data.gender == 'F'"
+              >
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 10 && data.age <= 14 && data.gender == 'M'"
+              >
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 10 && data.age <= 14 && data.gender == 'F'"
+              >
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 15 && data.age <= 19 && data.gender == 'M'"
+              >
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 15 && data.age <= 19 && data.gender == 'F'"
+              >
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 20 && data.age <= 24 && data.gender == 'M'"
+              >
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 20 && data.age <= 24 && data.gender == 'F'"
+              >
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age >= 25 && data.gender == 'M'">
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age >= 25 && data.gender == 'F'">
+                {{ data.started_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age < 15">
+                {{ data.screened_for_tb }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age >= 15">
+                {{ data.screened_for_tb }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age < 15">
+                {{ data.started_on_tpt }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age >= 15">
+                {{ data.started_on_tpt }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age < 1 && data.gender == 'M'">
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age < 1 && data.gender == 'F'">
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 1 && data.age <= 4 && data.gender == 'M'"
+              >
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 1 && data.age <= 4 && data.gender == 'F'"
+              >
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 5 && data.age <= 9 && data.gender == 'M'"
+              >
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 5 && data.age <= 9 && data.gender == 'F'"
+              >
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 10 && data.age <= 14 && data.gender == 'M'"
+              >
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 10 && data.age <= 14 && data.gender == 'F'"
+              >
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 15 && data.age <= 19 && data.gender == 'M'"
+              >
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 15 && data.age <= 19 && data.gender == 'F'"
+              >
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 20 && data.age <= 24 && data.gender == 'M'"
+              >
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container
+                *ngIf="data.age >= 20 && data.age <= 24 && data.gender == 'F'"
+              >
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age >= 25 && data.gender == 'M'">
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
+            <td rowspan="2">
+              <ng-container *ngIf="data.age >= 25 && data.gender == 'F'">
+                {{ data.current_on_art }}
+              </ng-container>
+            </td>
             <td colspan="2" rowspan="2">{{ data.dsd_status }}</td>
             <td colspan="2" rowspan="2">{{ data.dsd_type }}</td>
             <td colspan="4" rowspan="2">{{ data.remarks }}</td>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
index f94ae500f..76fa461a1 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
@@ -40,7 +40,7 @@ export class CntdailyRegisterComponent implements OnInit {
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,dayControl';
+  public enabledControls = 'datesControl, locationControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
@@ -61,6 +61,24 @@ export class CntdailyRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
+  private _startDate: Date = Moment().toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = new Date();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
   constructor(
     public router: Router,
     public route: ActivatedRoute,
@@ -103,7 +121,9 @@ export class CntdailyRegisterComponent implements OnInit {
   public storeParamsInUrl() {
     this.params = {
       locationUuids: this.jointLocationUuids,
-      month: Moment(this._month).format('YYYY-MM-DD')
+      month: Moment(this._month).format('YYYY-MM-DD'),
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
index 267576e6e..5c7c15274 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.html
@@ -11,8 +11,8 @@ <h4 class="component-title text-success">
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
         [enabledControls]="enabledControls"
-        (startDateChange)="onMonthChange($event)"
-        [startDate]="_month"
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
         [reportName]="reportName"
         (generateReport)="generateReport()"
       >
diff --git a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
index f7666f45f..7e2df3c06 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/defaultertracing-register/defaultertracing-register.component.ts
@@ -42,7 +42,7 @@ export class DefaultertracingRegisterComponent implements OnInit {
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,dayControl';
+  public enabledControls = 'datesControl, locationControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
@@ -65,6 +65,24 @@ export class DefaultertracingRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
+  private _startDate: Date = Moment().toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = new Date();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
   constructor(
     public router: Router,
     public route: ActivatedRoute,
@@ -108,7 +126,8 @@ export class DefaultertracingRegisterComponent implements OnInit {
   public storeParamsInUrl() {
     this.params = {
       locationUuids: this.jointLocationUuids,
-      month: Moment(this._month).format('YYYY-MM-DD')
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
index b7bd1a5a7..537282819 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
@@ -12,7 +12,8 @@ <h4 class="component-title text-success">
       <report-filters
         [enabledControls]="enabledControls"
         (startDateChange)="onMonthChange($event)"
-        [startDate]="_month"
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
         [reportName]="reportName"
         (generateReport)="generateReport()"
       >
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
index 06a7aceb8..4425dd303 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
@@ -41,7 +41,7 @@ export class HeiRegisterComponent implements OnInit {
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,dayControl';
+  public enabledControls = 'datesControl, locationControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
@@ -62,6 +62,24 @@ export class HeiRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
+  private _startDate: Date = Moment().toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = new Date();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
   constructor(
     public router: Router,
     public route: ActivatedRoute,
@@ -104,7 +122,8 @@ export class HeiRegisterComponent implements OnInit {
   public storeParamsInUrl() {
     this.params = {
       locationUuids: this.jointLocationUuids,
-      month: Moment(this._month).format('YYYY-MM-DD')
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -122,6 +141,7 @@ export class HeiRegisterComponent implements OnInit {
       } else {
         this.showInfoMessage = false;
         this.columnDefs = data.sectionDefinitions;
+        console.log('HEI DATA IS: ' + JSON.stringify(data));
         this.heiRegisterData = data;
         this.isLoading = false;
         this.showDraftReportAlert(this._month);
diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
index 8ec57b795..369418be5 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
@@ -11,7 +11,8 @@ <h4 class="component-title text-success">
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
         [enabledControls]="enabledControls"
-        [monthString]="_month"
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
         (onMonthChange)="onMonthChange($event)"
         [reportName]="reportName"
         (generateReport)="generateReport()"
diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts
index 8fe1183d4..ae122072c 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts
@@ -28,7 +28,7 @@ export class MaternityRegisterComponent implements OnInit {
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,monthControl';
+  public enabledControls = 'datesControl, locationControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
@@ -48,6 +48,24 @@ export class MaternityRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
+  private _startDate: Date = Moment().toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = new Date();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
   constructor(public router: Router, public route: ActivatedRoute) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
@@ -81,7 +99,9 @@ export class MaternityRegisterComponent implements OnInit {
       _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
       month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
       reportName: this.reportName,
-      _date: Moment(this._month).format('DD-MM-YYYY')
+      _date: Moment(this._month).format('DD-MM-YYYY'),
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
index 03028642c..fcf355c8a 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
@@ -10,9 +10,9 @@ <h4 class="component-title text-success">
   <div>
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
         [enabledControls]="enabledControls"
-        (startDateChange)="onMonthChange($event)"
-        [startDate]="_month"
         [reportName]="reportName"
         (generateReport)="generateReport()"
       >
@@ -201,6 +201,11 @@ <h4 *ngIf="!statusError">
     </table>
   </div>
 </div>
-<div *ngIf="prepRegisterData.length == 0 && generated">
-  <i class="alert alert-danger" style="width: 100%">No record found</i>
+<div
+  *ngIf="prepRegisterData.length == 0 && generated"
+  class="text-center rounded"
+>
+  <i class="alert alert-info text-center" style="width: 100%"
+    >No record found</i
+  >
 </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
index 4ef32df74..d7f4e3081 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
@@ -42,11 +42,30 @@ export class PrepdailyRegisterComponent implements OnInit {
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,dayControl';
+  public enabledControls = 'datesControl, locationControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
   public generated = false;
+
+  private _startDate: Date = Moment().toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = new Date();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
   @ViewChild('prepcontentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
@@ -107,7 +126,9 @@ export class PrepdailyRegisterComponent implements OnInit {
   public storeParamsInUrl() {
     this.params = {
       locationUuids: this.jointLocationUuids,
-      month: Moment(this._month).format('YYYY-MM-DD')
+      month: Moment(this._month).format('YYYY-MM-DD'),
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -117,6 +138,7 @@ export class PrepdailyRegisterComponent implements OnInit {
 
   public getPrEPRegisterReport(params: any) {
     this.isLoading = true;
+    console.log('PREP PARAMS ARE: ' + JSON.stringify(params));
     this.register.getPrEPRegisterReport(params).subscribe((data) => {
       if (data.error) {
         this.showInfoMessage = true;
@@ -125,6 +147,7 @@ export class PrepdailyRegisterComponent implements OnInit {
       } else {
         this.showInfoMessage = false;
         this.prepRegisterData = data;
+        console.log('PREP DATA IS: ' + JSON.stringify(data));
         this.isLoading = false;
         this.showDraftReportAlert(this._month);
       }
diff --git a/src/app/etl-api/anc-register-resource.service.ts b/src/app/etl-api/anc-register-resource.service.ts
index 7e966f10a..aa8910e07 100644
--- a/src/app/etl-api/anc-register-resource.service.ts
+++ b/src/app/etl-api/anc-register-resource.service.ts
@@ -18,7 +18,7 @@ export class ANCRegisterResourceService {
   public getANCRegisterRegister(params: any): Observable<any> {
     return this.http
       .get(
-        `${this.url}registers/ancregister?endDate=${params.month}&locationUuids=${params.locationUuids}`
+        `${this.url}registers/ancregister?startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
       )
       .pipe(
         catchError((err: any) => {
diff --git a/src/app/etl-api/care-treatment-resource.service.ts b/src/app/etl-api/care-treatment-resource.service.ts
index a4708492d..6e251fd2f 100644
--- a/src/app/etl-api/care-treatment-resource.service.ts
+++ b/src/app/etl-api/care-treatment-resource.service.ts
@@ -19,7 +19,7 @@ export class CareTreatmentResourceService {
     // tslint:disable-next-line: max-line-length
     return this.http
       .get(
-        `${this.url}registers/cntregister?endDate=${params.month}&locationUuids=${params.locationUuids}`
+        `${this.url}registers/cntregister?startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
       )
       .pipe(
         catchError((err: any) => {
diff --git a/src/app/etl-api/hei-register-resource.service.ts b/src/app/etl-api/hei-register-resource.service.ts
index b16ee1913..b699baef3 100644
--- a/src/app/etl-api/hei-register-resource.service.ts
+++ b/src/app/etl-api/hei-register-resource.service.ts
@@ -19,7 +19,7 @@ export class HeiRegisterResourceService {
     // tslint:disable-next-line: max-line-length
     return this.http
       .get(
-        `${this.url}registers/heiregister?endDate=${params.month}&locationUuids=${params.locationUuids}`
+        `${this.url}registers/heiregister?startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
       )
       .pipe(
         catchError((err: any) => {
diff --git a/src/app/etl-api/registers-resource.service.ts b/src/app/etl-api/registers-resource.service.ts
index 50b28d775..c8f664c53 100644
--- a/src/app/etl-api/registers-resource.service.ts
+++ b/src/app/etl-api/registers-resource.service.ts
@@ -18,7 +18,7 @@ export class RegistersResourceService {
   public getPrEPRegisterReport(params: any): Observable<any> {
     return this.http
       .get(
-        `${this.url}registers/prepregisterdata?month=${params.month}&locationUuids=${params.locationUuids}`
+        `${this.url}registers/prepregisterdata?month=${params.month}&startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
       )
       .pipe(
         catchError((err: any) => {
@@ -37,7 +37,7 @@ export class RegistersResourceService {
   public getDefaulterTracingRegister(params: any): Observable<any> {
     return this.http
       .get(
-        `${this.url}registers/defaultertracing?month=${params.month}&locationUuids=${params.locationUuids}`
+        `${this.url}registers/defaultertracing?month=${params.month}&startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
       )
       .pipe(
         catchError((err: any) => {

From 41736163e1b0de7988016e78b2825aca3a338444 Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Thu, 15 May 2025 10:51:14 +0300
Subject: [PATCH 39/50] POC-737: MOH Registers

---
 ...htsrefferallinkage-register.component.html | 464 +++---------------
 .../htsrefferallinkage-register.component.ts  | 200 ++++++--
 .../etl-api/hts-refferal-linkage.service.ts   |  38 ++
 3 files changed, 267 insertions(+), 435 deletions(-)
 create mode 100644 src/app/etl-api/hts-refferal-linkage.service.ts

diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
index e5d188bea..37503c28a 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
@@ -11,7 +11,8 @@ <h4 class="component-title text-success">
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
         [enabledControls]="enabledControls"
-        [monthString]="_month"
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
         (onMonthChange)="onMonthChange($event)"
         [reportName]="reportName"
         (generateReport)="generateReport()"
@@ -180,246 +181,48 @@ <h4 *ngIf="!statusError">
         </tr>
       </thead>
       <tbody>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
+        <ng-container *ngFor="let item of htsLabData">
+          <tr>
+            <td class="text-center" rowspan="4">{{ item.serialNumber }}</td>
+            <td class="text-center">{{ item.nupiNumber }}</td>
+            <td class="text-center" rowspan="4">{{ item.visitDate }}</td>
+            <td class="text-center" rowspan="4">{{ item.clientName }}</td>
+            <td class="text-center" rowspan="4">{{ item.age }}</td>
+            <td class="text-center" rowspan="4">{{ item.sex }}</td>
+            <td class="text-center" rowspan="4">{{ item.telephoneNumber }}</td>
+            <td class="text-center" rowspan="4">{{ item.maritalStatus }}</td>
+            <td class="text-center" rowspan="4">{{ item.populationType }}</td>
+            <td class="text-center" rowspan="4">{{ item.setting }}</td>
+            <td class="text-center">{{ item.hivTest1.kitName }}</td>
+            <td class="text-center">{{ item.hivTest2.kitName }}</td>
+            <td class="text-center">{{ item.hivTest3.kitName }}</td>
+            <td class="text-center" rowspan="4">{{ item.finalHivResult }}</td>
+            <td class="text-center" rowspan="4">{{ item.discordantCouple }}</td>
+            <td class="text-center" rowspan="4">
+              {{ item.referredForPrevention }}
+            </td>
+            <td class="text-center" rowspan="4">{{ item.htsProvider }}</td>
+            <td class="text-center" rowspan="4">{{ item.remarks }}</td>
+          </tr>
+          <tr>
+            <td class="text-center">{{ item.nationalId }}</td>
+            <td class="text-center">{{ item.hivTest1.lotNumber }}</td>
+            <td class="text-center">{{ item.hivTest2.lotNumber }}</td>
+            <td class="text-center">{{ item.hivTest3.lotNumber }}</td>
+          </tr>
+          <tr>
+            <td class="text-center"></td>
+            <td class="text-center">{{ item.hivTest1.expiryDate }}</td>
+            <td class="text-center">{{ item.hivTest2.expiryDate }}</td>
+            <td class="text-center">{{ item.hivTest3.expiryDate }}</td>
+          </tr>
+          <tr>
+            <td class="text-center"></td>
+            <td class="text-center">{{ item.hivTest1.result }}</td>
+            <td class="text-center">{{ item.hivTest2.result }}</td>
+            <td class="text-center">{{ item.hivTest3.result }}</td>
+          </tr>
+        </ng-container>
       </tbody>
     </table>
   </div>
@@ -495,165 +298,28 @@ <h4 *ngIf="!statusError">
         </tr>
       </thead>
       <tbody>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="16"></td>
-          <td></td>
-          <td rowspan="16"></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
-          <td rowspan="2"></td>
-          <td></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-          <td rowspan="2"></td>
-        </tr>
-        <tr>
-          <td></td>
-          <td></td>
-          <td></td>
-        </tr>
-        <tr>
+        <ng-container *ngFor="let item of htsLinkageData">
+          <tr>
+            <td rowspan="2">{{ item.serialNumber }}</td>
+            <td>{{ item.nupiNumber }}</td>
+            <td rowspan="2">{{ item.clientName }}</td>
+            <td>{{ item.telephoneNumber }}</td>
+            <td rowspan="2">{{ item.identificationStrategy }}</td>
+            <td rowspan="2">{{ item.patientReferredTo }}</td>
+            <td>{{ item.handedOverTo }}</td>
+            <td rowspan="2">{{ item.artStartDate }}</td>
+            <td rowspan="2">{{ item.cccNumber }}</td>
+            <td rowspan="2">{{ item.remarks }}</td>
+          </tr>
+          <tr>
+            <td>{{ item.nationalId }}</td>
+            <td>{{ item.residence }}</td>
+            <td>{{ item.cadre }}</td>
+          </tr>
+        </ng-container>
+        <tr *ngIf="pinnedBottomRowData.length > 0">
           <td colspan="9"><b>Totals Clients Linked</b></td>
-          <td></td>
+          <td>{{ pinnedBottomRowData[0].totalLinked }}</td>
         </tr>
       </tbody>
     </table>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
index 503ec25fc..dbe08a045 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
@@ -2,6 +2,10 @@ import { Component, OnInit, Output } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
+// import { HtsrefferallinkageRegisterService } from './htsrefferallinkage-register.service';
+import { HtsReferralLinkageService } from 'src/app/etl-api/hts-refferal-linkage.service';
+
 @Component({
   selector: 'app-htsrefferallinkage-register',
   templateUrl: './htsrefferallinkage-register.component.html',
@@ -12,7 +16,8 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public txnewReportSummaryData: any = [];
+  public htsLabData: any;
+  public htsLinkageData: any;
   public columnDefs: any = [];
   public reportName = 'HTS Lab Refferal & Linkage Register';
   public currentView = 'monthly';
@@ -22,13 +27,15 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
   public quarter: string;
   public eDate: string;
   public sDate: string;
+  public jointLocationUuids: string;
 
   public statusError = false;
   public errorMessage = '';
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,monthControl';
+  // public enabledControls = 'locationControl,monthControl';
+  public enabledControls = 'datesControl, locationControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
@@ -48,7 +55,30 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(public router: Router, public route: ActivatedRoute) {
+  private _startDate: Date = Moment().toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = new Date();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    private htsService: HtsReferralLinkageService,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -67,21 +97,11 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
     this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
   }
 
-  public generateReport(): any {
-    this.route.parent.parent.params.subscribe((params: any) => {
-      this.storeParamsInUrl(params.location_uuid);
-    });
-    this.txnewReportSummaryData = [];
-    // this.getTxNewReport(this.params);
-  }
-
-  public storeParamsInUrl(param) {
+  public storeParamsInUrl() {
     this.params = {
-      locationUuids: param,
-      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      reportName: this.reportName,
-      _date: Moment(this._month).format('DD-MM-YYYY')
+      locationUuids: this.jointLocationUuids,
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -89,31 +109,138 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
     });
   }
 
-  // public getTxNewReport(params: any) {
-  //   this.isLoading = true;
-  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
-  //     if (data.error) {
-  //       this.showInfoMessage = true;
-  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
-  //       this.isLoading = false;
-  //     } else {
-  //       this.showInfoMessage = false;
-  //       this.columnDefs = data.sectionDefinitions;
-  //       this.txnewReportSummaryData = data.result;
-  //       this.calculateTotalSummary();
-  //       this.isLoading = false;
-  //       this.showDraftReportAlert(this._month);
-  //     }
-  //   });
-  // }
+  public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `'${location.value}'`
+        );
+        this.jointLocationUuids = locationValues.join(', ');
+      });
+
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl();
+    });
+    this.htsLabData = [];
+    this.htsLinkageData = [];
+    this.getHtsReferralLinkageReport(this.params);
+    // this.generated = true;
+  }
+
+  public getHtsReferralLinkageReport(params: any) {
+    this.isLoading = true;
+    this.htsService.getHtsReferralLinkageReport(params).subscribe(
+      (data) => {
+        console.log('HTS RESULTS ARE: ' + JSON.stringify(data));
+        console.log('data', data.result);
+        if (data.error) {
+          console.log('---error---', data.error);
+          this.showInfoMessage = true;
+          this.errorMessage = `There has been an error while loading the report, please retry again`;
+          this.isLoading = false;
+        } else {
+          this.isLoading = false;
+          this.showInfoMessage = false;
+          const transformedData = this.transformApiData(data.result);
+          this.htsLabData = transformedData.htsLabData || [];
+          this.htsLinkageData = transformedData.htsLinkageData || [];
+          this.pinnedBottomRowData = transformedData.pinnedBottomRowData || [];
+          this.calculateTotalSummary();
+          this.isLoading = false;
+          this.showDraftReportAlert(this._month);
+        }
+      },
+      (error) => {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      }
+    );
+  }
+
+  public transformApiData(apiData: any[]) {
+    return {
+      htsLabData: apiData.map((item) => ({
+        serialNumber: item.serial_number || '',
+        nupiNumber: item.nupi || '',
+        nationalId: item.id_number || '',
+        visitDate: item.date_of_visit
+          ? new Date(item.date_of_visit).toISOString().split('T')[0]
+          : '',
+        clientName: `${item.first_name || ''} ${item.middle_name || ''} ${
+          item.last_name || ''
+        }`.trim(),
+        age: item.age || '',
+        sex: item.sex || '',
+        telephoneNumber: item.telephone || '',
+        maritalStatus: '', // Not available in API data
+        populationType: item.population_type || '',
+        setting: item.setting || '',
+        hivTest1: {
+          kitName: item.kit1_name || '',
+          lotNumber: item.lot1 || '',
+          expiryDate: item.expiry1
+            ? new Date(item.expiry1).toISOString().split('T')[0]
+            : '',
+          result: item.hiv_test1 || ''
+        },
+        hivTest2: {
+          kitName: item.kit2_name || '',
+          lotNumber: item.lot2 || '',
+          expiryDate: item.expiry2
+            ? new Date(item.expiry2).toISOString().split('T')[0]
+            : '',
+          result: item.hiv_test2 || ''
+        },
+        hivTest3: {
+          kitName: item.kit3_name || '',
+          lotNumber: item.lot3 || '',
+          expiryDate: item.expiry3
+            ? new Date(item.expiry3).toISOString().split('T')[0]
+            : '',
+          result: item.hiv_test3 || ''
+        },
+        finalHivResult: item.final_result || '',
+        discordantCouple: '', // Not available in API data
+        referredForPrevention: item.referral_services || '',
+        htsProvider: item.hts_provider || '',
+        remarks: item.initial_remarks || ''
+      })),
+      htsLinkageData: apiData.map((item) => ({
+        serialNumber: item.serial_number || '',
+        nupiNumber: item.nupi || '',
+        nationalId: item.id_number || '',
+        clientName: `${item.first_name || ''} ${item.middle_name || ''} ${
+          item.last_name || ''
+        }`.trim(),
+        telephoneNumber: item.telephone || '',
+        residence: '', // Not available in API data
+        identificationStrategy: item.client_tested_as || '',
+        patientReferredTo: item.referral_to || '',
+        handedOverTo: item.handed_to || '',
+        cadre: '', // Not available in API data
+        artStartDate: item.art_start_date
+          ? new Date(item.art_start_date).toISOString().split('T')[0]
+          : '',
+        cccNumber: item.ccc_number || '',
+        remarks: item.screening_remarks || ''
+      })),
+      pinnedBottomRowData: [
+        {
+          totalLinked: apiData.filter((item) => item.art_start_date).length
+        }
+      ]
+    };
+  }
 
   public calculateTotalSummary() {
     const totalsRow = [];
-    if (this.txnewReportSummaryData.length > 0) {
+    if (this.htsLinkageData.length > 0) {
       const totalObj = {
         location: 'Totals'
       };
-      _.each(this.txnewReportSummaryData, (row) => {
+      _.each(this.htsLinkageData, (row) => {
         Object.keys(row).map((key) => {
           if (Number.isInteger(row[key]) === true) {
             if (totalObj[key]) {
@@ -137,6 +264,7 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
       this.pinnedBottomRowData = totalsRow;
     }
   }
+
   public onIndicatorSelected(value) {
     this.router.navigate(['patient-list'], {
       relativeTo: this.route,
diff --git a/src/app/etl-api/hts-refferal-linkage.service.ts b/src/app/etl-api/hts-refferal-linkage.service.ts
new file mode 100644
index 000000000..d7a65f6d3
--- /dev/null
+++ b/src/app/etl-api/hts-refferal-linkage.service.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+import { AppSettingsService } from '../app-settings/app-settings.service';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+import * as Moment from 'moment';
+import { catchError, map } from 'rxjs/operators';
+@Injectable({
+  providedIn: 'root'
+})
+export class HtsReferralLinkageService {
+  public get url(): string {
+    return this.appSettingsService.getEtlRestbaseurl().trim();
+  }
+  constructor(
+    public http: HttpClient,
+    public appSettingsService: AppSettingsService
+  ) {}
+
+  public getHtsReferralLinkageReport(params: any): Observable<any> {
+    return this.http
+      .get(
+        `${this.url}registers/hts-register?startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+}

From cd08058e82596e218a250add6288abeec561f6ea Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Thu, 15 May 2025 11:54:26 +0300
Subject: [PATCH 40/50] Combined all registers

---
 .../htsrefferallinkage-register.component.ts                 | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
index dbe08a045..b9368f3f3 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
@@ -132,17 +132,14 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
     this.isLoading = true;
     this.htsService.getHtsReferralLinkageReport(params).subscribe(
       (data) => {
-        console.log('HTS RESULTS ARE: ' + JSON.stringify(data));
-        console.log('data', data.result);
         if (data.error) {
-          console.log('---error---', data.error);
           this.showInfoMessage = true;
           this.errorMessage = `There has been an error while loading the report, please retry again`;
           this.isLoading = false;
         } else {
           this.isLoading = false;
           this.showInfoMessage = false;
-          const transformedData = this.transformApiData(data.result);
+          const transformedData = this.transformApiData(data);
           this.htsLabData = transformedData.htsLabData || [];
           this.htsLinkageData = transformedData.htsLinkageData || [];
           this.pinnedBottomRowData = transformedData.pinnedBottomRowData || [];

From 8916d5619d1b362a9a014d008d2ea131e73a48ae Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Tue, 21 Oct 2025 07:47:30 +0300
Subject: [PATCH 41/50] POC-874: MoH 731 Facility Summary Reporting Tool

---
 .../moh731-register.component.css             |   68 +
 .../moh731-register.component.html            | 1761 +++++++++++++++++
 .../moh731-register.component.spec.ts         |   24 +
 .../moh731-register.component.ts              |  222 +++
 src/app/etl-api/registers-resource.service.ts |   96 +
 5 files changed, 2171 insertions(+)
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.ts

diff --git a/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.css
new file mode 100644
index 000000000..69247e43a
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.css
@@ -0,0 +1,68 @@
+.table {
+  border: 2px solid #000;
+}
+
+.border {
+  background-color: #f2f2f2;
+  border-bottom: 2px solid #000;
+  width: 100%;
+}
+.border2 {
+  background-color: #f2f2f2;
+  border-top: 2px solid #000;
+  border-bottom: 2px solid #000;
+  width: 100%;
+}
+
+.border3 {
+  border-top: 2px solid #000;
+  border-right: 2px dotted #000;
+  width: 78.5%;
+}
+
+.flex-column {
+  display: flex;
+  flex-direction: column;
+  margin: 1%;
+}
+
+.flex-row {
+  display: flex;
+  justify-content: space-between;
+}
+.rectangle {
+  width: 50px;
+  height: 20px;
+  border: 2px solid #000;
+  display: inline-block;
+  margin-left: 5px;
+}
+.text-box {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.text-box2 {
+  margin-left: 10px;
+}
+.space-after {
+  padding-right: 6vw;
+}
+.border-right {
+  border-right: 2px dotted #000;
+  padding-right: 4vw;
+}
+.border-left {
+  border-left: 2px dotted #000;
+  padding-left: 1vw;
+}
+
+.review-section {
+  display: grid;
+  grid-template-columns: repeat(5, 1fr); /* 5 even columns */
+  column-gap: 20px; /* space between columns */
+  text-align: center;
+  font-size: 14px;
+  margin-top: 10px;
+  font-weight: bold;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.html
new file mode 100644
index 000000000..e2c509a64
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.html
@@ -0,0 +1,1761 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <report-filters
+        [enabledControls]="enabledControls"
+        (startDateChange)="onMonthChange($event)"
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
+        [reportName]="reportName"
+        (generateReport)="generateReport()"
+      >
+      </report-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div class="table-responsible">
+  <div class="row">
+    <div class="col-md-4">
+      <b>Ministry Of Health</b>
+    </div>
+    <div class="col-md-4 text-right">
+      <b>Ver. July 2023</b>
+    </div>
+  </div>
+  <div class="table table-bordered border border-2">
+    <table style="width: 100%">
+      <tr>
+        <td style="text-align: center; font-weight: bold">
+          National AIDS & STI Control Program- NASCOP <br />
+          Comprehensive HIV/ AIDS reporting form
+          <div style="text-align: end; margin-bottom: 1%">
+            <span style="text-align: end; border: 2px dotted #000"
+              >(MOH 731-Ver. July 2023)</span
+            >
+          </div>
+        </td>
+      </tr>
+    </table>
+  </div>
+  <table class="table" style="margin-top: 0.5%">
+    <tr>
+      <td style="padding-left: 40%; padding-bottom: 1%">
+        County______________________SubCounty___________________Facility___________________MFL_______Month______year______
+      </td>
+    </tr>
+  </table>
+  <table class="table" style="margin-top: 1%">
+    <thead>
+      <tr>
+        <th class="border">1. HIV Testing & Pre exposure Prophylaxis</th>
+      </tr>
+    </thead>
+    <tbody>
+      <div class="flex-row">
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">1.1 HIV Tests</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female(Including PMTCT)</td>
+          </tr>
+          <tr>
+            <td>Tests</td>
+            <td class="text-box">
+              <span>HV01-01</span>
+              <div class="rectangle">{{ MOH731RegisterData.hiv_male }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-02</span>
+                <div class="rectangle">{{ MOH731RegisterData.hiv_female }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr class="margin">
+            <td>Tests_Facility</td>
+            <td class="text-box">
+              <span>HV01-03</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hiv_setting_facility }}
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tests_Community</td>
+            <td class="text-box">
+              <span>HV01-04</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hiv_setting_community }}
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested KVP</td>
+            <td class="text-box">
+              <span>HV01-05</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hiv_setting_kvp }}
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.3 No. Initiated on PrEP(NEW)
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female</td>
+          </tr>
+          <tr>
+            <td>General popn</td>
+            <td class="text-box">
+              <span>HV01-19</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_male_general_pop }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-20</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_female_general_pop }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>MSM/MSW</td>
+            <td class="text-box">
+              <span>HV01-21</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_new_msm }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>FSW</td>
+            <td></td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-22</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_fsw }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>PWID/PWUD</td>
+            <td class="text-box">
+              <span>HV01-23</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_pwud_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-24</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_pwud_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Discordant Couple</td>
+            <td class="text-box">
+              <span>HV01-25</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_discordant_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-26</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_discordant_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Vulnerable Pop.</td>
+            <td class="text-box">
+              <span>HV01-27</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_vulnerable_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-28</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_vulnerable_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>AYP (10-24yrs)</td>
+            <td class="text-box">
+              <span>HV01-29</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_new_ayp }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-30</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_ayp }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Pregnant and breastfeeding women</td>
+            <td></td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-31</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_preg_breastfeeding }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.5 No. Seroconverted while on PrEP
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female</td>
+          </tr>
+          <tr>
+            <td>HIV Positive</td>
+            <td class="text-box">
+              <span>HV01-45</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.seroconverted_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-46</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.seroconverted_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.2 HIV Positive Results
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female</td>
+          </tr>
+          <tr>
+            <td>Positive_2-9</td>
+            <td class="text-box">
+              <span>HV01-06</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_2_9 }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-07</span>
+                <div class="rectangle">{{ MOH731RegisterData.female_2_9 }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_10-14</td>
+            <td class="text-box">
+              <span>HV01-08</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_10_14 }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-09</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_10_14 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_15-19</td>
+            <td class="text-box">
+              <span>HV01-10</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_15_19 }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-11</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_15_19 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_20-24</td>
+            <td class="text-box">
+              <span>HV01-12</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_20_24 }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-13</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_25+</td>
+            <td class="text-box">
+              <span>HV01-14</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.male_25_above }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-15</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_25_above }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_KVP</td>
+            <td class="text-box">
+              <span>HV01-16</span>
+              <div class="rectangle"></div>
+            </td>
+          </tr>
+          <tr style="padding-top: 10px; padding-bottom: 10px">
+            <td>Discordant</td>
+            <td class="text-box">
+              <span>HV01-17</span>
+              <div class="rectangle"></div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-18</span>
+                <div class="rectangle"></div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Inconclusive Test Results</td>
+            <td class="text-box">
+              <span>HV01-47</span>
+              <div class="rectangle"></div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-48</span>
+                <div class="rectangle"></div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.4 No. on PrEP Diagnosed with STI
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female</td>
+          </tr>
+          <tr>
+            <td>General popn</td>
+            <td class="text-box">
+              <span>HV01-32</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_male_general_pop }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-33</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_female_general_pop }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>MSM/MSW</td>
+            <td class="text-box">
+              <span>HV01-34</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_sti_msm }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>FSW</td>
+            <td class="text-box">
+              <span>HV01-35</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_sti_fsw }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>PWID/PWUD</td>
+            <td class="text-box">
+              <span>HV01-36</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_pwud_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-37</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_pwud_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Discordant Couple</td>
+            <td class="text-box">
+              <span>HV01-38</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_discordant_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-39</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_discordant_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Vulnerable Pop.</td>
+            <td class="text-box">
+              <span>HV01-40</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_vulnerable_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-41</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_vulnerable_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>AYP(10-24 yrs)</td>
+            <td class="text-box">
+              <span>HV01-42</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_sti_ayp }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-43</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_ayp }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Pregnant and breastfeeding women</td>
+            <td></td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-44</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_preg_breastfeeding }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+      </div>
+    </tbody>
+    <thead>
+      <tr>
+        <th class="border2">
+          2. Elimination of Mother-to-Child Transmission(EMTCT)
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <div class="flex-row">
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.1 Maternal HIV Testing
+            </td>
+          </tr>
+          <tr>
+            <td>Known Positive at 1st ANC</td>
+            <td class="text-box">
+              <span>HV02-01</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.known_positive_1st_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Initial</td>
+            <td style="padding-left: 60px">Retest</td>
+          </tr>
+          <tr>
+            <td>Tested at ANC</td>
+            <td class="text-box">
+              <span>HV02-02</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_anc }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-03</span>
+                <div class="rectangle">{{ MOH731RegisterData.retest_anc }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at L&D</td>
+            <td class="text-box">
+              <span>HV02-04</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_LD }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-05</span>
+                <div class="rectangle">{{ MOH731RegisterData.retest_LD }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_<=6weeks</td>
+            <td class="text-box">
+              <span>HV02-06</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_pnc_less_6_weeks }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-07</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.retest_pnc_less_6_weeks }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_>6weeks</td>
+            <td class="text-box">
+              <span>HV02-08</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_pnc_greater_6_weeks }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-09</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.retest_pnc_greater_6_weeks }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.2 HIV Positive Results
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at ANC</td>
+            <td class="text-box">
+              <span>HV02-10</span>
+              <div class="rectangle">{{ MOH731RegisterData.positive_anc }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Tested at L&D</td>
+            <td class="text-box">
+              <span>HV02-11</span>
+              <div class="rectangle">{{ MOH731RegisterData.positive_LD }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_<=6weeks</td>
+            <td class="text-box">
+              <span>HV02-12</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.positive_pnc_less_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_>6weeks</td>
+            <td class="text-box">
+              <span>HV02-13</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.positive_pnc_greater_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.3 Maternal HAART
+            </td>
+          </tr>
+          <tr>
+            <td>On HAART at 1st ANC</td>
+            <td class="text-box">
+              <span>HV02-14</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.maternal_haart_1st_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_ANC</td>
+            <td class="text-box">
+              <span>HV02-15</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_maternal_haart_1st_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_L&D</td>
+            <td class="text-box">
+              <span>HV02-16</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_maternal_haart_LD }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_PNC_< =6weeks</td>
+            <td class="text-box">
+              <span>HV02-17</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.maternal_haart_less_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_PNC_>6weeks</td>
+            <td class="text-box">
+              <span>HV02-18</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.maternal_haart_more_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.4 HBV Screening at ANC
+            </td>
+          </tr>
+          <tr>
+            <td>Screened_HBV_ANC</td>
+            <td class="text-box">
+              <span>HV02-19</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>HBV Screened_Positive</td>
+            <td class="text-box">
+              <span>HV02-20</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hbv_screened_positive_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td style="font-weight: bold">
+              2.5 Adolescents girls & Young Women (10-24 Yrs)<br />
+              testing & results
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>10-19yrs</td>
+            <td style="padding-left: 60px">20-24yrs</td>
+          </tr>
+          <tr>
+            <td>1st ANC KP</td>
+            <td class="text-box">
+              <span>HV02-21</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.known_positive_anc_10_19 }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-22</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.known_positive_anc_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>New HIV Positive</td>
+            <td class="text-box">
+              <span>HV02-23</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.positive_anc_ld_pnc_10_19 }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-24</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.positive_anc_ld_pnc_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On HAART 1st ANC KP</td>
+            <td class="text-box">
+              <span>HV02-25</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_anc_10_19 }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-26</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_anc_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Started HAART New</td>
+            <td class="text-box">
+              <span>HV02-27</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_art_10_19 }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-28</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.start_art_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.6 Infant Prophylaxis
+            </td>
+          </tr>
+          <tr>
+            <td>Infant ARV Prophylaxis_ANC</td>
+            <td class="text-box">
+              <span>HV02-29</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.infant_arv_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Infant ARV Prophylaxis_L&D</td>
+            <td class="text-box">
+              <span>HV02-30</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.infant_arv_ld }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Infant ARV Prophylaxis_L&PNC</td>
+            <td class="text-box">
+              <span>HV02-31</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.infant_arv_pnc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.7 Infant Feeding
+            </td>
+          </tr>
+          <tr>
+            <td style="font-weight: bold">Below 6 months</td>
+          </tr>
+          <tr>
+            <td>Exclusive Breastfeeding (EBF)</td>
+            <td class="text-box">
+              <span>HV02-32</span>
+              <div class="rectangle">{{ MOH731RegisterData.exclusive_bf }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td style="font-weight: bold">6 to 24 months</td>
+          </tr>
+          <tr>
+            <td>Breastfeeding (BF)</td>
+            <td class="text-box">
+              <span>HV02-33</span>
+              <div class="rectangle">{{ MOH731RegisterData.bf }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td class="space-after">Not Breastfeeding (NBF)</td>
+            <td class="text-box">
+              <span>HV02-34</span>
+              <div class="rectangle">{{ MOH731RegisterData.weaning }}</div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+      </div>
+    </tbody>
+    <thead>
+      <tr>
+        <th class="border2">3. HIV and TB treatment</th>
+      </tr>
+    </thead>
+    <tbody>
+      <div class="flex-row">
+        <div class="flex-column border-right">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.1 Starting ART
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART_<1</td>
+            <td class="text-box">
+              <span>(M) HV03-01</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_less_1_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-02</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_less_1_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 1-4</td>
+            <td class="text-box">
+              <span>(M) HV03-03</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_1_4_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-04</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_1_4_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 5-9</td>
+            <td class="text-box">
+              <span>(M) HV03-05</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_5_9_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-06</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_5_9_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 10-14</td>
+            <td class="text-box">
+              <span>(M) HV03-07</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_10_14_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-08</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_10_14_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 15-19</td>
+            <td class="text-box">
+              <span>(M) HV03-09</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_15_19_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-10</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_15_19_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 20-24</td>
+            <td class="text-box">
+              <span>(M) HV03-11</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_20_24_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-12</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_20_24_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 25+</td>
+            <td class="text-box">
+              <span>(M) HV03-013</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_25_above_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-014</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_25_above_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.2 Curently on ART ([ALL])
+            </td>
+          </tr>
+          <tr>
+            <td>On ART_<1</td>
+            <td class="text-box">
+              <span>(M) HV03-015</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_less_1_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-016</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_less_1_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 1-4</td>
+            <td class="text-box">
+              <span>(M) HV03-017</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_1_4_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-018</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_1_4_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 5-9</td>
+            <td class="text-box">
+              <span>(M) HV03-019</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_5_9_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-020</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_5_9_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 10-14</td>
+            <td class="text-box">
+              <span>(M) HV03-021</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_10_14_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-022</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_10_14_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 15-19</td>
+            <td class="text-box">
+              <span>(M) HV03-023</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_15_19_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-024</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_15_19_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 20-24</td>
+            <td class="text-box">
+              <span>(M) HV03-025</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_20_24_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-026</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_20_24_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 25+</td>
+            <td class="text-box">
+              <span>(M) HV03-027</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_25_above_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-028</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_25_above_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.3 TB Screening
+            </td>
+          </tr>
+          <tr>
+            <td>Screened for TB_<15</td>
+            <td class="text-box">
+              <span>HV03-029</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.screened_tb_less_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Screened for TB_15+</td>
+            <td class="text-box">
+              <span>HV03-030</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.screened_tb_greater_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.4 Starting TPT
+            </td>
+          </tr>
+          <tr>
+            <td>Start TPT_<15</td>
+            <td class="text-box">
+              <span>HV03-031</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tpt_less_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start TPT_15+</td>
+            <td class="text-box">
+              <span>HV03-032</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tpt_greater_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.5 Differentiated Service Delivery
+            </td>
+          </tr>
+          <tr>
+            <td>Established</td>
+            <td class="text-box">
+              <span>HV03-033</span>
+              <div class="rectangle">{{ MOH731RegisterData.established }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Not Established</td>
+            <td class="text-box">
+              <span>HV03-034</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.not_established }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Community</td>
+            <td class="text-box">
+              <span>HV03-035</span>
+              <div class="rectangle">{{ MOH731RegisterData.community }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Facility</td>
+            <td class="text-box">
+              <span>HV03-036</span>
+              <div class="rectangle">{{ MOH731RegisterData.facility }}</div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.6 Nutrition and HIV
+            </td>
+          </tr>
+          <tr>
+            <td>Number SAM +</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td class="text-box">
+              <span>HV03-037</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td class="text-box">
+              <span>HV03-038</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td class="text-box">
+              <span>HV03-039</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td class="text-box">
+              <span>HV03-040</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td class="text-box">
+              <span>HV03-041</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td class="text-box">
+              <span>HV03-042</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <div style="height: 2vh"></div>
+          <tr>
+            <td class="space-after">Number MAM +</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td class="text-box">
+              <span>HV03-043</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td class="text-box">
+              <span>HV03-044</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td class="text-box">
+              <span>HV03-045</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td class="text-box">
+              <span>HV03-046</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td class="text-box">
+              <span>HV03-047</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td class="text-box">
+              <span>HV03-048</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <div style="height: 2vh"></div>
+          <tr>
+            <td>Number SAM + receiving therapeutic foods</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td class="text-box">
+              <span>HV03-049</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td class="text-box">
+              <span>HV03-050</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td class="text-box">
+              <span>HV03-051</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td class="text-box">
+              <span>HV03-052</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td class="text-box">
+              <span>HV03-053</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td class="text-box">
+              <span>HV03-054</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <div style="height: 2vh"></div>
+          <tr>
+            <td>Number MAM + receiving Supplimental foods</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td class="text-box">
+              <span>HV03-055</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td class="text-box">
+              <span>HV03-056</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td class="text-box">
+              <span>HV03-057</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td class="text-box">
+              <span>HV03-058</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td class="text-box">
+              <span>HV03-059</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td class="text-box">
+              <span>HV03-060</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+        </div>
+        <div class="flex-column border-left">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.7 HIV in TB Clinic
+            </td>
+          </tr>
+          <tr>
+            <td>TB cases_New</td>
+            <td class="text-box">
+              <span>HV03-061</span>
+              <div class="rectangle">{{ MOH731RegisterData.start_tb }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>
+              TB_New_Known HIV<br />
+              Positive(KPs)
+            </td>
+            <td class="text-box">
+              <span>HV03-062</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_known_positive }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>TB_New HIV Positive</td>
+            <td class="text-box">
+              <span>HV03-063</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_positive }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>
+              TB_New_Known HIV<br />
+              Positive(KP) on HAART
+            </td>
+            <td class="text-box">
+              <span>HV03-064</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_on_art }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>TB New_Start_HAART</td>
+            <td class="text-box">
+              <span>HV03-065</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_art_new }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <thead>
+            <tr>
+              <th class="border2">4. Medical Male Circumcision</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td class="space-after" style="font-weight: bold">
+                4.1 Number circumcised
+              </td>
+            </tr>
+            <tr>
+              <td>Circumcised_0-60 days</td>
+              <td class="text-box">
+                <span>HV04-01</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Circumcised_61 days -9 yrs days</td>
+              <td class="text-box">
+                <span>HV04-02</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Circumcised_10-14</td>
+              <td class="text-box">
+                <span>HV04-03</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Circumcised_15 +</td>
+              <td class="text-box">
+                <span>HV04-04</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after">Tested_ HIV+</td>
+              <td class="text-box">
+                <span>HV04-05</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td class="space-after">Tested_ HIV-</td>
+              <td class="text-box">
+                <span>HV04-06</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after" style="font-weight: bold">
+                4.2 Type of circumcission
+              </td>
+            </tr>
+            <tr>
+              <td>Surgical</td>
+              <td class="text-box">
+                <span>HV04-07</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Devices</td>
+              <td class="text-box">
+                <span>HV04-08</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after" style="font-weight: bold">
+                4.3 Circumcission Adverse Events
+              </td>
+            </tr>
+            <tr>
+              <td>AE_During_Moderate</td>
+              <td class="text-box">
+                <span>HV04-09</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>AE_During_Severe</td>
+              <td class="text-box">
+                <span>HV04-10</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after">AE_Post_Moderate</td>
+              <td class="text-box">
+                <span>HV04-11</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td class="space-after">AE_Post_Severe</td>
+              <td class="text-box">
+                <span>HV04-12</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after">Follow up visit < 14d</td>
+              <td class="text-box">
+                <span>HV04-13</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+          </tbody>
+          <thead>
+            <tr>
+              <th class="border2">5. Post Exposure Prophylaxis</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>Exposed_Occupational</td>
+              <td class="text-box">
+                <span>HV05-01</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.exposed_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Exposed Other</td>
+              <td class="text-box">
+                <span>HV05-02</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.exposed_non_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>PEP_Occupational</td>
+              <td class="text-box">
+                <span>HV05-03</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.pep_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>PEP_Other</td>
+              <td class="text-box">
+                <span>HV05-04</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.pep_non_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+          </tbody>
+        </div>
+      </div>
+    </tbody>
+    <thead>
+      <div class="review-section border3">
+        <div>Reviewed by:</div>
+        <div>Name</div>
+        <div>Designation</div>
+        <div>Signature</div>
+        <div>Date</div>
+
+        <div></div>
+        <div>_______________________________________</div>
+        <div>______________________</div>
+        <div>_____________</div>
+        <div>____________</div>
+      </div>
+    </thead>
+  </table>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.spec.ts
new file mode 100644
index 000000000..4d7cbbea4
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { Moh731RegisterComponent } from './moh731-register.component';
+
+describe('Moh731RegisterComponent', () => {
+  let component: Moh731RegisterComponent;
+  let fixture: ComponentFixture<Moh731RegisterComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [Moh731RegisterComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(Moh731RegisterComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.ts
new file mode 100644
index 000000000..6d150761c
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/moh731-register/moh731-register.component.ts
@@ -0,0 +1,222 @@
+import { DatePipe } from '@angular/common';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
+import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
+
+@Component({
+  selector: 'app-moh731-register',
+  templateUrl: './moh731-register.component.html',
+  styleUrls: ['./moh731-register.component.css']
+})
+export class Moh731RegisterComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public MOH731RegisterData: any = {};
+  public columnDefs: any = [];
+  public reportName = 'MOH 731 REGISTER';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+  public jointLocationUuids = [];
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'datesControl, locationControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+  public generated = false;
+  @ViewChild('cntdarcontentToSnapshot') contentToSnapshot!: ElementRef;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  private _startDate: Date = Moment().toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = new Date();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public register: RegistersResourceService,
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment().format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `${location.value}`
+        );
+        this.jointLocationUuids.push(...locationValues);
+      });
+
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl();
+    });
+    this.MOH731RegisterData = [];
+    this.getMOH731Register(this.params);
+    this.generated = true;
+  }
+
+  public storeParamsInUrl() {
+    this.params = {
+      locationUuids: this.jointLocationUuids,
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  public getMOH731Register(params: any) {
+    this.isLoading = true;
+    this.register.getMoh731Register(params).subscribe((data) => {
+      if (data.error) {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      } else {
+        this.showInfoMessage = false;
+        this.columnDefs = data.sectionDefinitions;
+        const flatData = Object.assign({}, ...data.result);
+        this.MOH731RegisterData = flatData;
+        this.calculateTotalSummary();
+        this.isLoading = false;
+        this.showDraftReportAlert(this._month);
+      }
+    });
+  }
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.MOH731RegisterData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.MOH731RegisterData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: value.field,
+        indicatorHeader: value.headerName,
+        indicatorGender: value.gender,
+        month: this._month,
+        locationUuids: value.location,
+        currentView: this.currentView
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH 731 Register.pdf');
+    });
+  }
+}
diff --git a/src/app/etl-api/registers-resource.service.ts b/src/app/etl-api/registers-resource.service.ts
index c8f664c53..4762d9298 100644
--- a/src/app/etl-api/registers-resource.service.ts
+++ b/src/app/etl-api/registers-resource.service.ts
@@ -53,4 +53,100 @@ export class RegistersResourceService {
         })
       );
   }
+  public getMaternityRegister(params: any): Observable<any> {
+    return this.http
+      .get(
+        `${this.url}registers/maternity?month=${params.month}&startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+  public getPncRegister(params: any): Observable<any> {
+    return this.http
+      .get(
+        `${this.url}registers/pncregister?month=${params.month}&startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+  public getNutritionRegister(params: any): Observable<any> {
+    return this.http
+      .get(
+        `${this.url}registers/nutrition?month=${params.month}&startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+
+  public getOTZRegister(params: any): Observable<any> {
+    return this.http
+      .get(
+        `${this.url}registers/otz-register?month=${params.month}&startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
+  public getMoh731Register(params: any): Observable<any> {
+    return this.http
+      .get(
+        `${this.url}moh-731?month=${params.month}&startDate=${params.startDate}&endDate=${params.endDate}&locationUuids=${params.locationUuids}`
+      )
+      .pipe(
+        catchError((err: any) => {
+          const error: any = err;
+          const errorObj = {
+            error: error.status,
+            message: error.statusText
+          };
+          return Observable.of(errorObj);
+        }),
+        map((response: Response) => {
+          return response;
+        })
+      );
+  }
 }

From 7cbffe3fb7e288fe45d4da343001faa0635ca64f Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Wed, 10 Dec 2025 22:56:36 +0300
Subject: [PATCH 42/50] Added HTS register

---
 .../htsrefferallinkage-register.component.css |  22 +
 ...htsrefferallinkage-register.component.html | 481 ++++++++++++++++--
 .../htsrefferallinkage-register.component.ts  |  97 +++-
 3 files changed, 564 insertions(+), 36 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css
index ab1f08146..7228658f8 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.css
@@ -15,3 +15,25 @@ tbody tr {
 th {
   min-width: 70px;
 }
+.summary {
+  display: flex;
+  gap: 20px;
+  align-items: stretch;
+}
+
+.flex-item {
+  flex: 1 1 30%;
+  box-sizing: border-box;
+}
+table {
+  width: 100%;
+  height: auto;
+}
+
+.inner {
+  display: flex;
+  flex-direction: column;
+}
+.highlighted-row {
+  background-color: #bbb;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
index 37503c28a..44779a982 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.html
@@ -37,7 +37,11 @@ <h4 *ngIf="!statusError">
   This report is likely to change without warning.
 </div>
 
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot1>
+<div
+  *ngIf="htsLabData && htsLabData.length > 0"
+  style="padding: 20px; font-size: 12px !important"
+  #contentToSnapshot1
+>
   <div class="table-responsive">
     <div class="row">
       <div class="col-md-4">
@@ -65,6 +69,7 @@ <h4 *ngIf="!statusError">
             Identification <br />
             Number
           </th>
+          <th rowspan="5" class="text-center">AMRSID</th>
           <th rowspan="5" class="text-center">
             Date of visit <br />
             (DD/MM/YYYY)
@@ -178,57 +183,461 @@ <h4 *ngIf="!statusError">
           <th class="text-center">(p)</th>
           <th class="text-center">(q)</th>
           <th class="text-center">(r)</th>
+          <th class="text-center">(s)</th>
         </tr>
       </thead>
       <tbody>
         <ng-container *ngFor="let item of htsLabData">
           <tr>
-            <td class="text-center" rowspan="4">{{ item.serialNumber }}</td>
+            <td class="text-center" rowspan="2">{{ item.serialNumber }}</td>
             <td class="text-center">{{ item.nupiNumber }}</td>
-            <td class="text-center" rowspan="4">{{ item.visitDate }}</td>
-            <td class="text-center" rowspan="4">{{ item.clientName }}</td>
-            <td class="text-center" rowspan="4">{{ item.age }}</td>
-            <td class="text-center" rowspan="4">{{ item.sex }}</td>
-            <td class="text-center" rowspan="4">{{ item.telephoneNumber }}</td>
-            <td class="text-center" rowspan="4">{{ item.maritalStatus }}</td>
-            <td class="text-center" rowspan="4">{{ item.populationType }}</td>
-            <td class="text-center" rowspan="4">{{ item.setting }}</td>
-            <td class="text-center">{{ item.hivTest1.kitName }}</td>
-            <td class="text-center">{{ item.hivTest2.kitName }}</td>
-            <td class="text-center">{{ item.hivTest3.kitName }}</td>
-            <td class="text-center" rowspan="4">{{ item.finalHivResult }}</td>
-            <td class="text-center" rowspan="4">{{ item.discordantCouple }}</td>
-            <td class="text-center" rowspan="4">
-              {{ item.referredForPrevention }}
+            <td class="text-center" rowspan="2">{{ item.amrsID }}</td>
+            <td class="text-center" rowspan="2">{{ item.visitDate }}</td>
+            <td class="text-center" rowspan="2">{{ item.clientName }}</td>
+            <td class="text-center" rowspan="2">{{ item.age }}</td>
+            <td class="text-center" rowspan="2">{{ item.sex }}</td>
+            <td class="text-center" rowspan="2">{{ item.telephoneNumber }}</td>
+            <td class="text-center" rowspan="2">{{ item.maritalStatus }}</td>
+            <td class="text-center">{{ item.populationType }}</td>
+            <td class="text-center" rowspan="2">{{ item.setting }}</td>
+            <td class="text-center" rowspan="2">
+              {{ item.hivTest1.kitName }} / {{ item.hivTest1.lotNumber }} /
+              {{ item.hivTest1.expiryDate }}
             </td>
-            <td class="text-center" rowspan="4">{{ item.htsProvider }}</td>
-            <td class="text-center" rowspan="4">{{ item.remarks }}</td>
+            <td class="text-center" rowspan="2">
+              {{ item.hivTest2.kitName }} / {{ item.hivTest2.lotNumber }} /
+              {{ item.hivTest2.expiryDate }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ item.hivTest3.kitName }} / {{ item.hivTest3.lotNumber }} /
+              {{ item.hivTest3.expiryDate }}
+            </td>
+            <td class="text-center" rowspan="2">{{ item.finalHivResult }}</td>
+            <td class="text-center" rowspan="2">{{ item.discordantCouple }}</td>
+            <td class="text-center" rowspan="2">
+              {{ null }}
+            </td>
+            <td class="text-center" rowspan="2">{{ item.htsProvider }}</td>
+            <td class="text-center" rowspan="2">{{ item.remarks }}</td>
           </tr>
           <tr>
             <td class="text-center">{{ item.nationalId }}</td>
-            <td class="text-center">{{ item.hivTest1.lotNumber }}</td>
-            <td class="text-center">{{ item.hivTest2.lotNumber }}</td>
-            <td class="text-center">{{ item.hivTest3.lotNumber }}</td>
-          </tr>
-          <tr>
-            <td class="text-center"></td>
-            <td class="text-center">{{ item.hivTest1.expiryDate }}</td>
-            <td class="text-center">{{ item.hivTest2.expiryDate }}</td>
-            <td class="text-center">{{ item.hivTest3.expiryDate }}</td>
-          </tr>
-          <tr>
-            <td class="text-center"></td>
-            <td class="text-center">{{ item.hivTest1.result }}</td>
-            <td class="text-center">{{ item.hivTest2.result }}</td>
-            <td class="text-center">{{ item.hivTest3.result }}</td>
+            <td class="text-center">{{ item.subPopulation }}</td>
           </tr>
         </ng-container>
       </tbody>
     </table>
+    <div
+      class="summary table-responsive"
+      *ngIf="htsLabData && htsLabData.length > 0"
+    >
+      <div class="inner">
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th class="highlighted-row">Tests (n)</th>
+                <th class="highlighted-row">2-9</th>
+                <th class="highlighted-row">10-14</th>
+                <th class="highlighted-row">15-19</th>
+                <th class="highlighted-row">20-24</th>
+                <th class="highlighted-row">25+</th>
+                <th class="highlighted-row">Total</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <th>Male</th>
+                <td>{{ getTotals(htsLabData, 'M', 2, 9) }}</td>
+                <td>{{ getTotals(htsLabData, 'M', 10, 14) }}</td>
+                <td>{{ getTotals(htsLabData, 'M', 15, 19) }}</td>
+                <td>{{ getTotals(htsLabData, 'M', 20, 24) }}</td>
+                <td>{{ getTotals(htsLabData, 'M', 25) }}</td>
+                <td>{{ getTotal(htsLabData, 'M') }}</td>
+              </tr>
+            </tbody>
+            <tr>
+              <th>Female</th>
+              <td>{{ getTotals(htsLabData, 'F', 2, 9) }}</td>
+              <td>{{ getTotals(htsLabData, 'F', 10, 14) }}</td>
+              <td>{{ getTotals(htsLabData, 'F', 15, 19) }}</td>
+              <td>{{ getTotals(htsLabData, 'F', 20, 24) }}</td>
+              <td>{{ getTotals(htsLabData, 'F', 25) }}</td>
+              <td>{{ getTotal(htsLabData, 'F') }}</td>
+            </tr>
+            <tr>
+              <th>Total</th>
+              <th>{{ getMaleAndFemaleTotal(htsLabData, 2, 9) }}</th>
+              <th>{{ getMaleAndFemaleTotal(htsLabData, 10, 14) }}</th>
+              <th>{{ getMaleAndFemaleTotal(htsLabData, 15, 19) }}</th>
+              <th>{{ getMaleAndFemaleTotal(htsLabData, 20, 24) }}</th>
+              <th>{{ getMaleAndFemaleTotal(htsLabData, 25) }}</th>
+              <th>{{ htsLabData.length }}</th>
+            </tr>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th class="highlighted-row">Positive (n)</th>
+                <th class="highlighted-row">2-9</th>
+                <th class="highlighted-row">10-14</th>
+                <th class="highlighted-row">15-19</th>
+                <th class="highlighted-row">20-24</th>
+                <th class="highlighted-row">25+</th>
+                <th class="highlighted-row">Total</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <th>Male</th>
+                <th>
+                  {{
+                    getParameterTotalsWithAge(
+                      htsLabData,
+                      'finalHivResult',
+                      'P',
+                      'M',
+                      2,
+                      9
+                    )
+                  }}
+                </th>
+                <th>
+                  {{
+                    getParameterTotalsWithAge(
+                      htsLabData,
+                      'finalHivResult',
+                      'P',
+                      'M',
+                      10,
+                      14
+                    )
+                  }}
+                </th>
+                <th>
+                  {{
+                    getParameterTotalsWithAge(
+                      htsLabData,
+                      'finalHivResult',
+                      'P',
+                      'M',
+                      15,
+                      19
+                    )
+                  }}
+                </th>
+                <th>
+                  {{
+                    getParameterTotalsWithAge(
+                      htsLabData,
+                      'finalHivResult',
+                      'P',
+                      'M',
+                      20,
+                      24
+                    )
+                  }}
+                </th>
+                <th>
+                  {{
+                    getParameterTotalsWithAge(
+                      htsLabData,
+                      'finalHivResult',
+                      'P',
+                      'M',
+                      25
+                    )
+                  }}
+                </th>
+                <th>
+                  {{
+                    getParameterTotals(htsLabData, 'finalHivResult', 'P', 'M')
+                  }}
+                </th>
+              </tr>
+            </tbody>
+            <tr>
+              <th>Female</th>
+              <th>
+                {{
+                  getParameterTotalsWithAge(
+                    htsLabData,
+                    'finalHivResult',
+                    'P',
+                    'F',
+                    2,
+                    9
+                  )
+                }}
+              </th>
+              <th>
+                {{
+                  getParameterTotalsWithAge(
+                    htsLabData,
+                    'finalHivResult',
+                    'P',
+                    'F',
+                    10,
+                    14
+                  )
+                }}
+              </th>
+              <th>
+                {{
+                  getParameterTotalsWithAge(
+                    htsLabData,
+                    'finalHivResult',
+                    'P',
+                    'F',
+                    15,
+                    19
+                  )
+                }}
+              </th>
+              <th>
+                {{
+                  getParameterTotalsWithAge(
+                    htsLabData,
+                    'finalHivResult',
+                    'P',
+                    'F',
+                    20,
+                    24
+                  )
+                }}
+              </th>
+              <th>
+                {{
+                  getParameterTotalsWithAge(
+                    htsLabData,
+                    'finalHivResult',
+                    'P',
+                    'F',
+                    25
+                  )
+                }}
+              </th>
+              <th>
+                {{ getParameterTotals(htsLabData, 'finalHivResult', 'P', 'F') }}
+              </th>
+            </tr>
+            <tr>
+              <th>Total</th>
+              <th>
+                {{ getPositiveMaleAndFemaleTotalWithAge(htsLabData, 2, 9) }}
+              </th>
+              <th>
+                {{ getPositiveMaleAndFemaleTotalWithAge(htsLabData, 10, 14) }}
+              </th>
+              <th>
+                {{ getPositiveMaleAndFemaleTotalWithAge(htsLabData, 15, 19) }}
+              </th>
+              <th>
+                {{ getPositiveMaleAndFemaleTotalWithAge(htsLabData, 20, 24) }}
+              </th>
+              <th>
+                {{ getPositiveMaleAndFemaleTotalWithAge(htsLabData, 25) }}
+              </th>
+              <th>{{ getPositiveTotal(htsLabData) }}</th>
+            </tr>
+          </table>
+        </div>
+      </div>
+      <div class="inner">
+        <div class="flex-item">
+          <table class="table-bordered text-centre">
+            <thead>
+              <tr>
+                <th class="highlighted-row">Total Negative (n)</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td style="text-align: center; font-weight: bold">
+                  {{ getParameterTotals(htsLabData, 'finalHivResult', 'N') }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table-bordered text-centre">
+            <thead>
+              <tr>
+                <th class="highlighted-row">Inconclusive test (n)</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td style="text-align: center; font-weight: bold">
+                  {{ getParameterTotals(htsLabData, 'finalHivResult', 'I') }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+      <div class="inner">
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th class="highlighted-row">Tests Facility (j)</th>
+                <th>{{ getParameterTotals(htsLabData, 'setting', '1') }}</th>
+              </tr>
+              <tr>
+                <th class="highlighted-row">Tests Community (j)</th>
+                <th>{{ getParameterTotals(htsLabData, 'setting', '2') }}</th>
+              </tr>
+            </thead>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th class="highlighted-row">Discordant (o)</th>
+                <th>
+                  {{ getParameterTotals(htsLabData, 'discordantCouple', 'Y') }}
+                </th>
+              </tr>
+            </thead>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th class="highlighted-row">Tests Key pops (i)</th>
+                <th>
+                  {{ getParameterTotals(htsLabData, 'populationType', '2') }}
+                </th>
+              </tr>
+              <tr>
+                <th class="highlighted-row">Positive key pops (i) & (n)</th>
+                <th>
+                  {{
+                    getParameterTotals(htsLabData, 'populationType', '2') +
+                      getParameterTotals(htsLabData, 'finalHivResult', 'P')
+                  }}
+                </th>
+              </tr>
+            </thead>
+            <tbody></tbody>
+          </table>
+        </div>
+      </div>
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <thead>
+            <tr>
+              <th colspan="2" class="highlighted-row">HIV Test 1 (k) Number</th>
+              <th class="highlighted-row">HIV Test 2 (I)</th>
+              <th class="highlighted-row">Number</th>
+              <th class="highlighted-row">HIV Test 3 (m)</th>
+              <th class="highlighted-row">Number</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <th class="highlighted-row">N: Negative</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest1', 'N') }}
+              </td>
+              <th class="highlighted-row">N: Negative</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest3', 'N') }}
+              </td>
+              <th class="highlighted-row">N: Negative</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest3', 'N') }}
+              </td>
+            </tr>
+            <tr>
+              <th class="highlighted-row">P: Positive</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest1', 'P') }}
+              </td>
+              <th class="highlighted-row">P: Positive</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest2', 'P') }}
+              </td>
+              <th class="highlighted-row">P: Positive</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest3', 'P') }}
+              </td>
+            </tr>
+            <tr>
+              <th class="highlighted-row">I: Invalid</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest1', 'I') }}
+              </td>
+              <th class="highlighted-row">I: Invalid</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest2', 'I') }}
+              </td>
+              <th class="highlighted-row">I: Invalid</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest3', 'P') }}
+              </td>
+            </tr>
+            <tr>
+              <th class="highlighted-row">Wastage:</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest1', 'NA') }}
+              </td>
+              <th class="highlighted-row">Wastage:</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest2', 'NA') }}
+              </td>
+              <th class="highlighted-row">Wastage:</th>
+              <td>
+                {{ getHivTestTypesAndTotals(htsLabData, 'hivTest3', 'NA') }}
+              </td>
+            </tr>
+            <tr>
+              <th class="highlighted-row">Total:</th>
+              <td>
+                {{
+                  getHivTestTypesAndTotals(htsLabData, 'hivTest1', 'N') +
+                    getHivTestTypesAndTotals(htsLabData, 'hivTest1', 'P') +
+                    getHivTestTypesAndTotals(htsLabData, 'hivTest1', 'I') +
+                    getHivTestTypesAndTotals(htsLabData, 'hivTest1', 'NA')
+                }}
+              </td>
+              <th class="highlighted-row">Total:</th>
+              <td>
+                {{
+                  getHivTestTypesAndTotals(htsLabData, 'hivTest2', 'N') +
+                    getHivTestTypesAndTotals(htsLabData, 'hivTest2', 'P') +
+                    getHivTestTypesAndTotals(htsLabData, 'hivTest2', 'I') +
+                    getHivTestTypesAndTotals(htsLabData, 'hivTest2', 'NA')
+                }}
+              </td>
+              <th class="highlighted-row">Total:</th>
+              <td>
+                {{
+                  getHivTestTypesAndTotals(htsLabData, 'hivTest3', 'N') +
+                    getHivTestTypesAndTotals(htsLabData, 'hivTest3', 'P') +
+                    getHivTestTypesAndTotals(htsLabData, 'hivTest3', 'I') +
+                    getHivTestTypesAndTotals(htsLabData, 'hivTest3', 'NA')
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
   </div>
 </div>
 <br />
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+<div
+  *ngIf="htsLabData && htsLabData.length > 0"
+  style="padding: 20px; font-size: 12px !important"
+  #contentToSnapshot
+>
   <div class="table-responsive">
     <div class="row">
       <div class="col-md-4">
@@ -251,6 +660,7 @@ <h4 *ngIf="!statusError">
             Serial<br />
             Number
           </th>
+          <th rowspan="2">AMRSID</th>
           <th>
             National Identification<br />
             Number
@@ -301,6 +711,7 @@ <h4 *ngIf="!statusError">
         <ng-container *ngFor="let item of htsLinkageData">
           <tr>
             <td rowspan="2">{{ item.serialNumber }}</td>
+            <td rowspan="2">{{ item.amrsID }}</td>
             <td>{{ item.nupiNumber }}</td>
             <td rowspan="2">{{ item.clientName }}</td>
             <td>{{ item.telephoneNumber }}</td>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
index b9368f3f3..951a2193e 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/htsrefferallinkage-register/htsrefferallinkage-register.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit, Output } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { zhCnLocale } from 'ngx-bootstrap';
 import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
 // import { HtsrefferallinkageRegisterService } from './htsrefferallinkage-register.service';
 import { HtsReferralLinkageService } from 'src/app/etl-api/hts-refferal-linkage.service';
@@ -160,6 +161,7 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
     return {
       htsLabData: apiData.map((item) => ({
         serialNumber: item.serial_number || '',
+        amrsID: item.amrsID || '',
         nupiNumber: item.nupi || '',
         nationalId: item.id_number || '',
         visitDate: item.date_of_visit
@@ -171,8 +173,9 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
         age: item.age || '',
         sex: item.sex || '',
         telephoneNumber: item.telephone || '',
-        maritalStatus: '', // Not available in API data
+        maritalStatus: item.marital_status || '',
         populationType: item.population_type || '',
+        subPopulation: item.sub_population || '',
         setting: item.setting || '',
         hivTest1: {
           kitName: item.kit1_name || '',
@@ -206,6 +209,7 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
       })),
       htsLinkageData: apiData.map((item) => ({
         serialNumber: item.serial_number || '',
+        amrsID: item.amrsID || '',
         nupiNumber: item.nupi || '',
         nationalId: item.id_number || '',
         clientName: `${item.first_name || ''} ${item.middle_name || ''} ${
@@ -283,4 +287,95 @@ export class HtsrefferallinkageRegisterComponent implements OnInit {
       this.isReleased = true;
     }
   }
+  getTotal(summaryData: any[], gender: string) {
+    return summaryData.filter((data) => data['sex'] === gender).length || '';
+  }
+  getMaleAndFemaleTotal(summaryData: any[], minAge: number, maxAge?: number) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['age'] >= minAge &&
+          (maxAge === undefined || data['age'] <= maxAge)
+      ).length || ''
+    );
+  }
+  getPositiveMaleAndFemaleTotalWithAge(
+    summaryData: any[],
+    minAge: number,
+    maxAge?: number
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['final_result'] === 'P' &&
+          data['age'] >= minAge &&
+          (maxAge === undefined || data['age'] <= maxAge)
+      ).length || ''
+    );
+  }
+  getPositiveTotal(summaryData: any[]) {
+    return (
+      summaryData.filter((data) => data['final_result'] === 'P').length || ''
+    );
+  }
+  getTotals(
+    summaryData: any[],
+    gender: string,
+    minAge: number,
+    maxAge?: number
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['age'] >= minAge &&
+          (maxAge === undefined || data['age'] <= maxAge) &&
+          data['sex'] === gender
+      ).length || ''
+    );
+  }
+  getParameterTotalsWithAge(
+    summaryData: any[],
+    parameter: string,
+    parameterValue: string,
+    gender: string,
+    minAge: number,
+    maxAge?: number
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['age'] >= minAge &&
+          data[parameter] === parameterValue &&
+          data['sex'] === gender &&
+          (maxAge === undefined || data['age'] <= maxAge)
+      ).length || ''
+    );
+  }
+
+  getParameterTotals(
+    summaryData: any[],
+    parameter: string,
+    parameterValue: string,
+    gender?: string
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data[parameter] === parameterValue &&
+          (gender === undefined || data['sex'] === gender)
+      ).length || ''
+    );
+  }
+
+  getHivTestTypesAndTotals(
+    summaryData: any[],
+    testType: string,
+    value: string
+  ) {
+    return (
+      summaryData.filter(
+        (data) => data[testType] && data[testType]['result'] === value
+      ).length || ''
+    );
+  }
 }

From c16f18acd026c32a978bdece3cc7739e29bd4135 Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Wed, 10 Dec 2025 23:03:38 +0300
Subject: [PATCH 43/50] Added Hei register

---
 .../hei-register-filters.component.css        |   0
 .../hei-register-filters.component.html       | 103 ++++++++++++
 .../hei-register-filters.component.spec.ts    |  24 +++
 .../hei-register-filters.component.ts         | 147 ++++++++++++++++++
 .../hei-register/hei-register.component.html  |  81 ++++++----
 .../hei-register/hei-register.component.ts    |  42 ++++-
 6 files changed, 358 insertions(+), 39 deletions(-)
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.ts

diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.css b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.html b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.html
new file mode 100644
index 000000000..e0ad0f919
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.html
@@ -0,0 +1,103 @@
+<div style="margin-top: 4px; margin-bottom: 4px" class="container-fluid">
+  <div
+    style="
+      padding: 0px;
+      border: 1px double lightgray;
+      border-bottom: 0px;
+      cursor: pointer;
+    "
+    class="row"
+    (click)="filterCollapsed = !filterCollapsed"
+  >
+    <span class="text-info" style="margin: 2px; font-weight: bold">
+      <span
+        class="glyphicon glyphicon-filter"
+        style="font-weight: normal"
+      ></span>
+      Report filters</span
+    >
+    <span style="margin: 2px" class="label label-default pull-right">
+      <span
+        class="glyphicon glyphicon-chevron-down"
+        *ngIf="!filterCollapsed"
+      ></span>
+      <span
+        class="glyphicon glyphicon-chevron-up"
+        *ngIf="filterCollapsed"
+      ></span>
+    </span>
+  </div>
+  <div style="padding: 0px; border: 1px double lightgray" class="row">
+    <div *ngIf="!filterCollapsed">
+      <div
+        class="col-xs-10"
+        style="padding: 4px; border-left: 4px solid lightgray"
+      >
+        <div *ngIf="!isMonthMode" class="form-row">
+          <label for="startDate">Start Date</label>
+          <input
+            id="startDate"
+            type="date"
+            class="form-control"
+            [(ngModel)]="startDateString"
+          />
+        </div>
+        <div *ngIf="!isMonthMode" class="form-row">
+          <label for="endDate">End Date</label>
+          <input
+            id="endDate"
+            type="date"
+            class="form-control"
+            [(ngModel)]="endDateString"
+          />
+        </div>
+        <div *ngIf="isMonthMode" class="form-row">
+          <label for="month">Month:</label>
+          <input
+            id="month"
+            type="month"
+            class="form-control"
+            [(ngModel)]="monthString"
+          />
+        </div>
+        <div class="form-row" *ngIf="showIsAggregateControl">
+          <label for="isAggregate">Aggregate Locations</label>
+          <input
+            id="isAggregate"
+            type="checkbox"
+            name="aggregated"
+            [checked]="isAggregated"
+            (change)="isAggregated = !isAggregated"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    style="padding: 0px; border: 1px double lightgray"
+    class="row"
+    *ngIf="showLocationsControl"
+  >
+    <location-filter
+      [multiple]="true"
+      [locationUuids]="locationUuids"
+      (onLocationChange)="onLocationsSelected($event)"
+    ></location-filter>
+  </div>
+  <div class="row" style="margin-top: 4px; padding: 0px">
+    <button
+      type="button"
+      *ngIf="!parentIsBusy"
+      class="btn btn-primary pull-right"
+      (click)="onClickedGenerate()"
+    >
+      Generate Report
+    </button>
+    <span
+      class="pull-right"
+      style="font-weight: bold; color: gray"
+      *ngIf="parentIsBusy"
+      >Loading report..</span
+    >
+  </div>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.spec.ts b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.spec.ts
new file mode 100644
index 000000000..463bec95f
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { HeiRegisterFiltersComponent } from './hei-register-filters.component';
+
+describe('HeiRegisterFiltersComponent', () => {
+  let component: HeiRegisterFiltersComponent;
+  let fixture: ComponentFixture<HeiRegisterFiltersComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [HeiRegisterFiltersComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(HeiRegisterFiltersComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.ts b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.ts
new file mode 100644
index 000000000..aa5ff65b6
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register-filters/hei-register-filters.component.ts
@@ -0,0 +1,147 @@
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import * as Moment from 'moment';
+
+@Component({
+  selector: 'app-hei-register-filters',
+  templateUrl: './hei-register-filters.component.html',
+  styleUrls: ['./hei-register-filters.component.css']
+})
+export class HeiRegisterFiltersComponent implements OnInit {
+  public filterCollapsed: boolean;
+  @Output()
+  public generateReport = new EventEmitter();
+
+  @Output()
+  public startDateChange = new EventEmitter<Date>();
+
+  @Output()
+  public endDateChange = new EventEmitter<Date>();
+
+  @Output()
+  public isLegacyVersionChange = new EventEmitter<boolean>();
+
+  @Output()
+  public isAggregatedChange = new EventEmitter<boolean>();
+
+  @Input()
+  public locationUuids: Array<any> = [];
+
+  @Output()
+  public locationUuidsChange = new EventEmitter<any>();
+
+  @Input()
+  public parentIsBusy = false;
+
+  @Input()
+  public isMonthMode = true;
+
+  private _showIsAggregateControl = false;
+  public get showIsAggregateControl(): boolean {
+    return this._showIsAggregateControl;
+  }
+  @Input()
+  public set showIsAggregateControl(v: boolean) {
+    this._showIsAggregateControl = v;
+  }
+
+  private _showLocationsControl = false;
+  public get showLocationsControl(): boolean {
+    return this._showLocationsControl;
+  }
+  @Input()
+  public set showLocationsControl(v: boolean) {
+    this._showLocationsControl = v;
+  }
+
+  private _startDate: Date;
+  public get startDate(): Date {
+    return this._startDate;
+  }
+  @Input()
+  public set startDate(v: Date) {
+    this._startDate = v;
+    this._month = v;
+    this.startDateChange.emit(this.startDate);
+  }
+
+  public get startDateString(): string {
+    return this.startDate ? Moment(this.startDate).format('YYYY-MM-DD') : null;
+  }
+  public set startDateString(v: string) {
+    this.startDate = new Date(v);
+  }
+
+  public get endDateString(): string {
+    return this.endDate ? Moment(this.endDate).format('YYYY-MM-DD') : null;
+  }
+  public set endDateString(v: string) {
+    this.endDate = new Date(v);
+  }
+
+  private _endDate: Date;
+  public get endDate(): Date {
+    return this._endDate;
+  }
+  @Input()
+  public set endDate(v: Date) {
+    this._endDate = v;
+    this._month = v;
+    this.endDateChange.emit(this.endDate);
+  }
+
+  public get monthString(): string {
+    return this.month ? Moment(this.month).format('YYYY-MM') : null;
+  }
+  public set monthString(v: string) {
+    this.month = new Date(v);
+  }
+
+  private _month: Date;
+  public get month(): Date {
+    return this._month;
+  }
+  @Input()
+  public set month(v: Date) {
+    this._month = v;
+    this.startDate = Moment(this._month).startOf('month').toDate();
+    this.endDate = Moment(this._month).endOf('month').toDate();
+  }
+
+  private _isAggregated: boolean;
+  public get isAggregated(): boolean {
+    return this._isAggregated;
+  }
+  @Input()
+  public set isAggregated(v: boolean) {
+    this._isAggregated = v;
+    this.isAggregatedChange.emit(this.isAggregated);
+  }
+
+  private _isLegacyVersion = true;
+  public get isLegacyVersion(): boolean {
+    return this._isLegacyVersion;
+  }
+  @Input()
+  public set isLegacyVersion(v: boolean) {
+    this._isLegacyVersion = v;
+    this.isLegacyVersionChange.emit(this.isLegacyVersion);
+  }
+
+  constructor() {}
+
+  ngOnInit() {}
+
+  public onClickedGenerate() {
+    this.generateReport.emit();
+  }
+
+  public changeIsLegacyValue(val: boolean) {
+    this.isLegacyVersion = val;
+  }
+
+  public onLocationsSelected(val) {
+    if (val) {
+      this.locationUuidsChange.emit(val.locations);
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
index 537282819..67b6d2129 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.html
@@ -9,15 +9,15 @@ <h4 class="component-title text-success">
 <p-tabView>
   <div>
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
-      <report-filters
-        [enabledControls]="enabledControls"
-        (startDateChange)="onMonthChange($event)"
+      <app-hei-register-filters
         [(startDate)]="startDate"
         [(endDate)]="endDate"
-        [reportName]="reportName"
+        [(locationUuids)]="jointLocationUuids"
+        [showLocationsControl]="showLocationsControl"
+        [showIsAggregateControl]="showIsAggregateControl"
         (generateReport)="generateReport()"
       >
-      </report-filters>
+      </app-hei-register-filters>
     </p-tabPanel>
   </div>
 </p-tabView>
@@ -67,8 +67,9 @@ <h4 *ngIf="!statusError">
       <thead>
         <tr>
           <th colspan="58">
-            Cohort: Month/Year
-            (MMM-YYYY).........................../..............................................
+            Cohort: Month/Year (MMM-YYYY)...........................{{
+              formattedStartDate
+            }}..............................................
           </th>
         </tr>
         <tr>
@@ -91,9 +92,7 @@ <h4 *ngIf="!statusError">
         </tr>
         <tr>
           <th colspan="1" rowspan="2">Serial No.</th>
-          <th colspan="3" rowspan="2">
-            Date of Collected enrollment (DD/MM/YYYY)
-          </th>
+          <th colspan="3" rowspan="2">Date of enrollment (DD/MM/YYYY)</th>
           <th colspan="3">
             Birth Certificate<br />
             Number
@@ -183,68 +182,83 @@ <h4 *ngIf="!statusError">
               {{ data.HEI_ID }}
             </td>
             <td colspan="4" rowspan="2">
-              {{ data.Infant_name }}
+              {{ data.given_name }} {{ data.middle_name }}
+              {{ data.family_name }}
             </td>
             <td colspan="2" rowspan="2">
-              {{ transformDate(data.birth_date) }}
+              {{ transformDate(data.dob) }}
             </td>
             <td colspan="2">Sex</td>
-            <td colspan="3" rowspan="2">{{ null }}</td>
+            <td colspan="3" rowspan="2">{{ data.infant_prophylaxis }}</td>
             <td colspan="4">{{ data.parent_name }}</td>
             <td rowspan="2">
-              {{ data.age_in_weeks_on_first_pcr }}
+              {{ data.pcr_one ? data.pcr_one_age_weeks : '' }}
             </td>
             <td colspan="2" rowspan="2">
               {{ date_enrolled }}
             </td>
-            <td colspan="2">{{ transformDate(data.first_pcr_date) }}</td>
+            <td colspan="2">
+              {{ transformDate(data.pcr_one ? data.pcr_one_date : '') }}
+            </td>
             <td colspan="2" rowspan="2">
-              {{ data.age_in_months_on_second_pcr }}
+              {{ data.pcr_two ? data.pcr_two_age_months : '' }}
+            </td>
+            <td colspan="2">
+              {{ transformDate(data.pcr_two ? data.pcr_two_date : '') }}
             </td>
-            <td colspan="2">{{ transformDate(data.second_pcr_date) }}</td>
             <td colspan="2" rowspan="2">
-              {{ data.age_in_months_on_third_pcr }}
+              {{ data.pcr_three ? data.pcr_three_age_months : '' }}
+            </td>
+            <td colspan="2">
+              {{ transformDate(data.pcr_three ? data.pcr_three_date : '') }}
             </td>
-            <td colspan="2">{{ transformDate(data.third_pcr_date) }}</td>
             <td colspan="2">Infant Feeding</td>
             <td colspan="2" rowspan="2">
-              {{ data.hei_outcome }}
+              {{ null }}
             </td>
             <td colspan="2" rowspan="2">
-              {{ data.age_in_months_on_confirm_pcr }}
+              {{ data.confirm_pcr ? data.confirm_pcr_age_months : '' }}
+            </td>
+            <td colspan="2">
+              {{ transformDate(data.confirm_pcr ? data.confirm_pcr_date : '') }}
             </td>
-            <td colspan="2">{{ transformDate(data.confirm_pcr_date) }}</td>
             <td colspan="2" rowspan="2">
               {{ data.age_in_months_on_first_antibody }}
             </td>
             <td colspan="2">
-              {{ transformDate(data.first_antibody_date) }}
+              {{ transformDate(data.antibody_date) }}
             </td>
             <td colspan="2">{{ null }}</td>
-            <td colspan="2">{{ null }}</td>
-            <td colspan="4" rowspan="2">{{ null }}</td>
+            <td colspan="2">
+              {{ data.death_date ? data.death_date : data.hei_outcome }}
+            </td>
+            <td colspan="4" rowspan="2">{{ data.remarks }}</td>
           </tr>
           <tr>
             <td colspan="3">{{ data.NUPI }}</td>
             <td colspan="2">{{ data.gender }}</td>
             <td colspan="4">{{ data.Phone_Number }}</td>
             <td colspan="2">
-              {{ data.results_pcr_first_pcr }}
+              {{ data.pcr_one }}
             </td>
             <td colspan="2">
-              {{ data.results_pcr_second_pcr }}
+              {{ data.pcr_two }}
             </td>
             <td colspan="2">
-              {{ data.results_pcr_third_pcr }}
+              {{ data.pcr_three }}
             </td>
-            <td colspan="2">{{ data.infant_feeding }}</td>
             <td colspan="2">
-              {{ data.results_confirm_pcr }}
+              {{ data.infant_feeding }}
             </td>
             <td colspan="2">
-              {{ data.results_first_antibody }}
+              {{ data.confirm_confirm }}
+            </td>
+            <td colspan="2">
+              {{ data.antibody_test }}
+            </td>
+            <td colspan="2">
+              {{ data.age_in_months === 24 ? data.infant_feeding : '' }}
             </td>
-            <td colspan="2">{{ null }}</td>
             <td colspan="2">{{ null }}</td>
           </tr>
         </ng-container>
@@ -252,3 +266,6 @@ <h4 *ngIf="!statusError">
     </table>
   </div>
 </div>
+<div *ngIf="heiRegisterData.length === 0 && generated">
+  <i class="alert alert-danger">No record found</i>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
index 4425dd303..c955c2da3 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/hei-register/hei-register.component.ts
@@ -11,7 +11,6 @@ import * as _ from 'lodash';
 import * as Moment from 'moment';
 import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
 import { HeiRegisterResourceService } from 'src/app/etl-api/hei-register-resource.service';
-import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
 import * as html2canvas from 'html2canvas';
 import * as jsPDF from 'jspdf';
 @Component({
@@ -45,6 +44,9 @@ export class HeiRegisterComponent implements OnInit {
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  public generated = false;
+  public showLocationsControl = true;
+  public showIsAggregateControl = false;
   @ViewChild('heicontentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
@@ -62,7 +64,7 @@ export class HeiRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  private _startDate: Date = Moment().toDate();
+  private _startDate: Date = Moment().startOf('month').toDate();
   public get startDate(): Date {
     return this._startDate;
   }
@@ -71,7 +73,7 @@ export class HeiRegisterComponent implements OnInit {
     this._startDate = v;
   }
 
-  private _endDate: Date = new Date();
+  private _endDate: Date = Moment().endOf('month').toDate();
   public get endDate(): Date {
     return this._endDate;
   }
@@ -119,11 +121,19 @@ export class HeiRegisterComponent implements OnInit {
     this.getHeiRegisterData(this.params);
   }
 
+  get formattedStartDate(): string {
+    return this.startDate
+      ? Moment(this.startDate).subtract(1, 'year').format('MMM-YYYY')
+      : '';
+  }
+
   public storeParamsInUrl() {
+    const startDateMinusOneYear = Moment(this.startDate).subtract(1, 'year');
+    const endDateMinusOneYear = Moment(this.endDate).subtract(1, 'year');
     this.params = {
-      locationUuids: this.jointLocationUuids,
-      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
-      endDate: Moment(this.endDate).format('YYYY-MM-DD')
+      locationUuids: this.getSelectedLocations(this.jointLocationUuids),
+      startDate: startDateMinusOneYear.format('YYYY-MM-DD'),
+      endDate: endDateMinusOneYear.format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -141,8 +151,8 @@ export class HeiRegisterComponent implements OnInit {
       } else {
         this.showInfoMessage = false;
         this.columnDefs = data.sectionDefinitions;
-        console.log('HEI DATA IS: ' + JSON.stringify(data));
         this.heiRegisterData = data;
+        this.generated = true;
         this.isLoading = false;
         this.showDraftReportAlert(this._month);
       }
@@ -217,4 +227,22 @@ export class HeiRegisterComponent implements OnInit {
       pdf.save('MOH 408 HIV Exposed Infant Register.pdf');
     });
   }
+  private getSelectedLocations(locationUuids: any): string {
+    if (!locationUuids || locationUuids.length === 0) {
+      return '';
+    }
+
+    let selectedLocations = '';
+
+    for (let i = 0; i < locationUuids.length; i++) {
+      const value = `'${(locationUuids[i] as any).value}'`;
+      if (i === 0) {
+        selectedLocations = value;
+      } else {
+        selectedLocations = selectedLocations + ', ' + value;
+      }
+    }
+
+    return selectedLocations;
+  }
 }

From e9870d6874762753aeead8b4046fc9190131f74b Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Wed, 10 Dec 2025 23:08:00 +0300
Subject: [PATCH 44/50] POC-746: Added MOH 366 Care and Treatment Daily
 Activity

---
 .../cntdaily-register.component.css           |  16 +-
 .../cntdaily-register.component.html          | 996 +++++++++++++++++-
 .../cntdaily-register.component.ts            | 121 ++-
 3 files changed, 1088 insertions(+), 45 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css
index 7d7e743ba..640a3a1b6 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.css
@@ -8,7 +8,19 @@ tbody tr {
 }
 .vertical-text {
   writing-mode: vertical-rl;
-  text-orientation: mixed;
   transform: rotate(180deg);
-  white-space: nowrap;
+}
+
+.center {
+  vertical-align: middle;
+  font-weight: bold;
+  text-align: center;
+}
+
+.bold {
+  font-weight: bolder;
+}
+
+.right {
+  text-align: right;
 }
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
index 3cd1ffdce..ea67405a2 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.html
@@ -68,6 +68,7 @@ <h4 *ngIf="!statusError">
         <tr>
           <th rowspan="4">No</th>
           <th colspan="2" rowspan="4">Date</th>
+          <th colspan="2" rowspan="4">AMRSID</th>
           <th colspan="3">National Identification Number</th>
           <th colspan="3" rowspan="4">Client CCC Number</th>
           <th rowspan="4">Age</th>
@@ -150,9 +151,9 @@ <h4 *ngIf="!statusError">
         <tr>
           <th class="text-center">(a)</th>
           <th colspan="2" class="text-center">(b)</th>
-          <th colspan="3" class="text-center">(c)</th>
+          <th colspan="2" class="text-center">(c)</th>
           <th colspan="3" class="text-center">(d)</th>
-          <th class="text-center">(e)</th>
+          <th colspan="3" class="text-center">(e)</th>
           <th class="text-center">(f)</th>
           <th class="text-center">(g)</th>
           <th class="text-center">(h)</th>
@@ -185,9 +186,10 @@ <h4 *ngIf="!statusError">
           <th class="text-center">(aj)</th>
           <th class="text-center">(ak)</th>
           <th class="text-center">(al)</th>
-          <th colspan="2" class="text-center">(am)</th>
+          <th class="text-center">(am)</th>
           <th colspan="2" class="text-center">(an)</th>
-          <th colspan="4" class="text-center">(ao)</th>
+          <th colspan="2" class="text-center">(ao)</th>
+          <th colspan="4" class="text-center">(ap)</th>
         </tr>
       </thead>
       <tbody>
@@ -199,209 +201,296 @@ <h4 *ngIf="!statusError">
             <td colspan="2" rowspan="2">
               {{ data.date | date: 'dd/MM/yyyy' }}
             </td>
+            <td colspan="2" rowspan="2">
+              {{ data.amrsID }}
+            </td>
             <td colspan="3">{{ data.national_id_number }}</td>
             <td colspan="3" rowspan="2">
-              {{ data.ccc_number }}
+              {{ data.ccc_number?.replace('-', '') }}
             </td>
             <td rowspan="2">{{ data.age }}</td>
             <td rowspan="2">
               <ng-container *ngIf="data.age < 1 && data.gender == 'M'">
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age < 1 && data.gender == 'F'">
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 1 && data.age <= 4 && data.gender == 'M'"
               >
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 1 && data.age <= 4 && data.gender == 'F'"
               >
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 5 && data.age <= 9 && data.gender == 'M'"
               >
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 5 && data.age <= 9 && data.gender == 'F'"
               >
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 10 && data.age <= 14 && data.gender == 'M'"
               >
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 10 && data.age <= 14 && data.gender == 'F'"
               >
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 15 && data.age <= 19 && data.gender == 'M'"
               >
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 15 && data.age <= 19 && data.gender == 'F'"
               >
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 20 && data.age <= 24 && data.gender == 'M'"
               >
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 20 && data.age <= 24 && data.gender == 'F'"
               >
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age >= 25 && data.gender == 'M'">
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age >= 25 && data.gender == 'F'">
-                {{ data.started_on_art }}
+                {{ data.started_on_art === 'Y' ? '✓' : '' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age < 15">
-                {{ data.screened_for_tb }}
+                {{ data.started_on_art === 'Y' ? data.screened_for_tb : 'NA' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age >= 15">
-                {{ data.screened_for_tb }}
+                {{ data.started_on_art === 'Y' ? data.screened_for_tb : 'NA' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age < 15">
-                {{ data.started_on_tpt }}
+                {{ data.started_on_art === 'Y' ? data.started_on_tpt : 'NA' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age >= 15">
-                {{ data.started_on_tpt }}
+                {{ data.started_on_art === 'Y' ? data.started_on_tpt : 'NA' }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age < 1 && data.gender == 'M'">
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age < 1 && data.gender == 'F'">
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 1 && data.age <= 4 && data.gender == 'M'"
               >
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 1 && data.age <= 4 && data.gender == 'F'"
               >
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 5 && data.age <= 9 && data.gender == 'M'"
               >
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 5 && data.age <= 9 && data.gender == 'F'"
               >
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 10 && data.age <= 14 && data.gender == 'M'"
               >
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 10 && data.age <= 14 && data.gender == 'F'"
               >
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 15 && data.age <= 19 && data.gender == 'M'"
               >
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 15 && data.age <= 19 && data.gender == 'F'"
               >
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 20 && data.age <= 24 && data.gender == 'M'"
               >
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container
                 *ngIf="data.age >= 20 && data.age <= 24 && data.gender == 'F'"
               >
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age >= 25 && data.gender == 'M'">
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td rowspan="2">
               <ng-container *ngIf="data.age >= 25 && data.gender == 'F'">
-                {{ data.current_on_art }}
+                {{
+                  data.revisit
+                    ? data.revisit
+                    : data.current_on_art > 0
+                    ? data.current_on_art
+                    : 1
+                }}
               </ng-container>
             </td>
             <td colspan="2" rowspan="2">{{ data.dsd_status }}</td>
@@ -412,7 +501,840 @@ <h4 *ngIf="!statusError">
             <td colspan="3">{{ data.NUPI }}</td>
           </tr>
         </ng-container>
+        <ng-container>
+          <tr>
+            <td colspan="8" rowspan="2" style="font-weight: bold">
+              Data element CODE
+            </td>
+            <td colspan="3" rowspan="2"></td>
+            <td rowspan="2"></td>
+            <td rowspan="2" class="vertical-text">HV03-O1</td>
+            <td rowspan="2" class="vertical-text">HVO3-02</td>
+            <td rowspan="2" class="vertical-text">HVO3-03</td>
+            <td rowspan="2" class="vertical-text">HVO3-04</td>
+            <td rowspan="2" class="vertical-text">HVO3-05</td>
+            <td rowspan="2" class="vertical-text">HVO3-06</td>
+            <td rowspan="2" class="vertical-text">HVO3-07</td>
+            <td rowspan="2" class="vertical-text">HVO3-08</td>
+            <td rowspan="2" class="vertical-text">HVO3-09</td>
+            <td rowspan="2" class="vertical-text">HVO3-10</td>
+            <td rowspan="2" class="vertical-text">HVO3-11</td>
+            <td rowspan="2" class="vertical-text">HVO3-12</td>
+            <td rowspan="2" class="vertical-text">HVO3-13</td>
+            <td rowspan="2" class="vertical-text">HVO3-14</td>
+            <td rowspan="2" class="vertical-text">HVO3-15</td>
+            <td rowspan="2" class="vertical-text">HVO3-16</td>
+            <td rowspan="2" class="vertical-text">HVO3-17</td>
+            <td rowspan="2" class="vertical-text">HVO3-18</td>
+            <td rowspan="2" class="vertical-text">HVO3-19</td>
+            <td rowspan="2" class="vertical-text">HVO3-20</td>
+            <td rowspan="2" class="vertical-text">HVO3-21</td>
+            <td rowspan="2" class="vertical-text">HVO3-22</td>
+            <td rowspan="2" class="vertical-text">HVO3-23</td>
+            <td rowspan="2" class="vertical-text">HVO3-24</td>
+            <td rowspan="2" class="vertical-text">HVO3-25</td>
+            <td rowspan="2" class="vertical-text">HVO3-26</td>
+            <td rowspan="2" class="vertical-text">HVO3-27</td>
+            <td rowspan="2" class="vertical-text">HVO3-28</td>
+            <td rowspan="2" class="vertical-text">HVO3-29</td>
+            <td rowspan="2" class="vertical-text">HVO3-30</td>
+            <td rowspan="2" class="vertical-text">HVO3-31</td>
+            <td rowspan="2" class="vertical-text">HVO3-32</td>
+            <td rowspan="2" colspan="2" class="vertical-text">HVO3-33</td>
+            <td rowspan="2" colspan="2" class="vertical-text">HVO3-34</td>
+            <td rowspan="2" colspan="4"></td>
+          </tr>
+          <tr></tr>
+          <tr>
+            <td colspan="8" style="font-weight: bold">TOTAL this Page</td>
+            <td colspan="3">{{ careTreatmentRegisterData.length }}</td>
+            <td></td>
+            <td>
+              {{ getLessThanOneTotals(careTreatmentRegisterData, 'M') }}
+            </td>
+            <td>
+              {{ getLessThanOneTotals(careTreatmentRegisterData, 'F') }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 1, 4) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 1, 4) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 5, 9) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 5, 9) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 10, 14) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 10, 14) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 15, 19) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 15, 19) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 20, 24) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 20, 24) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 25) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 25) }}
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>
+              {{ currentOnArtLessOneTotals(careTreatmentRegisterData, 'M') }}
+            </td>
+            <td>
+              {{ currentOnArtLessOneTotals(careTreatmentRegisterData, 'F') }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 1, 4) }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 1, 4) }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 5, 9) }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 5, 9) }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 20, 24)
+              }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 20, 24)
+              }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 25) }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 25) }}
+            </td>
+            <td colspan="2"></td>
+            <td colspan="2"></td>
+            <td colspan="4"></td>
+          </tr>
+          <tr>
+            <td colspan="8" style="font-weight: bold">TOTAL this Month</td>
+            <td colspan="3">{{ careTreatmentRegisterData.length }}</td>
+            <td></td>
+            <td>
+              {{ getLessThanOneTotals(careTreatmentRegisterData, 'M') }}
+            </td>
+            <td>
+              {{ getLessThanOneTotals(careTreatmentRegisterData, 'F') }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 1, 4) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 1, 4) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 5, 9) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 5, 9) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 10, 14) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 10, 14) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 15, 19) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 15, 19) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 20, 24) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 20, 24) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'M', 25) }}
+            </td>
+            <td>
+              {{ getStartingARTTotals(careTreatmentRegisterData, 'F', 25) }}
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>
+              {{ currentOnArtLessOneTotals(careTreatmentRegisterData, 'M') }}
+            </td>
+            <td>
+              {{ currentOnArtLessOneTotals(careTreatmentRegisterData, 'F') }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 1, 4) }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 1, 4) }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 5, 9) }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 5, 9) }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 20, 24)
+              }}
+            </td>
+            <td>
+              {{
+                getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 20, 24)
+              }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'M', 25) }}
+            </td>
+            <td>
+              {{ getCurrentOnARTTotals(careTreatmentRegisterData, 'F', 25) }}
+            </td>
+            <td colspan="2"></td>
+            <td colspan="2"></td>
+            <td colspan="4"></td>
+          </tr>
+          <tr>
+            <td colspan="8"></td>
+            <td colspan="3"></td>
+            <td>(e)</td>
+            <td>(f)</td>
+            <td>(g)</td>
+            <td>(h)</td>
+            <td>(i)</td>
+            <td>(j)</td>
+            <td>(k)</td>
+            <td>(l)</td>
+            <td>(m)</td>
+            <td>(n)</td>
+            <td>(o)</td>
+            <td>(q)</td>
+            <td>(r)</td>
+            <td>(s)</td>
+            <td>(t)</td>
+            <td>(u)</td>
+            <td>(v)</td>
+            <td>(w)</td>
+            <td>(x)</td>
+            <td>(y)</td>
+            <td>(z)</td>
+            <td>(aa)</td>
+            <td>(ab)</td>
+            <td>(ac)</td>
+            <td>(ad)</td>
+            <td>(ae)</td>
+            <td>(af)</td>
+            <td>(ag)</td>
+            <td>(ah)</td>
+            <td>(ai)</td>
+            <td>(aj)</td>
+            <td>(ak)</td>
+            <td>(al)</td>
+            <td colspan="2">(am)</td>
+            <td colspan="2">(an)</td>
+            <td colspan="4">(ao)</td>
+          </tr>
+          <tr>
+            <td rowspan="10" colspan="12" class="center">
+              Summary of clinical visits
+            </td>
+            <td colspan="14" class="right">
+              Count of clients with 2 months appointment
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td rowspan="10" colspan="8"></td>
+          </tr>
+          <tr>
+            <td colspan="14" class="bold right">Total this Month(2s)</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>
+              {{
+                getAppointmentTotalsAgeLessThanOne(
+                  careTreatmentRegisterData,
+                  2,
+                  'M'
+                )
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotalsAgeLessThanOne(
+                  careTreatmentRegisterData,
+                  2,
+                  'F'
+                )
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 2, 'M', 1, 4)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 2, 'F', 1, 4)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 2, 'M', 5, 9)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 2, 'F', 5, 9)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 2, 'M', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 2, 'F', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 2, 'M', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 2, 'F', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 2, 'M', 20, 24)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 2, 'F', 20, 24)
+              }}
+            </td>
+            <td>
+              {{ getAppointmentTotals(careTreatmentRegisterData, 2, 'M', 25) }}
+            </td>
+            <td>
+              {{ getAppointmentTotals(careTreatmentRegisterData, 2, 'F', 25) }}
+            </td>
+          </tr>
+          <tr>
+            <td colspan="14" class="right">
+              Count of clients with 3 months appointment
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td colspan="14" class="right bold">Total this Month (3s)</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>
+              {{
+                getAppointmentTotalsAgeLessThanOne(
+                  careTreatmentRegisterData,
+                  3,
+                  'M'
+                )
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotalsAgeLessThanOne(
+                  careTreatmentRegisterData,
+                  3,
+                  'F'
+                )
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 3, 'M', 1, 4)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 3, 'F', 1, 4)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 3, 'M', 5, 9)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 3, 'F', 5, 9)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 3, 'M', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 3, 'F', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 3, 'M', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 3, 'F', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 3, 'M', 20, 24)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 3, 'F', 20, 24)
+              }}
+            </td>
+            <td>
+              {{ getAppointmentTotals(careTreatmentRegisterData, 3, 'M', 25) }}
+            </td>
+            <td>
+              {{ getAppointmentTotals(careTreatmentRegisterData, 3, 'F', 25) }}
+            </td>
+          </tr>
+          <tr>
+            <td colspan="14" class="right">
+              Count of clients with 4 months appointment
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td colspan="14" class="right bold">Total this Month (4s)</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>
+              {{
+                getAppointmentTotalsAgeLessThanOne(
+                  careTreatmentRegisterData,
+                  4,
+                  'M'
+                )
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotalsAgeLessThanOne(
+                  careTreatmentRegisterData,
+                  4,
+                  'F'
+                )
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 4, 'M', 1, 4)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 4, 'F', 1, 4)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 4, 'M', 5, 9)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 4, 'F', 5, 9)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 4, 'M', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 4, 'F', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 4, 'M', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 4, 'F', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 4, 'M', 20, 24)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 4, 'F', 20, 24)
+              }}
+            </td>
+            <td>
+              {{ getAppointmentTotals(careTreatmentRegisterData, 4, 'M', 25) }}
+            </td>
+            <td>
+              {{ getAppointmentTotals(careTreatmentRegisterData, 4, 'F', 25) }}
+            </td>
+          </tr>
+          <tr>
+            <td colspan="14" class="right">
+              Count of clients with 5 mnths appointment
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td colspan="14" class="right bold">Total this Month (5s)</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>
+              {{
+                getAppointmentTotalsAgeLessThanOne(
+                  careTreatmentRegisterData,
+                  5,
+                  'M'
+                )
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotalsAgeLessThanOne(
+                  careTreatmentRegisterData,
+                  5,
+                  'F'
+                )
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 5, 'M', 1, 4)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 5, 'F', 1, 4)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 5, 'M', 5, 9)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 5, 'F', 5, 9)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 5, 'M', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 5, 'F', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 5, 'M', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 5, 'F', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 5, 'M', 20, 24)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 5, 'F', 20, 24)
+              }}
+            </td>
+            <td>
+              {{ getAppointmentTotals(careTreatmentRegisterData, 5, 'M', 25) }}
+            </td>
+            <td>
+              {{ getAppointmentTotals(careTreatmentRegisterData, 5, 'F', 25) }}
+            </td>
+          </tr>
+          <tr>
+            <td colspan="14" class="right">
+              Count of clients with 6 months appointment
+            </td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td colspan="14" class="bold right">Total this Month (6s)</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td>
+              {{
+                getAppointmentTotalsAgeLessThanOne(
+                  careTreatmentRegisterData,
+                  6,
+                  'M'
+                )
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotalsAgeLessThanOne(
+                  careTreatmentRegisterData,
+                  6,
+                  'F'
+                )
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 6, 'M', 1, 4)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 6, 'F', 1, 4)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 6, 'M', 5, 9)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 6, 'F', 5, 9)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 6, 'M', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 6, 'F', 10, 14)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 6, 'M', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 6, 'F', 15, 19)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 6, 'M', 20, 24)
+              }}
+            </td>
+            <td>
+              {{
+                getAppointmentTotals(careTreatmentRegisterData, 6, 'F', 20, 24)
+              }}
+            </td>
+            <td>
+              {{ getAppointmentTotals(careTreatmentRegisterData, 6, 'M', 25) }}
+            </td>
+            <td>
+              {{ getAppointmentTotals(careTreatmentRegisterData, 6, 'F', 25) }}
+            </td>
+          </tr>
+        </ng-container>
       </tbody>
     </table>
   </div>
 </div>
+<div
+  *ngIf="careTreatmentRegisterData.length == 0 && generated"
+  class="text-center rounded"
+>
+  <i class="alert alert-info text-center" style="width: 100%"
+    >No record found</i
+  >
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
index 76fa461a1..3e74e116f 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/cntdaily-register/cntdaily-register.component.ts
@@ -44,6 +44,8 @@ export class CntdailyRegisterComponent implements OnInit {
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  public generated = false;
+
   @ViewChild('cntdarcontentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
@@ -116,6 +118,7 @@ export class CntdailyRegisterComponent implements OnInit {
     });
     this.careTreatmentRegisterData = [];
     this.getCareTreatmentRegisterData(this.params);
+    this.generated = true;
   }
 
   public storeParamsInUrl() {
@@ -141,7 +144,6 @@ export class CntdailyRegisterComponent implements OnInit {
           this.errorMessage = `There has been an error while loading the report, please retry again`;
           this.isLoading = false;
         } else {
-          console.log('Care&Treatment', data);
           this.showInfoMessage = false;
           this.columnDefs = data.sectionDefinitions;
           this.careTreatmentRegisterData = data;
@@ -211,13 +213,120 @@ export class CntdailyRegisterComponent implements OnInit {
   public takeSnapshotAndExport() {
     const elementToSnapshot = this.contentToSnapshot.nativeElement;
 
-    html2canvas(elementToSnapshot).then((canvas) => {
+    html2canvas(elementToSnapshot, { scale: 2 }).then((canvas) => {
       const imgData = canvas.toDataURL('image/png');
-      const pdf = new jsPDF('p', 'mm', 'a4');
-      const imgWidth = 210; // A4 width in mm
+      const pdf = new jsPDF('p', 'mm', 'a0');
+
+      const pageWidth = 841; // A0 width (portrait)
+      const pageHeight = 1189; // A0 height
+
+      const imgWidth = pageWidth;
       const imgHeight = (canvas.height * imgWidth) / canvas.width;
-      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
-      pdf.save('MOH 366 Care and Treatment Daily Activity.pdf');
+
+      let heightLeft = imgHeight;
+      let position = 0;
+
+      pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight);
+
+      heightLeft -= pageHeight;
+
+      // Add additional pages if required
+      while (heightLeft > 0) {
+        pdf.addPage();
+        position = heightLeft - imgHeight;
+        pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight);
+        heightLeft -= pageHeight;
+      }
+      pdf.save('MOH_366_Care_and_Treatment_Daily_Activity.pdf');
     });
   }
+
+  getStartingARTTotals(
+    summaryData: any[],
+    genderValue: string,
+    minAge: number,
+    maxAge?: number
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['started_on_art'] === 'Y' &&
+          data['gender'] === genderValue &&
+          data['age'] >= minAge &&
+          (maxAge === undefined || data['age'] <= maxAge)
+      ).length || ''
+    );
+  }
+  getCurrentOnARTTotals(
+    summaryData: any[],
+    genderValue: string,
+    minAge: number,
+    maxAge?: number
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['current_on_art'] !== null &&
+          data['current_on_art'] !== undefined &&
+          data['gender'] === genderValue &&
+          data['age'] >= minAge &&
+          (maxAge === undefined || data['age'] <= maxAge)
+      ).length || ''
+    );
+  }
+
+  getLessThanOneTotals(summaryData: any[], genderValue: string) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['started_on_art'] === 'Y' &&
+          data['age'] < 1 &&
+          data['gender'] === genderValue
+      ).length || ''
+    );
+  }
+  currentOnArtLessOneTotals(summaryData: any[], genderValue: string) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['current_on_art'] !== null &&
+          data['current_on_art'] !== undefined &&
+          data['age'] < 1 &&
+          data['gender'] === genderValue
+      ).length || ''
+    );
+  }
+
+  getAppointmentTotals(
+    summaryData: any[],
+    artValue: number,
+    gender: string,
+    minAge: number,
+    maxAge?: number
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['current_on_art'] === artValue &&
+          data['gender'] === gender &&
+          data['age'] >= minAge &&
+          (maxAge === undefined || data['age'] <= maxAge)
+      ).length || ''
+    );
+  }
+
+  getAppointmentTotalsAgeLessThanOne(
+    summaryData: any[],
+    artValue: number,
+    gender: string
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['current_on_art'] === artValue &&
+          data['age'] < 1 &&
+          data['gender'] === gender
+      ).length || ''
+    );
+  }
 }

From 685f7be1b639ba847eac914428aac70d5c2fcb75 Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Wed, 10 Dec 2025 23:12:55 +0300
Subject: [PATCH 45/50] POC-874: Added MoH 731 Facility Summary Reporting Tool

---
 .../moh731-filters.component.css              |    0
 .../moh731-filters.component.html             |  103 +
 .../moh731-filters.component.spec.ts          |   24 +
 .../moh731-filters.component.ts               |  155 +
 .../moh731-report-patient-list.component.css  |    0
 .../moh731-report-patient-list.component.html |   48 +
 ...h731-report-patient-list.component.spec.ts |   24 +
 .../moh731-report-patient-list.component.ts   |  159 +
 .../moh731-report-view.component.css          |   68 +
 .../moh731-report-view.component.html         | 1737 ++++++++++
 .../moh731-report-view.component.spec.ts      |   24 +
 .../moh731-report-view.component.ts           |  210 ++
 .../hiv/report731/report731.component.css     |   69 +
 .../hiv/report731/report731.component.html    | 2879 +++++++++++++++++
 .../hiv/report731/report731.component.spec.ts |   24 +
 .../hiv/report731/report731.component.ts      |  254 ++
 16 files changed, 5778 insertions(+)
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/report731.component.css
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/report731.component.html
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/report731.component.spec.ts
 create mode 100644 src/app/data-analytics-dashboard/hiv/report731/report731.component.ts

diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.css b/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.html b/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.html
new file mode 100644
index 000000000..e0ad0f919
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.html
@@ -0,0 +1,103 @@
+<div style="margin-top: 4px; margin-bottom: 4px" class="container-fluid">
+  <div
+    style="
+      padding: 0px;
+      border: 1px double lightgray;
+      border-bottom: 0px;
+      cursor: pointer;
+    "
+    class="row"
+    (click)="filterCollapsed = !filterCollapsed"
+  >
+    <span class="text-info" style="margin: 2px; font-weight: bold">
+      <span
+        class="glyphicon glyphicon-filter"
+        style="font-weight: normal"
+      ></span>
+      Report filters</span
+    >
+    <span style="margin: 2px" class="label label-default pull-right">
+      <span
+        class="glyphicon glyphicon-chevron-down"
+        *ngIf="!filterCollapsed"
+      ></span>
+      <span
+        class="glyphicon glyphicon-chevron-up"
+        *ngIf="filterCollapsed"
+      ></span>
+    </span>
+  </div>
+  <div style="padding: 0px; border: 1px double lightgray" class="row">
+    <div *ngIf="!filterCollapsed">
+      <div
+        class="col-xs-10"
+        style="padding: 4px; border-left: 4px solid lightgray"
+      >
+        <div *ngIf="!isMonthMode" class="form-row">
+          <label for="startDate">Start Date</label>
+          <input
+            id="startDate"
+            type="date"
+            class="form-control"
+            [(ngModel)]="startDateString"
+          />
+        </div>
+        <div *ngIf="!isMonthMode" class="form-row">
+          <label for="endDate">End Date</label>
+          <input
+            id="endDate"
+            type="date"
+            class="form-control"
+            [(ngModel)]="endDateString"
+          />
+        </div>
+        <div *ngIf="isMonthMode" class="form-row">
+          <label for="month">Month:</label>
+          <input
+            id="month"
+            type="month"
+            class="form-control"
+            [(ngModel)]="monthString"
+          />
+        </div>
+        <div class="form-row" *ngIf="showIsAggregateControl">
+          <label for="isAggregate">Aggregate Locations</label>
+          <input
+            id="isAggregate"
+            type="checkbox"
+            name="aggregated"
+            [checked]="isAggregated"
+            (change)="isAggregated = !isAggregated"
+          />
+        </div>
+      </div>
+    </div>
+  </div>
+  <div
+    style="padding: 0px; border: 1px double lightgray"
+    class="row"
+    *ngIf="showLocationsControl"
+  >
+    <location-filter
+      [multiple]="true"
+      [locationUuids]="locationUuids"
+      (onLocationChange)="onLocationsSelected($event)"
+    ></location-filter>
+  </div>
+  <div class="row" style="margin-top: 4px; padding: 0px">
+    <button
+      type="button"
+      *ngIf="!parentIsBusy"
+      class="btn btn-primary pull-right"
+      (click)="onClickedGenerate()"
+    >
+      Generate Report
+    </button>
+    <span
+      class="pull-right"
+      style="font-weight: bold; color: gray"
+      *ngIf="parentIsBusy"
+      >Loading report..</span
+    >
+  </div>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.spec.ts b/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.spec.ts
new file mode 100644
index 000000000..68d50b30b
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { Moh731FiltersComponent } from './moh731-filters.component';
+
+describe('Moh731FiltersComponent', () => {
+  let component: Moh731FiltersComponent;
+  let fixture: ComponentFixture<Moh731FiltersComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [Moh731FiltersComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(Moh731FiltersComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.ts b/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.ts
new file mode 100644
index 000000000..e37201e8a
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/moh731-filters/moh731-filters.component.ts
@@ -0,0 +1,155 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output
+} from '@angular/core';
+import * as Moment from 'moment';
+
+@Component({
+  selector: 'app-moh731-filters',
+  templateUrl: './moh731-filters.component.html',
+  styleUrls: ['./moh731-filters.component.css'],
+  changeDetection: ChangeDetectionStrategy.OnPush
+})
+export class Moh731FiltersComponent implements OnInit {
+  public filterCollapsed: boolean;
+  @Output()
+  public generateReport = new EventEmitter();
+
+  @Output()
+  public startDateChange = new EventEmitter<Date>();
+
+  @Output()
+  public endDateChange = new EventEmitter<Date>();
+
+  @Output()
+  public isLegacyVersionChange = new EventEmitter<boolean>();
+
+  @Output()
+  public isAggregatedChange = new EventEmitter<boolean>();
+
+  @Input()
+  public locationUuids: Array<any> = [];
+
+  @Output()
+  public locationUuidsChange = new EventEmitter<any>();
+
+  @Input()
+  public parentIsBusy = false;
+
+  @Input()
+  public isMonthMode = true;
+
+  private _showIsAggregateControl = false;
+  public get showIsAggregateControl(): boolean {
+    return this._showIsAggregateControl;
+  }
+  @Input()
+  public set showIsAggregateControl(v: boolean) {
+    this._showIsAggregateControl = v;
+  }
+
+  private _showLocationsControl = false;
+  public get showLocationsControl(): boolean {
+    return this._showLocationsControl;
+  }
+  @Input()
+  public set showLocationsControl(v: boolean) {
+    this._showLocationsControl = v;
+  }
+
+  private _startDate: Date;
+  public get startDate(): Date {
+    return this._startDate;
+  }
+  @Input()
+  public set startDate(v: Date) {
+    this._startDate = v;
+    this._month = v;
+    this.startDateChange.emit(this.startDate);
+  }
+
+  public get startDateString(): string {
+    return this.startDate ? Moment(this.startDate).format('YYYY-MM-DD') : null;
+  }
+  public set startDateString(v: string) {
+    this.startDate = new Date(v);
+  }
+
+  public get endDateString(): string {
+    return this.endDate ? Moment(this.endDate).format('YYYY-MM-DD') : null;
+  }
+  public set endDateString(v: string) {
+    this.endDate = new Date(v);
+  }
+
+  private _endDate: Date;
+  public get endDate(): Date {
+    return this._endDate;
+  }
+  @Input()
+  public set endDate(v: Date) {
+    this._endDate = v;
+    this._month = v;
+    this.endDateChange.emit(this.endDate);
+  }
+
+  public get monthString(): string {
+    return this.month ? Moment(this.month).format('YYYY-MM') : null;
+  }
+  public set monthString(v: string) {
+    this.month = new Date(v);
+  }
+
+  private _month: Date;
+  public get month(): Date {
+    return this._month;
+  }
+  @Input()
+  public set month(v: Date) {
+    this._month = v;
+    this.startDate = Moment(this._month).startOf('month').toDate();
+    this.endDate = Moment(this._month).endOf('month').toDate();
+  }
+
+  private _isAggregated: boolean;
+  public get isAggregated(): boolean {
+    return this._isAggregated;
+  }
+  @Input()
+  public set isAggregated(v: boolean) {
+    this._isAggregated = v;
+    this.isAggregatedChange.emit(this.isAggregated);
+  }
+
+  private _isLegacyVersion = true;
+  public get isLegacyVersion(): boolean {
+    return this._isLegacyVersion;
+  }
+  @Input()
+  public set isLegacyVersion(v: boolean) {
+    this._isLegacyVersion = v;
+    this.isLegacyVersionChange.emit(this.isLegacyVersion);
+  }
+
+  constructor() {}
+
+  ngOnInit() {}
+
+  public onClickedGenerate() {
+    this.generateReport.emit();
+  }
+
+  public changeIsLegacyValue(val: boolean) {
+    this.isLegacyVersion = val;
+  }
+
+  public onLocationsSelected(val) {
+    if (val) {
+      this.locationUuidsChange.emit(val.locations);
+    }
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.css b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.html b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.html
new file mode 100644
index 000000000..7fbb5852d
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.html
@@ -0,0 +1,48 @@
+<div>
+  <button class="btn btn-primary" (click)="goBack()">
+    <span class="glyphicon glyphicon-arrow-left"></span>
+    <span>Go back to report view</span>
+  </button>
+</div>
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+<h3>
+  <b>{{ selectedIndicatorGender }} {{ selectedIndicator }}</b> patient list
+</h3>
+<hr />
+<patient-list
+  [extraColumns]="extraColumns"
+  [overrideColumns]="overrideColumns"
+  [data]="patientData"
+></patient-list>
+
+<div *ngIf="!hasLoadedAll">
+  <div class="button">
+    <button
+      class="btn btn-primary"
+      [ladda]="isLoading"
+      data-size="xs"
+      data-color="blue"
+      (click)="loadMorePatients()"
+    >
+      <span class=""></span>Load More...
+    </button>
+  </div>
+</div>
+
+<div *ngIf="hasLoadedAll">
+  <p class="bg-info" style="padding: 4px">
+    <b>
+      <span style="color: green" class="glyphicon glyphicon-ok"
+        >All records loaded {{ '[ ' + patientData.length + ' ]' }}</span
+      ></b
+    >
+  </p>
+
+  <p></p>
+</div>
+
+<div *ngIf="hasError">
+  <p class="alert-error alert">Error loading patient list.</p>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.spec.ts b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.spec.ts
new file mode 100644
index 000000000..8a394a8c9
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { Moh731ReportPatientListComponent } from './moh731-report-patient-list.component';
+
+describe('Moh731ReportPatientListComponent', () => {
+  let component: Moh731ReportPatientListComponent;
+  let fixture: ComponentFixture<Moh731ReportPatientListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [Moh731ReportPatientListComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(Moh731ReportPatientListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.ts b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.ts
new file mode 100644
index 000000000..19cbbff70
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-patient-list/moh731-report-patient-list.component.ts
@@ -0,0 +1,159 @@
+import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Location } from '@angular/common';
+import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
+
+@Component({
+  selector: 'app-moh731-report-patient-list',
+  templateUrl: './moh731-report-patient-list.component.html',
+  styleUrls: ['./moh731-report-patient-list.component.css']
+})
+export class Moh731ReportPatientListComponent implements OnInit {
+  public params: any;
+  public patientData: any;
+  public extraColumns: Array<any> = [];
+  public isLoading = true;
+  public overrideColumns: Array<any> = [];
+  public selectedIndicator: string;
+  public selectedIndicatorGender: string;
+  public hasLoadedAll = false;
+  public hasError = false;
+  public selectedMonth: String;
+  public busyIndicator: any = {
+    busy: false,
+    message: ''
+  };
+
+  constructor(
+    private router: Router,
+    private route: ActivatedRoute,
+    private _location: Location,
+    public register: RegistersResourceService
+  ) {}
+
+  ngOnInit() {
+    this.route.queryParams.subscribe(
+      (params) => {
+        if (params && params.month) {
+          this.params = params;
+          this.selectedIndicator = params.indicatorHeader;
+          this.selectedIndicatorGender = params.indicatorGender;
+          this.getPatientList(params, params.indicators);
+        }
+      },
+      (error) => {
+        console.error('Error', error);
+      }
+    );
+    this.addExtraColumns();
+  }
+
+  private getPatientList(params: any, indicator: string) {
+    this.busyIndicator = {
+      busy: true,
+      message: 'Loading Patient List...please wait'
+    };
+    console.log('PARAMS: ' + JSON.stringify(params));
+    this.register.getMoh731PatientList(params, indicator).subscribe((data) => {
+      this.isLoading = false;
+      this.patientData = data.results.results;
+      if (data.results.results.length < 300) {
+        this.hasLoadedAll = true;
+      }
+      this.busyIndicator = {
+        busy: false,
+        message: ''
+      };
+    });
+  }
+
+  public addExtraColumns() {
+    const extraColumns = {
+      weight: 'Weight',
+      height: 'Height',
+      stage: 'WHO Stage',
+      location: 'Location',
+      enrollment_date: 'Enrollment Date',
+      arv_first_regimen_start_date: 'ARVs Initial Start Date',
+      cur_regimen_arv_start_date: 'Current ARV Regimen Start Date (edited)',
+      cur_arv_line: 'Current ARV Line (edited)',
+      cur_arv_meds: 'Current ARV Regimen',
+      has_pending_vl_test: 'Pending Viral Load Test',
+      phone_number: 'Phone Number',
+      last_appointment: 'Latest Appointment',
+      patient_category: 'Patient Category',
+      latest_rtc_date: 'Latest RTC Date',
+      latest_vl: 'Latest VL',
+      vl_category: 'VL Category',
+      latest_vl_date: 'Latest VL Date',
+      previous_vl: 'Previous VL',
+      previous_vl_date: 'Previous VL Date',
+      ipt_start_date: 'IPT Start Date',
+      ipt_completion_date: 'IPT Completion Date',
+      ipt_stop_date: 'IPT Stop Date',
+      ovcid_id: 'OVCID',
+      hiv_disclosure_status: 'Hiv Disclosure Status',
+      discordant_status: 'Discordant Status',
+      tb_screening_date: 'TB Screening Date',
+      tb_screening_result: 'TB Screening Result',
+      covid_19_vaccination_status: 'Covid-19 Assessment Status',
+      cervical_screening_date: 'Cervical Screening Date',
+      cervical_screening_method: 'Cervical Screening Method',
+      cervical_screening_result: 'Cervical Screening Result',
+      sms_consent_provided: 'SMS Consent Provided',
+      sms_receive_time: 'SMS Time',
+      nearest_center: 'Nearest Center',
+      patient_categorization: 'DSD Model'
+    };
+
+    const status = this.selectedIndicatorGender.split(' - ')[0];
+    if (status === 'Died') {
+      Object.assign(extraColumns, {
+        death_date: 'Death Date',
+        cause_of_death: 'Cause of Death'
+      });
+    } else if (status === 'Transferred Out') {
+      Object.assign(extraColumns, {
+        transfer_out_date_v1: 'Transfer out date'
+      });
+    }
+    for (const indicator in extraColumns) {
+      if (indicator) {
+        this.extraColumns.push({
+          headerName: extraColumns[indicator],
+          field: indicator
+        });
+      }
+    }
+
+    this.overrideColumns.push(
+      {
+        field: 'identifiers',
+        cellRenderer: (column) => {
+          return (
+            '<a href="javascript:void(0);" title="Identifiers">' +
+            column.value +
+            '</a>'
+          );
+        }
+      },
+      {
+        field: 'last_appointment',
+        width: 200
+      },
+      {
+        field: 'cur_prep_meds_names',
+        width: 160
+      }
+    );
+  }
+
+  public loadMorePatients() {
+    this.isLoading = true;
+    this.getPatientList(this.params, this.params.indicators);
+  }
+
+  public goBack() {
+    this._location.back();
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.css b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.css
new file mode 100644
index 000000000..77429c985
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.css
@@ -0,0 +1,68 @@
+.table {
+  border: 2px solid #000;
+}
+
+.border {
+  background-color: #f2f2f2;
+  border-bottom: 2px solid #000;
+  width: 100%;
+}
+.border2 {
+  background-color: #f2f2f2;
+  border-top: 2px solid #000;
+  border-bottom: 2px solid #000;
+  width: 100%;
+}
+
+.border3 {
+  border-top: 2px solid #000;
+  border-right: 2px dotted #000;
+  width: 78.5%;
+}
+
+.flex-column {
+  display: flex;
+  flex-direction: column;
+  margin: 1%;
+}
+
+.flex-row {
+  display: flex;
+  justify-content: space-between;
+}
+.rectangle {
+  width: 50px;
+  height: 20px;
+  border: 2px solid #000;
+  display: inline-block;
+  margin-left: 5px;
+}
+.text-box {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.text-box2 {
+  margin-left: 10px;
+}
+.space-after {
+  padding-right: 6vw;
+}
+.border-right {
+  border-right: 2px dotted #000;
+  padding-right: 4vw;
+}
+.border-left {
+  border-left: 2px dotted #000;
+  padding-left: 1vw;
+}
+
+.review-section {
+  display: grid;
+  grid-template-columns: repeat(5, 1fr);
+  column-gap: 20px;
+  text-align: center;
+  font-size: 14px;
+  margin-top: 10px;
+  font-weight: bold;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.html b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.html
new file mode 100644
index 000000000..3ed2b59dd
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.html
@@ -0,0 +1,1737 @@
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div class="table-responsible">
+  <div class="row">
+    <div class="col-md-4">
+      <b>Ministry Of Health</b>
+    </div>
+    <div class="col-md-4 text-right">
+      <b>Ver. July 2023</b>
+    </div>
+  </div>
+  <div class="table table-bordered border border-2">
+    <table style="width: 100%">
+      <tr>
+        <td style="text-align: center; font-weight: bold">
+          National AIDS & STI Control Program- NASCOP <br />
+          Comprehensive HIV/ AIDS reporting form
+          <div style="text-align: end; margin-bottom: 1%">
+            <span style="text-align: end; border: 2px dotted #000"
+              >(MOH 731-Ver. July 2023)</span
+            >
+          </div>
+        </td>
+      </tr>
+    </table>
+  </div>
+  <table class="table" style="margin-top: 0.5%">
+    <tr>
+      <td style="padding-left: 40%; padding-bottom: 1%">
+        County______________________SubCounty___________________Facility___________________MFL_______Month______year______
+      </td>
+    </tr>
+  </table>
+  <table class="table" style="margin-top: 1%">
+    <thead>
+      <tr>
+        <th class="border">1. HIV Testing & Pre exposure Prophylaxis</th>
+      </tr>
+    </thead>
+    <tbody>
+      <div class="flex-row">
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">1.1 HIV Tests</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female(Including PMTCT)</td>
+          </tr>
+          <tr>
+            <td>Tests</td>
+            <td class="text-box">
+              <span>HV01-01</span>
+              <div class="rectangle">{{ MOH731RegisterData.hiv_male }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-02</span>
+                <div class="rectangle">{{ MOH731RegisterData.hiv_female }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr class="margin">
+            <td>Tests_Facility</td>
+            <td class="text-box">
+              <span>HV01-03</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hiv_setting_facility }}
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tests_Community</td>
+            <td class="text-box">
+              <span>HV01-04</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hiv_setting_community }}
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested KVP</td>
+            <td class="text-box">
+              <span>HV01-05</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hiv_setting_kvp }}
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.3 No. Initiated on PrEP(NEW)
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female</td>
+          </tr>
+          <tr>
+            <td>General popn</td>
+            <td class="text-box">
+              <span>HV01-19</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_male_general_pop }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-20</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_female_general_pop }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>MSM/MSW</td>
+            <td class="text-box">
+              <span>HV01-21</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_new_msm }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>FSW</td>
+            <td></td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-22</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_fsw }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>PWID/PWUD</td>
+            <td class="text-box">
+              <span>HV01-23</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_pwud_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-24</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_pwud_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Discordant Couple</td>
+            <td class="text-box">
+              <span>HV01-25</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_discordant_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-26</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_discordant_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Vulnerable Pop.</td>
+            <td class="text-box">
+              <span>HV01-27</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_vulnerable_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-28</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_vulnerable_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>AYP (10-24yrs)</td>
+            <td class="text-box">
+              <span>HV01-29</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_new_ayp }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-30</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_ayp }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Pregnant and breastfeeding women</td>
+            <td></td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-31</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_preg_breastfeeding }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.5 No. Seroconverted while on PrEP
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female</td>
+          </tr>
+          <tr>
+            <td>HIV Positive</td>
+            <td class="text-box" (click)="onIndicatorSelected($event)">
+              <span>HV01-45</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.seroconverted_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-46</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.seroconverted_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.2 HIV Positive Results
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female</td>
+          </tr>
+          <tr>
+            <td>Positive_2-9</td>
+            <td class="text-box">
+              <span>HV01-06</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_2_9 }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-07</span>
+                <div class="rectangle">{{ MOH731RegisterData.female_2_9 }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_10-14</td>
+            <td class="text-box">
+              <span>HV01-08</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_10_14 }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-09</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_10_14 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_15-19</td>
+            <td class="text-box">
+              <span>HV01-10</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_15_19 }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-11</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_15_19 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_20-24</td>
+            <td class="text-box">
+              <span>HV01-12</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_20_24 }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-13</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_25+</td>
+            <td class="text-box">
+              <span>HV01-14</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.male_25_above }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-15</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_25_above }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_KVP</td>
+            <td class="text-box">
+              <span>HV01-16</span>
+              <div class="rectangle"></div>
+            </td>
+          </tr>
+          <tr style="padding-top: 10px; padding-bottom: 10px">
+            <td>Discordant</td>
+            <td class="text-box">
+              <span>HV01-17</span>
+              <div class="rectangle"></div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-18</span>
+                <div class="rectangle"></div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Inconclusive Test Results</td>
+            <td class="text-box">
+              <span>HV01-47</span>
+              <div class="rectangle"></div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-48</span>
+                <div class="rectangle"></div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.4 No. on PrEP Diagnosed with STI
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female</td>
+          </tr>
+          <tr>
+            <td>General popn</td>
+            <td class="text-box">
+              <span>HV01-32</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_male_general_pop }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-33</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_female_general_pop }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>MSM/MSW</td>
+            <td class="text-box">
+              <span>HV01-34</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_sti_msm }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>FSW</td>
+            <td class="text-box">
+              <span>HV01-35</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_sti_fsw }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>PWID/PWUD</td>
+            <td class="text-box">
+              <span>HV01-36</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_pwud_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-37</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_pwud_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Discordant Couple</td>
+            <td class="text-box">
+              <span>HV01-38</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_discordant_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-39</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_discordant_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Vulnerable Pop.</td>
+            <td class="text-box">
+              <span>HV01-40</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_vulnerable_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-41</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_vulnerable_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>AYP(10-24 yrs)</td>
+            <td class="text-box">
+              <span>HV01-42</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_sti_ayp }}</div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-43</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_ayp }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Pregnant and breastfeeding women</td>
+            <td></td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV01-44</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_preg_breastfeeding }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+      </div>
+    </tbody>
+    <thead>
+      <tr>
+        <th class="border2">
+          2. Elimination of Mother-to-Child Transmission(EMTCT)
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <div class="flex-row">
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.1 Maternal HIV Testing
+            </td>
+          </tr>
+          <tr>
+            <td>Known Positive at 1st ANC</td>
+            <td class="text-box">
+              <span>HV02-01</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.known_positive_1st_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Initial</td>
+            <td style="padding-left: 60px">Retest</td>
+          </tr>
+          <tr>
+            <td>Tested at ANC</td>
+            <td class="text-box">
+              <span>HV02-02</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_anc }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-03</span>
+                <div class="rectangle">{{ MOH731RegisterData.retest_anc }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at L&D</td>
+            <td class="text-box">
+              <span>HV02-04</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_LD }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-05</span>
+                <div class="rectangle">{{ MOH731RegisterData.retest_LD }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_<=6weeks</td>
+            <td class="text-box">
+              <span>HV02-06</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_pnc_less_6_weeks }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-07</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.retest_pnc_less_6_weeks }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_>6weeks</td>
+            <td class="text-box">
+              <span>HV02-08</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_pnc_greater_6_weeks }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-09</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.retest_pnc_greater_6_weeks }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.2 HIV Positive Results
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at ANC</td>
+            <td class="text-box">
+              <span>HV02-10</span>
+              <div class="rectangle">{{ MOH731RegisterData.positive_anc }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Tested at L&D</td>
+            <td class="text-box">
+              <span>HV02-11</span>
+              <div class="rectangle">{{ MOH731RegisterData.positive_LD }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_<=6weeks</td>
+            <td class="text-box">
+              <span>HV02-12</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.positive_pnc_less_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_>6weeks</td>
+            <td class="text-box">
+              <span>HV02-13</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.positive_pnc_greater_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.3 Maternal HAART
+            </td>
+          </tr>
+          <tr>
+            <td>On HAART at 1st ANC</td>
+            <td class="text-box">
+              <span>HV02-14</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.maternal_haart_1st_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_ANC</td>
+            <td class="text-box">
+              <span>HV02-15</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_maternal_haart_1st_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_L&D</td>
+            <td class="text-box">
+              <span>HV02-16</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_maternal_haart_LD }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_PNC_< =6weeks</td>
+            <td class="text-box">
+              <span>HV02-17</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.maternal_haart_less_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_PNC_>6weeks</td>
+            <td class="text-box">
+              <span>HV02-18</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.maternal_haart_more_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.4 HBV Screening at ANC
+            </td>
+          </tr>
+          <tr>
+            <td>Screened_HBV_ANC</td>
+            <td class="text-box">
+              <span>HV02-19</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>HBV Screened_Positive</td>
+            <td class="text-box">
+              <span>HV02-20</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hbv_screened_positive_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td style="font-weight: bold">
+              2.5 Adolescents girls & Young Women (10-24 Yrs)<br />
+              testing & results
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>10-19yrs</td>
+            <td style="padding-left: 60px">20-24yrs</td>
+          </tr>
+          <tr>
+            <td>1st ANC KP</td>
+            <td class="text-box">
+              <span>HV02-21</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.known_positive_anc_10_19 }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-22</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.known_positive_anc_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>New HIV Positive</td>
+            <td class="text-box">
+              <span>HV02-23</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.positive_anc_ld_pnc_10_19 }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-24</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.positive_anc_ld_pnc_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On HAART 1st ANC KP</td>
+            <td class="text-box">
+              <span>HV02-25</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_anc_10_19 }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-26</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_anc_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Started HAART New</td>
+            <td class="text-box">
+              <span>HV02-27</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_art_10_19 }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>HV02-28</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.start_art_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.6 Infant Prophylaxis
+            </td>
+          </tr>
+          <tr>
+            <td>Infant ARV Prophylaxis_ANC</td>
+            <td class="text-box">
+              <span>HV02-29</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.infant_arv_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Infant ARV Prophylaxis_L&D</td>
+            <td class="text-box">
+              <span>HV02-30</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.infant_arv_ld }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Infant ARV Prophylaxis_L&PNC</td>
+            <td class="text-box">
+              <span>HV02-31</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.infant_arv_pnc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.7 Infant Feeding
+            </td>
+          </tr>
+          <tr>
+            <td style="font-weight: bold">Below 6 months</td>
+          </tr>
+          <tr>
+            <td>Exclusive Breastfeeding (EBF)</td>
+            <td class="text-box">
+              <span>HV02-32</span>
+              <div class="rectangle">{{ MOH731RegisterData.exclusive_bf }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td style="font-weight: bold">6 to 24 months</td>
+          </tr>
+          <tr>
+            <td>Breastfeeding (BF)</td>
+            <td class="text-box">
+              <span>HV02-33</span>
+              <div class="rectangle">{{ MOH731RegisterData.bf }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td class="space-after">Not Breastfeeding (NBF)</td>
+            <td class="text-box">
+              <span>HV02-34</span>
+              <div class="rectangle">{{ MOH731RegisterData.weaning }}</div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+      </div>
+    </tbody>
+    <thead>
+      <tr>
+        <th class="border2">3. HIV and TB treatment</th>
+      </tr>
+    </thead>
+    <tbody>
+      <div class="flex-row">
+        <div class="flex-column border-right">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.1 Starting ART
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART_<1</td>
+            <td class="text-box">
+              <span>(M) HV03-01</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_less_1_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-02</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_less_1_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 1-4</td>
+            <td class="text-box">
+              <span>(M) HV03-03</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_1_4_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-04</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_1_4_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 5-9</td>
+            <td class="text-box">
+              <span>(M) HV03-05</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_5_9_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-06</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_5_9_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 10-14</td>
+            <td class="text-box">
+              <span>(M) HV03-07</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_10_14_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-08</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_10_14_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 15-19</td>
+            <td class="text-box">
+              <span>(M) HV03-09</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_15_19_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-10</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_15_19_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 20-24</td>
+            <td class="text-box">
+              <span>(M) HV03-11</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_20_24_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-12</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_20_24_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 25+</td>
+            <td class="text-box">
+              <span>(M) HV03-013</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_25_above_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-014</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_25_above_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.2 Curently on ART ([ALL])
+            </td>
+          </tr>
+          <tr>
+            <td>On ART_<1</td>
+            <td class="text-box">
+              <span>(M) HV03-015</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_less_1_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-016</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_less_1_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 1-4</td>
+            <td class="text-box">
+              <span>(M) HV03-017</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_1_4_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-018</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_1_4_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 5-9</td>
+            <td class="text-box">
+              <span>(M) HV03-019</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_5_9_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-020</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_5_9_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 10-14</td>
+            <td class="text-box">
+              <span>(M) HV03-021</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_10_14_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-022</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_10_14_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 15-19</td>
+            <td class="text-box">
+              <span>(M) HV03-023</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_15_19_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-024</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_15_19_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 20-24</td>
+            <td class="text-box">
+              <span>(M) HV03-025</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_20_24_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-026</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_20_24_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 25+</td>
+            <td class="text-box">
+              <span>(M) HV03-027</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_25_above_male }}
+              </div>
+            </td>
+            <td>
+              <div class="text-box text-box2">
+                <span>(F) HV03-028</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_25_above_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.3 TB Screening
+            </td>
+          </tr>
+          <tr>
+            <td>Screened for TB_<15</td>
+            <td class="text-box">
+              <span>HV03-029</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.screened_tb_less_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Screened for TB_15+</td>
+            <td class="text-box">
+              <span>HV03-030</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.screened_tb_greater_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.4 Starting TPT
+            </td>
+          </tr>
+          <tr>
+            <td>Start TPT_<15</td>
+            <td class="text-box">
+              <span>HV03-031</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tpt_less_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start TPT_15+</td>
+            <td class="text-box">
+              <span>HV03-032</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tpt_greater_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.5 Differentiated Service Delivery
+            </td>
+          </tr>
+          <tr>
+            <td>Established</td>
+            <td class="text-box">
+              <span>HV03-033</span>
+              <div class="rectangle">{{ MOH731RegisterData.established }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Not Established</td>
+            <td class="text-box">
+              <span>HV03-034</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.not_established }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Community</td>
+            <td class="text-box">
+              <span>HV03-035</span>
+              <div class="rectangle">{{ MOH731RegisterData.community }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Facility</td>
+            <td class="text-box">
+              <span>HV03-036</span>
+              <div class="rectangle">{{ MOH731RegisterData.facility }}</div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.6 Nutrition and HIV
+            </td>
+          </tr>
+          <tr>
+            <td>Number SAM +</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td class="text-box">
+              <span>HV03-037</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td class="text-box">
+              <span>HV03-038</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td class="text-box">
+              <span>HV03-039</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td class="text-box">
+              <span>HV03-040</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td class="text-box">
+              <span>HV03-041</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td class="text-box">
+              <span>HV03-042</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <div style="height: 2vh"></div>
+          <tr>
+            <td class="space-after">Number MAM +</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td class="text-box">
+              <span>HV03-043</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td class="text-box">
+              <span>HV03-044</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td class="text-box">
+              <span>HV03-045</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td class="text-box">
+              <span>HV03-046</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td class="text-box">
+              <span>HV03-047</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td class="text-box">
+              <span>HV03-048</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <div style="height: 2vh"></div>
+          <tr>
+            <td>Number SAM + receiving therapeutic foods</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td class="text-box">
+              <span>HV03-049</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td class="text-box">
+              <span>HV03-050</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td class="text-box">
+              <span>HV03-051</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td class="text-box">
+              <span>HV03-052</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td class="text-box">
+              <span>HV03-053</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td class="text-box">
+              <span>HV03-054</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <div style="height: 2vh"></div>
+          <tr>
+            <td>Number MAM + receiving Supplimental foods</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td class="text-box">
+              <span>HV03-055</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td class="text-box">
+              <span>HV03-056</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td class="text-box">
+              <span>HV03-057</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td class="text-box">
+              <span>HV03-058</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td class="text-box">
+              <span>HV03-059</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td class="text-box">
+              <span>HV03-060</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+        </div>
+        <div class="flex-column border-left">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.7 HIV in TB Clinic
+            </td>
+          </tr>
+          <tr>
+            <td>TB cases_New</td>
+            <td class="text-box">
+              <span>HV03-061</span>
+              <div class="rectangle">{{ MOH731RegisterData.start_tb }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>
+              TB_New_Known HIV<br />
+              Positive(KPs)
+            </td>
+            <td class="text-box">
+              <span>HV03-062</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_known_positive }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>TB_New HIV Positive</td>
+            <td class="text-box">
+              <span>HV03-063</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_positive }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>
+              TB_New_Known HIV<br />
+              Positive(KP) on HAART
+            </td>
+            <td class="text-box">
+              <span>HV03-064</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_on_art }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>TB New_Start_HAART</td>
+            <td class="text-box">
+              <span>HV03-065</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_art_new }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <thead>
+            <tr>
+              <th class="border2">4. Medical Male Circumcision</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td class="space-after" style="font-weight: bold">
+                4.1 Number circumcised
+              </td>
+            </tr>
+            <tr>
+              <td>Circumcised_0-60 days</td>
+              <td class="text-box">
+                <span>HV04-01</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Circumcised_61 days -9 yrs days</td>
+              <td class="text-box">
+                <span>HV04-02</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Circumcised_10-14</td>
+              <td class="text-box">
+                <span>HV04-03</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Circumcised_15 +</td>
+              <td class="text-box">
+                <span>HV04-04</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after">Tested_ HIV+</td>
+              <td class="text-box">
+                <span>HV04-05</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td class="space-after">Tested_ HIV-</td>
+              <td class="text-box">
+                <span>HV04-06</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after" style="font-weight: bold">
+                4.2 Type of circumcission
+              </td>
+            </tr>
+            <tr>
+              <td>Surgical</td>
+              <td class="text-box">
+                <span>HV04-07</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Devices</td>
+              <td class="text-box">
+                <span>HV04-08</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after" style="font-weight: bold">
+                4.3 Circumcission Adverse Events
+              </td>
+            </tr>
+            <tr>
+              <td>AE_During_Moderate</td>
+              <td class="text-box">
+                <span>HV04-09</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>AE_During_Severe</td>
+              <td class="text-box">
+                <span>HV04-10</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after">AE_Post_Moderate</td>
+              <td class="text-box">
+                <span>HV04-11</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td class="space-after">AE_Post_Severe</td>
+              <td class="text-box">
+                <span>HV04-12</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after">Follow up visit < 14d</td>
+              <td class="text-box">
+                <span>HV04-13</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+          </tbody>
+          <thead>
+            <tr>
+              <th class="border2">5. Post Exposure Prophylaxis</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>Exposed_Occupational</td>
+              <td class="text-box">
+                <span>HV05-01</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.exposed_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Exposed Other</td>
+              <td class="text-box">
+                <span>HV05-02</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.exposed_non_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>PEP_Occupational</td>
+              <td class="text-box">
+                <span>HV05-03</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.pep_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>PEP_Other</td>
+              <td class="text-box">
+                <span>HV05-04</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.pep_non_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+          </tbody>
+        </div>
+      </div>
+    </tbody>
+    <thead>
+      <div class="review-section border3">
+        <div>Reviewed by:</div>
+        <div>Name</div>
+        <div>Designation</div>
+        <div>Signature</div>
+        <div>Date</div>
+
+        <div></div>
+        <div>_______________________________________</div>
+        <div>______________________</div>
+        <div>_____________</div>
+        <div>____________</div>
+      </div>
+    </thead>
+  </table>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.spec.ts b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.spec.ts
new file mode 100644
index 000000000..be41a84ae
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { Moh731ReportViewComponent } from './moh731-report-view.component';
+
+describe('Moh731ReportViewComponent', () => {
+  let component: Moh731ReportViewComponent;
+  let fixture: ComponentFixture<Moh731ReportViewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [Moh731ReportViewComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(Moh731ReportViewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.ts b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.ts
new file mode 100644
index 000000000..2a5723a2a
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/moh731-report-view/moh731-report-view.component.ts
@@ -0,0 +1,210 @@
+import {
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
+import * as _ from 'lodash';
+import * as Moment from 'moment';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
+import { ActivatedRoute, Router } from '@angular/router';
+import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
+import { DatePipe } from '@angular/common';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
+
+@Component({
+  selector: 'app-moh731-report-view',
+  templateUrl: './moh731-report-view.component.html',
+  styleUrls: ['./moh731-report-view.component.css']
+})
+export class Moh731ReportViewComponent implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  @Input() MOH731RegisterData: any;
+  @Output() generateReportEvent = new EventEmitter<void>();
+  @Output() indicatorSelectedEvent = new EventEmitter<void>();
+  public columnDefs: any = [];
+  public reportName = 'MOH 731 REPORT';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+  public jointLocationUuids = [];
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'datesControl, locationControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public isReleased = true;
+  public generated = false;
+  public showIsAggregateControl = false;
+  public showLocationsControl = true;
+  @ViewChild('cntdarcontentToSnapshot') contentToSnapshot!: ElementRef;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  private _startDate: Date = Moment()
+    .subtract(1, 'months')
+    .startOf('month')
+    .toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = Moment()
+    .subtract(1, 'months')
+    .endOf('month')
+    .toDate();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public register: RegistersResourceService,
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment().format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {}
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).format('YYYY-MM-DD');
+  }
+
+  public storeParamsInUrl() {
+    this.params = {
+      locationUuids: this.getSelectedLocations(this.jointLocationUuids),
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  public generateReport(): any {
+    this.generateReportEvent.emit();
+  }
+
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.MOH731RegisterData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.MOH731RegisterData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(value) {
+    this.indicatorSelectedEvent.emit(value);
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH 731 Register.pdf');
+    });
+  }
+
+  private getSelectedLocations(locationUuids: any): string {
+    if (!locationUuids || locationUuids.length === 0) {
+      return '';
+    }
+
+    let selectedLocations = '';
+
+    for (let i = 0; i < locationUuids.length; i++) {
+      if (i === 0) {
+        selectedLocations = selectedLocations + (locationUuids[0] as any).value;
+      } else {
+        selectedLocations =
+          selectedLocations + ',' + (locationUuids[i] as any).value;
+      }
+    }
+    return selectedLocations;
+  }
+}
diff --git a/src/app/data-analytics-dashboard/hiv/report731/report731.component.css b/src/app/data-analytics-dashboard/hiv/report731/report731.component.css
new file mode 100644
index 000000000..2e970f9a7
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/report731.component.css
@@ -0,0 +1,69 @@
+.table {
+  border: 2px solid #000;
+}
+
+.border {
+  background-color: #f2f2f2;
+  border-bottom: 2px solid #000;
+  width: 100%;
+}
+.border2 {
+  background-color: #f2f2f2;
+  border-top: 2px solid #000;
+  border-bottom: 2px solid #000;
+  width: 100%;
+}
+
+.border3 {
+  border-top: 2px solid #000;
+  border-right: 2px dotted #000;
+  width: 78.5%;
+}
+
+.flex-column {
+  display: flex;
+  flex-direction: column;
+  margin: 1%;
+}
+
+.flex-row {
+  display: flex;
+  justify-content: space-between;
+}
+.rectangle {
+  width: 50px;
+  height: 20px;
+  border: 2px solid #000;
+  display: inline-block;
+  margin-left: 5px;
+  text-align: center;
+}
+.text-box {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+.text-box2 {
+  margin-left: 10px;
+}
+.space-after {
+  padding-right: 6vw;
+}
+.border-right {
+  border-right: 2px dotted #000;
+  padding-right: 4vw;
+}
+.border-left {
+  border-left: 2px dotted #000;
+  padding-left: 1vw;
+}
+
+.review-section {
+  display: grid;
+  grid-template-columns: repeat(5, 1fr);
+  column-gap: 20px;
+  text-align: center;
+  font-size: 14px;
+  margin-top: 10px;
+  font-weight: bold;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/report731/report731.component.html b/src/app/data-analytics-dashboard/hiv/report731/report731.component.html
new file mode 100644
index 000000000..c7b56c9c9
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/report731.component.html
@@ -0,0 +1,2879 @@
+<h4 class="component-title text-success">
+  <span class="fa fa-table"></span>{{ reportName }}
+</h4>
+
+<div class="loader" *ngIf="isLoading">
+  <span><i class="fa fa-spinner fa-spin"></i>Loading...</span>
+</div>
+
+<p-tabView>
+  <div>
+    <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
+      <app-moh731-filters
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
+        [(locationUuids)]="jointLocationUuids"
+        [showLocationsControl]="showLocationsControl"
+        [showIsAggregateControl]="showIsAggregateControl"
+        (generateReport)="generateReport()"
+      >
+      </app-moh731-filters>
+    </p-tabPanel>
+  </div>
+</p-tabView>
+<div class="alert alert-danger fade in" *ngIf="showInfoMessage">
+  <a href="#" class="close" data-dismiss="alert">&times;</a>
+  <h4 *ngIf="!statusError">
+    <strong><span class="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>
+<div class="table-responsible">
+  <div class="row">
+    <div class="col-md-4">
+      <b>Ministry Of Health</b>
+    </div>
+    <div class="col-md-4 text-right">
+      <b>Ver. July 2023</b>
+    </div>
+  </div>
+  <div class="table table-bordered border border-2">
+    <table style="width: 100%">
+      <tr>
+        <td style="text-align: center; font-weight: bold">
+          National AIDS & STI Control Program- NASCOP <br />
+          Comprehensive HIV/ AIDS reporting form
+          <div style="text-align: end; margin-bottom: 1%">
+            <span style="text-align: end; border: 2px dotted #000"
+              >(MOH 731-Ver. July 2023)</span
+            >
+          </div>
+        </td>
+      </tr>
+    </table>
+  </div>
+  <table class="table" style="margin-top: 0.5%">
+    <tr>
+      <td style="padding-left: 40%; padding-bottom: 1%">
+        County______________________SubCounty___________________Facility___________________MFL_______Month______year______
+      </td>
+    </tr>
+  </table>
+  <table class="table" style="margin-top: 1%">
+    <thead>
+      <tr>
+        <th class="border">1. HIV Testing & Pre exposure Prophylaxis</th>
+      </tr>
+    </thead>
+    <tbody>
+      <div class="flex-row">
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">1.1 HIV Tests</td>
+          </tr>
+          <tr>
+            <td></td>
+            <td style="font-weight: bold; padding-left: 60px">Male</td>
+            <td style="padding-left: 77px; font-weight: bold">
+              Female(Including<br />
+              PMTCT)
+            </td>
+          </tr>
+          <tr>
+            <td>Tests</td>
+            <td
+              class="text-box"
+              (click)="onIndicatorSelected('HIV Tests', 'hiv_male', 'M')"
+            >
+              <span>HV01-01</span>
+              <div class="rectangle">{{ MOH731RegisterData.hiv_male }}</div>
+            </td>
+            <td (click)="onIndicatorSelected('HIV Tests', 'hiv_female', 'F')">
+              <div class="text-box text-box2">
+                <span>HV01-02</span>
+                <div class="rectangle">{{ MOH731RegisterData.hiv_female }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr class="margin">
+            <td>Tests_Facility</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('HIV Tests', 'hiv_setting_facility', '')
+              "
+            >
+              <span>HV01-03</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hiv_setting_facility }}
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tests_Community</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('HIV Tests', 'hiv_setting_community', '')
+              "
+            >
+              <span>HV01-04</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hiv_setting_community }}
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested KVP</td>
+            <td
+              class="text-box"
+              (click)="onIndicatorSelected('HIV Tests', 'hiv_setting_kvp', '')"
+            >
+              <span>HV01-05</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hiv_setting_kvp }}
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.3 No. Initiated on PrEP(NEW)
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td style="font-weight: bold; padding-left: 70px">Male</td>
+            <td style="font-weight: bold; padding-left: 75px">Female</td>
+          </tr>
+          <tr>
+            <td>General popn</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_male_general_pop',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-19</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_male_general_pop }}
+              </div>
+            </td>
+            <td>
+              <div
+                class="text-box text-box2"
+                (click)="
+                  onIndicatorSelected(
+                    'Initiated on PrEP(NEW)',
+                    'prep_new_female_general_pop',
+                    'F'
+                  )
+                "
+              >
+                <span>HV01-20</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_female_general_pop }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>MSM/MSW</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_msm',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-21</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_new_msm }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>FSW</td>
+            <td></td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_fsw',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-22</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_fsw }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>PWID/PWUD</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_pwud_male',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-23</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_pwud_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_pwud_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-24</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_pwud_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Discordant Couple</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW) Discordant Couple',
+                  'prep_new_discordant_male',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-25</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_discordant_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_discordant_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-26</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_discordant_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Vulnerable Pop.</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_vulnerable_male',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-27</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_new_vulnerable_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_vulnerable_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-28</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_vulnerable_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>AYP (10-24yrs)</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_ayp',
+                  'F'
+                )
+              "
+            >
+              <span>HV01-29</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_new_ayp }}</div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_ayp',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-30</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_ayp }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Pregnant and breastfeeding women</td>
+            <td></td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Initiated on PrEP(NEW)',
+                  'prep_new_preg_breastfeeding',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-31</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_new_preg_breastfeeding }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.5 No. Seroconverted while on PrEP
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td>Male</td>
+            <td style="padding-left: 60px">Female</td>
+          </tr>
+          <tr>
+            <td>HIV Positive</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Seroconverted while on PrEP Male',
+                  'seroconverted_male',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-45</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.seroconverted_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Seroconverted while on PrEP Female',
+                  'seroconverted_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-46</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.seroconverted_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.2 HIV Positive Results
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td style="font-weight: bold; padding-left: 62px">Male</td>
+            <td style="padding-left: 72px; font-weight: bold">Female</td>
+          </tr>
+          <tr>
+            <td>Positive_2-9</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('HIV Positive Results', 'male_2_9', 'M')
+              "
+            >
+              <span>HV01-06</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_2_9 }}</div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('HIV Positive Results', 'female_2_9', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-07</span>
+                <div class="rectangle">{{ MOH731RegisterData.female_2_9 }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_10-14</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('HIV Positive Results', 'male_10_14', 'M')
+              "
+            >
+              <span>HV01-08</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_10_14 }}</div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('HIV Positive Results', 'female_10_14', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-09</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_10_14 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_15-19</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('HIV Positive Results', 'male_15_19', 'M')
+              "
+            >
+              <span>HV01-10</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_15_19 }}</div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('HIV Positive Results', 'female_15_19', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-11</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_15_19 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_20-24</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('HIV Positive Results', 'male_20_24', 'M')
+              "
+            >
+              <span>HV01-12</span>
+              <div class="rectangle">{{ MOH731RegisterData.male_20_24 }}</div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('HIV Positive Results', 'female_20_24', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-13</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_25+</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'HIV Positive Results',
+                  'male_25_above',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-14</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.male_25_above }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'HIV Positive Results',
+                  'female_25_above',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-15</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.female_25_above }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Positive_KVP</td>
+            <td
+              class="text-box"
+              (click)="onIndicatorSelected('HIV Positive Results', '', 'M')"
+            >
+              <span>HV01-16</span>
+              <div class="rectangle"></div>
+            </td>
+          </tr>
+          <tr style="padding-top: 10px; padding-bottom: 10px">
+            <td>Discordant</td>
+            <td
+              class="text-box"
+              (click)="onIndicatorSelected('HIV Positive Results', '', 'M')"
+            >
+              <span>HV01-17</span>
+              <div class="rectangle"></div>
+            </td>
+            <td (click)="onIndicatorSelected('HIV Positive Results', '', 'F')">
+              <div class="text-box text-box2">
+                <span>HV01-18</span>
+                <div class="rectangle"></div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Inconclusive Test Results</td>
+            <td
+              class="text-box"
+              (click)="onIndicatorSelected('HIV Positive Results', '', 'M')"
+            >
+              <span>HV01-47</span>
+              <div class="rectangle"></div>
+            </td>
+            <td (click)="onIndicatorSelected('HIV Positive Results', '', 'F')">
+              <div class="text-box text-box2">
+                <span>HV01-48</span>
+                <div class="rectangle"></div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              1.4 No. on PrEP Diagnosed with STI
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td style="font-weight: bold; padding-left: 62px">Male</td>
+            <td style="padding-left: 72px; font-weight: bold">Female</td>
+          </tr>
+          <tr>
+            <td>General popn</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_male_general_pop',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-32</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_male_general_pop }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_female_general_pop',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-33</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_female_general_pop }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>MSM/MSW</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_msm',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-34</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_sti_msm }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>FSW</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_fsw',
+                  'F'
+                )
+              "
+            >
+              <span>HV01-35</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_sti_fsw }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>PWID/PWUD</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_pwud_male',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-36</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_pwud_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_pwud_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-37</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_pwud_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Discordant Couple</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_discordant_male',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-38</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_discordant_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_discordant_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-39</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_discordant_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Vulnerable Pop.</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_vulnerable_male',
+                  'M'
+                )
+              "
+            >
+              <span>HV01-40</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.prep_sti_vulnerable_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_vulnerable_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-41</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_vulnerable_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>AYP(10-24 yrs)</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_ayp',
+                  'F'
+                )
+              "
+            >
+              <span>HV01-42</span>
+              <div class="rectangle">{{ MOH731RegisterData.prep_sti_ayp }}</div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_ayp',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-43</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_ayp }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Pregnant and breastfeeding women</td>
+            <td></td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'No. on PrEP Diagnosed with STI',
+                  'prep_sti_preg_breastfeeding',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV01-44</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.prep_sti_preg_breastfeeding }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+      </div>
+    </tbody>
+    <thead>
+      <tr>
+        <th class="border2">
+          2. Elimination of Mother-to-Child Transmission(EMTCT)
+        </th>
+      </tr>
+    </thead>
+    <tbody>
+      <div class="flex-row">
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.1 Maternal HIV Testing
+            </td>
+          </tr>
+          <tr>
+            <td>Known Positive at 1st ANC</td>
+            <td class="text-box">
+              <span>HV02-01</span>
+              <div
+                class="rectangle"
+                (click)="
+                  onIndicatorSelected(
+                    'Elimination of Mother-to-Child Transmission(EMTCT)',
+                    'known_positive_1st_anc',
+                    ''
+                  )
+                "
+              >
+                {{ MOH731RegisterData.known_positive_1st_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td></td>
+            <td style="font-weight: bold; padding-left: 70px">Initial</td>
+            <td style="padding-left: 80px; font-weight: bold">Retest</td>
+          </tr>
+          <tr>
+            <td>Tested at ANC</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'initial_test_anc',
+                  ''
+                )
+              "
+            >
+              <span>HV02-02</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_anc }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'retest_anc',
+                  ''
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV02-03</span>
+                <div class="rectangle">{{ MOH731RegisterData.retest_anc }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at L&D</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'initial_test_LD',
+                  ''
+                )
+              "
+            >
+              <span>HV02-04</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_LD }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'retest_LD',
+                  ''
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV02-05</span>
+                <div class="rectangle">{{ MOH731RegisterData.retest_LD }}</div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_<=6weeks</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'initial_test_pnc_less_6_weeks',
+                  ''
+                )
+              "
+            >
+              <span>HV02-06</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_pnc_less_6_weeks }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'retest_pnc_less_6_weeks',
+                  ''
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV02-07</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.retest_pnc_less_6_weeks }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_>6weeks</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'initial_test_pnc_greater_6_weeks',
+                  ''
+                )
+              "
+            >
+              <span>HV02-08</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.initial_test_pnc_greater_6_weeks }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'retest_pnc_greater_6_weeks',
+                  ''
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV02-09</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.retest_pnc_greater_6_weeks }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.2 HIV Positive Results
+            </td>
+          </tr>
+          <tr>
+            <td>Tested at ANC</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'positive_anc',
+                  ''
+                )
+              "
+            >
+              <span>HV02-10</span>
+              <div class="rectangle">{{ MOH731RegisterData.positive_anc }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Tested at L&D</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'positive_LD',
+                  ''
+                )
+              "
+            >
+              <span>HV02-11</span>
+              <div class="rectangle">{{ MOH731RegisterData.positive_LD }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_<=6weeks</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'positive_pnc_less_6_weeks',
+                  ''
+                )
+              "
+            >
+              <span>HV02-12</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.positive_pnc_less_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Tested at PNC_>6weeks</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'positive_pnc_greater_6_weeks',
+                  ''
+                )
+              "
+            >
+              <span>HV02-13</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.positive_pnc_greater_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.3 Maternal HAART
+            </td>
+          </tr>
+          <tr>
+            <td>On HAART at 1st ANC</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'maternal_haart_1st_anc',
+                  ''
+                )
+              "
+            >
+              <span>HV02-14</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.maternal_haart_1st_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_ANC</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'start_maternal_haart_1st_anc',
+                  ''
+                )
+              "
+            >
+              <span>HV02-15</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_maternal_haart_1st_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_L&D</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'start_maternal_haart_LD',
+                  ''
+                )
+              "
+            >
+              <span>HV02-16</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_maternal_haart_LD }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_PNC_< =6weeks</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'maternal_haart_less_6_weeks',
+                  ''
+                )
+              "
+            >
+              <span>HV02-17</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.maternal_haart_less_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start HAART_PNC_>6weeks</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'maternal_haart_more_6_weeks',
+                  ''
+                )
+              "
+            >
+              <span>HV02-18</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.maternal_haart_more_6_weeks }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.4 HBV Screening at ANC
+            </td>
+          </tr>
+          <tr>
+            <td>Screened_HBV_ANC</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  '',
+                  ''
+                )
+              "
+            >
+              <span>HV02-19</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>HBV Screened_Positive</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'hbv_screened_positive_anc',
+                  ''
+                )
+              "
+            >
+              <span>HV02-20</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.hbv_screened_positive_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td style="font-weight: bold">
+              2.5 Adolescents girls & Young Women (10-24 Yrs)<br />
+              testing & results
+            </td>
+          </tr>
+          <tr>
+            <td></td>
+            <td style="font-weight: bold; padding-left: 62px">10-19yrs</td>
+            <td style="padding-left: 72px; font-weight: bold">20-24yrs</td>
+          </tr>
+          <tr>
+            <td>1st ANC KP</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'known_positive_ayp_10_19',
+                  ''
+                )
+              "
+            >
+              <span>HV02-21</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.known_positive_ayp_10_19 }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'known_positive_ayp_20_24',
+                  ''
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV02-22</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.known_positive_ayp_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>New HIV Positive</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'new_positive_ayp_10_19',
+                  ''
+                )
+              "
+            >
+              <span>HV02-23</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.new_positive_ayp_10_19 }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'new_positive_ayp_20_24',
+                  ''
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV02-24</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.new_positive_ayp_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On HAART 1st ANC KP</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'on_art_ayp_10_19',
+                  ''
+                )
+              "
+            >
+              <span>HV02-25</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_ayp_10_19 }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'on_art_ayp_20_24',
+                  ''
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV02-26</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_ayp_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Started HAART New</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'start_art_ayp_10_19',
+                  ''
+                )
+              "
+            >
+              <span>HV02-27</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_art_ayp_10_19 }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'start_art_ayp_20_24',
+                  ''
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>HV02-28</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.start_art_ayp_20_24 }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.6 Infant Prophylaxis
+            </td>
+          </tr>
+          <tr>
+            <td>Infant ARV Prophylaxis_ANC</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'infant_arv_anc',
+                  ''
+                )
+              "
+            >
+              <span>HV02-29</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.infant_arv_anc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Infant ARV Prophylaxis_L&D</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'infant_arv_ld',
+                  ''
+                )
+              "
+            >
+              <span>HV02-30</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.infant_arv_ld }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Infant ARV Prophylaxis_L&PNC</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'infant_arv_pnc',
+                  ''
+                )
+              "
+            >
+              <span>HV02-31</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.infant_arv_pnc }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              2.7 Infant Feeding
+            </td>
+          </tr>
+          <tr>
+            <td style="font-weight: bold">Below 6 months</td>
+          </tr>
+          <tr>
+            <td>Exclusive Breastfeeding (EBF)</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'exclusive_bf',
+                  ''
+                )
+              "
+            >
+              <span>HV02-32</span>
+              <div class="rectangle">{{ MOH731RegisterData.exclusive_bf }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td style="font-weight: bold">6 to 24 months</td>
+          </tr>
+          <tr>
+            <td>Breastfeeding (BF)</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'bf',
+                  ''
+                )
+              "
+            >
+              <span>HV02-33</span>
+              <div class="rectangle">{{ MOH731RegisterData.bf }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td class="space-after">Not Breastfeeding (NBF)</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Elimination of Mother-to-Child Transmission(EMTCT)',
+                  'weaning',
+                  ''
+                )
+              "
+            >
+              <span>HV02-34</span>
+              <div class="rectangle">{{ MOH731RegisterData.weaning }}</div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+      </div>
+    </tbody>
+    <thead>
+      <tr>
+        <th class="border2">3. HIV and TB treatment</th>
+      </tr>
+    </thead>
+    <tbody>
+      <div class="flex-row">
+        <div class="flex-column border-right">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.1 Starting ART
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART_<1</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_less_1_male', 'M')
+              "
+            >
+              <span>(M) HV03-01</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_less_1_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Starting ART',
+                  'art_new_less_1_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-02</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_less_1_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 1-4</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_1_4_male', 'M')
+              "
+            >
+              <span>(M) HV03-03</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_1_4_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_1_4_female', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-04</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_1_4_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 5-9</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_5_9_male', 'M')
+              "
+            >
+              <span>(M) HV03-05</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_5_9_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_5_9_female', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-06</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_5_9_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 10-14</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_10_14_male', 'M')
+              "
+            >
+              <span>(M) HV03-07</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_10_14_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_10_14_female', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-08</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_10_14_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 15-19</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_15_19_male', 'M')
+              "
+            >
+              <span>(M) HV03-09</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_15_19_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_15_19_female', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-10</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_15_19_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 20-24</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_20_24_male', 'M')
+              "
+            >
+              <span>(M) HV03-11</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_20_24_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('Starting ART', 'art_new_20_24_female', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-12</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_20_24_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>Start ART 25+</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Starting ART',
+                  'art_new_25_above_male',
+                  'M'
+                )
+              "
+            >
+              <span>(M) HV03-013</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.art_new_25_above_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Starting ART',
+                  'art_new_25_above_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-014</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.art_new_25_above_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.2 Curently on ART ([ALL])
+            </td>
+          </tr>
+          <tr>
+            <td>On ART_<1</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Curently on ART',
+                  'on_art_less_1_male',
+                  'M'
+                )
+              "
+            >
+              <span>(M) HV03-015</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_less_1_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Curently on ART',
+                  'on_art_less_1_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-016</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_less_1_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 1-4</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Curently on ART', 'on_art_1_4_male', 'M')
+              "
+            >
+              <span>(M) HV03-017</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_1_4_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('Curently on ART', 'on_art_1_4_female', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-018</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_1_4_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 5-9</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Curently on ART', 'on_art_5_9_male', 'M')
+              "
+            >
+              <span>(M) HV03-019</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_5_9_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected('Curently on ART', 'on_art_5_9_female', 'F')
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-020</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_5_9_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 10-14</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Curently on ART', 'on_art_10_14_male', 'M')
+              "
+            >
+              <span>(M) HV03-021</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_10_14_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Curently on ART',
+                  'on_art_10_14_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-022</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_10_14_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 15-19</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Curently on ART', 'on_art_15_19_male', 'M')
+              "
+            >
+              <span>(M) HV03-023</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_15_19_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Curently on ART',
+                  'on_art_15_19_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-024</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_15_19_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 20-24</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Curently on ART', 'on_art_20_24_male', 'M')
+              "
+            >
+              <span>(M) HV03-025</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_20_24_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Curently on ART',
+                  'on_art_20_24_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-026</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_20_24_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          <tr>
+            <td>On ART 25+</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Curently on ART',
+                  'on_art_25_above_male',
+                  'M'
+                )
+              "
+            >
+              <span>(M) HV03-027</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.on_art_25_above_male }}
+              </div>
+            </td>
+            <td
+              (click)="
+                onIndicatorSelected(
+                  'Curently on ART',
+                  'on_art_25_above_female',
+                  'F'
+                )
+              "
+            >
+              <div class="text-box text-box2">
+                <span>(F) HV03-028</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.on_art_25_above_female }}
+                </div>
+              </div>
+            </td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.3 TB Screening
+            </td>
+          </tr>
+          <tr>
+            <td>Screened for TB_<15</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('TB Screening', 'screened_tb_less_15', '')
+              "
+            >
+              <span>HV03-029</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.screened_tb_less_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Screened for TB_15+</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'TB Screening',
+                  'screened_tb_greater_15',
+                  ''
+                )
+              "
+            >
+              <span>HV03-030</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.screened_tb_greater_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.4 Starting TPT
+            </td>
+          </tr>
+          <tr>
+            <td>Start TPT_<15</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Starting TPT', 'start_tpt_less_15', '')
+              "
+            >
+              <span>HV03-031</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tpt_less_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Start TPT_15+</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected('Starting TPT', 'start_tpt_greater_15', '')
+              "
+            >
+              <span>HV03-032</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tpt_greater_15 }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.5 Differentiated Service Delivery
+            </td>
+          </tr>
+          <tr>
+            <td>Established</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Differentiated Service Delivery Established',
+                  'established',
+                  ''
+                )
+              "
+            >
+              <span>HV03-033</span>
+              <div class="rectangle">{{ MOH731RegisterData.established }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Not Established</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Differentiated Service Delivery Not Established',
+                  'not_established',
+                  ''
+                )
+              "
+            >
+              <span>HV03-034</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.not_established }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Community</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Differentiated Service Delivery Community',
+                  'community',
+                  ''
+                )
+              "
+            >
+              <span>HV03-035</span>
+              <div class="rectangle">{{ MOH731RegisterData.community }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Facility</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Differentiated Service Delivery Facility',
+                  'facility',
+                  ''
+                )
+              "
+            >
+              <span>HV03-036</span>
+              <div class="rectangle">{{ MOH731RegisterData.facility }}</div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+        </div>
+        <div class="flex-column">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.6 Nutrition and HIV
+            </td>
+          </tr>
+          <tr>
+            <td>Number SAM +</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM +',
+                  'has_sam_0_5_months',
+                  ''
+                )
+              "
+            >
+              <span>HV03-037</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM +',
+                  'has_sam_6_59_months',
+                  ''
+                )
+              "
+            >
+              <span>HV03-038</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM +',
+                  'has_sam_5_9_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-039</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM +',
+                  'has_sam_10_17_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-040</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM +',
+                  'has_sam_18_and_above_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-041</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_sam_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td
+              class="text-box"
+              (click)="onIndicatorSelected('Nutrition Number SAM +', '', '')"
+            >
+              <span>HV03-042</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <div style="height: 2vh"></div>
+          <tr>
+            <td class="space-after">Number MAM +</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM +',
+                  'has_smm_0_5_months',
+                  ''
+                )
+              "
+            >
+              <span>HV03-043</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM +',
+                  'has_smm_6_59_months',
+                  ''
+                )
+              "
+            >
+              <span>HV03-044</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM +',
+                  'has_smm_5_9_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-045</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM +',
+                  'has_smm_10_17_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-046</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM +',
+                  'has_smm_18_and_above_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-047</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.has_smm_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td
+              class="text-box"
+              (click)="onIndicatorSelected('Nutrition Number MAM +', '', '')"
+            >
+              <span>HV03-048</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <div style="height: 2vh"></div>
+          <tr>
+            <td>Number SAM + receiving therapeutic foods</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM + receiving therapeutic foods',
+                  'severe_acute_supp_0_5_months',
+                  ''
+                )
+              "
+            >
+              <span>HV03-049</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM + receiving therapeutic foods',
+                  'severe_acute_supp_6_59_months',
+                  ''
+                )
+              "
+            >
+              <span>HV03-050</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM + receiving therapeutic foods',
+                  'severe_acute_supp_5_9_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-051</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM + receiving therapeutic foods',
+                  'severe_acute_supp_10_17_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-052</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM + receiving therapeutic foods',
+                  'severe_acute_supp_18_and_above_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-053</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_acute_supp_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number SAM + receiving therapeutic foods',
+                  '',
+                  ''
+                )
+              "
+            >
+              <span>HV03-054</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+          <div style="height: 2vh"></div>
+          <tr>
+            <td>Number MAM + receiving Supplimental foods</td>
+          </tr>
+          <tr>
+            <td>0-5Months</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM + receiving therapeutic foods',
+                  'severe_moderate_supp_0_5_months',
+                  ''
+                )
+              "
+            >
+              <span>HV03-055</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_0_5_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59Months</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM + receiving therapeutic foods',
+                  'severe_moderate_supp_6_59_months',
+                  ''
+                )
+              "
+            >
+              <span>HV03-056</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_6_59_months }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM + receiving therapeutic foods',
+                  'severe_moderate_supp_5_9_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-057</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_5_9_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM + receiving therapeutic foods',
+                  'severe_moderate_supp_10_17_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-058</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_10_17_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+Years</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM + receiving therapeutic foods',
+                  'severe_moderate_supp_18_and_above_years',
+                  ''
+                )
+              "
+            >
+              <span>HV03-059</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.severe_moderate_supp_18_and_above_years }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant & Lactating</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'Nutrition Number MAM + receiving therapeutic foods',
+                  '',
+                  ''
+                )
+              "
+            >
+              <span>HV03-060</span>
+              <div class="rectangle"></div>
+            </td>
+            <td></td>
+          </tr>
+        </div>
+        <div class="flex-column border-left">
+          <tr>
+            <td class="space-after" style="font-weight: bold">
+              3.7 HIV in TB Clinic
+            </td>
+          </tr>
+          <tr>
+            <td>TB cases_New</td>
+            <td
+              class="text-box"
+              (click)="onIndicatorSelected('TB cases_New', 'start_tb', '')"
+            >
+              <span>HV03-061</span>
+              <div class="rectangle">{{ MOH731RegisterData.start_tb }}</div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>
+              TB_New_Known HIV<br />
+              Positive(KPs)
+            </td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'TB_New_Known HIV Positive(KPs)',
+                  'start_tb_known_positive',
+                  ''
+                )
+              "
+            >
+              <span>HV03-062</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_known_positive }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>TB_New HIV Positive</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'TB_New HIV Positive',
+                  'start_tb_positive',
+                  ''
+                )
+              "
+            >
+              <span>HV03-063</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_positive }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>
+              TB_New_Known HIV<br />
+              Positive(KP) on HAART
+            </td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'TB_New_Known HIV Positive(KP) on HAART',
+                  'start_tb_on_art',
+                  ''
+                )
+              "
+            >
+              <span>HV03-064</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_on_art }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>TB New_Start_HAART</td>
+            <td
+              class="text-box"
+              (click)="
+                onIndicatorSelected(
+                  'TB New_Start_HAART',
+                  'start_tb_art_new',
+                  ''
+                )
+              "
+            >
+              <span>HV03-065</span>
+              <div class="rectangle">
+                {{ MOH731RegisterData.start_tb_art_new }}
+              </div>
+            </td>
+            <td></td>
+          </tr>
+          ____________________________________________________________________
+          <thead>
+            <tr>
+              <th class="border2">4. Medical Male Circumcision</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td class="space-after" style="font-weight: bold">
+                4.1 Number circumcised
+              </td>
+            </tr>
+            <tr>
+              <td>Circumcised_0-60 days</td>
+              <td class="text-box">
+                <span>HV04-01</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Circumcised_61 days -9 yrs days</td>
+              <td class="text-box">
+                <span>HV04-02</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Circumcised_10-14</td>
+              <td class="text-box">
+                <span>HV04-03</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Circumcised_15 +</td>
+              <td class="text-box">
+                <span>HV04-04</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after">Tested_ HIV+</td>
+              <td class="text-box">
+                <span>HV04-05</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td class="space-after">Tested_ HIV-</td>
+              <td class="text-box">
+                <span>HV04-06</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after" style="font-weight: bold">
+                4.2 Type of circumcission
+              </td>
+            </tr>
+            <tr>
+              <td>Surgical</td>
+              <td class="text-box">
+                <span>HV04-07</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Devices</td>
+              <td class="text-box">
+                <span>HV04-08</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after" style="font-weight: bold">
+                4.3 Circumcission Adverse Events
+              </td>
+            </tr>
+            <tr>
+              <td>AE_During_Moderate</td>
+              <td class="text-box">
+                <span>HV04-09</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>AE_During_Severe</td>
+              <td class="text-box">
+                <span>HV04-10</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after">AE_Post_Moderate</td>
+              <td class="text-box">
+                <span>HV04-11</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td class="space-after">AE_Post_Severe</td>
+              <td class="text-box">
+                <span>HV04-12</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+            ____________________________________________________________________
+            <tr>
+              <td class="space-after">Follow up visit < 14d</td>
+              <td class="text-box">
+                <span>HV04-13</span>
+                <div class="rectangle"></div>
+              </td>
+              <td></td>
+            </tr>
+          </tbody>
+          <thead>
+            <tr>
+              <th class="border2">5. Post Exposure Prophylaxis</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>Exposed_Occupational</td>
+              <td
+                class="text-box"
+                (click)="
+                  onIndicatorSelected(
+                    'Exposed Occupational',
+                    'exposed_occupational',
+                    ''
+                  )
+                "
+              >
+                <span>HV05-01</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.exposed_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Exposed Other</td>
+              <td
+                class="text-box"
+                (click)="
+                  onIndicatorSelected(
+                    'Exposed Other',
+                    'exposed_non_occupational',
+                    ''
+                  )
+                "
+              >
+                <span>HV05-02</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.exposed_non_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>PEP_Occupational</td>
+              <td
+                class="text-box"
+                (click)="
+                  onIndicatorSelected(
+                    'PEP Occupational',
+                    'pep_occupational',
+                    ''
+                  )
+                "
+              >
+                <span>HV05-03</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.pep_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>PEP_Other</td>
+              <td
+                class="text-box"
+                (click)="
+                  onIndicatorSelected('PEP Other', 'pep_non_occupational', '')
+                "
+              >
+                <span>HV05-04</span>
+                <div class="rectangle">
+                  {{ MOH731RegisterData.pep_non_occupational }}
+                </div>
+              </td>
+              <td></td>
+            </tr>
+          </tbody>
+        </div>
+      </div>
+    </tbody>
+    <thead>
+      <div class="review-section border3">
+        <div>Reviewed by:</div>
+        <div>Name</div>
+        <div>Designation</div>
+        <div>Signature</div>
+        <div>Date</div>
+
+        <div></div>
+        <div>_______________________________________</div>
+        <div>______________________</div>
+        <div>_____________</div>
+        <div>____________</div>
+      </div>
+    </thead>
+  </table>
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/report731/report731.component.spec.ts b/src/app/data-analytics-dashboard/hiv/report731/report731.component.spec.ts
new file mode 100644
index 000000000..3132b6d76
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/report731.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { Report731Component } from './report731.component';
+
+describe('Report731Component', () => {
+  let component: Report731Component;
+  let fixture: ComponentFixture<Report731Component>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [Report731Component]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(Report731Component);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/data-analytics-dashboard/hiv/report731/report731.component.ts b/src/app/data-analytics-dashboard/hiv/report731/report731.component.ts
new file mode 100644
index 000000000..7c329feb6
--- /dev/null
+++ b/src/app/data-analytics-dashboard/hiv/report731/report731.component.ts
@@ -0,0 +1,254 @@
+import * as Moment from 'moment';
+import * as _ from 'lodash';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
+import { ActivatedRoute, Router } from '@angular/router';
+import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
+import { DatePipe } from '@angular/common';
+import { DataAnalyticsDashboardService } from '../../services/data-analytics-dashboard.services';
+
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
+
+@Component({
+  selector: 'app-report731',
+  templateUrl: './report731.component.html',
+  styleUrls: ['./report731.component.css']
+})
+export class Report731Component implements OnInit {
+  @Output()
+  public params: any;
+  public indicators: string;
+  public selectedIndicators = [];
+  public MOH731RegisterData: any = {};
+  public columnDefs: any = [];
+  public reportName = 'MOH 731 REPORT';
+  public currentView = 'monthly';
+  public currentViewBelow = 'pdf';
+  public month: string;
+  public year: number;
+  public quarter: string;
+  public eDate: string;
+  public sDate: string;
+  public jointLocationUuids = [];
+
+  public statusError = false;
+  public errorMessage = '';
+  public showInfoMessage = false;
+  public isLoading = false;
+  public reportHead: any;
+  public enabledControls = 'monthControl, locationControl';
+  public pinnedBottomRowData: any = [];
+  public _month: string;
+  public showLocationsControl = true;
+  public showIsAggregateControl = false;
+  public isReleased = false;
+  public generated = false;
+  @ViewChild('cntdarcontentToSnapshot') contentToSnapshot!: ElementRef;
+
+  public _locationUuids: any = [];
+  public get locationUuids(): Array<string> {
+    return this._locationUuids;
+  }
+
+  public set locationUuids(v: Array<string>) {
+    const locationUuids = [];
+    _.each(v, (location: any) => {
+      if (location.value) {
+        locationUuids.push(location);
+      }
+    });
+    this._locationUuids = locationUuids;
+  }
+
+  private _startDate: Date = Moment()
+    .subtract(1, 'months')
+    .startOf('month')
+    .toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = Moment()
+    .subtract(1, 'months')
+    .endOf('month')
+    .toDate();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public register: RegistersResourceService,
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
+    this.route.queryParams.subscribe((data) => {
+      data.month === undefined
+        ? (this._month = Moment().subtract(1, 'month').format('YYYY-MM-DD'))
+        : (this._month = data.month);
+
+      this.showDraftReportAlert(this._month);
+    });
+  }
+
+  ngOnInit() {
+    // if (this.register.moh731Data) {
+    //   this.MOH731RegisterData = this.register.moh731Data;
+    //   this.calculateTotalSummary();
+    // }
+  }
+
+  public onMonthChange(value): any {
+    this._month = Moment(value).format('YYYY-MM-DD');
+  }
+
+  public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `${location.value}`
+        );
+        this.jointLocationUuids.push(...locationValues);
+      });
+
+    this.route.parent.parent.params.subscribe((params: any) => {
+      this.storeParamsInUrl();
+    });
+    this.MOH731RegisterData = [];
+    this.getMOH731Register(this.params);
+    this.generated = true;
+  }
+
+  public storeParamsInUrl() {
+    this.params = {
+      locationUuids: this.getSelectedLocations(this.jointLocationUuids),
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
+    };
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: this.params
+    });
+  }
+
+  public getMOH731Register(params: any) {
+    this.isLoading = true;
+    this.register.getMoh731Register(params).subscribe((data) => {
+      if (data.error) {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      } else {
+        this.showInfoMessage = false;
+        this.columnDefs = data.sectionDefinitions;
+        const flatData = Object.assign({}, ...data.result);
+        this.MOH731RegisterData = flatData;
+        // this.register.moh731Data = flatData;
+        this.calculateTotalSummary();
+        this.isLoading = false;
+        this.showDraftReportAlert(this._month);
+      }
+    });
+  }
+  public calculateTotalSummary() {
+    const totalsRow = [];
+    if (this.MOH731RegisterData.length > 0) {
+      const totalObj = {
+        location: 'Totals'
+      };
+      _.each(this.MOH731RegisterData, (row) => {
+        Object.keys(row).map((key) => {
+          if (Number.isInteger(row[key]) === true) {
+            if (totalObj[key]) {
+              totalObj[key] = row[key] + totalObj[key];
+            } else {
+              totalObj[key] = row[key];
+            }
+          } else {
+            if (Number.isNaN(totalObj[key])) {
+              totalObj[key] = 0;
+            }
+            if (totalObj[key] === null) {
+              totalObj[key] = 0;
+            }
+            totalObj[key] = 0 + totalObj[key];
+          }
+        });
+      });
+      totalObj.location = 'Totals';
+      totalsRow.push(totalObj);
+      this.pinnedBottomRowData = totalsRow;
+    }
+  }
+  public onIndicatorSelected(title: string, indicator: string, gender: string) {
+    this.router.navigate(['patient-list'], {
+      relativeTo: this.route,
+      queryParams: {
+        indicators: indicator,
+        indicatorHeader: title,
+        month: this._month,
+        locationUuids: this.getSelectedLocations(this.jointLocationUuids),
+        indicatorGender: gender,
+        startDate: this.startDate,
+        endDate: this.endDate
+      }
+    });
+  }
+
+  public showDraftReportAlert(date) {
+    if (date != null && date >= Moment().format('YYYY-MM-DD')) {
+      this.isReleased = false;
+    } else {
+      this.isReleased = true;
+    }
+  }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH 731 Register.pdf');
+    });
+  }
+  private getSelectedLocations(locationUuids: any): string {
+    if (!locationUuids || locationUuids.length === 0) {
+      return '';
+    }
+
+    let selectedLocations = '';
+
+    for (let i = 0; i < locationUuids.length; i++) {
+      if (i === 0) {
+        selectedLocations = selectedLocations + (locationUuids[0] as any).value;
+      } else {
+        selectedLocations =
+          selectedLocations + ',' + (locationUuids[i] as any).value;
+      }
+    }
+    return selectedLocations;
+  }
+}

From 51ed3f619a58b9599517be9de8a269ef80731773 Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Wed, 10 Dec 2025 23:16:57 +0300
Subject: [PATCH 46/50] POC-738: Added MOH 405 ANC Register

---
 .../anc-register/anc-register.component.css   |  22 +
 .../anc-register/anc-register.component.html  | 462 +++++++++++++++++-
 .../anc-register/anc-register.component.ts    |  72 ++-
 3 files changed, 548 insertions(+), 8 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css
index ab1f08146..189ddd1cd 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.css
@@ -15,3 +15,25 @@ tbody tr {
 th {
   min-width: 70px;
 }
+
+.summary {
+  display: flex;
+  gap: 40px;
+  align-items: stretch;
+  justify-content: space-between;
+}
+
+.flex-item {
+  flex: 1 1 30%;
+  min-width: 250px;
+  box-sizing: border-box;
+}
+table {
+  width: 100%;
+  height: auto;
+}
+
+.inner {
+  display: flex;
+  flex-direction: column;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
index aaaf31c18..a53c2d27d 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.html
@@ -73,6 +73,7 @@ <h4 *ngIf="!statusError">
             Number/NUPI<br />
             (Re Visit)
           </th>
+          <th rowspan="7">AMRSID</th>
           <th rowspan="7">
             Number of <br />
             Visits <br />
@@ -359,6 +360,7 @@ <h4 *ngIf="!statusError">
           <td class="text-center">(aq)</td>
           <td class="text-center">(ar)</td>
           <td class="text-center">(as)</td>
+          <td class="text-center">(at)</td>
         </tr>
         <ng-container *ngFor="let data of ancRegisterData; let a = index">
           <tr>
@@ -367,6 +369,7 @@ <h4 *ngIf="!statusError">
             </td>
             <td class="text-center">{{ data.anc_number }}</td>
             <td class="text-center" rowspan="2">{{ data.anc_number_NUPI }}</td>
+            <td class="text-center" rowspan="2">{{ data.amrsID }}</td>
             <td class="text-center" rowspan="2">
               {{ data.number_of_anc_visits }}
             </td>
@@ -403,10 +406,29 @@ <h4 *ngIf="!statusError">
             <td class="text-center">{{ data.rpr_vdrl_duo }}</td>
             <td class="text-center">{{ data.hepatitisB }}</td>
             <td class="text-center" rowspan="2">{{ data.tb_screening }}</td>
-            <td class="text-center" rowspan="2">{{ data.hiv_test_type }}</td>
-            <td class="text-center">{{ data.hiv_test_1_kit_name }}</td>
-            <td class="text-center">{{ data.hiv_test_2_kit_name }}</td>
-            <td class="text-center">{{ data.hiv_test_3_kit_name }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.hiv_test_type }}
+            </td>
+            <td class="text-center">
+              {{ data.hiv_test_1_kit_name }} / {{ data.hiv_test_1_lot_no }} /{{
+                data.hiv_test_1_expiry_date
+              }}
+              / {{ data.hiv_test_1_test_result }}
+            </td>
+            <td class="text-center">
+              {{ data.hiv_test_2_kit_name }} /
+              {{ data.hiv_test_2_lot_number }} /{{
+                data.hiv_test_2_expiry_date
+              }}
+              / {{ data.hiv_test_2_test_result }}
+            </td>
+            <td class="text-center">
+              {{ data.hiv_test_3_kit_name }} /
+              {{ data.hiv_test_3_lot_number }} /{{
+                data.hiv_test_3_expiry_date
+              }}
+              /{{ data.hiv_test_3_test_result }}
+            </td>
             <td class="text-center" rowspan="2">{{ data.hiv_results }}</td>
             <td class="text-center" rowspan="2">{{ data.maternal_haart }}</td>
             <td class="text-center" rowspan="2">
@@ -449,5 +471,437 @@ <h4 *ngIf="!statusError">
         </ng-container>
       </tbody>
     </table>
+    <ng-container *ngIf="ancRegisterData !== []">
+      <div class="summary">
+        <div class="inner">
+          <div class="flex-item">
+            <table class="table table-bordered text-centre">
+              <thead>
+                <tr>
+                  <th>HIV Testing</th>
+                  <th>Tests (ab)</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>Initial</td>
+                  <td>
+                    {{ filterData(ancRegisterData, 'hiv_test_type', 'I') }}
+                  </td>
+                </tr>
+                <tr>
+                  <td>Retest</td>
+                  <td>
+                    {{ filterData(ancRegisterData, 'hiv_test_type', 'R') }}
+                  </td>
+                </tr>
+                <tr>
+                  <td>Total (Initial + Retest)</td>
+                  <td>
+                    {{
+                      filterData(ancRegisterData, 'hiv_test_type', 'I') +
+                        filterData(ancRegisterData, 'hiv_test_type', 'R')
+                    }}
+                  </td>
+                </tr>
+                <tr>
+                  <td>Known HIV Positive</td>
+                  <td>
+                    {{ filterData(ancRegisterData, 'hiv_results', 'NA') }}
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+          <div class="flex-item">
+            <table class="table table-bordered text-centre">
+              <tbody>
+                <tr>
+                  <td>Partner Testing (al)</td>
+                  <td>
+                    {{
+                      filterData(ancRegisterData, 'partner_hiv_testing', 'P')
+                    }}
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th>HIV Test Kit</th>
+                <th>Test 1 (ac)</th>
+                <th>Test 2 (ad)</th>
+                <th>Test 3 (ae)</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>N: Negative</td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_1_test_result',
+                      'N'
+                    )
+                  }}
+                </td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_2_test_result',
+                      'N'
+                    )
+                  }}
+                </td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_3_test_result',
+                      'N'
+                    )
+                  }}
+                </td>
+              </tr>
+              <tr>
+                <td>P: Positive</td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_1_test_result',
+                      'P'
+                    )
+                  }}
+                </td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_2_test_result',
+                      'P'
+                    )
+                  }}
+                </td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_3_test_result',
+                      'P'
+                    )
+                  }}
+                </td>
+              </tr>
+              <tr>
+                <td>I: Invalid</td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_1_test_result',
+                      'I'
+                    )
+                  }}
+                </td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_2_test_result',
+                      'I'
+                    )
+                  }}
+                </td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_3_test_result',
+                      'I'
+                    )
+                  }}
+                </td>
+              </tr>
+              <tr>
+                <td>Wastage:</td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_1_test_result',
+                      'NA'
+                    )
+                  }}
+                </td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_2_test_result',
+                      'NA'
+                    )
+                  }}
+                </td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_3_test_result',
+                      'NA'
+                    )
+                  }}
+                </td>
+              </tr>
+              <tr>
+                <td>T: Total</td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_1_test_result',
+                      'N'
+                    ) +
+                      getPropertyTotals(
+                        ancRegisterData,
+                        'hiv_test_1_test_result',
+                        'P'
+                      ) +
+                      getPropertyTotals(
+                        ancRegisterData,
+                        'hiv_test_1_test_result',
+                        'I'
+                      ) +
+                      getPropertyTotals(
+                        ancRegisterData,
+                        'hiv_test_1_test_result',
+                        'NA'
+                      )
+                  }}
+                </td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_2_test_result',
+                      'N'
+                    ) +
+                      getPropertyTotals(
+                        ancRegisterData,
+                        'hiv_test_2_test_result',
+                        'P'
+                      ) +
+                      getPropertyTotals(
+                        ancRegisterData,
+                        'hiv_test_2_test_result',
+                        'I'
+                      ) +
+                      getPropertyTotals(
+                        ancRegisterData,
+                        'hiv_test_2_test_result',
+                        'NA'
+                      )
+                  }}
+                </td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hiv_test_3_test_result',
+                      'N'
+                    ) +
+                      getPropertyTotals(
+                        ancRegisterData,
+                        'hiv_test_3_test_result',
+                        'P'
+                      ) +
+                      getPropertyTotals(
+                        ancRegisterData,
+                        'hiv_test_3_test_result',
+                        'I'
+                      ) +
+                      getPropertyTotals(
+                        ancRegisterData,
+                        'hiv_test_3_test_result',
+                        'NA'
+                      )
+                  }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th>HIV Results</th>
+                <th>Results (af)</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>Positive</td>
+                <td>{{ filterData(ancRegisterData, 'hiv_results', 'P') }}</td>
+              </tr>
+              <tr>
+                <td>Negative</td>
+                <td>{{ filterData(ancRegisterData, 'hiv_results', 'N') }}</td>
+              </tr>
+              <tr>
+                <td>Total</td>
+                <td>
+                  {{
+                    filterData(ancRegisterData, 'hiv_results', 'P') +
+                      filterData(ancRegisterData, 'hiv_results', 'N')
+                  }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th colspan="2">
+                  Adolescents(10-19Yrs) testing and result (f)
+                </th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>Initial - 10-19yrs (ab)</td>
+                <td>
+                  {{
+                    getPropertyTotalsWithAge(
+                      ancRegisterData,
+                      'hiv_test_1_test_result',
+                      'P',
+                      10,
+                      19
+                    )
+                  }}
+                </td>
+              </tr>
+              <tr>
+                <td>Positive - 10-19yrs (af)</td>
+                <td>
+                  {{
+                    getPropertyTotalsWithAge(
+                      ancRegisterData,
+                      'hiv_test_1_test_result',
+                      'P',
+                      10,
+                      19
+                    )
+                  }}
+                </td>
+              </tr>
+              <tr>
+                <td>Started on HAART - 10-19yrs (ag)</td>
+                <td>
+                  {{
+                    getPropertyTotalsWithAge(
+                      ancRegisterData,
+                      'maternal_haart',
+                      'P',
+                      10,
+                      19
+                    )
+                  }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th>Started on HAART</th>
+                <th>HAART (ag)</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>New On ART</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>On ART at 1st ANC</td>
+                <td></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th>Screened for Syphillis</th>
+                <th>Total</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>Testing (y)</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>Testing Results (y)</td>
+                <td>
+                  {{ getPropertyTotals(ancRegisterData, 'rpr_vdrl_duo', 'P') }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead>
+              <tr>
+                <th>HBV Screening</th>
+                <th>Total</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>Positive(z)</td>
+                <td>
+                  {{ getPropertyTotals(ancRegisterData, 'hepatitisB', 'P') }}
+                </td>
+              </tr>
+              <tr>
+                <td>Treatment(z)</td>
+                <td>
+                  {{
+                    getPropertyTotals(
+                      ancRegisterData,
+                      'hepatitisB_treatment',
+                      '2'
+                    )
+                  }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </ng-container>
   </div>
 </div>
+<div
+  *ngIf="ancRegisterData.length == 0 && generated"
+  class="text-center rounded"
+>
+  <i class="alert alert-info text-center" style="width: 100%"
+    >No record found</i
+  >
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
index 31628171c..bcd807310 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/anc-register/anc-register.component.ts
@@ -44,6 +44,7 @@ export class AncRegisterComponent implements OnInit {
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  public generated = false;
   @ViewChild('cntdarcontentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
@@ -116,6 +117,7 @@ export class AncRegisterComponent implements OnInit {
     });
     this.ancRegisterData = [];
     this.getANCRegisterData(this.params);
+    this.generated = true;
   }
 
   public storeParamsInUrl() {
@@ -207,13 +209,75 @@ export class AncRegisterComponent implements OnInit {
   public takeSnapshotAndExport() {
     const elementToSnapshot = this.contentToSnapshot.nativeElement;
 
-    html2canvas(elementToSnapshot).then((canvas) => {
+    html2canvas(elementToSnapshot, { scale: 2 }).then((canvas) => {
       const imgData = canvas.toDataURL('image/png');
-      const pdf = new jsPDF('p', 'mm', 'a4');
-      const imgWidth = 210; // A4 width in mm
+      const pdf = new jsPDF('p', 'mm', 'a0');
+
+      const pageWidth = 841; // A0 width (portrait)
+      const pageHeight = 1189; // A0 height
+
+      const imgWidth = pageWidth;
       const imgHeight = (canvas.height * imgWidth) / canvas.width;
-      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+
+      let heightLeft = imgHeight;
+      let position = 0;
+
+      pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight);
+
+      heightLeft -= pageHeight;
+
+      // Add additional pages if required
+      while (heightLeft > 0) {
+        pdf.addPage();
+        position = heightLeft - imgHeight;
+        pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight);
+        heightLeft -= pageHeight;
+      }
       pdf.save('MOH 405 ANC Register.pdf');
     });
   }
+  filterData(summaryData: any, condition: string, value) {
+    if (!summaryData) {
+      return '';
+    }
+    return (
+      summaryData.filter((data) => {
+        const field = data[condition];
+
+        if (!value) {
+          return;
+        }
+
+        return field === value;
+      }).length || ''
+    );
+  }
+
+  getPropertyTotals(
+    summaryData: any[],
+    property: string,
+    propertyValue: string
+  ) {
+    return (
+      summaryData.filter((data) => data[property] === propertyValue).length ||
+      ''
+    );
+  }
+
+  getPropertyTotalsWithAge(
+    summaryData: any[],
+    property: string,
+    propertyValue: string,
+    minAge: number,
+    maxAge: number
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data[property] === propertyValue &&
+          data['age'] >= minAge &&
+          data['age'] <= maxAge
+      ).length || ''
+    );
+  }
 }

From 88e5bf0f7d05486ce90a842d0a57a10b8ec0cd10 Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Wed, 10 Dec 2025 23:20:40 +0300
Subject: [PATCH 47/50] POC-743: Added MOH 406 PNC Register

---
 .../pnc-register/pnc-register.component.css   |   35 +
 .../pnc-register/pnc-register.component.html  | 1156 +++++++++--------
 .../pnc-register/pnc-register.component.ts    |  188 ++-
 3 files changed, 823 insertions(+), 556 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css
index ab1f08146..23732fefc 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.css
@@ -15,3 +15,38 @@ tbody tr {
 th {
   min-width: 70px;
 }
+
+.summary {
+  display: flex;
+  gap: 50px;
+  align-items: stretch;
+  justify-content: space-between;
+}
+
+.flex-item {
+  flex: 1 1 30%;
+  min-width: 250px;
+  box-sizing: border-box;
+}
+table {
+  width: 100%;
+  height: auto;
+}
+
+.inner {
+  display: flex;
+  flex-direction: column;
+}
+.highlighted-row {
+  background-color: #bbb; /* Light gray */
+}
+
+.no-border {
+  border: none !important;
+  padding: 0 !important;
+  margin: 0 !important;
+  height: 0 !important;
+}
+.no-border-row {
+  border: none !important;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html
index 6206fb58f..eb9268687 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.html
@@ -11,7 +11,8 @@ <h4 class="component-title text-success">
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
         [enabledControls]="enabledControls"
-        [monthString]="_month"
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
         (onMonthChange)="onMonthChange($event)"
         [reportName]="reportName"
         (generateReport)="generateReport()"
@@ -36,7 +37,11 @@ <h4 *ngIf="!statusError">
   This report is likely to change without warning.
 </div>
 
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+<div
+  *ngIf="pncSummaryData && pncSummaryData.length > 0"
+  style="padding: 20px; font-size: 12px !important"
+  #contentToSnapshot
+>
   <div class="table-responsive">
     <div class="row">
       <div class="col-md-4">
@@ -52,7 +57,7 @@ <h4 *ngIf="!statusError">
     <table class="table table-bordered text-centre">
       <thead>
         <tr>
-          <th colspan="7">Date of visit</th>
+          <th colspan="8">Registration Information</th>
           <th colspan="3">Maternity History</th>
           <th colspan="2">Postpartum Visit</th>
           <th colspan="3">Vital Signs</th>
@@ -96,6 +101,7 @@ <h4 *ngIf="!statusError">
             PNC Number/NUPI <br />
             (Revisit)
           </th>
+          <th rowspan="6">AMRSID</th>
           <th rowspan="6">
             Full Name(first name, middle and <br />
             surname)
@@ -368,528 +374,632 @@ <h4 *ngIf="!statusError">
           <td class="text-center">(an)</td>
           <td class="text-center">(ao)</td>
           <td class="text-center">(ap)</td>
+          <td class="text-center">(aq)</td>
         </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
+        <ng-container *ngFor="let data of pncSummaryData; let a = index">
+          <tr>
+            <td class="text-center" rowspan="2">
+              {{ data.date_of_visit | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center">{{ data.pnc_number }}</td>
+            <td class="text-center" rowspan="2">{{ data.pnc_number }}</td>
+            <td class="text-center" rowspan="2">{{ data.amrsID }}</td>
+            <td class="text-center" rowspan="2">{{ data.full_names }}</td>
+            <td class="text-center">
+              {{ data.date_of_birth | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.subcounty_county }}</td>
+            <td class="text-center">{{ data.village_estate_landmark }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.date_of_delivery | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.place_of_delivery }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.mode_of_delivery }}</td>
+            <td class="text-center" rowspan="2">{{ data.timing_mother }}</td>
+            <td class="text-center" rowspan="2">{{ data.timing_baby }}</td>
+            <td class="text-center" rowspan="2">{{ data.temperature }}</td>
+            <td class="text-center" rowspan="2">{{ data.pulse }}</td>
+            <td class="text-center" rowspan="2">{{ data.blood_pressure }}</td>
+            <td class="text-center">{{ data.pallor_present }}</td>
+            <td class="text-center" rowspan="2">{{ data.breast }}</td>
+            <td class="text-center" rowspan="2">{{ data.uterus }}</td>
+            <td class="text-center" rowspan="2">{{ data.pph }}</td>
+            <td class="text-center" rowspan="2">{{ data.c_section_site }}</td>
+            <td class="text-center" rowspan="2">{{ data.lochia }}</td>
+            <td class="text-center" rowspan="2">{{ data.episiotomy }}</td>
+            <td class="text-center" rowspan="2">{{ data.fistula }}</td>
+            <td class="text-center" rowspan="2">{{ data.tb_screening }}</td>
+            <td class="text-center" rowspan="2">{{ data.tested_pnc }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.hiv_test_1_kit_name }}/ {{ data.hiv_test_1_lot_no }} /
+              {{ data.hiv_test_1_expiry_date }} /
+              {{ data.hiv_test_1_test_result }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.hiv_test_2_kit_name }}/ {{ data.hiv_test_2_lot_no }} /
+              {{ data.hiv_test_2_expiry_date }} /
+              {{ data.hiv_test_1_test_result }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.hiv_test_3_kit_name }}/ {{ data.hiv_test_3_lot_no }} /
+              {{ data.hiv_test_3_expiry_date }} /
+              {{ data.hiv_test_1_test_result }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.results_less_6_weeks }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.results_greater_6_weeks }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.infant_prophylaxis_less_6_weeks }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.maternal_haart_less_6_weeks }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.infant_prophylaxis_greater_6_weeks }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.maternal_haart_greater_6_weeks }}
+            </td>
+            <td class="text-center">{{ data.cervical_cancer_method }}</td>
+            <td class="text-center">{{ data.counselled }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.other_maternal_complications }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.haematinics }}</td>
+            <td class="text-center" rowspan="2">{{ data.referrals_from }}</td>
+            <td class="text-center" rowspan="2">{{ data.referrals_to }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.reason_for_referral }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.remarks }}
+            </td>
+          </tr>
+          <tr>
+            <td class="text-center">{{ data.nupi }}</td>
+            <td class="text-center">{{ data.age }}</td>
+            <td class="text-center">{{ data.phone_number }}</td>
+            <td class="text-center">{{ data.pallor }}</td>
+            <td class="text-center">{{ data.cervical_cancer_results }}</td>
+            <td class="text-center">{{ data.family_planning_method }}</td>
+          </tr>
+        </ng-container>
       </tbody>
     </table>
   </div>
+  <div
+    *ngIf="pncSummaryData && pncSummaryData.length > 0"
+    class="summary table-responsive"
+  >
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr class="highlighted-row">
+            <th>CLIENT AGE (f)</th>
+            <th>Total</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>10-14yrs</td>
+            <td>{{ calculateAgeTotal(pncSummaryData, 10, 14) }}</td>
+          </tr>
+          <tr>
+            <td>15-19yrs</td>
+            <td>{{ calculateAgeTotal(pncSummaryData, 15, 19) }}</td>
+          </tr>
+          <tr>
+            <td>20-24yrs</td>
+            <td>{{ calculateAgeTotal(pncSummaryData, 20, 24) }}</td>
+          </tr>
+          <tr>
+            <td>25yrs Plus</td>
+            <td>{{ calculateAgeTotal(pncSummaryData, 25) }}</td>
+          </tr>
+          <tr>
+            <td>Totals</td>
+            <td>{{ pncSummaryData.length }}</td>
+          </tr>
+          <tr class="highlighted-row">
+            <th colspan="2">New PNC Visits (c)</th>
+          </tr>
+          <tr>
+            <td>PNC Revisit (d)</td>
+            <td>
+              {{
+                getPropertyTotals(
+                  pncSummaryData,
+                  'postpartum_visit_baby',
+                  'R'
+                ) +
+                  getPropertyTotals(
+                    pncSummaryData,
+                    'postpartum_visit_mother',
+                    'R'
+                  )
+              }}
+            </td>
+          </tr>
+          <tr>
+            <td>Total PNC Visits</td>
+            <td>
+              {{
+                getPropertyTotals(
+                  pncSummaryData,
+                  'postpartum_visit_baby',
+                  'Y'
+                ) +
+                  getPropertyTotals(
+                    pncSummaryData,
+                    'postpartum_visit_mother',
+                    'Y'
+                  )
+              }}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div class="inner">
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <thead>
+            <tr class="highlighted-row">
+              <th>PNC Visit Mother</th>
+              <th>Total</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>New PNC Visit within 48 hours</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>New PNC Visit 3 days < 6 weeks</td>
+              <td>
+                {{
+                  getPropertyTotals(pncSummaryData, 'results_less_6_weeks', 'Y')
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>New PNC Visit after 6 weeks</td>
+              <td>
+                {{
+                  getPropertyTotals(
+                    pncSummaryData,
+                    'results_greater_6_weeks',
+                    'Y'
+                  )
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <thead>
+            <tr class="highlighted-row">
+              <th>PNC Visit Baby</th>
+              <th>Total</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>New PNC Visit within 48 hours</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>New PNC Visit 3 days < 6 weeks</td>
+              <td>
+                {{
+                  getPropertyTotals(pncSummaryData, 'results_less_6_weeks', 'Y')
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>New PNC Visit after 6 weeks</td>
+              <td>
+                {{
+                  getPropertyTotals(
+                    pncSummaryData,
+                    'results_greater_6_weeks',
+                    'Y'
+                  )
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr class="highlighted-row">
+            <th>Codes for Col (p)</th>
+            <th>Codes for Col (g)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>1=Mild</td>
+            <td>1=Normal</td>
+          </tr>
+          <tr>
+            <td>2=Moderate</td>
+            <td>2=Cracked nipple</td>
+          </tr>
+          <tr>
+            <td>3=Servere</td>
+            <td>3=Engorged</td>
+          </tr>
+          <tr>
+            <td class="highlighted-row"></td>
+            <td>4=Mastitis</td>
+          </tr>
+          <tr class="highlighted-row">
+            <th>Codes for col (r)</th>
+            <th>Codes for Col (s)</th>
+          </tr>
+          <tr>
+            <td>1=Contracted</td>
+            <td>1=Present</td>
+          </tr>
+          <tr>
+            <td>2=Not Contracted</td>
+            <td>2=Absent</td>
+          </tr>
+          <tr>
+            <td>3=Other (Specify)</td>
+            <td class="highlighted-row"></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr class="highlighted-row">
+            <th>Codes for Col (i)</th>
+            <th>Codes for Col (j)</th>
+            <th>Codes for Col (t)</th>
+            <th>Codes for Col (u)</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>F=Facility</td>
+            <td>1=SVD</td>
+            <td>1=Bleeding</td>
+            <td>1=Normal</td>
+          </tr>
+          <tr>
+            <td>H=Home</td>
+            <td>2=CS</td>
+            <td>2=Normal</td>
+            <td>2=Foul smelling</td>
+          </tr>
+          <tr>
+            <td>BBA=Born Before Arrival</td>
+            <td>3=Breech</td>
+            <td>3=Infected</td>
+            <td>3=Excessive</td>
+          </tr>
+          <tr>
+            <td class="highlighted-row"></td>
+            <td>4=AVD</td>
+            <td>4=Gaping</td>
+            <td rowspan="2" class="highlighted-row"></td>
+          </tr>
+          <tr class="no-border-row">
+            <td colspan="2" class="no-border"></td>
+            <th>5=NA</th>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr>
+            <th class="highlighted-row">Codes for Col (v)</th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>1=Repaired</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>2=Gaping</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>3=Infected</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>4=Healed</td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5=NA</td>
+            <td></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <tbody>
+          <tr>
+            <td>No. Tests at PNC: (ac) & (ad):</td>
+            <td>{{ getPropertyTotals(pncSummaryData, 'tested_pnc', 'Y') }}</td>
+          </tr>
+          <tr>
+            <td>No.HIV Positive results (ac) & (ad):</td>
+            <td>
+              {{
+                getPropertyTotals(pncSummaryData, 'hiv_test_results_pnc', 'P')
+              }}
+            </td>
+          </tr>
+          <tr>
+            <td>No. Positive Adolescents 10-19 yrs_PNC (ac)(e) & (ad)(e)</td>
+            <td>
+              {{
+                getPropertyWithAgeTotals(
+                  pncSummaryData,
+                  'hiv_test_results_pnc',
+                  'P',
+                  10,
+                  19
+                )
+              }}
+            </td>
+          </tr>
+          <tr>
+            <td>No. Started HAART Adolescents 10-19 yrs (af)(e) & (ah)(e)</td>
+            <td>
+              {{
+                getPropertyWithAgeTotals(
+                  pncSummaryData,
+                  'maternal_haart',
+                  'P',
+                  10,
+                  19
+                )
+              }}
+            </td>
+          </tr>
+          <tr>
+            <td>No. Start HAART_PNC (af) & (ah):</td>
+            <td>
+              {{ getPropertyTotals(pncSummaryData, 'maternal_haart', 'Y') }}
+            </td>
+          </tr>
+          <tr>
+            <td>No.Infant ARV prophylaxis (ae) & (ag):</td>
+            <td>
+              {{ getPropertyTotals(pncSummaryData, 'infant_prophylaxis', 'Y') }}
+            </td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr>
+            <th>HIV TEST 1 (z)</th>
+            <th>NUMBER</th>
+          </tr>
+          <tr>
+            <th>N: Negative</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_1_test_result', 'N') }}
+            </th>
+          </tr>
+          <tr>
+            <th>P: Positive</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_1_test_result', 'P') }}
+            </th>
+          </tr>
+          <tr>
+            <th>I: Invalid</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_1_test_result', 'I') }}
+            </th>
+          </tr>
+          <tr>
+            <th>Westage:</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_1_test_result', 'NA') }}
+            </th>
+          </tr>
+          <tr>
+            <th>Total:</th>
+            <th>
+              {{
+                getHivTotals(pncSummaryData, 'hiv_test_1_test_result', 'N') +
+                  getHivTotals(pncSummaryData, 'hiv_test_1_test_result', 'P') +
+                  getHivTotals(pncSummaryData, 'hiv_test_1_test_result', 'I') +
+                  getHivTotals(pncSummaryData, 'hiv_test_1_test_result', 'NA')
+              }}
+            </th>
+          </tr>
+        </thead>
+      </table>
+    </div>
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr>
+            <th>HIV TEST 2 (aa)</th>
+            <th>NUMBER</th>
+          </tr>
+          <tr>
+            <th>N: Negative</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_2_test_result', 'N') }}
+            </th>
+          </tr>
+          <tr>
+            <th>P: Positive</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_2_test_result', 'P') }}
+            </th>
+          </tr>
+          <tr>
+            <th>I: Invalid</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_2_test_result', 'I') }}
+            </th>
+          </tr>
+          <tr>
+            <th>Westage:</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_2_test_result', 'NA') }}
+            </th>
+          </tr>
+          <tr>
+            <th>Total:</th>
+            <th>
+              {{
+                getHivTotals(pncSummaryData, 'hiv_test_2_test_result', 'N') +
+                  getHivTotals(pncSummaryData, 'hiv_test_2_test_result', 'P') +
+                  getHivTotals(pncSummaryData, 'hiv_test_2_test_result', 'I') +
+                  getHivTotals(pncSummaryData, 'hiv_test_2_test_result', 'NA')
+              }}
+            </th>
+          </tr>
+        </thead>
+      </table>
+    </div>
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr>
+            <th>HIV TEST 3 (ab)</th>
+            <th>NUMBER</th>
+          </tr>
+          <tr>
+            <th>N: Negative</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_3_test_result', 'N') }}
+            </th>
+          </tr>
+          <tr>
+            <th>P: Positive</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_3_test_result', 'P') }}
+            </th>
+          </tr>
+          <tr>
+            <th>I: Invalid</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_3_test_result', 'I') }}
+            </th>
+          </tr>
+          <tr>
+            <th>Westage:</th>
+            <th>
+              {{ getHivTotals(pncSummaryData, 'hiv_test_3_test_result', 'NA') }}
+            </th>
+          </tr>
+          <tr>
+            <th>Total:</th>
+            <th>
+              {{
+                getHivTotals(pncSummaryData, 'hiv_test_3_test_result', 'N') +
+                  getHivTotals(pncSummaryData, 'hiv_test_3_test_result', 'P') +
+                  getHivTotals(pncSummaryData, 'hiv_test_3_test_result', 'I') +
+                  getHivTotals(pncSummaryData, 'hiv_test_3_test_result', 'NA')
+              }}
+            </th>
+          </tr>
+        </thead>
+      </table>
+    </div>
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr>
+            <th>Screened for Cervical Cancer (PAP) (ai)</th>
+            <th>
+              {{
+                getCevicalCancerScreeningTotals(pncSummaryData, 'PAP S', 'P')
+              }}
+            </th>
+          </tr>
+          <tr>
+            <th>Screened for Cervical Cancer (VIA) (ai)</th>
+            <th>
+              {{ getCevicalCancerScreeningTotals(pncSummaryData, 'VIA', 'P') }}
+            </th>
+          </tr>
+          <tr>
+            <th>Screened for Cervical Cancer (VILI) (ai)</th>
+            <th>
+              {{ getCevicalCancerScreeningTotals(pncSummaryData, 'VILI', 'P') }}
+            </th>
+          </tr>
+          <tr>
+            <th>Screened for Cervical Cancer (HPV) (ai)</th>
+            <th>
+              {{ getCevicalCancerScreeningTotals(pncSummaryData, 'HPV', 'P') }}
+            </th>
+          </tr>
+          <tr>
+            <th>Received an FP method (ai)</th>
+            <th>{{ getPropertyTotals(pncSummaryData, 'ppfp_done', 'Y') }}</th>
+          </tr>
+        </thead>
+      </table>
+    </div>
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr>
+            <th>Codes of Col (ai)</th>
+            <th></th>
+          </tr>
+          <tr>
+            <th>1=Normal</th>
+            <th></th>
+          </tr>
+          <tr>
+            <th>2=Suspected</th>
+            <th></th>
+          </tr>
+          <tr>
+            <th>3=Confirmed</th>
+            <th></th>
+          </tr>
+          <tr>
+            <th>4=ND if not done</th>
+            <th></th>
+          </tr>
+        </thead>
+      </table>
+    </div>
+  </div>
+</div>
+<div
+  *ngIf="pncSummaryData.length == 0 && generated"
+  class="text-center rounded"
+>
+  <i class="alert alert-info text-center" style="width: 100%"
+    >No record found</i
+  >
 </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.ts
index 160dead32..440a57d79 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/pnc-register/pnc-register.component.ts
@@ -1,7 +1,19 @@
-import { Component, OnInit, Output } from '@angular/core';
+import { DatePipe } from '@angular/common';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
+import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
+
 @Component({
   selector: 'app-pnc-register',
   templateUrl: './pnc-register.component.html',
@@ -12,7 +24,7 @@ export class PncRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public txnewReportSummaryData: any = [];
+  public pncSummaryData: any = [];
   public columnDefs: any = [];
   public reportName = 'PNC Register';
   public currentView = 'monthly';
@@ -22,16 +34,19 @@ export class PncRegisterComponent implements OnInit {
   public quarter: string;
   public eDate: string;
   public sDate: string;
+  public jointLocationUuids: string;
 
   public statusError = false;
   public errorMessage = '';
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,monthControl';
+  public enabledControls = 'datesControl, locationControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  public generated = false;
+  @ViewChild('contentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
   public get locationUuids(): Array<string> {
@@ -48,7 +63,31 @@ export class PncRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(public router: Router, public route: ActivatedRoute) {
+  private _startDate: Date = Moment().toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = new Date();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public register: RegistersResourceService,
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -64,24 +103,33 @@ export class PncRegisterComponent implements OnInit {
   ngOnInit() {}
 
   public onMonthChange(value): any {
-    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+    this._month = Moment(value).format('YYYY-MM-DD');
   }
 
   public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `'${location.value}'`
+        );
+        this.jointLocationUuids = locationValues.join(', ');
+      });
+
     this.route.parent.parent.params.subscribe((params: any) => {
-      this.storeParamsInUrl(params.location_uuid);
+      this.storeParamsInUrl();
     });
-    this.txnewReportSummaryData = [];
-    // this.getTxNewReport(this.params);
+    this.pncSummaryData = [];
+    this.getPncRegisterData(this.params);
+    this.generated = true;
   }
 
-  public storeParamsInUrl(param) {
+  public storeParamsInUrl() {
     this.params = {
-      locationUuids: param,
-      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      reportName: this.reportName,
-      _date: Moment(this._month).format('DD-MM-YYYY')
+      locationUuids: this.jointLocationUuids,
+      month: Moment(this._month).format('YYYY-MM-DD'),
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -89,31 +137,31 @@ export class PncRegisterComponent implements OnInit {
     });
   }
 
-  // public getTxNewReport(params: any) {
-  //   this.isLoading = true;
-  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
-  //     if (data.error) {
-  //       this.showInfoMessage = true;
-  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
-  //       this.isLoading = false;
-  //     } else {
-  //       this.showInfoMessage = false;
-  //       this.columnDefs = data.sectionDefinitions;
-  //       this.txnewReportSummaryData = data.result;
-  //       this.calculateTotalSummary();
-  //       this.isLoading = false;
-  //       this.showDraftReportAlert(this._month);
-  //     }
-  //   });
-  // }
+  public getPncRegisterData(params: any) {
+    this.isLoading = true;
+    this.register.getPncRegister(params).subscribe((data) => {
+      if (data.error) {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      } else {
+        this.showInfoMessage = false;
+        this.columnDefs = data.sectionDefinitions;
+        this.pncSummaryData = data;
+        this.calculateTotalSummary();
+        this.isLoading = false;
+        this.showDraftReportAlert(this._month);
+      }
+    });
+  }
 
   public calculateTotalSummary() {
     const totalsRow = [];
-    if (this.txnewReportSummaryData.length > 0) {
+    if (this.pncSummaryData.length > 0) {
       const totalObj = {
         location: 'Totals'
       };
-      _.each(this.txnewReportSummaryData, (row) => {
+      _.each(this.pncSummaryData, (row) => {
         Object.keys(row).map((key) => {
           if (Number.isInteger(row[key]) === true) {
             if (totalObj[key]) {
@@ -158,4 +206,78 @@ export class PncRegisterComponent implements OnInit {
       this.isReleased = true;
     }
   }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH 366 Care and Treatment Daily Activity.pdf');
+    });
+  }
+
+  calculateAgeTotal(summaryData: any[], minAge: number, maxAge?: number) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['age'] >= minAge &&
+          (maxAge === undefined || data['age'] <= maxAge)
+      ).length || ''
+    );
+  }
+
+  getHivTotals(summaryData: any[], hivTestType: string, hivTestResult: string) {
+    return (
+      summaryData.filter((data) => data[hivTestType] === hivTestResult)
+        .length || ''
+    );
+  }
+  getCevicalCancerScreeningTotals(
+    summaryData: any[],
+    screeningMethod: string,
+    screenigValue: string
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['cervical_cancer_method'] === screeningMethod &&
+          data['cervical_cancer_results'] === screenigValue
+      ).length || ''
+    );
+  }
+
+  getPropertyTotals(
+    summaryData: any[],
+    property: string,
+    propertyValue: string
+  ) {
+    return (
+      summaryData.filter((data) => data[property] === propertyValue).length ||
+      ''
+    );
+  }
+  getPropertyWithAgeTotals(
+    summaryData: any[],
+    property: string,
+    propertyValue: string,
+    minAge: number,
+    maxAge: number
+  ) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data[property] === propertyValue &&
+          data['age'] >= minAge &&
+          data['age'] <= maxAge
+      ).length || ''
+    );
+  }
 }

From 8a81072f321ca7c21d681bedb75794eb26503ed7 Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Wed, 10 Dec 2025 23:24:16 +0300
Subject: [PATCH 48/50] POC-745: Added MOH 267 PrEP Daily Activity Register

---
 .../prepdaily-register.component.css          |    9 +
 .../prepdaily-register.component.html         | 3664 +++++++++++++++++
 .../prepdaily-register.component.ts           |  203 +-
 3 files changed, 3872 insertions(+), 4 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css
index 7d7e743ba..3ca74cbcf 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.css
@@ -12,3 +12,12 @@ tbody tr {
   transform: rotate(180deg);
   white-space: nowrap;
 }
+
+.bold {
+  font-weight: bold;
+}
+
+.summary {
+  display: flex;
+  gap: 5px;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
index fcf355c8a..68aab0301 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.html
@@ -78,6 +78,7 @@ <h4 *ngIf="!statusError">
         <tr>
           <th rowspan="2" colspan="2">PrEP No</th>
           <th rowspan="2" colspan="2">Date of Visit</th>
+          <th rowspan="2" colspan="2">AMRSID</th>
           <th colspan="3" style="max-width: 120px">
             National Identification Number
           </th>
@@ -129,6 +130,7 @@ <h4 *ngIf="!statusError">
         <tr>
           <th colspan="2" class="text-center">(a)</th>
           <th colspan="2" class="text-center">(b)</th>
+          <th colspan="2" class="text-center">(l)</th>
           <th colspan="3" class="text-center">(c)</th>
           <th colspan="2" class="text-center">(d)</th>
           <th colspan="2" class="text-center">(e)</th>
@@ -149,6 +151,9 @@ <h4 *ngIf="!statusError">
             <td colspan="2" rowspan="2">
               {{ transformDate(data.Date_Of_Visit) }}
             </td>
+            <td colspan="2" rowspan="2">
+              {{ data.amrsId }}
+            </td>
             <td colspan="3">{{ data.National_ID }}</td>
             <td colspan="2" rowspan="2">{{ data.Age }}</td>
             <td colspan="2" rowspan="2">{{ data.Sex }}</td>
@@ -199,6 +204,3665 @@ <h4 *ngIf="!statusError">
         </tr>
       </tbody>
     </table>
+    <ng-container *ngIf="prepRegisterData != []">
+      <div class="summary">
+        <table class="table table-sm table-bordered text-centre">
+          <thead>
+            <tr>
+              <th rowspan="3" colspan="2"></th>
+              <th colspan="9" style="text-align: center">
+                Number initiated (New) on PrEP (g)
+              </th>
+              <th></th>
+            </tr>
+            <tr>
+              <th colspan="2">10-14 Yrs</th>
+              <th colspan="2">15-19 Yrs</th>
+              <th colspan="2">20-24 Yrs</th>
+              <th colspan="2">25-29 Yrs</th>
+              <th colspan="2">>=30 Yrs</th>
+            </tr>
+            <tr>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td colspan="2" class="bold">General popn</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">MSM/MSW</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">FSW</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">PWID/PWUD</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">Discordant Couple</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">Vulnerable Pop.</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'N'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'N' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">TOTAL</td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'M', 'Age', 10, {
+                    maxAge: 14,
+                    prepStatus: 'client_prep_status',
+                    statusValue: 'N'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'F', 'Age', 10, {
+                    maxAge: 14,
+                    prepStatus: 'client_prep_status',
+                    statusValue: 'N'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'M', 'Age', 15, {
+                    maxAge: 19,
+                    prepStatus: 'client_prep_status',
+                    statusValue: 'N'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'F', 'Age', 15, {
+                    maxAge: 19,
+                    prepStatus: 'client_prep_status',
+                    statusValue: 'N'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'M', 'Age', 20, {
+                    maxAge: 24,
+                    prepStatus: 'client_prep_status',
+                    statusValue: 'N'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'F', 'Age', 20, {
+                    maxAge: 24,
+                    prepStatus: 'client_prep_status',
+                    statusValue: 'N'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'M', 'Age', 25, {
+                    maxAge: 29,
+                    prepStatus: 'client_prep_status',
+                    statusValue: 'N'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'F', 'Age', 25, {
+                    maxAge: 29,
+                    prepStatus: 'client_prep_status',
+                    statusValue: 'N'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'M', 'Age', 30, {
+                    prepStatus: 'client_prep_status',
+                    statusValue: 'N'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'F', 'Age', 30, {
+                    prepStatus: 'client_prep_status',
+                    statusValue: 'N'
+                  })
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <table class="table table-sm table-bordered text-centre">
+          <thead>
+            <tr>
+              <th
+                rowspan="3"
+                colspan="2"
+                style="text-align: center; vertical-align: middle"
+              >
+                New + <br />Refill + <br />
+                Restart
+              </th>
+              <th colspan="9" style="text-align: center">
+                Number Current on PrEP
+              </th>
+              <th></th>
+            </tr>
+            <tr>
+              <th colspan="2">10-14 Yrs</th>
+              <th colspan="2">15-19 Yrs</th>
+              <th colspan="2">20-24 Yrs</th>
+              <th colspan="2">25-29 Yrs</th>
+              <th colspan="2">>=30 Yrs</th>
+            </tr>
+            <tr>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td colspan="2" class="bold">General popn</td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">MSM/MSW</td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">FSW</td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">PWID/PWUD</td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">Discordant Couple</td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">Vulnerable Pop.</td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinued(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">TOTAL</td>
+              <td>
+                {{
+                  filterPrepDiscontinuedTotal(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinuedTotal(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    10,
+                    {
+                      maxAge: 14,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinuedTotal(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinuedTotal(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    15,
+                    {
+                      maxAge: 19,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinuedTotal(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinuedTotal(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    20,
+                    {
+                      maxAge: 24,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinuedTotal(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinuedTotal(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    25,
+                    {
+                      maxAge: 29,
+                      prepStatus: 'client_prep_status',
+                      statusValue: 'D'
+                    }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinuedTotal(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepDiscontinuedTotal(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    30,
+                    { prepStatus: 'client_prep_status', statusValue: 'D' }
+                  )
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <table class="table table-sm table-bordered text-centre">
+          <thead>
+            <tr>
+              <th rowspan="3" colspan="2"></th>
+              <th colspan="9" style="text-align: center">
+                Number diagnosed with STI (j)
+              </th>
+              <th></th>
+            </tr>
+            <tr>
+              <th colspan="2">10-14 Yrs</th>
+              <th colspan="2">15-19 Yrs</th>
+              <th colspan="2">20-24 Yrs</th>
+              <th colspan="2">25-29 Yrs</th>
+              <th colspan="2">>=30 Yrs</th>
+            </tr>
+            <tr>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+              <th>M</th>
+              <th>F</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td colspan="2" class="bold">General popn</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '1',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '1',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">MSM/MSW</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '3',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '3',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">FSW</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '4',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '4',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">PWID/PWUD</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '5',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '5',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">Discordant Couple</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '2',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '2',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">Vulnerable Pop.</td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    10,
+                    { maxAge: 14, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    15,
+                    { maxAge: 19, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    20,
+                    { maxAge: 24, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    25,
+                    { maxAge: 29, stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'M',
+                    'population_type',
+                    '6',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepData(
+                    prepRegisterData,
+                    'Age',
+                    'Sex',
+                    'F',
+                    'population_type',
+                    '6',
+                    30,
+                    { stiStatus: 'with_STI', stiValue: 'Y' }
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">TOTAL</td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'M', 'Age', 10, {
+                    maxAge: 14,
+                    stiStatus: 'with_STI',
+                    stiValue: 'Y'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'F', 'Age', 10, {
+                    maxAge: 14,
+                    stiStatus: 'with_STI',
+                    stiValue: 'Y'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'M', 'Age', 15, {
+                    maxAge: 19,
+                    stiStatus: 'with_STI',
+                    stiValue: 'Y'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'F', 'Age', 15, {
+                    maxAge: 19,
+                    stiStatus: 'with_STI',
+                    stiValue: 'Y'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'M', 'Age', 20, {
+                    maxAge: 24,
+                    stiStatus: 'with_STI',
+                    stiValue: 'Y'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'F', 'Age', 20, {
+                    maxAge: 24,
+                    stiStatus: 'with_STI',
+                    stiValue: 'Y'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'M', 'Age', 25, {
+                    maxAge: 29,
+                    stiStatus: 'with_STI',
+                    stiValue: 'Y'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'F', 'Age', 25, {
+                    maxAge: 29,
+                    stiStatus: 'with_STI',
+                    stiValue: 'Y'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'M', 'Age', 30, {
+                    stiStatus: 'with_STI',
+                    stiValue: 'Y'
+                  })
+                }}
+              </td>
+              <td>
+                {{
+                  getTotalData(prepRegisterData, 'Sex', 'F', 'Age', 30, {
+                    stiStatus: 'with_STI',
+                    stiValue: 'Y'
+                  })
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+        <table class="table table-sm table-bordered text-centre">
+          <thead>
+            <tr>
+              <th rowspan="2" colspan="2" style="vertical-align: middle">
+                Indicator/ <br />PrEP method
+              </th>
+              <th colspan="5" style="text-align: center">
+                Number of clients on each PrEP method (h)
+              </th>
+            </tr>
+            <tr>
+              <th>Event Driven</th>
+              <th>Daily Oral</th>
+              <th>Dapivirine Vaginal</th>
+              <th>Cabotegravir injectable</th>
+              <th>Total</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td colspan="2" class="bold">Number initiated (New) on PrEP</td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '2',
+                    'client_prep_status',
+                    'N'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '1',
+                    'client_prep_status',
+                    'N'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '3',
+                    'client_prep_status',
+                    'N'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '4',
+                    'client_prep_status',
+                    'N'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  getPrepMethodTotal(
+                    prepRegisterData,
+                    'client_prep_status',
+                    'N'
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">
+                Number continuing / <br />
+                currently on (Refills) PrEP
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '2',
+                    'client_prep_status',
+                    'C'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '1',
+                    'client_prep_status',
+                    'C'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '3',
+                    'client_prep_status',
+                    'C'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '4',
+                    'client_prep_status',
+                    'C'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  getPrepMethodTotal(
+                    prepRegisterData,
+                    'client_prep_status',
+                    'C'
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">Number Restarting PrEP</td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '2',
+                    'client_prep_status',
+                    'R'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '1',
+                    'client_prep_status',
+                    'R'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '3',
+                    'client_prep_status',
+                    'R'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '4',
+                    'client_prep_status',
+                    'R'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  getPrepMethodTotal(
+                    prepRegisterData,
+                    'client_prep_status',
+                    'R'
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td colspan="2" class="bold">
+                Number on PrEP for at-least 3 months
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '2',
+                    'client_prep_status',
+                    'C'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '1',
+                    'client_prep_status',
+                    'C'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '3',
+                    'client_prep_status',
+                    'C'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  filterPrepMethod(
+                    prepRegisterData,
+                    'prep_method',
+                    '4',
+                    'client_prep_status',
+                    'C'
+                  )
+                }}
+              </td>
+              <td>
+                {{
+                  getPrepMethodTotal(
+                    prepRegisterData,
+                    'client_prep_status',
+                    'C'
+                  )
+                }}
+              </td>
+            </tr>
+            <br />
+            <tr>
+              <td colspan="2" class="bold">
+                Number Seroconverting while on PrEP (i)
+              </td>
+              <td colspan="10"></td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </ng-container>
   </div>
 </div>
 <div
diff --git a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
index d7f4e3081..3e0c1e07f 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/prepdaily-register/prepdaily-register.component.ts
@@ -3,8 +3,6 @@ import {
   Component,
   OnInit,
   Output,
-  Input,
-  OnDestroy,
   ViewChild,
   ElementRef
 } from '@angular/core';
@@ -15,6 +13,15 @@ import { RegistersResourceService } from 'src/app/etl-api/registers-resource.ser
 import * as html2canvas from 'html2canvas';
 import * as jsPDF from 'jspdf';
 import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
+
+interface FilterPrepOptions {
+  maxAge?: number;
+  prepStatus?: string;
+  statusValue?: string;
+  stiStatus?: string;
+  stiValue?: string;
+}
+
 @Component({
   selector: 'app-prepdaily-register',
   templateUrl: './prepdaily-register.component.html',
@@ -138,7 +145,6 @@ export class PrepdailyRegisterComponent implements OnInit {
 
   public getPrEPRegisterReport(params: any) {
     this.isLoading = true;
-    console.log('PREP PARAMS ARE: ' + JSON.stringify(params));
     this.register.getPrEPRegisterReport(params).subscribe((data) => {
       if (data.error) {
         this.showInfoMessage = true;
@@ -147,7 +153,6 @@ export class PrepdailyRegisterComponent implements OnInit {
       } else {
         this.showInfoMessage = false;
         this.prepRegisterData = data;
-        console.log('PREP DATA IS: ' + JSON.stringify(data));
         this.isLoading = false;
         this.showDraftReportAlert(this._month);
       }
@@ -192,4 +197,194 @@ export class PrepdailyRegisterComponent implements OnInit {
       pdf.save('MOH 267 PrEP Daily Activity Register.pdf');
     });
   }
+
+  filterPrepData(
+    data: any[],
+    age: string,
+    gender: string,
+    genderValue: string,
+    populationType: string,
+    populationValue: string,
+    minAge: number,
+    options: FilterPrepOptions = {}
+  ): number | string {
+    if (!Array.isArray(data)) {
+      return '';
+    }
+    const { maxAge, prepStatus, statusValue, stiStatus, stiValue } = options;
+
+    return (
+      data.filter((item) => {
+        const ageValue = item[age];
+        const genderMatch = item[gender] === genderValue;
+        const popTypeMatch = item[populationType] === populationValue;
+        const minAgeMatch = ageValue >= minAge;
+        const maxAgeMatch = maxAge !== undefined ? ageValue <= maxAge : true;
+        const prepStatusMatch =
+          prepStatus && statusValue ? item[prepStatus] === statusValue : true;
+
+        const stiStatusMatch =
+          stiStatus && stiValue ? item[stiStatus] === stiValue : true;
+
+        return (
+          genderMatch &&
+          popTypeMatch &&
+          minAgeMatch &&
+          maxAgeMatch &&
+          prepStatusMatch &&
+          stiStatusMatch
+        );
+      }).length || ''
+    );
+  }
+
+  filterPrepDiscontinued(
+    data: any[],
+    age: string,
+    gender: string,
+    genderValue: string,
+    populationType: string,
+    populationValue: string,
+    minAge: number,
+    options: FilterPrepOptions = {}
+  ): number | string {
+    if (!Array.isArray(data)) {
+      return '';
+    }
+    const { maxAge, prepStatus, statusValue, stiStatus, stiValue } = options;
+
+    return (
+      data.filter((item) => {
+        const ageValue = item[age];
+        const genderMatch = item[gender] === genderValue;
+        const popTypeMatch = item[populationType] === populationValue;
+        const minAgeMatch = ageValue >= minAge;
+        const maxAgeMatch = maxAge !== undefined ? ageValue <= maxAge : true;
+        const prepStatusMatch =
+          prepStatus && statusValue
+            ? item[prepStatus] === 'R' ||
+              item[prepStatus] === 'N' ||
+              item[prepStatus] === 'C'
+            : true;
+
+        const stiStatusMatch =
+          stiStatus && stiValue ? item[stiStatus] === stiValue : true;
+
+        return (
+          genderMatch &&
+          popTypeMatch &&
+          minAgeMatch &&
+          maxAgeMatch &&
+          prepStatusMatch &&
+          stiStatusMatch
+        );
+      }).length || ''
+    );
+  }
+
+  filterPrepDiscontinuedTotal(
+    data: any[],
+    age: string,
+    gender: string,
+    genderValue: string,
+    minAge: number,
+    options: FilterPrepOptions = {}
+  ): number | string {
+    if (!Array.isArray(data)) {
+      return '';
+    }
+    const { maxAge, prepStatus, statusValue, stiStatus, stiValue } = options;
+
+    return (
+      data.filter((item) => {
+        const ageValue = item[age];
+        const genderMatch = item[gender] === genderValue;
+        const minAgeMatch = ageValue >= minAge;
+        const maxAgeMatch = maxAge !== undefined ? ageValue <= maxAge : true;
+        const prepStatusMatch =
+          prepStatus && statusValue
+            ? item[prepStatus] === 'R' ||
+              item[prepStatus] === 'N' ||
+              item[prepStatus] === 'C'
+            : true;
+
+        const stiStatusMatch =
+          stiStatus && stiValue ? item[stiStatus] === stiValue : true;
+
+        return (
+          genderMatch &&
+          minAgeMatch &&
+          maxAgeMatch &&
+          prepStatusMatch &&
+          stiStatusMatch
+        );
+      }).length || ''
+    );
+  }
+
+  getTotalData(
+    summaryData: any[],
+    gender: string,
+    genderValue: string,
+    age: string,
+    minAge: number,
+    options: FilterPrepOptions = {}
+  ): number | string {
+    if (!Array.isArray(summaryData)) {
+      return '';
+    }
+
+    const { maxAge, prepStatus, statusValue, stiStatus, stiValue } = options;
+
+    return (
+      summaryData.filter((data) => {
+        const ageValue = data[age];
+        const genderMatch = data[gender] === genderValue;
+        const minAgeMatch = ageValue >= minAge;
+        const maxAgeMatch = maxAge !== undefined ? ageValue <= maxAge : true;
+        const prepStatusMatch =
+          prepStatus && statusValue ? data[prepStatus] === statusValue : true;
+
+        const stiStatusMatch =
+          stiStatus && stiValue ? data[stiStatus] === stiValue : true;
+
+        return (
+          genderMatch &&
+          minAgeMatch &&
+          maxAgeMatch &&
+          prepStatusMatch &&
+          stiStatusMatch
+        );
+      }).length || ''
+    );
+  }
+
+  filterPrepMethod(
+    data: any[],
+    prepMethod: string,
+    prepMethodValue: number,
+    prepStatus: string,
+    prepStatusValue: string
+  ) {
+    return (
+      data.filter(
+        (param) =>
+          param[prepMethod] === prepMethodValue &&
+          param[prepStatus] === prepStatusValue
+      ).length || ''
+    );
+  }
+
+  getPrepMethodTotal(data: any[], prepStatus: string, prepStatusValue: number) {
+    return (
+      data.filter(
+        (param) =>
+          (param['prep_method'] === '1' ||
+            param['prep_method'] === '2' ||
+            param['prep_method'] === '3' ||
+            param['prep_method'] === '4') &&
+          param[prepStatus] === prepStatusValue
+      ).length || ''
+    );
+  }
 }

From cccb64aebce348aa9ad5cffc44878850d8862b17 Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Wed, 10 Dec 2025 23:27:23 +0300
Subject: [PATCH 49/50] POC-740: Added MOH 407 Nutrition Service Register

---
 .../nutrition-register.component.css          |   32 +-
 .../nutrition-register.component.html         | 1478 ++++++-----------
 .../nutrition-register.component.ts           |  128 +-
 3 files changed, 640 insertions(+), 998 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css
index ab1f08146..a4ad7f3a1 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.css
@@ -1,10 +1,10 @@
 tr,
 .table-bordered th,
 .table-bordered td {
-  border: 2px solid #000; /* Darker border color */
+  border: 2px solid #000;
 }
 tbody tr {
-  height: 20px; /* Adjust the height as per your design */
+  height: 20px;
 }
 .vertical-text {
   writing-mode: vertical-rl;
@@ -15,3 +15,31 @@ tbody tr {
 th {
   min-width: 70px;
 }
+
+.summary {
+  display: flex;
+  gap: 50px;
+  align-items: stretch;
+  justify-content: space-between;
+}
+
+.flex-item {
+  flex: 1 1 30%;
+  min-width: 250px;
+  box-sizing: border-box;
+}
+
+.no-border {
+  border: none !important;
+}
+
+.table.table-bordered thead tr th.no-border {
+  border: none !important;
+}
+
+.center {
+  text-align: center;
+}
+.bold {
+  font-weight: bold;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
index aa9f35a0b..a7fe5632a 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.html
@@ -11,7 +11,8 @@ <h4 class="component-title text-success">
     <p-tabPanel header="Monthly" leftIcon="fa-calendar-o">
       <report-filters
         [enabledControls]="enabledControls"
-        [monthString]="_month"
+        [(startDate)]="startDate"
+        [(endDate)]="endDate"
         (onMonthChange)="onMonthChange($event)"
         [reportName]="reportName"
         (generateReport)="generateReport()"
@@ -36,7 +37,11 @@ <h4 *ngIf="!statusError">
   This report is likely to change without warning.
 </div>
 
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
+<div
+  style="padding: 20px; font-size: 12px !important"
+  #contentToSnapshot
+  *ngIf="nutritionSummaryData && nutritionSummaryData.length > 0"
+>
   <div class="table-responsive">
     <div class="row">
       <div class="col-md-4">
@@ -158,242 +163,207 @@ <h4 *ngIf="!statusError">
         </tr>
       </thead>
       <tbody>
+        <ng-container *ngFor="let data of nutritionSummaryData; let a = index">
+          <tr>
+            <td class="text-centre" rowspan="2">{{ a + 1 }}</td>
+            <td class="text-centre" rowspan="2">
+              {{ data.date | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-centre">{{ data.id_number }}</td>
+            <td class="text-centre" rowspan="2">{{ data.ccc_number }}</td>
+            <td class="text-centre" rowspan="2">{{ data.full_names }}</td>
+            <td class="text-centre" rowspan="2">{{ data.visit_type }}</td>
+            <td class="text-centre" rowspan="2">
+              {{ data.village_estate_landmark }}
+            </td>
+            <td class="text-centre" rowspan="2">{{ data.sex }}</td>
+            <td class="text-centre" rowspan="2">{{ data.age_years }}</td>
+            <td class="text-centre" rowspan="2">{{ data.age_months }}</td>
+            <td class="text-centre" rowspan="2">
+              {{ data.pregnant_lactating }}
+            </td>
+            <td class="text-centre">{{ data.nutritional_assessment_code }}</td>
+            <td class="text-centre" rowspan="2">
+              {{ data.nutritional_status }}
+            </td>
+            <td class="text-centre" rowspan="2">{{ data.serostatus }}</td>
+            <td class="text-centre" rowspan="2">{{ data.cormobidities }}</td>
+            <td class="text-centre" rowspan="2">{{ data.food_secure }}</td>
+            <td class="text-centre" rowspan="2">{{ data.remarks }}</td>
+          </tr>
+          <tr>
+            <td class="text-center">{{ data.nupi }}</td>
+            <td class="text-center">{{ data.nutritional_assessment_value }}</td>
+          </tr>
+        </ng-container>
+      </tbody>
+    </table>
+  </div>
+  <p class="bold">Page Summary</p>
+</div>
+<div
+  class="summary table-responsive"
+  *ngIf="nutritionSummaryData && nutritionSummaryData.length > 0"
+>
+  <div class="flex-item">
+    <table class="table table-bordered text-centre">
+      <thead>
         <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
+          <th class="center" colspan="6">Patients Seen</th>
+          <th class="center" colspan="4">Nutrition Diagnosis</th>
         </tr>
+      </thead>
+      <tbody>
         <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
+          <th rowspan="2">Patient Category</th>
+          <th class="center" colspan="3">New</th>
+          <th class="center" colspan="2">Revisit</th>
+          <th>Age category</th>
+          <th class="no-border"></th>
+          <th class="center">SAM +</th>
+          <th class="center">MAM +</th>
+        </tr>
+        <tr>
+          <th class="center">HIV+</th>
+          <th></th>
+          <th class="center">TOTAL</th>
+          <th class="center">HIV+</th>
+          <th class="center">TOTAL</th>
+          <td>0-5 Months</td>
+          <td class="no-border"></td>
+          <td class="no-border"></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td>6-59 Months</td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>Male</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td>5-9 yrs</td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>Female</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td>10-17 yrs</td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>Pregnant & Lactating</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td>18+ yrs</td>
+          <td></td>
+          <td></td>
+          <td></td>
+        </tr>
+        <tr>
+          <td>Food Secure</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td>Pregnant/Lactating</td>
+          <td></td>
+          <td></td>
+          <td></td>
         </tr>
+      </tbody>
+    </table>
+  </div>
+  <div class="flex-item">
+    <table class="table table-bordered text-centre">
+      <thead>
         <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
+          <th class="center" colspan="5">Medical Condition</th>
         </tr>
         <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
+          <th class="center">Age category</th>
+          <th class="center">TB</th>
+          <th class="center">Hypertension</th>
+          <th class="center">diabetes</th>
+          <th class="center">Others</th>
         </tr>
+      </thead>
+      <tbody>
         <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
+          <td>0-5 Months</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
         </tr>
         <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
+          <td>6-59 Months</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
         </tr>
         <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
+          <td>5-9 yrs</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
         </tr>
         <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
+          <td>10-17 yrs</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
         </tr>
         <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
+          <td>18+ yrs</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
         </tr>
         <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
+          <td>Pregnant/<br />Lactating</td>
+          <td></td>
+          <td></td>
+          <td></td>
+          <td></td>
         </tr>
       </tbody>
     </table>
   </div>
 </div>
 <br />
-<div style="padding: 20px; font-size: 12px !important" #contentToSnapshot1>
+<div
+  style="padding: 20px; font-size: 12px !important"
+  #contentToSnapshot1
+  *ngIf="nutritionSummaryData && nutritionSummaryData.length > 0"
+>
   <div class="table-responsive">
     <div class="row">
       <div class="col-md-4">
@@ -409,7 +379,7 @@ <h4 *ngIf="!statusError">
     <table class="table table-bordered text-centre">
       <thead>
         <tr>
-          <th class="text-center" colspan="79">Client's follow up Register</th>
+          <th class="text-center" colspan="80">Client's follow up Register</th>
         </tr>
         <tr>
           <th class="text-center" rowspan="2" colspan="12">Clients' Details</th>
@@ -420,7 +390,7 @@ <h4 *ngIf="!statusError">
             Discharge/Transfer <br />
             Measurements
           </th>
-          <th class="text-center" rowspan="2" colspan="5">Outcome</th>
+          <th class="text-center" rowspan="2" colspan="6">Outcome</th>
         </tr>
         <tr>
           <th class="text-center" colspan="4">week1</th>
@@ -490,6 +460,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2 (1-3)
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //1 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -498,6 +469,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //2 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -506,6 +478,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //3 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -514,6 +487,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //4 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -525,6 +499,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //5 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -533,6 +508,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //6 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -541,6 +517,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- /7 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -549,6 +526,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //8 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -560,6 +538,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //9 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -568,6 +547,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //10 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -576,6 +556,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //11 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -584,6 +565,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //12 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -595,6 +577,7 @@ <h4 *ngIf="!statusError">
             W/H Zscore/BMI For Age/BMIKg/m2
           </th>
           <th class="text-center vertical-text" rowspan="2">MUAC</th>
+          <!-- //13 -->
           <th class="text-center vertical-text" rowspan="2">
             Nutrition Intervention
           </th>
@@ -626,6 +609,7 @@ <h4 *ngIf="!statusError">
             5-Transfer,<br />
             6- Death
           </th>
+          <th class="text-center" rowspan="2">Remarks</th>
         </tr>
         <tr>
           <th class="text-center">
@@ -696,6 +680,7 @@ <h4 *ngIf="!statusError">
           <td class="text-centre">(bb)</td>
           <td class="text-centre">(bc)</td>
           <td class="text-centre">(bd)</td>
+          <td class="text-centre">(bd)</td>
           <td class="text-centre">(be)</td>
           <td class="text-centre">(bf)</td>
           <td class="text-centre">(bg)</td>
@@ -714,757 +699,324 @@ <h4 *ngIf="!statusError">
           <td class="text-centre">(bt)</td>
           <td class="text-centre">(bu)</td>
           <td class="text-centre">(bv)</td>
-          <td class="text-centre">(bw)</td>
+          <td class="text-centre" colspan="2">(bw)</td>
           <td class="text-centre">(bx)</td>
         </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-centre"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-centre"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-centre"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-centre"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-centre"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-centre"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-centre"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-centre"></td>
-        </tr>
-        <tr>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-          <td class="text-centre" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-centre"></td>
-        </tr>
+        <ng-container *ngFor="let data of nutritionSummaryData; let a = index">
+          <tr>
+            <td class="text-centre" rowspan="2">{{ a + 1 }}</td>
+            <td class="text-centre" rowspan="2">
+              {{ data.date | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-centre">{{ data.id_number }}</td>
+            <td class="text-centre" rowspan="2">{{ data.ccc_number }}</td>
+            <td class="text-centre" rowspan="2">{{ data.full_names }}</td>
+            <td class="text-centre" rowspan="2">
+              {{ data.village_estate_landmark }}
+            </td>
+            <td class="text-centre" rowspan="2">{{ data.phone_number }}</td>
+            <td class="text-centre" rowspan="2">{{ data.age_years }}</td>
+            <td class="text-centre" rowspan="2">{{ data.age_months }}</td>
+            <td class="text-centre" rowspan="2">{{ data.sex }}</td>
+            <td class="text-centre" rowspan="2">
+              {{ data.type_of_addmission }}
+            </td>
+            <td class="text-centre" rowspan="2">
+              {{ data.pregnant_lactating }}
+            </td>
+            <td class="text-centre" rowspan="2">{{ data.serostatus }}</td>
+            <td class="text-centre" rowspan="2">
+              {{ data.admission_criteria }}
+            </td>
+            <td class="text-centre" rowspan="2">{{ data.weight }}</td>
+            <td class="text-centre" rowspan="2">{{ data.height }}</td>
+            <td class="text-centre" rowspan="2">
+              {{ data.weight_for_height_z_score }}
+            </td>
+            <td class="text-centre" rowspan="2">{{ data.muac }}</td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2"></td>
+            <td class="text-centre" rowspan="2">{{ data.exit_date }}</td>
+            <td class="text-centre" rowspan="2">{{ data.length_of_stay }}</td>
+            <td class="text-centre" rowspan="2">
+              {{ data.exit_outcome }}
+            </td>
+            <td class="text-centre" rowspan="2">{{ data.remarks }}</td>
+          </tr>
+          <tr>
+            <td class="text-centre">{{ data.nupi }}</td>
+          </tr>
+        </ng-container>
       </tbody>
     </table>
   </div>
+  <div
+    class="summary"
+    *ngIf="nutritionSummaryData && nutritionSummaryData.length > 0"
+  >
+    <p class="bold">Page Summary</p>
+    <p class="bold">Page Summary</p>
+  </div>
+  <div
+    class="summary table-responsive"
+    *ngIf="nutritionSummaryData && nutritionSummaryData.length > 0"
+  >
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr>
+            <th>Age category</th>
+            <th>Total HIV <br />+ve</th>
+            <th>Total HIV+ve Provided<br />Therapeutic support</th>
+            <th>Total HIV+ve Provided<br />Supplemental support</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td>0-5 Months</td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>6-59 Months</td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>5-9 yrs</td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>10-17 yrs</td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>18+ yrs</td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Pregnant/</td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <div class="flex-item">
+      <table class="table table-bordered text-centre">
+        <thead>
+          <tr>
+            <th>
+              Prescribed Nutritional<br />
+              Support
+            </th>
+            <th class="center" colspan="2">0-5Months</th>
+            <th class="center" colspan="2">6-59Months</th>
+            <th class="center" colspan="2">5-9 Years</th>
+            <th class="center" colspan="2">10-17 Years</th>
+            <th class="center" colspan="2">18+years</th>
+            <th class="center" colspan="2">Pregnant/<br />lactating</th>
+            <th class="center" colspan="2">TB</th>
+            <th class="center">
+              Total HIV+ve Provided<br />
+              Nutritional support
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <th></th>
+            <th>HIV +ve</th>
+            <th>HIV -ve</th>
+            <th>HIV +ve</th>
+            <th>HIV -ve</th>
+            <th>HIV +ve</th>
+            <th>HIV -ve</th>
+            <th>HIV +ve</th>
+            <th>HIV -ve</th>
+            <th>HIV +ve</th>
+            <th>HIV -ve</th>
+            <th>HIV +ve</th>
+            <th>HIV -ve</th>
+            <th>HIV +ve</th>
+            <th>HIV -ve</th>
+            <th></th>
+          </tr>
+          <tr>
+            <td>Therapeutic Milk <br />(F 75/F 100)</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>RUTF</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>RUSF</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>FBF</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>CSB</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+          <tr>
+            <td>Others</td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+            <td></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+  </div>
 </div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.ts
index 3240e3fd1..0fab34a1b 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/nutrition-register/nutrition-register.component.ts
@@ -1,7 +1,19 @@
-import { Component, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
+import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
+import { DatePipe } from '@angular/common';
+
 @Component({
   selector: 'app-nutrition-register',
   templateUrl: './nutrition-register.component.html',
@@ -12,7 +24,7 @@ export class NutritionRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public txnewReportSummaryData: any = [];
+  public nutritionSummaryData: any = [];
   public columnDefs: any = [];
   public reportName = 'Nutrition Service Register';
   public currentView = 'monthly';
@@ -22,16 +34,18 @@ export class NutritionRegisterComponent implements OnInit {
   public quarter: string;
   public eDate: string;
   public sDate: string;
+  public jointLocationUuids: string;
 
   public statusError = false;
   public errorMessage = '';
   public showInfoMessage = false;
   public isLoading = false;
   public reportHead: any;
-  public enabledControls = 'locationControl,monthControl';
+  public enabledControls = 'datesControl, locationControl';
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  @ViewChild('contentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
   public get locationUuids(): Array<string> {
@@ -48,7 +62,31 @@ export class NutritionRegisterComponent implements OnInit {
     this._locationUuids = locationUuids;
   }
 
-  constructor(public router: Router, public route: ActivatedRoute) {
+  private _startDate: Date = Moment().toDate();
+  public get startDate(): Date {
+    return this._startDate;
+  }
+
+  public set startDate(v: Date) {
+    this._startDate = v;
+  }
+
+  private _endDate: Date = new Date();
+  public get endDate(): Date {
+    return this._endDate;
+  }
+
+  public set endDate(v: Date) {
+    this._endDate = v;
+  }
+
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public register: RegistersResourceService,
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -64,24 +102,32 @@ export class NutritionRegisterComponent implements OnInit {
   ngOnInit() {}
 
   public onMonthChange(value): any {
-    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+    this._month = Moment(value).format('YYYY-MM-DD');
   }
 
   public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `'${location.value}'`
+        );
+        this.jointLocationUuids = locationValues.join(', ');
+      });
+
     this.route.parent.parent.params.subscribe((params: any) => {
-      this.storeParamsInUrl(params.location_uuid);
+      this.storeParamsInUrl();
     });
-    this.txnewReportSummaryData = [];
-    // this.getTxNewReport(this.params);
+    this.nutritionSummaryData = [];
+    this.getNutritionData(this.params);
   }
 
-  public storeParamsInUrl(param) {
+  public storeParamsInUrl() {
     this.params = {
-      locationUuids: param,
-      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      reportName: this.reportName,
-      _date: Moment(this._month).format('DD-MM-YYYY')
+      locationUuids: this.jointLocationUuids,
+      month: Moment(this._month).format('YYYY-MM-DD'),
+      startDate: Moment(this.startDate).format('YYYY-MM-DD'),
+      endDate: Moment(this.endDate).format('YYYY-MM-DD')
     };
     this.router.navigate([], {
       relativeTo: this.route,
@@ -89,31 +135,30 @@ export class NutritionRegisterComponent implements OnInit {
     });
   }
 
-  // public getTxNewReport(params: any) {
-  //   this.isLoading = true;
-  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
-  //     if (data.error) {
-  //       this.showInfoMessage = true;
-  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
-  //       this.isLoading = false;
-  //     } else {
-  //       this.showInfoMessage = false;
-  //       this.columnDefs = data.sectionDefinitions;
-  //       this.txnewReportSummaryData = data.result;
-  //       this.calculateTotalSummary();
-  //       this.isLoading = false;
-  //       this.showDraftReportAlert(this._month);
-  //     }
-  //   });
-  // }
+  public getNutritionData(params: any) {
+    this.isLoading = true;
+    this.register.getNutritionRegister(params).subscribe((data) => {
+      if (data.error) {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      } else {
+        this.showInfoMessage = false;
+        this.nutritionSummaryData = data;
+        this.calculateTotalSummary();
+        this.isLoading = false;
+        this.showDraftReportAlert(this._month);
+      }
+    });
+  }
 
   public calculateTotalSummary() {
     const totalsRow = [];
-    if (this.txnewReportSummaryData.length > 0) {
+    if (this.nutritionSummaryData.length > 0) {
       const totalObj = {
         location: 'Totals'
       };
-      _.each(this.txnewReportSummaryData, (row) => {
+      _.each(this.nutritionSummaryData, (row) => {
         Object.keys(row).map((key) => {
           if (Number.isInteger(row[key]) === true) {
             if (totalObj[key]) {
@@ -158,4 +203,21 @@ export class NutritionRegisterComponent implements OnInit {
       this.isReleased = true;
     }
   }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH 366 Care and Treatment Daily Activity.pdf');
+    });
+  }
 }

From 9141f630ae366c9a5c36e0527cd1063391dfec8b Mon Sep 17 00:00:00 2001
From: Denzel Kipkemoi <denzelkipkemoi@Denzels-MacBook-Pro.local>
Date: Wed, 10 Dec 2025 23:35:17 +0300
Subject: [PATCH 50/50] POC-741: Added MOH 333 Maternity Register

---
 .../maternity-register.component.css          |   22 +
 .../maternity-register.component.html         | 1334 +++++++----------
 .../maternity-register.component.ts           |  140 +-
 3 files changed, 695 insertions(+), 801 deletions(-)

diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css
index ab1f08146..ae9e9ed55 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css
+++ b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.css
@@ -15,3 +15,25 @@ tbody tr {
 th {
   min-width: 70px;
 }
+
+.summary {
+  display: flex;
+  gap: 20px;
+  align-items: stretch;
+  justify-content: space-between;
+}
+
+.flex-item {
+  flex: 1 1 30%;
+  min-width: 250px;
+  box-sizing: border-box;
+}
+table {
+  width: 100%;
+  height: auto;
+}
+
+.inner {
+  display: flex;
+  flex-direction: column;
+}
diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
index 369418be5..8c6924891 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
+++ b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.html
@@ -38,7 +38,10 @@ <h4 *ngIf="!statusError">
 </div>
 
 <div style="padding: 20px; font-size: 12px !important" #contentToSnapshot>
-  <div class="table-responsive">
+  <div
+    class="table-responsive"
+    *ngIf="maternitySummaryData && maternitySummaryData.length > 0"
+  >
     <div class="row">
       <div class="col-md-4">
         <b>Ministry Of Health</b>
@@ -58,6 +61,7 @@ <h4 *ngIf="!statusError">
             Admission <br />
             (dd/mm/yyyy)
           </th>
+          <th rowspan="6">AMRSID</th>
           <th>Admission number (yyyy-mm-nnnn)</th>
           <th rowspan="6">
             Full Name<br />
@@ -431,776 +435,568 @@ <h4 *ngIf="!statusError">
           <td class="text-center">(av)</td>
           <td class="text-center">(aw)</td>
           <td class="text-center">(ax)</td>
+          <td class="text-center">(ay)</td>
         </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
-        <tr>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-          <td class="text-center" rowspan="2"></td>
-        </tr>
-        <tr>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-          <td class="text-center"></td>
-        </tr>
+        <ng-container *ngFor="let data of maternitySummaryData; let a = index">
+          <tr>
+            <td class="text-center" rowspan="2">
+              {{ data.date_of_admission }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.amrsID }}
+            </td>
+            <td class="text-center">{{ data.admission_number }}</td>
+            <td class="text-center" rowspan="2">{{ data.full_names }}</td>
+            <td class="text-center">
+              {{ data.date_of_birth | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.subcounty_county }}</td>
+            <td class="text-center">{{ data.village_estate_landmark }}</td>
+            <td class="text-center" rowspan="2">{{ data.marital_status }}</td>
+            <td class="text-center" rowspan="2">{{ data.parity }}</td>
+            <td class="text-center" rowspan="2">{{ data.gravidae }}</td>
+            <td class="text-center" rowspan="2">{{ data.no_of_anc_visits }}</td>
+            <td class="text-center" rowspan="2">{{ data.lmp }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.edd | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.diagnosis }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.duration_of_labour }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.date_of_delivery | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.time_of_delivery }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.gestation_at_birth }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.mode_of_delivery }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.no_of_babies_delivered }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.placenta_complete }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.uterotonic_given }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.vaginal_examination }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.blood_loss }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.mother_status_after_delivery }}
+            </td>
+            <td class="text-center">
+              {{ data.maternal_deaths_notified }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.delivery_complications }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.apgar_score }}</td>
+            <td class="text-center" rowspan="2">{{ data.birth_outcome }}</td>
+            <td class="text-center" rowspan="2">{{ data.birth_weight }}</td>
+            <td class="text-center" rowspan="2">{{ data.sex }}</td>
+            <td class="text-center">
+              {{ data.initiated_on_bf_less_one_hour }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.teo_given_at_birth }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.chlorhexdine_applied_on_cord_stump }}
+            </td>
+            <td class="text-center">{{ data.birth_with_deformity }}</td>
+            <td class="text-center" rowspan="2">{{ data.given_vitamin_k }}</td>
+            <td class="text-center">{{ data.duo_test_result }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.hiv_test_1_kit_name }}/ {{ datahiv_test_1_lot_no }} /
+              {{ hiv_test_1_expiry_date }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.hiv_test_2_kit_name }}/ {{ datahiv_test_2_lot_no }} /
+              {{ hiv_test_2_expiry_date }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.hiv_test_3_kit_name }}/ {{ datahiv_test_3_lot_no }} /
+              {{ hiv_test_3_expiry_date }}
+            </td>
+            <td class="text-center">{{ data.hiv_test_results_maternity }}</td>
+            <td class="text-center" rowspan="2">{{ data.maternal_haart }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.infant_prophylaxis }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.partner_tested_for_hiv }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.counselled_on_infant_feeding }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.deleivery_conducted_by }}
+            </td>
+            <td class="text-center" rowspan="2">
+              {{ data.birth_notification_number }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.discharge_date }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.discharge_status_of_baby }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.referrals_from }}</td>
+            <td class="text-center" rowspan="2">{{ data.referrals_to }}</td>
+            <td class="text-center" rowspan="2">
+              {{ data.reasons_for_refferal }}
+            </td>
+            <td class="text-center" rowspan="2">{{ data.comments }}</td>
+          </tr>
+          <tr>
+            <td class="text-center">{{ data.nupi }}</td>
+            <td class="text-center">{{ data.age }}</td>
+            <td class="text-center">{{ data.phone_number }}</td>
+            <td class="text-center">
+              {{ data.date_maternal_death_notified | date: 'dd/MM/yyyy' }}
+            </td>
+            <td class="text-center">{{ data.kangaroo_mother_care }}</td>
+            <td class="text-center">{{ data.type_of_deformity }}</td>
+            <td class="text-center">{{ data.hiv_test_type }}</td>
+            <td class="text-center">{{ data.hiv_test_type }}</td>
+          </tr>
+        </ng-container>
       </tbody>
     </table>
-    <tr>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-    </tr>
-    <tr>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-    </tr>
-    <tr>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-      <td class="text-center" rowspan="2"></td>
-    </tr>
-    <tr>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-      <td class="text-center"></td>
-    </tr>
+    <div
+      class="summary"
+      *ngIf="maternitySummaryData && maternitySummaryData.length > 0"
+    >
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <thead>
+            <tr>
+              <th>AGE (d)</th>
+              <th>Number</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>10-14 years</td>
+              <td>{{ calculateAgeTotals(maternitySummaryData, 10, 14) }}</td>
+            </tr>
+            <tr>
+              <td>15-19 years</td>
+              <td>{{ calculateAgeTotals(maternitySummaryData, 15, 19) }}</td>
+            </tr>
+            <tr>
+              <td>20-24 years</td>
+              <td>{{ calculateAgeTotals(maternitySummaryData, 20, 24) }}</td>
+            </tr>
+            <tr>
+              <td>Above 25 years</td>
+              <td>{{ calculateAgeTotals(maternitySummaryData, 25) }}</td>
+            </tr>
+            <tr>
+              <td>Totals</td>
+              <td>{{ maternitySummaryData.length }}</td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <thead>
+            <tr>
+              <th>No of mothers given Uterotonics (u)</th>
+              <th>Number</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>Oxytocin</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'uterotonic_given',
+                    1
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>Carbetocin</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'uterotonic_given',
+                    2
+                  )
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <thead>
+            <tr>
+              <th>Mode of delivery (r)</th>
+              <th>Number</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>No. Normal deliveries (r)</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'mode_of_delivery',
+                    1
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>No. Caesarean sections (r)</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'mode_of_delivery',
+                    2
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>No. Breech deliveries (r)</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'mode_of_delivery',
+                    3
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>No. Assisted vaginal deliveries (r)</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'mode_of_delivery',
+                    4
+                  )
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <thead>
+            <tr>
+              <th>Maternal deaths (y)</th>
+              <th></th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>Maternal deaths 10-14Years (y)</td>
+              <td>
+                {{ getMaternalDeathTotals(maternitySummaryData, 10, 14) }}
+              </td>
+            </tr>
+            <tr>
+              <td>Maternal deaths 15-19Years (y)</td>
+              <td>
+                {{ getMaternalDeathTotals(maternitySummaryData, 15, 19) }}
+              </td>
+            </tr>
+            <tr>
+              <td>Maternal deaths 20 years plus (y)</td>
+              <td>{{ getMaternalDeathTotals(maternitySummaryData, 20) }}</td>
+            </tr>
+            <tr>
+              <td>Maternal deaths audited</td>
+              <td>
+                {{
+                  getMaternalDeathTotals(maternitySummaryData, 10, 14) +
+                    getMaternalDeathTotals(maternitySummaryData, 15, 19) +
+                    getMaternalDeathTotals(maternitySummaryData, 20)
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <thead>
+            <tr>
+              <th>Maternal complications (z):</th>
+              <th>Alive</th>
+              <th>Dead</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>No. with APH (z):</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>No. with PPH(z):</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>No. with rutpured uterus (z):</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>No. with obstructed labour (z):</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>No. with sepsis (z):</td>
+              <td></td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <tbody>
+            <tr>
+              <td>Pre Term Babies (q):</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Underweight Babies (ac):</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Live Birth (ab):</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Birth with deformities (ah):</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Fresh Still Births (ab):</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td>Macerated Still Births (ab):</td>
+              <td></td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="inner">
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead></thead>
+            <tbody>
+              <tr>
+                <td>Adolescents (10 -19 yrs) New HIV+ maternity (al)(d)</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>Adolescents (10 -19 yrs) Started HAART (am)(d)</td>
+                <td></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead></thead>
+            <tbody>
+              <tr>
+                <td>Young Women (20 -24 yrs) New HIV+ maternity (al)(d)</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>
+                  Young Women (20 -24 yrs) Started HAART maternity (am)(d)
+                </td>
+                <td></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+      <div class="inner">
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead></thead>
+            <tbody>
+              <tr>
+                <td>Initial test at L&D (al):</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>ARetest at L&D (al):</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>Positive Results L&D (al):</td>
+                <td></td>
+              </tr>
+              <tr>
+                <td>No. HIV positive deliveries (ab)(al)</td>
+                <td></td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+        <div class="flex-item">
+          <table class="table table-bordered text-centre">
+            <thead></thead>
+            <tbody>
+              <tr>
+                <td>No. Started HAART_L&D (am):</td>
+                <td>
+                  {{
+                    getParameterTotals(
+                      maternitySummaryData,
+                      'maternal_haart',
+                      'Y'
+                    )
+                  }}
+                </td>
+              </tr>
+              <tr>
+                <td>Infant ARV prophylaxis_L&D(an):</td>
+                <td>
+                  {{
+                    getParameterTotals(
+                      maternitySummaryData,
+                      'infant_prophylaxis',
+                      'Y'
+                    )
+                  }}
+                </td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </div>
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <thead></thead>
+          <tbody>
+            <tr>
+              <td>No. of babies applied chlorhexidine for cord care (ag)</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'chlorhexdine_applied_on_cord_stump',
+                    'Y'
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>No. of babies given tetracycline at birth (af)</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'teo_given_at_birth',
+                    'Y'
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>
+                No. of Infants intiatied on breastfeeding within 1 hour after
+                birth (ae)
+              </td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'initiated_on_bf_less_one_hour',
+                    'Y'
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>No. of neonates given Vit "K" (ah)</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'given_vitamin_k',
+                    'Y'
+                  )
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="flex-item">
+        <table class="table table-bordered text-centre">
+          <thead>
+            <tr></tr>
+          </thead>
+          <tbody>
+            <tr>
+              <td>No. of babies discharged alive (at):</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'baby_status_on_discharge',
+                    'A'
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>Early Neonatal deaths (at):(0-7days)</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'baby_status_on_discharge',
+                    'D'
+                  )
+                }}
+              </td>
+            </tr>
+            <tr>
+              <td>Late Neonatal deaths (at):(8-28days)</td>
+              <td>
+                {{
+                  getParameterTotals(
+                    maternitySummaryData,
+                    'baby_status_on_discharge',
+                    'D'
+                  )
+                }}
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
   </div>
 </div>
+<div
+  *ngIf="maternitySummaryData.length == 0 && generated"
+  class="text-center rounded"
+>
+  <i class="alert alert-info text-center" style="width: 100%"
+    >No record found</i
+  >
+</div>
diff --git a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts
index ae122072c..8422d906e 100644
--- a/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts
+++ b/src/app/data-analytics-dashboard/hiv/registers/maternity-register/maternity-register.component.ts
@@ -1,7 +1,19 @@
-import { Component, OnInit, Output } from '@angular/core';
+import { DatePipe } from '@angular/common';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+  Output,
+  ViewChild
+} from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import * as _ from 'lodash';
 import * as Moment from 'moment';
+import { DataAnalyticsDashboardService } from 'src/app/data-analytics-dashboard/services/data-analytics-dashboard.services';
+import { RegistersResourceService } from 'src/app/etl-api/registers-resource.service';
+import * as html2canvas from 'html2canvas';
+import * as jsPDF from 'jspdf';
+
 @Component({
   selector: 'app-maternity-register',
   templateUrl: './maternity-register.component.html',
@@ -12,7 +24,7 @@ export class MaternityRegisterComponent implements OnInit {
   public params: any;
   public indicators: string;
   public selectedIndicators = [];
-  public txnewReportSummaryData: any = [];
+  public maternitySummaryData: any = [];
   public columnDefs: any = [];
   public reportName = 'Martenity Register';
   public currentView = 'monthly';
@@ -22,6 +34,7 @@ export class MaternityRegisterComponent implements OnInit {
   public quarter: string;
   public eDate: string;
   public sDate: string;
+  public jointLocationUuids: string;
 
   public statusError = false;
   public errorMessage = '';
@@ -32,6 +45,8 @@ export class MaternityRegisterComponent implements OnInit {
   public pinnedBottomRowData: any = [];
   public _month: string;
   public isReleased = true;
+  public generated = false;
+  @ViewChild('contentToSnapshot') contentToSnapshot!: ElementRef;
 
   public _locationUuids: any = [];
   public get locationUuids(): Array<string> {
@@ -66,7 +81,13 @@ export class MaternityRegisterComponent implements OnInit {
     this._endDate = v;
   }
 
-  constructor(public router: Router, public route: ActivatedRoute) {
+  constructor(
+    public router: Router,
+    public route: ActivatedRoute,
+    public register: RegistersResourceService,
+    private datePipe: DatePipe,
+    private dataAnalyticsDashboardService: DataAnalyticsDashboardService
+  ) {
     this.route.queryParams.subscribe((data) => {
       data.month === undefined
         ? (this._month = Moment()
@@ -82,24 +103,31 @@ export class MaternityRegisterComponent implements OnInit {
   ngOnInit() {}
 
   public onMonthChange(value): any {
-    this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+    // this._month = Moment(value).endOf('month').format('YYYY-MM-DD');
+    this._month = Moment(value).format('YYYY-MM-DD');
   }
 
   public generateReport(): any {
+    this.dataAnalyticsDashboardService
+      .getSelectedLocations()
+      .subscribe((data) => {
+        const locationValues = data.locations.map(
+          (location) => `'${location.value}'`
+        );
+        this.jointLocationUuids = locationValues.join(', ');
+      });
     this.route.parent.parent.params.subscribe((params: any) => {
-      this.storeParamsInUrl(params.location_uuid);
+      this.storeParamsInUrl();
     });
-    this.txnewReportSummaryData = [];
-    // this.getTxNewReport(this.params);
+    this.maternitySummaryData = [];
+    this.getMaternityRegister(this.params);
+    this.generated = true;
   }
 
-  public storeParamsInUrl(param) {
+  public storeParamsInUrl() {
     this.params = {
-      locationUuids: param,
-      _month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      month: Moment(this._month).endOf('month').format('YYYY-MM-DD'),
-      reportName: this.reportName,
-      _date: Moment(this._month).format('DD-MM-YYYY'),
+      locationUuids: this.jointLocationUuids,
+      month: Moment(this._month).format('YYYY-MM-DD'),
       startDate: Moment(this.startDate).format('YYYY-MM-DD'),
       endDate: Moment(this.endDate).format('YYYY-MM-DD')
     };
@@ -109,31 +137,31 @@ export class MaternityRegisterComponent implements OnInit {
     });
   }
 
-  // public getTxNewReport(params: any) {
-  //   this.isLoading = true;
-  //   this.txnewReport.getTxNewReport(params).subscribe((data) => {
-  //     if (data.error) {
-  //       this.showInfoMessage = true;
-  //       this.errorMessage = `There has been an error while loading the report, please retry again`;
-  //       this.isLoading = false;
-  //     } else {
-  //       this.showInfoMessage = false;
-  //       this.columnDefs = data.sectionDefinitions;
-  //       this.txnewReportSummaryData = data.result;
-  //       this.calculateTotalSummary();
-  //       this.isLoading = false;
-  //       this.showDraftReportAlert(this._month);
-  //     }
-  //   });
-  // }
+  public getMaternityRegister(params: any) {
+    this.isLoading = true;
+    this.register.getMaternityRegister(params).subscribe((data) => {
+      if (data.error) {
+        this.showInfoMessage = true;
+        this.errorMessage = `There has been an error while loading the report, please retry again`;
+        this.isLoading = false;
+      } else {
+        this.showInfoMessage = false;
+        this.columnDefs = data.sectionDefinitions;
+        this.maternitySummaryData = data;
+        this.calculateTotalSummary();
+        this.isLoading = false;
+        this.showDraftReportAlert(this._month);
+      }
+    });
+  }
 
   public calculateTotalSummary() {
     const totalsRow = [];
-    if (this.txnewReportSummaryData.length > 0) {
+    if (this.maternitySummaryData.length > 0) {
       const totalObj = {
         location: 'Totals'
       };
-      _.each(this.txnewReportSummaryData, (row) => {
+      _.each(this.maternitySummaryData, (row) => {
         Object.keys(row).map((key) => {
           if (Number.isInteger(row[key]) === true) {
             if (totalObj[key]) {
@@ -178,4 +206,52 @@ export class MaternityRegisterComponent implements OnInit {
       this.isReleased = true;
     }
   }
+
+  transformDate(date: string): string | null {
+    return this.datePipe.transform(date, 'dd/MM/yyyy');
+  }
+
+  public takeSnapshotAndExport() {
+    const elementToSnapshot = this.contentToSnapshot.nativeElement;
+
+    html2canvas(elementToSnapshot).then((canvas) => {
+      const imgData = canvas.toDataURL('image/png');
+      const pdf = new jsPDF('p', 'mm', 'a4');
+      const imgWidth = 210; // A4 width in mm
+      const imgHeight = (canvas.height * imgWidth) / canvas.width;
+      pdf.addImage(imgData, 'PNG', 0, 0, imgWidth, imgHeight);
+      pdf.save('MOH 366 Care and Treatment Daily Activity.pdf');
+    });
+  }
+
+  calculateAgeTotals(summaryData: any[], minAge: number, maxAge?: number) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['age'] >= minAge &&
+          (maxAge === undefined || data['age'] <= maxAge)
+      ).length || ''
+    );
+  }
+
+  getMaternalDeathTotals(summaryData: any[], minAge: number, maxAge?: number) {
+    return (
+      summaryData.filter(
+        (data) =>
+          data['maternal_deaths_notified'] === 'Y' &&
+          data['age'] >= minAge &&
+          (maxAge === undefined || data['age'] <= maxAge)
+      ).length || ''
+    );
+  }
+  getParameterTotals(
+    summaryData: any[],
+    parameterName: string,
+    parameterValue: string | number
+  ) {
+    return (
+      summaryData.filter((data) => data[parameterName] === parameterValue)
+        .length || ''
+    );
+  }
 }