Merge branch 'master' into POC-558

AMPATH · Nov 15, 2023 · 5a40247 · 5a40247
2 parents e4d77e8 + cff94f4
commit 5a40247
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 69 deletions.
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map.component.html b/src/app/patient-dashboard/common/locator-map/locator-map.component.html
@@ -1,58 +1,8 @@
-<p-dialog
-  header="Locator-Map"
-  [(visible)]="display"
-  styleClass="edit-identifier-dialog"
-  class="edit_link"
->
-  <div class="container-fluid"></div>
-</p-dialog>
-
-<!--<div class="loader" *ngIf="loading">
+<div class="loader" *ngIf="loading">
   <span><i class="fa fa-spinner fa-spin"> </i>Loading...</span>
 </div>
 <div class="row">
-  <div class="col-md-12">
-    <div
-      *ngIf="imageSaved"
-      class="alert alert-success alert-dismissible"
-      role="alert">
-      <button
-        type="button"
-        class="close"
-        data-dismiss="alert"
-        aria-label="Close"
-      >
-        <span aria-hidden="true">&times;</span>
-      </button>
-      Image saved successfully
-    </div>
-    <div
-      *ngIf="imageUploadFailed"
-      class="alert alert-danger alert-dismissible"
-      role="alert"
-    >
-      <button
-        type="button"
-        class="close"
-        data-dismiss="alert"
-        aria-label="Close"
-      >
-        <span aria-hidden="true">&times;</span>
-      </button>
-      Image not saved try again;
-    </div>
-    <div> -->
-<!-- [singleFile]="singleFileInput"  
-      <lib-file-uploader
-        [(ngModel)]="dataModel"
-        [srcUrl]="pdfUrl"
-        (uploadData)="onFileChange($event)"
-        (liveCamera)="liveCamera()"
-        (_onClear)="clearPhoto()"
-        (fileChanged)="uploadFile($event)"
-      ></lib-file-uploader>
-    </div>
-  </div>
+  <div class="col-md-12"></div>
   <div *ngIf="dataModel" class="col-md-12">
     <span
       ><b>Last Updated : </b>
@@ -71,4 +21,4 @@
       style="display: block"
     ></pdf-viewer>
   </div>
-</div> -->
+</div>
diff --git a/src/app/patient-dashboard/common/locator-map/locator-map.component.ts b/src/app/patient-dashboard/common/locator-map/locator-map.component.ts
@@ -16,10 +16,6 @@ import { PatientService } from '../../services/patient.service';
   styleUrls: ['./locator-map.css']
 })
 export class LocatorMapComponent implements OnInit, OnDestroy {
-  public display = false;
-  public addDialog = false;
-  public showSuccessAlert = false;
-  public showErrorAlert = false;
   public dataModel: string;
   public mapInfo: any;
   public lastUpdatedDate: string;
@@ -43,15 +39,7 @@ export class LocatorMapComponent implements OnInit, OnDestroy {
     private personResourceService: PersonResourceService
   ) {}
 
-  public ngOnInit(): void {}
-
-  public ngOnDestroy(): void {}
-
-  public showDialog() {
-    this.display = true;
-  }
-
-  /*public ngOnInit() {
+  public ngOnInit() {
     this.subscriptions.push(
       this.patientService.currentlyLoadedPatient.subscribe((patient) => {
         if (patient) {
@@ -197,5 +185,5 @@ export class LocatorMapComponent implements OnInit, OnDestroy {
   public resetValues(): void {
     this.dataModel = null;
     this.pdfAvailable = false;
-  } */
+  }
 }
diff --git a/src/app/patient-dashboard/common/patient-info/patient-info.component.html b/src/app/patient-dashboard/common/patient-info/patient-info.component.html
@@ -81,12 +81,12 @@ <h5 class="info_section_title">Relationships</h5>
 
 <hr class="intro-divider patient-info-divider" />
 
-<div class="row patient-info-row">
+<div class="row patient-info-row" id="locator-map">
   <div class="col-md-12 col-sm-12 col-lg-12 col-xs-12">
     <h5 class="info_section_title">Patient Location Details</h5>
   </div>
-  <locator-map></locator-map>
   <locator-map-details></locator-map-details>
+  <locator-map></locator-map>
 </div>
 
 <hr class="intro-divider patient-info-divider" />
diff --git a/.../shared/data-lists/pre-appointment-patient-list/pre-appointment-patient-list.component.ts b/.../shared/data-lists/pre-appointment-patient-list/pre-appointment-patient-list.component.ts
@@ -80,6 +80,11 @@ export class PreAppointmentPatientListComponent
       return { 'background-color': 'green', color: 'white' };
     } else if (params.data.rescheduled_date !== null) {
       return { 'background-color': 'yellow' };
+    } else if (
+      params.data.follow_up_type !== null &&
+      params.data.was_follow_up_successful === 0
+    ) {
+      return { 'background-color': 'pink' };
     } else {
       return {};
     }