From ad9a72789c044c8d118cc7afb72b10ceba13f248 Mon Sep 17 00:00:00 2001
From: Olu Amey <ameye@chiefsoft.com>
Date: Mon, 7 Dec 2020 13:37:35 -0500
Subject: [PATCH] fix

---
 src/app/merms-dash/merms-dash.page.html       | 12 +++---
 .../merms-mypatients/merms-mypatients.page.ts |  7 +++-
 .../merms-selectedpatient.page.html           |  2 +-
 .../merms-selectedpatient.page.ts             | 38 ++++++++++++++++++-
 4 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/app/merms-dash/merms-dash.page.html b/src/app/merms-dash/merms-dash.page.html
index 7794e8b..5aeb587 100644
--- a/src/app/merms-dash/merms-dash.page.html
+++ b/src/app/merms-dash/merms-dash.page.html
@@ -1,9 +1,9 @@
 <ion-content fullscreen>
-  <ion-grid>
+  <ion-grid style="scroll-padding-bottom: 0px;">
     <ion-row>
       <ion-col>
         <div>
-          <h4>{{ welcomeName }}</h4>
+          <h4 style="font-weight: bold;">{{ welcomeName }}</h4>
         </div>
       </ion-col>
       <ion-col>
@@ -29,7 +29,7 @@
 
   <ion-list>
     <ion-list-header>
-      Pending Consults
+      <h3 style="font-weight: bold;">Pending Consult(s)</h3>
     </ion-list-header>
 
     <ion-item *ngFor="let type of pendingEncounterData"  (click)="goPatient(type)">
@@ -37,9 +37,9 @@
         <img src="./../../assets/imgs/avatar.svg">
       </ion-avatar>
       <ion-label>
-        <h2>{{type.firstname}} {{type.lastname}}</h2>
+        <h2 style="font-weight: bold;color: #8e54e9;">{{type.appt}} {{type.gender}} , {{type.age}} yrs</h2>
+        <h3>{{type.firstname}} {{type.lastname}}</h3>
         <h3>{{type.reason}}</h3>
-        <p>{{type.appt}} {{type.gender}} , {{type.age}} yrs</p>
       </ion-label>
     </ion-item>
 
@@ -48,7 +48,7 @@
 
   <ion-list>
     <ion-list-header>
-      Recent Consults
+      <h3 style="font-weight: bold;">Recent Consult(s)</h3>
     </ion-list-header>
 
     <ion-item *ngFor="let type of cardData"  (click)="goPatient(type)">
diff --git a/src/app/merms-mypatients/merms-mypatients.page.ts b/src/app/merms-mypatients/merms-mypatients.page.ts
index b11b5a6..ba6616e 100644
--- a/src/app/merms-mypatients/merms-mypatients.page.ts
+++ b/src/app/merms-mypatients/merms-mypatients.page.ts
@@ -51,7 +51,12 @@ export class MermsMypatientsPage implements OnInit {
 
   }
   goSelectPatient(patientData: any) {
-    this.router.navigateByUrl('/merms-selectedpatient');
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        special: JSON.stringify(patientData)
+      }
+    };
+    this.router.navigateByUrl('/merms-selectedpatient',navigationExtras);
   }
 
   goAddPatient() {
diff --git a/src/app/patient/merms-selectedpatient/merms-selectedpatient.page.html b/src/app/patient/merms-selectedpatient/merms-selectedpatient.page.html
index cb652c1..4a64a81 100644
--- a/src/app/patient/merms-selectedpatient/merms-selectedpatient.page.html
+++ b/src/app/patient/merms-selectedpatient/merms-selectedpatient.page.html
@@ -6,7 +6,7 @@
         <ion-col size="2" class="navigation">
           <ion-back-button text="" (click)="goBack()"></ion-back-button>
         </ion-col>
-        <ion-col size="8" class="page-title">Paient Name Here</ion-col>
+        <ion-col size="8" class="page-title">{{patient_name}}</ion-col>
       </ion-row>
     </ion-grid>
 
diff --git a/src/app/patient/merms-selectedpatient/merms-selectedpatient.page.ts b/src/app/patient/merms-selectedpatient/merms-selectedpatient.page.ts
index 1d16dd4..f779967 100644
--- a/src/app/patient/merms-selectedpatient/merms-selectedpatient.page.ts
+++ b/src/app/patient/merms-selectedpatient/merms-selectedpatient.page.ts
@@ -1,4 +1,10 @@
 import { Component, OnInit } from '@angular/core';
+import { Router, NavigationExtras, ActivatedRoute } from '@angular/router'
+import {
+  NavController,
+  AlertController,
+  LoadingController,
+} from '@ionic/angular'
 
 @Component({
   selector: 'app-merms-selectedpatient',
@@ -7,11 +13,39 @@ import { Component, OnInit } from '@angular/core';
 })
 export class MermsSelectedpatientPage implements OnInit {
 
-  constructor() { }
+  patient_name: string = "Selected Patient";
+  patientData: any;
+  reason: string;
+  patient_id : number = 0;
+  lastname : string ='';
+  firstname : string ='';
+  appt : string ='';
+  gender : string ='';
+  age : number =0;
+
+  constructor(public navCtrl: NavController, private router: Router, private route: ActivatedRoute) {
+    console.log('-----------------------------xxxx-----------------------------');
+    console.log(this.router.getCurrentNavigation().extras.queryParams);
+    this.patientData = this.router.getCurrentNavigation().extras.queryParams;
+
+    console.log(this.patientData.special);
+    var params = JSON.parse(this.patientData.special);
+    this.patient_name = params.firstname + ' ' + params.lastname;
+    this.reason = params.reason;
+
+    this.age = params.age;
+    this.gender = params.gender;
+    this.appt = params.appt;
+    this.patient_id = params.id;
+    this.firstname = params.firstname;
+    
+
+
+  }
 
   ngOnInit() {
   }
   goBack(){
-    
+
   }
 }