From 49eaf622bd9edce539d0adbbe8c8432e10e94bd7 Mon Sep 17 00:00:00 2001
From: Olu Amey <ameye@chiefsoft.com>
Date: Sat, 5 Dec 2020 20:33:58 -0500
Subject: [PATCH] fix

---
 android/app/build.gradle                      |  4 +-
 src/app/merms-dash/merms-dash.page.html       |  2 +-
 .../merms-mypatients.page.html                | 35 ++++++++++-----
 .../merms-mypatients/merms-mypatients.page.ts | 45 +++++++++++++++++--
 4 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index e1df477..602b64b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "com.mermsemr.providers"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1028
-        versionName "1.0.28"
+        versionCode 1029
+        versionName "1.0.29"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/src/app/merms-dash/merms-dash.page.html b/src/app/merms-dash/merms-dash.page.html
index f314960..7794e8b 100644
--- a/src/app/merms-dash/merms-dash.page.html
+++ b/src/app/merms-dash/merms-dash.page.html
@@ -12,7 +12,7 @@
         </div>
       </ion-col>
     </ion-row>
-    <ion-row style="height: 60px; padding-top: 0px; font-size: 50px; text-align: center; background-color: honeydew; ">
+    <ion-row style="height: 60px; padding-top: 0px; font-size: 40px; text-align: center; background-color: white; ">
       <ion-col >
         <ion-icon  name="people-outline" (click)="goPracticepatients()" ></ion-icon>
       </ion-col>
diff --git a/src/app/merms-mypatients/merms-mypatients.page.html b/src/app/merms-mypatients/merms-mypatients.page.html
index cffbe9b..ace8a58 100644
--- a/src/app/merms-mypatients/merms-mypatients.page.html
+++ b/src/app/merms-mypatients/merms-mypatients.page.html
@@ -8,20 +8,31 @@
         <ion-col size="8" class="page-title">Patients</ion-col>
       </ion-row>
     </ion-grid>
-    
 
-    
-    <!-- Item Dividers in a List -->
-    <ion-list>
 
-      <ion-item><ion-label>Search patient </ion-label></ion-item>
-      <ion-item><ion-label>Edit Profile</ion-label></ion-item>
-      <ion-item><ion-label>A4</ion-label></ion-item>
-      <ion-item><ion-label>Practice Time</ion-label></ion-item>
-    
-      
-    </ion-list>
-    
+    <ion-grid style="font-size: 25px; text-align: center; height: 30px; width: 100%;">
+      <ion-row>
+        <ion-col>
+          <ion-icon name="calendar-outline" style="padding-right: 20px; padding-left: 20px;"></ion-icon>
+        </ion-col>
+        <ion-col>
+          <ion-icon name="person-add-outline" style="padding-right: 20px; padding-left: 20px;"></ion-icon>
+        </ion-col>
+      </ion-row>
+      <ion-row>
+        <ion-toolbar>
+          <ion-searchbar></ion-searchbar>
+        </ion-toolbar>
+
+        <ion-list style="width: 100%;">
+          <ion-item *ngFor="let type of patientsData" (click)="goSelectPatient(type)">{{type.firstname}}
+            {{type.lastname}}</ion-item>
+        </ion-list>
+      </ion-row>
+    </ion-grid>
+
+
+
 
   </div>
 
diff --git a/src/app/merms-mypatients/merms-mypatients.page.ts b/src/app/merms-mypatients/merms-mypatients.page.ts
index 5951a90..55a038e 100644
--- a/src/app/merms-mypatients/merms-mypatients.page.ts
+++ b/src/app/merms-mypatients/merms-mypatients.page.ts
@@ -1,4 +1,7 @@
 import { Component, OnInit } from '@angular/core';
+import { Router, NavigationExtras } from '@angular/router'
+import { MermsServiceProviderService } from './../providers/merms-service-provider.service';
+import { MermsSessionService } from './../merms-session.service';
 
 @Component({
   selector: 'app-merms-mypatients',
@@ -7,11 +10,47 @@ import { Component, OnInit } from '@angular/core';
 })
 export class MermsMypatientsPage implements OnInit {
 
-  constructor() { }
+  patientsData:any;
+  currentProviderData: {
+    sessionid: string,
+    member_id: number,
+    card_count: number
+    card_type: number
+  };
+
+  constructor(
+    private router: Router,
+    private mermsServiceProviderService: MermsServiceProviderService,
+    private mermsSessionService: MermsSessionService
+  ) {
+    this.currentProviderData = {
+      sessionid: this.mermsSessionService.session,
+      member_id: this.mermsSessionService.member_id,
+      card_count: 100,
+      card_type: 22000
+    };
+
+
+    try {
+      this.mermsServiceProviderService.genericGetService('provider/mypatients', this.currentProviderData).subscribe(patientsData => {
+        console.log("card data result 22k: ", patientsData[0]['payload']);
+        this.patientsData = patientsData[0]['payload'];
+
+      });
+    } catch (e) {
+      console.log(e);
+    }
+
+
+  }
+
 
   ngOnInit() {
   }
-  goBack(){
-    
+  goBack() {
+
+  }
+  goSelectPatient(patientData:any){
+
   }
 }