-
+
@@ -216,7 +216,7 @@
-
+
Change Picture
diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts
index a9b2aed..e900a85 100644
--- a/src/app/pages/familymember/familymember.page.ts
+++ b/src/app/pages/familymember/familymember.page.ts
@@ -28,7 +28,7 @@ export class FamilymemberPage implements OnInit {
curr_session:string='';
// family_member_uid:string='';
member_qr_string ='0000000';
-
+ etag:string='';
constructor(
private navctr: NavController,
private router: Router,
@@ -42,6 +42,7 @@ export class FamilymemberPage implements OnInit {
this.member_lastname = this.familyMemberData.itemData.lastname;
this.family_uid = this.familyMemberData.itemData.family_uid;
this.jobManagerActiveData = this.familyMemberData.jobManagerActiveData;
+ this.etag = '' + Date.now();
}
ngOnInit() {
@@ -50,7 +51,9 @@ export class FamilymemberPage implements OnInit {
this.getThisFamilyAccount();
this.getFamilyWalletsData();
}
-
+ ionViewWillEnter() {
+ this.etag = '' + Date.now();
+ }
onBack() {
this.navctr.back();
}
@@ -302,6 +305,7 @@ familyTransfer(reqData){
loading.present();
this.wrenchService.uploadFile(this.uploadData).subscribe(
uploadResult => {
+ this.etag = '' + Date.now();
this.uploadResult = uploadResult;
console.log("this.wrenchService.uploadFile RETURN DATA->", this.uploadResult);
}
diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts
index e352d9c..a5d8af9 100644
--- a/src/app/pages/home/home.page.ts
+++ b/src/app/pages/home/home.page.ts
@@ -29,7 +29,7 @@ export class HomePage implements OnInit {
walletDescription:string ="";
walletData:any;
enableTracking:number=0;
-
+ etag:string='';
constructor(
private router: Router,
@@ -49,7 +49,7 @@ export class HomePage implements OnInit {
this.blogData = this.blogDataService.blogData;
this.active_job_count = this.sessionDataProviderService.active_job_count;
this.enableTracking = this.sessionDataProviderService.tracking;
-
+ this.etag = '' + Date.now();
addEventListener('dash_tool_myjobs', () => {
this. myJobs(1);
});
@@ -85,7 +85,19 @@ export class HomePage implements OnInit {
}
+ 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.etag;
+ /// debugger;
+ }
+ if (this.accountType == 'FAMILY'){
+ this.profilePicture = this.sessionDataProviderService.profilePicture(this.sessionDataProviderService.session, this.sessionDataProviderService.family_uid)+'?'+this.etag;
+ }
+ }
ionViewWillEnter(){
console.log('Home page did enter - > ionViewWillEnter');
this.allInitFunctions();
@@ -103,18 +115,17 @@ export class HomePage implements OnInit {
}
ionViewDidEnter(){
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.getBlogData([]);
this.getBannersData();
}
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.getFamilySuggestList();
}
- // this.walletPresentation();
- //debugger;
+ this. setProfilePicture();
}
blogResult:any;
bannerResult:any;