From 66fdaef9e39d81c5ba739a07b6c1cedf4c50f251 Mon Sep 17 00:00:00 2001
From: Olu Amey <ameye@chiefsoft.com>
Date: Mon, 23 Nov 2020 16:58:31 -0500
Subject: [PATCH] fix

---
 src/app/merms-dash/merms-dash.page.html | 82 +++----------------------
 src/app/merms-dash/merms-dash.page.ts   | 29 ++++++---
 2 files changed, 32 insertions(+), 79 deletions(-)

diff --git a/src/app/merms-dash/merms-dash.page.html b/src/app/merms-dash/merms-dash.page.html
index 4b847a9..350dc48 100644
--- a/src/app/merms-dash/merms-dash.page.html
+++ b/src/app/merms-dash/merms-dash.page.html
@@ -38,49 +38,18 @@
       Pending Encounter
     </ion-list-header>
 
-    <ion-item (click)="goPatient()">
+    <ion-item *ngFor="let type of pendingEncounterData"  (click)="goPatient(type)">
       <ion-avatar slot="start">
         <img src="./../../assets/imgs/avatar.svg">
       </ion-avatar>
       <ion-label>
-        <h2>Adekunle Gold</h2>
-        <h3>Need hew head</h3>
-        <p>10/10/2050, 9:30 AM Male , 54 yrs</p>
+        <h2>{{type.firstname}} {{type.lastname}}</h2>
+        <h3>{{type.reason}}</h3>
+        <p>{{type.appt}} {{type.gender}} , {{type.age}} yrs</p>
       </ion-label>
     </ion-item>
 
-    <ion-item>
-      <ion-avatar slot="start">
-        <img src="./../../assets/imgs/avatar.svg">
-      </ion-avatar>
-      <ion-label>
-        <h2>Janet Jackson</h2>
-        <h3>Want to escape from the planet</h3>
-        <p>10/10/2050, 10:30 AM Female , 34 yrs</p>
-      </ion-label>
-    </ion-item>
-
-    <ion-item>
-      <ion-avatar slot="start">
-        <img src="./../../assets/imgs/avatar.svg">
-      </ion-avatar>
-      <ion-label>
-        <h2>Rey Dashe</h2>
-        <h3>I can handle myself</h3>
-        <p>You will remove these restraints and leave...</p>
-      </ion-label>
-    </ion-item>
-
-    <ion-item>
-      <ion-avatar slot="start">
-        <img src="./../../assets/imgs/avatar.svg">
-      </ion-avatar>
-      <ion-label>
-        <h2>Luke</h2>
-        <h3>Your thoughts betray you</h3>
-        <p>I feel the good in you, the conflict...</p>
-      </ion-label>
-    </ion-item>
+   
   </ion-list>
 
   <ion-list>
@@ -88,49 +57,18 @@
       Recent Encounter
     </ion-list-header>
 
-    <ion-item>
+    <ion-item *ngFor="let type of cardData"  (click)="goPatient(type)">
       <ion-avatar slot="start">
         <img src="./../../assets/imgs/avatar.svg">
       </ion-avatar>
       <ion-label>
-        <h2>Poe</h2>
-        <h3>New Ride</h3>
-        <p>I just upgraded my X-Wing. Next time...</p>
+        <h2>{{type.firstname}} {{type.lastname}}</h2>
+        <h3>{{type.reason}}</h3>
+        <p>{{type.appt}} {{type.gender}} , {{type.age}} yrs</p>
       </ion-label>
     </ion-item>
 
-    <ion-item>
-      <ion-avatar slot="start">
-        <img src="./../../assets/imgs/avatar.svg">
-      </ion-avatar>
-      <ion-label>
-        <h2>Ben</h2>
-        <h3>Move Along</h3>
-        <p>These aren't the droids you're looking for...</p>
-      </ion-label>
-    </ion-item>
-
-    <ion-item>
-      <ion-avatar slot="start">
-        <img src="./../../assets/imgs/avatar.svg">
-      </ion-avatar>
-      <ion-label>
-        <h2>Leia</h2>
-        <h3>You're My Only Hope</h3>
-        <p>I've placed information vital to the survival...</p>
-      </ion-label>
-    </ion-item>
-
-    <ion-item>
-      <ion-avatar slot="start">
-        <img src="./../../assets/imgs/avatar.svg">
-      </ion-avatar>
-      <ion-label>
-        <h2>Yoda</h2>
-        <h3>Size matters not</h3>
-        <p>Do or do not. There is no try...</p>
-      </ion-label>
-    </ion-item>
+   
   </ion-list>
 
 
diff --git a/src/app/merms-dash/merms-dash.page.ts b/src/app/merms-dash/merms-dash.page.ts
index f32305c..e8f5d8e 100644
--- a/src/app/merms-dash/merms-dash.page.ts
+++ b/src/app/merms-dash/merms-dash.page.ts
@@ -19,9 +19,9 @@ export class MermsDashPage implements OnInit {
   constructor(
     private router: Router,
     private mermsServiceProviderService: MermsServiceProviderService,
-    private mermsSessionService : MermsSessionService 
+    private mermsSessionService: MermsSessionService
   ) {
-    this.welcomeName =this.mermsSessionService.getUserFormatedName();
+    this.welcomeName = this.mermsSessionService.getUserFormatedName();
     this.currentDateFormated = this.mermsSessionService.getThisData();
   }
 
@@ -37,6 +37,7 @@ export class MermsDashPage implements OnInit {
   };
 
   cardData: any;
+  pendingEncounterData:any;
 
   getDashData() {
     console.log('MermsServiceProviderService::getDashData() ########  @@@@  ########');
@@ -49,16 +50,30 @@ export class MermsDashPage implements OnInit {
 
     try {
       this.mermsServiceProviderService.genericGetService('provider/recentencounter', this.currentProviderData).subscribe(cardData => {
-        console.log("card data result 22k: ", this.cardData);
-        if (cardData.hasOwnProperty('result_list') && Array.isArray(cardData['result_list'])) {
- 
-
+        console.log("card data result 22k: ", cardData[0]['payload']);
+        this.cardData = cardData[0]['payload'];
+        if (cardData.hasOwnProperty('payload') && Array.isArray(cardData['payload'])) {
+          this.cardData = cardData['payload'];
+          console.log("card data result 22k: ", this.cardData);
         }
       });
     } catch (e) {
       console.log(e);
     }
 
+    try {
+      this.mermsServiceProviderService.genericGetService('provider/pendingencounter', this.currentProviderData).subscribe(pendingEncounterData => {
+        console.log("card data result 22k: ", pendingEncounterData[0]['payload']);
+        this.pendingEncounterData = pendingEncounterData[0]['payload'];
+       
+      });
+    } catch (e) {
+      console.log(e);
+    }
+
+    //
+
+
   }
 
   goSettings() {
@@ -74,7 +89,7 @@ export class MermsDashPage implements OnInit {
   goHome() {
 
   }
-  goCalendar(){
+  goCalendar() {
     this.router.navigateByUrl('/merms-calendar')
   }
 }