From 3149fd888cb91b169429b344ed8bde71c139ba6e Mon Sep 17 00:00:00 2001
From: Angie-540 <96350406+Angie-540@users.noreply.github.com>
Date: Wed, 29 Nov 2023 10:14:37 +0300
Subject: [PATCH 1/2] POC-492: Modified pre-appointment to display failed phone
 attempts (#1681)

---
 .../pre-appointment-outreach.component.ts                    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts b/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts
index d81010b4a..7bcd5431c 100644
--- a/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts
+++ b/src/app/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts
@@ -215,6 +215,11 @@ export class PreAppointmentOutreachComponent implements OnInit {
         width: 100,
         field: 'rescheduled_date'
       },
+      {
+        headerName: 'No. of Failed Phone Attempts',
+        width: 100,
+        field: 'number_of_failed_phone_attempts'
+      },
       {
         headerName: 'Contact Reached',
         width: 100,

From ecd37da9ec441bc6f5cb6790dd848a5ac527fa97 Mon Sep 17 00:00:00 2001
From: Angie-540 <96350406+Angie-540@users.noreply.github.com>
Date: Wed, 29 Nov 2023 12:19:53 +0300
Subject: [PATCH 2/2] POC-570:remove program snapshot tag after patient has
 made clinical visit (#1687)

* remove program snapshot tag after patient has made clinical visit

* fixed pre-appoinment-reminder tag on program snapshot

* POC-570:fixed pre-appoinment-reminder tag on program snapshot

* Update src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.ts

---------

Co-authored-by: Drizzentic <derrickrono@gmail.com>
---
 .../hiv/program-snapshot/hiv-program-snapshot.component.html | 5 ++++-
 .../hiv/program-snapshot/hiv-program-snapshot.component.ts   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.html b/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.html
index bcde35032..a9a4f621c 100644
--- a/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.html
+++ b/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.html
@@ -57,7 +57,10 @@
       </div>
       <div
         class="alert-div"
-        *ngIf="hasPredictedScore"
+        *ngIf="
+          hasPredictedScore &&
+          patientData?.encounter_datetime < prediction.prediction_generated_date
+        "
         style="display: inline-block"
       >
         <p [ngClass]="getPredictionAlertColorCoded(prediction.predicted_risk)">
diff --git a/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.ts b/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.ts
index 050f7b703..d4150513d 100644
--- a/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.ts
+++ b/src/app/patient-dashboard/hiv/program-snapshot/hiv-program-snapshot.component.ts
@@ -299,7 +299,8 @@ export class HivProgramSnapshotComponent implements OnInit {
         if (
           result &&
           result.predicted_prob_disengage &&
-          result.predicted_risk
+          result.predicted_risk &&
+          result.observed_rtc_date === null
         ) {
           this.hasPredictedScore = true;
           this.prediction = result;