From e0449365f8dc5fb282a5e011d99a6e2d0494798c Mon Sep 17 00:00:00 2001
From: Faith Kamau <121166087+hiqedme@users.noreply.github.com>
Date: Wed, 24 Jul 2024 09:13:14 +0300
Subject: [PATCH 1/2] Corrections: added verification

---
 .../patient-banner.component.html             | 74 +++++++++----------
 .../patient-banner.component.ts               | 12 +++
 2 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/src/app/patient-dashboard/common/patient-banner/patient-banner.component.html b/src/app/patient-dashboard/common/patient-banner/patient-banner.component.html
index 7451cc5e9..5234c83b9 100644
--- a/src/app/patient-dashboard/common/patient-banner/patient-banner.component.html
+++ b/src/app/patient-dashboard/common/patient-banner/patient-banner.component.html
@@ -82,24 +82,24 @@
                 <span class="id-label">UPI:</span>
                 <span>{{ searchIdentifiers?.upi }}</span>
               </span>
-              <span
-                *ngIf="!isPatientVerified"
-                (click)="
-                  identifiers.showDialog('verify', patient?._identifier, true)
-                "
-                style="
-                  color: darkorange;
-                  border: 1px solid darkorange;
-                  padding-left: 4px;
-                  padding-top: 2px;
-                  padding-bottom: 2px;
-                  padding-right: 0px;
-                  cursor: pointer;
-                "
-              >
-                <span class="glyphicon glyphicon-info-sign"></span>
-                <span style="margin-left: -5px">Verify Patient</span>
-              </span>
+            </span>
+            <span
+              *ngIf="!isPatientVerified && isVerifiable && searchIdentifiers && isPatientEnrolledToHIVProgram"
+              (click)="
+                identifiers.showDialog('verify', patient?._identifier, true)
+              "
+              style="
+                color: darkorange;
+                border: 1px solid darkorange;
+                padding-left: 4px;
+                padding-top: 2px;
+                padding-bottom: 2px;
+                padding-right: 0px;
+                cursor: pointer;
+              "
+            >
+              <span class="glyphicon glyphicon-info-sign"></span>
+              <span style="margin-left: -5px">Verify Patient</span>
             </span>
             <span *ngIf="searchIdentifiers && enrolledToHEIProgram">
               <span
@@ -301,31 +301,31 @@
             </span>
             <span
               *ngIf="
-                searchIdentifiers && enrolled && isPatientEnrolledToHIVProgram
+                searchIdentifiers && !enrolled && isPatientEnrolledToHIVProgram
               "
             >
               <span *ngIf="isPatientVerified && searchIdentifiers?.upi">
                 <span class="id-label">UPI:</span>
                 <span>{{ searchIdentifiers?.upi }}</span>
               </span>
-              <span
-                *ngIf="!isPatientVerified"
-                (click)="
-                  identifiers.showDialog('verify', patient?._identifier, true)
-                "
-                style="
-                  color: darkorange;
-                  border: 1px solid darkorange;
-                  padding-left: 4px;
-                  padding-top: 2px;
-                  padding-bottom: 2px;
-                  padding-right: 0px;
-                  cursor: pointer;
-                "
-              >
-                <span class="glyphicon glyphicon-info-sign"></span>
-                <span style="margin-left: -5px">Verify Patient</span>
-              </span>
+            </span>
+            <span
+              *ngIf="!isPatientVerified && isVerifiable && searchIdentifiers && isPatientEnrolledToHIVProgram"
+              (click)="
+                identifiers.showDialog('verify', patient?._identifier, true)
+              "
+              style="
+                color: darkorange;
+                border: 1px solid darkorange;
+                padding-left: 4px;
+                padding-top: 2px;
+                padding-bottom: 2px;
+                padding-right: 0px;
+                cursor: pointer;
+              "
+            >
+              <span class="glyphicon glyphicon-info-sign"></span>
+              <span style="margin-left: -5px">Verify Patient</span>
             </span>
             <span *ngIf="searchIdentifiers && enrolledToHEIProgram">
               <span
