WrenchBoard/WrenchBoardIonic2023
2
0
Fork 0
Code Issues Pull Requests Releases Activity

image updares

Browse Source
This commit is contained in:
CHIEFSOFT\ameye
2024-01-20 12:13:26 -05:00
parent 25398554ab
commit 1c1cc69418
5 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/family/family.page.html
+1 -1
View File
@@ -56,7 +56,7 @@
<div class="video" *ngFor="let item of familyData" (click)="familyMemebr(item)">
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/family/'+item.family_uid+')'"></div>
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/family/'+item.family_uid+'?'+etag+')'"></div>
<div class="text">
<ion-label class="bold_text name_bg_text">{{item.firstname}} {{item.lastname}} ({{item.age}})</ion-label>
src/app/pages/family/family.page.ts
+5 -2
View File
@@ -19,7 +19,7 @@ export class FamilyPage implements OnInit {
family_active:number = 0;
session_image_server:string='';
curr_session:string='';
etag:string='';
constructor(
private navctr: NavController,
@@ -28,7 +28,7 @@ export class FamilyPage implements OnInit {
private wrenchService: WrenchService,
public familysuggestPendingService: FamilysuggestPendingService
) {
this.etag = '' + Date.now();
addEventListener('family_refresh_list', () => {
this.getFamilyData();
});
@@ -49,6 +49,9 @@ export class FamilyPage implements OnInit {
this.navctr.back();
}
ionViewWillEnter() {
this.etag = '' + Date.now();
}
familySettings(){
this.router.navigate(['familysettings']);
}
src/app/pages/familymember/familymember.page.html
+2 -2
View File
@@ -17,7 +17,7 @@
<div class="boxed_contents">
<div class="bg_image back_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/family/'+family_uid+')'">
<div class="bg_image back_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/family/'+family_uid+'?'+etag+')'">
<div class="ion-padding">
<ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
</div>
@@ -216,7 +216,7 @@
<div class="item_line" >
<div class="left">
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/family/'+family_uid+')'"></div>
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/family/'+family_uid+'?'+etag+')'"></div>
<div class="text">
<ion-label class="bold_text name_bg_text">Change Picture</ion-label>
src/app/pages/familymember/familymember.page.ts
+6 -2
View File
@@ -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);
}
src/app/pages/home/home.page.ts
+17 -6
View File
@@ -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;