From 791b724ce1bb646c659f21ecde9783574ca90017 Mon Sep 17 00:00:00 2001
From: Olu Amey <ameye@chiefsoft.com>
Date: Sat, 28 Nov 2020 22:53:02 -0500
Subject: [PATCH] fix

---
 src/app/merms-dash/merms-dash.page.ts       | 28 +++++++++++++++------
 src/app/merms-patient/merms-patient.page.ts | 28 ++++++++++++++++-----
 2 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/src/app/merms-dash/merms-dash.page.ts b/src/app/merms-dash/merms-dash.page.ts
index 2e24546..330dd2e 100644
--- a/src/app/merms-dash/merms-dash.page.ts
+++ b/src/app/merms-dash/merms-dash.page.ts
@@ -37,7 +37,7 @@ export class MermsDashPage implements OnInit {
   };
 
   cardData: any;
-  pendingEncounterData:any;
+  pendingEncounterData: any;
 
   getDashData() {
     console.log('MermsServiceProviderService::getDashData() ########  @@@@  ########');
@@ -65,7 +65,7 @@ export class MermsDashPage implements OnInit {
       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);
@@ -77,21 +77,35 @@ export class MermsDashPage implements OnInit {
   }
 
   goSettings() {
-    this.router.navigateByUrl('/merms-settings')
+    this.router.navigateByUrl('/merms-settings');
   }
 
 
-  goPatient() {
-    this.router.navigateByUrl('/merms-patient')
+  goPatient(selPatData: any) {
+    // Set our navigation extras object
+    // that passes on our global query params and fragment
+    console.log(selPatData);
+    let navigationExtras2: NavigationExtras = {
+      queryParams: selPatData,
+      state: [0]
+    };
+
+    let navigationExtras: NavigationExtras = {
+      queryParams: {
+        special: JSON.stringify(selPatData)
+      }
+    };
+
+    this.router.navigateByUrl('/merms-patient', navigationExtras);
   }
   goHome() {
 
   }
   goCalendar() {
-    this.router.navigateByUrl('/merms-calendar')
+    this.router.navigateByUrl('/merms-calendar');
   }
   goWallet() {
-    this.router.navigateByUrl('/merms-wallet')
+    this.router.navigateByUrl('/merms-wallet');
   }
 
 
diff --git a/src/app/merms-patient/merms-patient.page.ts b/src/app/merms-patient/merms-patient.page.ts
index 5486f1b..85c21a7 100644
--- a/src/app/merms-patient/merms-patient.page.ts
+++ b/src/app/merms-patient/merms-patient.page.ts
@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Router, NavigationExtras } from '@angular/router'
+import { Router, NavigationExtras, ActivatedRoute } from '@angular/router'
 import {
   NavController,
   AlertController,
@@ -13,15 +13,31 @@ import {
   styleUrls: ['./merms-patient.page.scss'],
 })
 export class MermsPatientPage implements OnInit {
-  patient_name:string ="Selected Patient";
-  constructor(public navCtrl: NavController,private router: Router) { }
+  patient_name: string = "Selected Patient";
+  patientData: any;
+  constructor(public navCtrl: NavController, private router: Router, private route: ActivatedRoute) {
+    console.log('-----------------------------xxxx-----------------------------');
+    console.log(this.route.data);
+
+    this.route.queryParams.subscribe(params => {
+      console.log(params);
+      this.patient_name = params.firstname + ' ' + params.lastname;
+      if (params && params.special) {
+        this.patientData = JSON.parse(params.special);
+        console.log(this.patientData);
+      }
+    });
+
+  }
 
   ngOnInit() {
-  }
-  goBack(){
+    console.log('-----------------------------yyyyy-----------------------------');
 
   }
-  goHome(){
+  goBack() {
+    this.navCtrl.pop()
+  }
+  goHome() {
     this.router.navigateByUrl('/merms-dash')
   }
 }