POC-475:draft

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>

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;
-  } */
+  }
 }

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" />

src/app/patient-dashboard/hiv/hiv-summary/ahd-events-summary/ahd-events-summary.component.css

@@ -0,0 +1,23 @@
+/* .header {
+    display: flex;
+    justify-content: space-between;
+} */
+/* 
+table tbody tr,
+table thead tr{
+    display: flex;
+    flex-direction: row;
+
+} */
+table tbody tr td,
+table thead tr th {
+  width: 50%;
+}
+
+/* table tbody tr td{
+    background-color: blue;
+} */
+
+/* .ahd {
+    max-width: 100%;
+} */

src/app/patient-dashboard/hiv/hiv-summary/ahd-events-summary/ahd-events-summary.component.html

@@ -0,0 +1,134 @@
+<div>
+  <div>
+    <table
+      class="table table-hover table-striped table-responsive"
+      *ngIf="tbStartdates.length > 0 || tbEnddates[0] != null"
+    >
+      <thead>
+        <tr>
+          <th>TB Treatment Start Date</th>
+          <th>TB Treatment End Date</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td *ngFor="let startDate of tbStartdates">
+            {{ startDate | date: 'dd-MM-yyyy' }}
+          </td>
+          <td *ngFor="let endDate of tbEnddates">
+            {{ endDate | date: 'dd-MM-yyyy' }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <table
+      class="table table-hover table-striped table-responsive"
+      *ngIf="
+        cryptococallStartDates[0] != null || cryptococallEndDates[0] != null
+      "
+    >
+      <thead>
+        <tr>
+          <th>Cryptococcal Treatment Start Date :</th>
+          <th>Cryptococcal Treatment End Date :</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td *ngFor="let startDate of cryptococallStartDates">
+            {{ startDate | date: 'dd-MM-yyyy' }}
+          </td>
+          <td *ngFor="let endDate of cryptococallEndDates">
+            {{ endDate | date: 'dd-MM-yyyy' }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <table
+      class="table table-hover table-striped table-responsive"
+      *ngIf="pcpStartDates[0] != null || pcpEndDates[0] != null"
+    >
+      <thead>
+        <tr>
+          <th>PCP Treatment Start Date</th>
+          <th>PCP Treatment End Date</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td *ngFor="let startDate of pcpStartDates">
+            {{ startDate | date: 'dd-MM-yyyy' }}
+          </td>
+          <td *ngFor="let endDate of pcpEndDates">
+            {{ endDate | date: 'dd-MM-yyyy' }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <table
+      class="table table-hover table-striped table-responsive"
+      *ngIf="
+        toxoplasmosisStartDates[0] != null || toxoplasmosisEndDates[0] != null
+      "
+    >
+      <thead>
+        <tr>
+          <th>Toxoplasmosis Treatment Start Date</th>
+          <th>Toxoplasmosis Treatment End Date</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td *ngFor="let startDate of toxoplasmosisStartDates">
+            {{ startDate | date: 'dd-MM-yyyy' }}
+          </td>
+          <td *ngFor="let startDate of toxoplasmosisEndDates">
+            {{ endDate | date: 'dd-MM-yyyy' }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+
+    <table
+      class="table table-hover table-striped table-responsive"
+      *ngIf="kaposisStartDates[0] != null || kaposisEndDates[0] != null"
+    >
+      <thead>
+        <tr>
+          <th>Kaposis Sarcoma Treatment Start Date</th>
+          <th>Kaposis Sarcoma Treatment End Date</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td *ngFor="let startDate of kaposisStartDates">
+            {{ startDate | date: 'dd-MM-yyyy' }}
+          </td>
+          <td *ngFor="let startDate of kaposisEndDates">
+            {{ endDate | date: 'dd-MM-yyyy' }}
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+
+  <div
+    *ngIf="
+      kaposisStartDates[0] == null &&
+      kaposisEndDates[0] == null &&
+      toxoplasmosisStartDates[0] == null &&
+      toxoplasmosisEndDates[0] == null &&
+      tbStartdates.length == 0 &&
+      tbEnddates[0] == null &&
+      pcpStartDates[0] == null &&
+      pcpEndDates[0] == null &&
+      cryptococallStartDates[0] == null &&
+      cryptococallEndDates[0] == null
+    "
+  >
+    <p class="mx-8">NO AHD SUMMARY DATA!</p>
+  </div>
+</div>

src/app/patient-dashboard/hiv/hiv-summary/ahd-events-summary/ahd-events-summary.component.spec.ts

@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { AhdEventsSummaryComponent } from './ahd-events-summary.component';
+
+describe('AhdEventsSummaryComponent', () => {
+  let component: AhdEventsSummaryComponent;
+  let fixture: ComponentFixture<AhdEventsSummaryComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [AhdEventsSummaryComponent]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AhdEventsSummaryComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});