diff --git a/src/app/pages/family/family.page.html b/src/app/pages/family/family.page.html index 556d919..eb28312 100644 --- a/src/app/pages/family/family.page.html +++ b/src/app/pages/family/family.page.html @@ -40,7 +40,7 @@
Select kid to send reward to:
-
+
diff --git a/src/app/pages/family/family.page.ts b/src/app/pages/family/family.page.ts index f6fafc0..91135e2 100644 --- a/src/app/pages/family/family.page.ts +++ b/src/app/pages/family/family.page.ts @@ -86,12 +86,25 @@ export class FamilyPage implements OnInit { this.router.navigate(['jobactive'],{state: item}); } familyMemebr(item){ - var famItem = {jobManagerActiveData: this.jobManagerActiveData, - familyPendingData:this.familyPendingData, - itemData:item}; + var famItem = { + jobManagerActiveData: this.jobManagerActiveData, + familyPendingData:this.familyPendingData, + itemData:item, + startPage: '' + }; this.router.navigate(['familymember'],{state: famItem}); } + familyMemeberToWallet(item){ + var famItem = { + jobManagerActiveData: this.jobManagerActiveData, + familyPendingData:this.familyPendingData, + itemData:item, + startPage: 'WALLET' + }; + this.router.navigate(['familymember'],{state: famItem}); + } + usrData: { action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0 }; diff --git a/src/app/pages/familymember/familymember.page.html b/src/app/pages/familymember/familymember.page.html index 4a5707b..8a2d9c1 100644 --- a/src/app/pages/familymember/familymember.page.html +++ b/src/app/pages/familymember/familymember.page.html @@ -99,12 +99,15 @@
+ +
{{member_firstname}} Wallet
+
- {{item.amount*0.01 | number : '1.2-2'}} {{item.description}} + Balance : {{item.amount*0.01 | number : '1.2-2'}} {{item.description}}
@@ -114,13 +117,17 @@ - - Reward - - - Plan Account + + Send Reward + + + diff --git a/src/app/pages/familymember/familymember.page.scss b/src/app/pages/familymember/familymember.page.scss index 515b1fc..b4149d0 100644 --- a/src/app/pages/familymember/familymember.page.scss +++ b/src/app/pages/familymember/familymember.page.scss @@ -194,6 +194,7 @@ ion-content { } .wallet-tools{ background-color: white; + background-image: linear-gradient(to right, aliceblue, #ecf0f3,aliceblue); ion-toolbar{ --ion-background-color: white; border-radius: 10px; diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts index a0d8974..e155839 100644 --- a/src/app/pages/familymember/familymember.page.ts +++ b/src/app/pages/familymember/familymember.page.ts @@ -4,6 +4,7 @@ import {Router} from "@angular/router"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; import {Camera, CameraResultType, CameraSource} from "@capacitor/camera"; +import {UserWalletService} from "../../store/user-wallet.service"; @Component({ selector: 'app-familymember', @@ -34,22 +35,38 @@ export class FamilymemberPage implements OnInit { private router: Router, public sessionDataProviderService: SessionDataProviderService, private wrenchService: WrenchService, - private loadingCtrl: LoadingController + private loadingCtrl: LoadingController, + public userWalletService: UserWalletService ) { this.familyMemberData = this.router.getCurrentNavigation().extras.state; //debugger; + + this.member_firstname= this.familyMemberData.itemData.firstname; this.member_lastname = this.familyMemberData.itemData.lastname; this.family_uid = this.familyMemberData.itemData.family_uid; this.jobManagerActiveData = this.familyMemberData.jobManagerActiveData; this.etag = '' + Date.now(); + // this.userWalletService.getWalletData(); } ngOnInit() { + // this.familyMemberWalletData = this.userWalletService.walletData; + this.session_image_server = this.sessionDataProviderService.session_image_server; this.curr_session=this.sessionDataProviderService.session; this.getThisFamilyAccount(); this.getFamilyWalletsData(); + if ( + this.familyMemberData != undefined + && this.familyMemberData .startPage != undefined + && this.familyMemberData.startPage !='' + ){ + if (this.familyMemberData.startPage == 'WALLET'){ + this.startFamilyMemberReward(); + } + + } } ionViewWillEnter() { this.etag = '' + Date.now(); @@ -58,6 +75,14 @@ export class FamilymemberPage implements OnInit { this.navctr.back(); } + startFamilyMemberReward(){ + var wallet = this.familyMemberWalletData; + // if (wallet.length> 0){ + // this.startAddfund(wallet[0]) + // debugger; + // } + // debugger; + } jobActive(item){ this.router.navigate(['jobactive'],{state: item});