Merge branch 'master' into POC-536a

AMPATH · Sep 29, 2023 · ab0d794 · ab0d794
2 parents 0b728cc + 662bff3
commit ab0d794
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ngx-amrs",
-  "version": "2.17.0",
+  "version": "2.17.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --host 0.0.0.0 --port 3000",

diff --git a/src/app/patient-dashboard/common/visit/visit-details/visit-details.component.html b/src/app/patient-dashboard/common/visit/visit-details/visit-details.component.html
@@ -164,6 +164,16 @@ <h3 *ngIf="confirmingCancelVisit || confirmingEndVisit">
           >To access clinical forms kindly fill Covid 19 Assessment Form</strong
         >
       </div>
+      <div
+        class="alert alert-danger"
+        *ngIf="isViremicHighVL"
+        style="margin-top: 10px"
+      >
+        <strong
+          >To access clinical forms kindly fill Enhanced Adherence Encounter
+          Form</strong
+        >
+      </div>
     </div>
   </div>
   <span style="padding: 10px"></span>

diff --git a/src/app/patient-dashboard/common/visit/visit-details/visit-details.component.ts b/src/app/patient-dashboard/common/visit/visit-details/visit-details.component.ts
@@ -33,6 +33,7 @@ export class VisitDetailsComponent implements OnInit {
   public retrospectiveAttributeTypeUuid =
     '3bb41949-6596-4ff9-a54f-d3d7883a69ed';
   public qualifiesForCovidScreening = false;
+  public isViremicHighVL = false;
   public isRetrospectiveVisit = false;
 
   public get visitEncounters(): any[] {
@@ -226,11 +227,32 @@ export class VisitDetailsComponent implements OnInit {
           Array.isArray(visitType.encounterTypes.disallowedEncounters)
         ) {
           visitType.encounterTypes.disallowedEncounters.forEach((e) => {
-            if (e.errors && e.errors.covidError != null) {
+            if (
+              e.errors &&
+              e.errors.covidError &&
+              e.errors.covidError != null
+            ) {
               this.qualifiesForCovidScreening = true;
             }
           });
         }
+        // Check if their are allowed Viremia clinical encounters already capture in the allowed visits.
+        const viremiaEncounterFilter = visitType.encounterTypes.allowedEncounters.filter(
+          (encounterType) => {
+            return [
+              '8d5b2be0-c2cc-11de-8d13-0010c6dffd0f',
+              '4e7553b4-373d-452f-bc89-3f4ad9a01ce7',
+              '8d5b3108-c2cc-11de-8d13-0010c6dffd0f'
+            ].includes(encounterType.uuid);
+          }
+        );
+
+        if (
+          Array.isArray(viremiaEncounterFilter) &&
+          viremiaEncounterFilter.length === 0
+        ) {
+          this.isViremicHighVL = true;
+        }
 
         if (
           visitType &&