From 33752284f2143eede7e109dbe9b4be6a51c5043e Mon Sep 17 00:00:00 2001
From: Elwin Schmitz <eschmitz@redcross.nl>
Date: Thu, 3 Dec 2020 11:13:38 +0100
Subject: [PATCH 1/2] AB#5008 Show phoneNumber in more program-phases for PM

---
 .../program-people-affected.component.ts                   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.ts b/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.ts
index 7689896597..59397c552d 100644
--- a/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.ts
+++ b/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.ts
@@ -186,7 +186,12 @@ export class ProgramPeopleAffectedComponent implements OnInit {
           'page.program.program-people-affected.column.phone-number',
         ),
         ...columnDefaults,
-        phases: [ProgramPhase.reviewInclusion, ProgramPhase.payment],
+        phases: [
+          ProgramPhase.registrationValidation,
+          ProgramPhase.inclusion,
+          ProgramPhase.reviewInclusion,
+          ProgramPhase.payment,
+        ],
         roles: [UserRole.ProgramManager],
         minWidth: columnPhoneNumberWidth,
       },

From 56b8a1abc22beb7afc07b4bff3e0c51ee1a9de02 Mon Sep 17 00:00:00 2001
From: Elwin Schmitz <eschmitz@redcross.nl>
Date: Thu, 3 Dec 2020 11:32:09 +0100
Subject: [PATCH 2/2] AB#5037 Add WhatsAppPhoneNumber-column for PM (when
 available)

---
 .../HO-Portal/src/app/models/person.model.ts  |  2 ++
 .../program-people-affected.component.html    | 20 ++++++++---
 .../program-people-affected.component.ts      | 35 ++++++++++---------
 interfaces/HO-Portal/src/assets/i18n/en.json  |  1 +
 4 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/interfaces/HO-Portal/src/app/models/person.model.ts b/interfaces/HO-Portal/src/app/models/person.model.ts
index e6031661f5..0f65145b4a 100644
--- a/interfaces/HO-Portal/src/app/models/person.model.ts
+++ b/interfaces/HO-Portal/src/app/models/person.model.ts
@@ -16,6 +16,7 @@ export class Person {
   status: PaStatus;
   fsp?: string;
   vnumber?: string;
+  whatsappPhoneNumber?: string;
 }
 
 // Model for display (in table)
@@ -38,6 +39,7 @@ export class PersonRow {
   phoneNumber?: string | null;
   fsp?: string | null;
   vnumber?: string | null;
+  whatsappPhoneNumber?: string | null;
 }
 
 export enum PaStatus {
diff --git a/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.html b/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.html
index de71d1f920..002c820734 100644
--- a/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.html
+++ b/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.html
@@ -104,16 +104,26 @@ <h2>{{ 'page.program.program-people-affected.section-title'|translate }}</h2>
     [cellClass]="column.cellClass"
   ></ngx-datatable-column>
 
+  <ngx-datatable-column
+    *ngIf="hasVoucherSupport(allPeopleAffected[0]?.fsp) && [phaseEnum.registrationValidation, phaseEnum.inclusion, phaseEnum.reviewInclusion, phaseEnum.payment].includes(thisPhase) && userRole === userEnum.ProgramManager"
+    prop="whatsappPhoneNumber"
+    [name]="'page.program.program-people-affected.column.whatsappPhoneNumber'|translate"
+    minWidth="130"
+    [draggable]="columnDefaults.draggable"
+    [resizeable]="columnDefaults.resizeable"
+    [sortable]="columnDefaults.sortable"
+    [headerClass]="columnDefaults.headerClass"
+  ></ngx-datatable-column>
   <ngx-datatable-column
     *ngIf="allPeopleAffected[0]?.vnumber && [phaseEnum.reviewInclusion, phaseEnum.payment].includes(thisPhase) && userRole === userEnum.ProgramManager"
     prop="vnumber"
     [name]="'page.program.program-people-affected.column.vnumber'|translate"
     minWidth="100"
-    draggable="false"
-    resizeable="false"
-    sortable="true"
-  >
-  </ngx-datatable-column>
+    [draggable]="columnDefaults.draggable"
+    [resizeable]="columnDefaults.resizeable"
+    [sortable]="columnDefaults.sortable"
+    [headerClass]="columnDefaults.headerClass"
+  ></ngx-datatable-column>
 
   <ngx-datatable-column
     *ngFor="let column of paymentColumns"
diff --git a/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.ts b/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.ts
index 59397c552d..a5952893e7 100644
--- a/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.ts
+++ b/interfaces/HO-Portal/src/app/program/program-people-affected/program-people-affected.component.ts
@@ -37,6 +37,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
   private locale: string;
   private dateFormat = 'yyyy-MM-dd, HH:mm';
 
+  public columnDefaults: any;
   public columns: any[] = [];
   private columnsAvailable: any[] = [];
   private paymentColumnTemplate: any = {};
@@ -143,7 +144,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
       ),
     };
 