diff --git a/src/app/patient-dashboard/common/patient-banner/patient-banner.component.ts b/src/app/patient-dashboard/common/patient-banner/patient-banner.component.ts
index 81349130a..3650f050d 100644
--- a/src/app/patient-dashboard/common/patient-banner/patient-banner.component.ts
+++ b/src/app/patient-dashboard/common/patient-banner/patient-banner.component.ts
@@ -59,6 +59,7 @@ export class PatientBannerComponent implements OnInit, OnDestroy, OnChanges {
     ignoreBackdropClick: true
   };
   private enrolled: boolean;
+  private isVerifiable: boolean;
   private enrolledToHEIProgram: boolean;
   private isPatientEnrolledToHIVProgram: boolean;
   private currentLocation: { uuid: string; display: string };
@@ -117,6 +118,9 @@ export class PatientBannerComponent implements OnInit, OnDestroy, OnChanges {
           this.isPatientEligableForCCCNumber(
             _.filter(patient.enrolledPrograms, 'isEnrolled')
           );
+          this.isPatientVerifiable(
+            _.filter(patient.enrolledPrograms, 'isEnrolled')
+          );
           this.isEnrolledToHEIProgram(
             _.filter(patient.enrolledPrograms, 'isEnrolled')
           );
@@ -308,6 +312,14 @@ export class PatientBannerComponent implements OnInit, OnDestroy, OnChanges {
         program.concept.uuid === '9c64af03-f712-411e-8880-16e98dcdb4a6'
     );
   }
+  private isPatientVerifiable(enrolledPrograms: Array<any>) {
+    _.filter(
+      enrolledPrograms,
+      ({ concept }) => concept.uuid === '23e234c3-5d8a-46ca-8465-3b746143dd68'
+    ).length > 0
+      ? (this.isVerifiable = false)
+      : (this.isVerifiable = true);
+  }
 
   private getHIVPatient(enrolledPrograms: Array<any>) {
     _.filter(enrolledPrograms, ({ baseRoute }) => baseRoute === 'hiv').length >

From c7762eafa9bee7c4349f8727b3df76457edd2f1c Mon Sep 17 00:00:00 2001
From: Faith Kamau <121166087+hiqedme@users.noreply.github.com>
Date: Wed, 24 Jul 2024 10:18:22 +0300
Subject: [PATCH 2/2] Corrections: added verification

---
 .../patient-banner/patient-banner.component.html   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/app/patient-dashboard/common/patient-banner/patient-banner.component.html b/src/app/patient-dashboard/common/patient-banner/patient-banner.component.html
index 5234c83b9..3ce2edc41 100644
--- a/src/app/patient-dashboard/common/patient-banner/patient-banner.component.html
+++ b/src/app/patient-dashboard/common/patient-banner/patient-banner.component.html
@@ -84,7 +84,12 @@
               </span>
             </span>
             <span
-              *ngIf="!isPatientVerified && isVerifiable && searchIdentifiers && isPatientEnrolledToHIVProgram"
+              *ngIf="
+                !isPatientVerified &&
+                isVerifiable &&
+                searchIdentifiers &&
+                isPatientEnrolledToHIVProgram
+              "
               (click)="
                 identifiers.showDialog('verify', patient?._identifier, true)
               "
@@ -310,7 +315,12 @@
               </span>
             </span>
             <span
-              *ngIf="!isPatientVerified && isVerifiable && searchIdentifiers && isPatientEnrolledToHIVProgram"
+              *ngIf="
+                !isPatientVerified &&
+                isVerifiable &&
+                searchIdentifiers &&
+                isPatientEnrolledToHIVProgram
+              "
               (click)="
                 identifiers.showDialog('verify', patient?._identifier, true)
               "