POC-386: Datim Feedback (#1641)

* POC-386: Datim Feedback * POC-386: updated github workflow * POC-386: Datim Feedback --------- Co-authored-by: Drizzentic <[email protected]>
AMPATH · Aug 2, 2023 · eaa29aa · eaa29aa
1 parent 0bbe7de
commit eaa29aa
Show file tree

Hide file tree

Showing 9 changed files with 109 additions and 246 deletions.
diff --git a/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-base/tx-curr-report-base.component.html b/src/app/hiv-care-lib/tx-curr-report/tx-curr-report-base/tx-curr-report-base.component.html
@@ -47,6 +47,7 @@ <h4 *ngIf="!statusError">
         [sectionDefs]="columnDefs"
         (CellSelection)="onIndicatorSelected($event)"
         [reportDetails]="params"
+        [reportHeader]="reportName"
       ></app-tx-ml-report-view>
     </p-tabPanel>
   </p-tabView>

diff --git a/src/app/hiv-care-lib/tx-ml-report/tx-ml-report-base/tx-ml-report-base.component.html b/src/app/hiv-care-lib/tx-ml-report/tx-ml-report-base/tx-ml-report-base.component.html
@@ -49,6 +49,7 @@ <h4 *ngIf="!statusError">
         [sectionDefs]="columnDefs"
         (CellSelection)="onIndicatorSelected($event)"
         [reportDetails]="params"
+        [reportHeader]="reportName"
       ></app-tx-ml-report-view>
     </p-tabPanel>
   </p-tabView>

diff --git a/...iv-care-lib/tx-ml-report/tx-ml-report-patient-list/tx-ml-report-patient-list.component.ts b/...iv-care-lib/tx-ml-report/tx-ml-report-patient-list/tx-ml-report-patient-list.component.ts
@@ -28,7 +28,6 @@ export class TxMlReportPatientListComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.addExtraColumns();
     this.route.queryParams.subscribe(
       (params) => {
         if (params && params.sDate) {
@@ -42,6 +41,7 @@ export class TxMlReportPatientListComponent implements OnInit {
         console.error('Error', error);
       }
     );
+    this.addExtraColumns();
   }
 
   private getPatientList(params: any) {
@@ -69,12 +69,20 @@ export class TxMlReportPatientListComponent implements OnInit {
       latest_vl_date: 'Latest VL Date',
       previous_vl: 'Previous VL',
       previous_vl_date: 'Previous VL Date',
-      ovcid_id: 'OVCID',
-      transfer_out_date_v1: 'Transfer out date',
-      death_date: 'Death Date',
-      cause_of_death: 'Cause of Death'
+      ovcid_id: 'OVCID'
     };
 
+    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({

diff --git a/src/app/hiv-care-lib/tx-ml-report/tx-ml-report-view/tx-ml-report-view.component.html b/src/app/hiv-care-lib/tx-ml-report/tx-ml-report-view/tx-ml-report-view.component.html
@@ -7,7 +7,7 @@
         <div class="btn-group pull-right">
           <button
             class="btn btn-primary"
-            (click)="downloadPdf()"
+            (click)="downloadCSV()"
             [disabled]="!gridOptions"
           >
             <i class="fa fa-download"> </i> Export to CSV
@@ -108,7 +108,7 @@
                       ></th>
                     </tr>
                   </ng-container>
-                  <ng-container *ngIf="a !== 0 && i < 16">
+                  <ng-container *ngIf="a !== 0 && i < 15">
                     <tr>
                       <td
                         style="min-width: 150px"
@@ -146,7 +146,7 @@
                       </td>
                     </tr>
                   </ng-container>
-                  <ng-container *ngIf="i === 16 && a !== 0">
+                  <ng-container *ngIf="i === 15 && a !== 0">
                     <tr>
                       <td style="min-width: 150px"><b>Sub Total</b></td>
                       <ng-container *ngFor="let val of col.value">
@@ -168,7 +168,7 @@
                       <td *ngIf="sectionIndicatorsValues.length > 1"></td>
                     </tr>
                   </ng-container>
-                  <ng-container *ngIf="i === 17 && a !== 0">
+                  <ng-container *ngIf="i === 16 && a !== 0">
                     <tr>
                       <td style="min-width: 150px"><b>Facility Total</b></td>
                       <ng-container *ngFor="let val of col.value">