From 8c9d086126a82a07fd1be7502ec546a047342091 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Fri, 15 Dec 2023 22:33:02 -0500
Subject: [PATCH] profile picture fix

---
 src/app/pages/home/home.page.ts                | 4 +++-
 src/app/pages/myfiles/myfiles.page.ts          | 2 +-
 src/app/pages/profile/profile.page.ts          | 9 ++++++++-
 src/app/store/session-data-provider.service.ts | 9 ++++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts
index 832258c..d33155b 100644
--- a/src/app/pages/home/home.page.ts
+++ b/src/app/pages/home/home.page.ts
@@ -65,7 +65,7 @@ export class HomePage implements OnInit {
     }
 
 //debugger;
-    this.profilePicture =  this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid);
+
 
     this.walletPresentation();
   }
@@ -92,11 +92,13 @@ export class HomePage implements OnInit {
   }
   ionViewDidEnter(){
     if (this.accountType == 'FULL'){
+      this.profilePicture =  this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid);
       this.getBlogData([]);
       this.getBannersData();
     }
 
     if (this.accountType == 'FAMILY'){
+      this.profilePicture =  this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.family_uid);
       this.getFamilySuggestList();
     }
 
diff --git a/src/app/pages/myfiles/myfiles.page.ts b/src/app/pages/myfiles/myfiles.page.ts
index 80548a8..45eea38 100644
--- a/src/app/pages/myfiles/myfiles.page.ts
+++ b/src/app/pages/myfiles/myfiles.page.ts
@@ -109,7 +109,7 @@ export class MyfilesPage implements OnInit {
 
         if (image) {
             const loading = await this.loadingCtrl.create({
-                message: 'Uploading Banner',
+                message: 'Uploading File...',
                 duration: 5000,
             });
             var file_size = parseInt(String(image.base64String.toString().length / 1.3224954) ) ;
diff --git a/src/app/pages/profile/profile.page.ts b/src/app/pages/profile/profile.page.ts
index 0a75bc0..afa271a 100644
--- a/src/app/pages/profile/profile.page.ts
+++ b/src/app/pages/profile/profile.page.ts
@@ -29,7 +29,14 @@ export class ProfilePage implements OnInit {
     this.firstname = this.sessionDataProviderService.firstname;
     this.lastname =  this.sessionDataProviderService.lastname;
     this.email = this.sessionDataProviderService.username;
-    this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid);
+    if (this.accountType == 'FULL'){
+      this.profilePicture =  this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid);
+    }
+
+    if (this.accountType == 'FAMILY'){
+      this.profilePicture =  this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.family_uid);
+    }
+    //this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid);
   }
 
   onFamily() {
diff --git a/src/app/store/session-data-provider.service.ts b/src/app/store/session-data-provider.service.ts
index 612cb57..3aecb2d 100644
--- a/src/app/store/session-data-provider.service.ts
+++ b/src/app/store/session-data-provider.service.ts
@@ -79,6 +79,7 @@ export class SessionDataProviderService {
   active_job_count:number =0;
   tracking:number = 0;
   session_image_server: string='';
+  family_uid:string='';
 
  session_contructed:boolean = false;
 
@@ -98,6 +99,7 @@ export class SessionDataProviderService {
       this.last_login = loginResult.last_login2;
       this.member_id = loginResult.member_id;
       this.member_uid = loginResult.uid;
+      this.family_uid = loginResult?.family_uid;
       this.balance = loginResult.balance;
       this.ccard=loginResult.ccard;  
       this.profile_pic=loginResult.profile_pic;
@@ -201,7 +203,12 @@ export class SessionDataProviderService {
     else{
       profile_p = defualtProfilePicture;
     }
-    profile_p = `${environment.baseUrl}/getmedia/${sessionID}/profile/${memberUID}`;
+    if (this.account_type == 'FAMILY'){
+      profile_p = `${environment.baseUrl}/getmedia/${sessionID}/family/${memberUID}`;
+    }
+    else{
+      profile_p = `${environment.baseUrl}/getmedia/${sessionID}/profile/${memberUID}`;
+    }
     console.log("profile_p->", profile_p);
     //https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/0B6246CE2B89EC948618711E6E6D2DD532797C7F750C69A237FE3F650ECA6B14/profile/3119b744-42ad-4834-bb83-b737588754ca
     //https://apigate.lotus.g1.wrenchboard.com/en/wrench/api/v1/getmedia/81EAF85BBD946518E8CAE81C2CEBCCB8134985203325343F5703E874BED476E2/profile/3119b744-42ad-4834-bb83-b737588754ca