diff --git a/src/app/pages/edit-profile/edit-profile.page.ts b/src/app/pages/edit-profile/edit-profile.page.ts index 3e1a22d..16e41b4 100644 --- a/src/app/pages/edit-profile/edit-profile.page.ts +++ b/src/app/pages/edit-profile/edit-profile.page.ts @@ -10,7 +10,7 @@ import {Camera, CameraResultType, CameraSource} from "@capacitor/camera"; styleUrls: ['./edit-profile.page.scss'], }) export class EditProfilePage implements OnInit { - + etag:string=''; // @ViewChild('firstname') firstname; // @ViewChild('lastname') lastname; // //@ViewChild('lastname') lastname; @@ -40,8 +40,8 @@ export class EditProfilePage implements OnInit { this.lastname = this.sessionDataProviderService.lastname; this.email = this.sessionDataProviderService.email; this.online_name = this.sessionDataProviderService.online_name; - this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); - + this.etag = '' + Date.now(); + this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid)+'?'+this.etag; setInterval(()=>{ var myIframe=document.getElementById('profile_pic'); @@ -52,6 +52,9 @@ export class EditProfilePage implements OnInit { // document.getElementById("profile_pic").reload(true); } + ionViewWillEnter() { + this.etag = '' + Date.now(); + } onBack() { this.navctr.back(); } @@ -117,7 +120,9 @@ export class EditProfilePage implements OnInit { this.profileResult = profileResult; if (this.profileResult?.internal_return==0){ this.profileMessage="Profile Updated"; + dispatchEvent(new Event("profile_picture_updated")); setTimeout(()=>{ + this.etag = '' + Date.now(); this.profileMessage=''; }, 3000); } @@ -176,10 +181,12 @@ export class EditProfilePage implements OnInit { uploadResult => { this.uploadResult = uploadResult; console.log("this.wrenchService.uploadFile RETURN DATA->", this.uploadResult); - this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); + // this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); //this.ngOnInit(); // trying this //debugger; - document.getElementById("profile_pic").style.backgroundImage="'url('"+this.profilePicture+"')'"; ///this.profilePicture; + this.etag = '' + Date.now(); + this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid)+'?'+this.etag; + // document.getElementById("profile_pic").style.backgroundImage="'url('"+this.profilePicture+"')'"; ///this.profilePicture; } ); diff --git a/src/app/pages/profile/profile.page.ts b/src/app/pages/profile/profile.page.ts index 126912e..9d0e65d 100644 --- a/src/app/pages/profile/profile.page.ts +++ b/src/app/pages/profile/profile.page.ts @@ -15,6 +15,7 @@ export class ProfilePage implements OnInit { email:string=''; profilePicture:string=''; accountType:string="FULL"; + etag:string=''; constructor( private router: Router, @@ -22,23 +23,51 @@ export class ProfilePage implements OnInit { public sessionDataProviderService:SessionDataProviderService, public helpDataService:HelpDataService ) { - this.accountType = sessionDataProviderService.account_type; + this.etag = '' + Date.now(); + this.accountType = this.sessionDataProviderService.account_type; + this.setProfilePicture(); + addEventListener('profile_picture_updated', () => { + this.setProfilePicture(); + }); } ngOnInit() { + this.accountType = this.sessionDataProviderService.account_type; this.firstname = this.sessionDataProviderService.firstname; this.lastname = this.sessionDataProviderService.lastname; this.email = this.sessionDataProviderService.username; + this.setProfilePicture(); + + // if (this.accountType == 'FULL'){ + // // this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); + // this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid)+'?'+this.etag; + // debugger; + // } + // + // if (this.accountType == 'FAMILY'){ + // this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.family_uid)+'?'+this.etag; + // } + //this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); + } + ionViewWillEnter() { + this.setProfilePicture(); + } + ionViewDidEnter(){ + this.setProfilePicture(); + } + setProfilePicture(){ + this.accountType = this.sessionDataProviderService.account_type; + this.etag = '' + Date.now(); if (this.accountType == 'FULL'){ - this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); + // this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); + this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid)+'?'+this.etag; + /// debugger; } 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.family_uid)+'?'+this.etag; } - //this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.member_uid); } - onFamily() { this.router.navigate(['family']); }