Merge branch 'master' into POC-495

AMPATH · Nov 30, 2023 · 2523c04 · 2523c04
2 parents bbd98ab + ecd37da
commit 2523c04
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/...p/clinic-dashboard/general/pre-appointment-outreach/pre-appointment-outreach.component.ts b/...p/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,

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
@@ -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
@@ -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;