-    const columnDefaults = {
+    this.columnDefaults = {
       draggable: false,
       resizeable: false,
       sortable: true,
@@ -158,7 +159,6 @@ export class ProgramPeopleAffectedComponent implements OnInit {
       headerClass: 'ion-text-wrap ion-align-self-end',
     };
     const columnDateTimeWidth = 142;
-    const columnDateWidth = 100;
     const columnScoreWidth = 90;
     const columnPhoneNumberWidth = 130;
 
@@ -168,7 +168,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.person',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         width: 85,
       },
       {
@@ -176,7 +176,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.name',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [ProgramPhase.reviewInclusion, ProgramPhase.payment],
         roles: [UserRole.ProgramManager],
       },
@@ -185,7 +185,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.phone-number',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [
           ProgramPhase.registrationValidation,
           ProgramPhase.inclusion,
@@ -200,7 +200,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.status',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         width: 90,
       },
       {
@@ -208,7 +208,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.digital-id-created',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [ProgramPhase.registrationValidation],
         width: columnDateTimeWidth,
       },
@@ -217,7 +217,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.vulnerability-assessment-completed',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [ProgramPhase.registrationValidation],
         width: columnDateTimeWidth,
       },
@@ -226,7 +226,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.temp-score',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [ProgramPhase.registrationValidation, ProgramPhase.inclusion],
         showIfNoValidation: false,
         width: columnScoreWidth,
@@ -236,7 +236,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.selected-for-validation',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [ProgramPhase.registrationValidation],
         showIfNoValidation: false,
         width: columnDateTimeWidth,
@@ -246,7 +246,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.vulnerability-assessment-validated',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [ProgramPhase.registrationValidation],
         showIfNoValidation: false,
         width: columnDateTimeWidth,
@@ -256,7 +256,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.final-score',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [ProgramPhase.registrationValidation, ProgramPhase.inclusion],
         width: columnScoreWidth,
       },
@@ -265,7 +265,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.included',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [
           ProgramPhase.inclusion,
           ProgramPhase.reviewInclusion,
@@ -278,7 +278,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.notified-of-inclusion',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [ProgramPhase.reviewInclusion, ProgramPhase.payment],
         width: columnDateTimeWidth,
       },
@@ -287,7 +287,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.rejected',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [ProgramPhase.reviewInclusion, ProgramPhase.payment],
         width: columnDateTimeWidth,
       },
@@ -296,7 +296,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         name: this.translate.instant(
           'page.program.program-people-affected.column.fsp',
         ),
-        ...columnDefaults,
+        ...this.columnDefaults,
         phases: [ProgramPhase.reviewInclusion, ProgramPhase.payment],
         width: 150,
       },
@@ -307,7 +307,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         'page.program.program-people-affected.column.payment',
       ),
       installmentIndex: 0,
-      ...columnDefaults,
+      ...this.columnDefaults,
       phases: [ProgramPhase.payment],
       width: columnDateTimeWidth,
     };
@@ -475,6 +475,7 @@ export class ProgramPeopleAffectedComponent implements OnInit {
         : null,
       name: person.name,
       phoneNumber: formatPhoneNumber(person.phoneNumber),
+      whatsappPhoneNumber: formatPhoneNumber(person.whatsappPhoneNumber),
       vnumber: person.vnumber,
       fsp: person.fsp,
     };
diff --git a/interfaces/HO-Portal/src/assets/i18n/en.json b/interfaces/HO-Portal/src/assets/i18n/en.json
index 45ad5bec7a..aaf8f17716 100644
--- a/interfaces/HO-Portal/src/assets/i18n/en.json
+++ b/interfaces/HO-Portal/src/assets/i18n/en.json
@@ -172,6 +172,7 @@
           "phone-number": "Phonenumber",
           "payment": "Payment #",
           "vnumber": "V-number",
+          "whatsappPhoneNumber": "WhatsApp nr.",
           "fsp": "Financial Service Provider"
         },
         "status": {