family
This commit is contained in:
@@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
<div style="font-weight: bolder; color: #8b198e; font-size: 16px; margin-top: 10px;">Select kid to send reward to:</div>
|
<div style="font-weight: bolder; color: #8b198e; font-size: 16px; margin-top: 10px;">Select kid to send reward to:</div>
|
||||||
<div class="lesson">
|
<div class="lesson">
|
||||||
<div class="video" *ngFor="let item of familyData" (click)="familyMemebr(item)">
|
<div class="video" *ngFor="let item of familyData" (click)="familyMemeberToWallet(item)">
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/family/'+item.family_uid+'?'+etag+')'"></div>
|
<div class="bg_image men_image" [style.backgroundImage]="'url('+session_image_server+'/'+curr_session+'/family/'+item.family_uid+'?'+etag+')'"></div>
|
||||||
|
|
||||||
|
|||||||
@@ -86,12 +86,25 @@ export class FamilyPage implements OnInit {
|
|||||||
this.router.navigate(['jobactive'],{state: item});
|
this.router.navigate(['jobactive'],{state: item});
|
||||||
}
|
}
|
||||||
familyMemebr(item){
|
familyMemebr(item){
|
||||||
var famItem = {jobManagerActiveData: this.jobManagerActiveData,
|
var famItem = {
|
||||||
familyPendingData:this.familyPendingData,
|
jobManagerActiveData: this.jobManagerActiveData,
|
||||||
itemData:item};
|
familyPendingData:this.familyPendingData,
|
||||||
|
itemData:item,
|
||||||
|
startPage: ''
|
||||||
|
};
|
||||||
this.router.navigate(['familymember'],{state: famItem});
|
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: {
|
usrData: {
|
||||||
action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0
|
action:number, member_id: number, uid: string, sessionid: string, limit:20, page:1,offset: 0
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -99,12 +99,15 @@
|
|||||||
<div class="video" *ngFor="let item of familyMemberWalletData" >
|
<div class="video" *ngFor="let item of familyMemberWalletData" >
|
||||||
|
|
||||||
<ion-grid class="wallet-tools">
|
<ion-grid class="wallet-tools">
|
||||||
|
<ion-row>
|
||||||
|
<div style="font-weight: bolder; font-size: 18px; color: #8b198e;"> {{member_firstname}} Wallet</div>
|
||||||
|
</ion-row>
|
||||||
<ion-row>
|
<ion-row>
|
||||||
<ion-col>
|
<ion-col>
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/currency/'+item.description.toLowerCase()+'.svg)'"></div>
|
<div class="bg_image men_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/currency/'+item.description.toLowerCase()+'.svg)'"></div>
|
||||||
<div class="text">
|
<div class="text">
|
||||||
<ion-label class="bold_text"> {{item.amount*0.01 | number : '1.2-2'}} {{item.description}}</ion-label>
|
<ion-label class="bold_text">Balance : {{item.amount*0.01 | number : '1.2-2'}} {{item.description}}</ion-label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -114,13 +117,17 @@
|
|||||||
<ion-col>
|
<ion-col>
|
||||||
<ion-toolbar *ngIf="toolBarShow == '1' ">
|
<ion-toolbar *ngIf="toolBarShow == '1' ">
|
||||||
<ion-buttons class="actions" slot="end">
|
<ion-buttons class="actions" slot="end">
|
||||||
<ion-button size="small" fill="solid" color="secondary" shape="round" (click)="startAddfund(item)">
|
<ion-button size="small"
|
||||||
Reward
|
fill="solid"
|
||||||
<ion-icon name="chevron-forward-circle-outline"></ion-icon>
|
color="secondary"
|
||||||
</ion-button>
|
shape="round"
|
||||||
<ion-button size="small" fill="solid" shape="round" (click)="startWalletPlan()">Plan Account
|
(click)="startAddfund(item)">
|
||||||
|
Send Reward
|
||||||
<ion-icon name="chevron-forward-circle-outline"></ion-icon>
|
<ion-icon name="chevron-forward-circle-outline"></ion-icon>
|
||||||
</ion-button>
|
</ion-button>
|
||||||
|
<!-- <ion-button size="small" fill="solid" shape="round" (click)="startWalletPlan()">Plan Account-->
|
||||||
|
<!-- <ion-icon name="chevron-forward-circle-outline"></ion-icon>-->
|
||||||
|
<!-- </ion-button>-->
|
||||||
</ion-buttons>
|
</ion-buttons>
|
||||||
</ion-toolbar>
|
</ion-toolbar>
|
||||||
|
|
||||||
|
|||||||
@@ -194,6 +194,7 @@ ion-content {
|
|||||||
}
|
}
|
||||||
.wallet-tools{
|
.wallet-tools{
|
||||||
background-color: white;
|
background-color: white;
|
||||||
|
background-image: linear-gradient(to right, aliceblue, #ecf0f3,aliceblue);
|
||||||
ion-toolbar{
|
ion-toolbar{
|
||||||
--ion-background-color: white;
|
--ion-background-color: white;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {Router} from "@angular/router";
|
|||||||
import {SessionDataProviderService} from "../../store/session-data-provider.service";
|
import {SessionDataProviderService} from "../../store/session-data-provider.service";
|
||||||
import {WrenchService} from "../../services/wrench.service";
|
import {WrenchService} from "../../services/wrench.service";
|
||||||
import {Camera, CameraResultType, CameraSource} from "@capacitor/camera";
|
import {Camera, CameraResultType, CameraSource} from "@capacitor/camera";
|
||||||
|
import {UserWalletService} from "../../store/user-wallet.service";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-familymember',
|
selector: 'app-familymember',
|
||||||
@@ -34,22 +35,38 @@ export class FamilymemberPage implements OnInit {
|
|||||||
private router: Router,
|
private router: Router,
|
||||||
public sessionDataProviderService: SessionDataProviderService,
|
public sessionDataProviderService: SessionDataProviderService,
|
||||||
private wrenchService: WrenchService,
|
private wrenchService: WrenchService,
|
||||||
private loadingCtrl: LoadingController
|
private loadingCtrl: LoadingController,
|
||||||
|
public userWalletService: UserWalletService
|
||||||
) {
|
) {
|
||||||
this.familyMemberData = this.router.getCurrentNavigation().extras.state;
|
this.familyMemberData = this.router.getCurrentNavigation().extras.state;
|
||||||
//debugger;
|
//debugger;
|
||||||
|
|
||||||
|
|
||||||
this.member_firstname= this.familyMemberData.itemData.firstname;
|
this.member_firstname= this.familyMemberData.itemData.firstname;
|
||||||
this.member_lastname = this.familyMemberData.itemData.lastname;
|
this.member_lastname = this.familyMemberData.itemData.lastname;
|
||||||
this.family_uid = this.familyMemberData.itemData.family_uid;
|
this.family_uid = this.familyMemberData.itemData.family_uid;
|
||||||
this.jobManagerActiveData = this.familyMemberData.jobManagerActiveData;
|
this.jobManagerActiveData = this.familyMemberData.jobManagerActiveData;
|
||||||
this.etag = '' + Date.now();
|
this.etag = '' + Date.now();
|
||||||
|
// this.userWalletService.getWalletData();
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
|
// this.familyMemberWalletData = this.userWalletService.walletData;
|
||||||
|
|
||||||
this.session_image_server = this.sessionDataProviderService.session_image_server;
|
this.session_image_server = this.sessionDataProviderService.session_image_server;
|
||||||
this.curr_session=this.sessionDataProviderService.session;
|
this.curr_session=this.sessionDataProviderService.session;
|
||||||
this.getThisFamilyAccount();
|
this.getThisFamilyAccount();
|
||||||
this.getFamilyWalletsData();
|
this.getFamilyWalletsData();
|
||||||
|
if (
|
||||||
|
this.familyMemberData != undefined
|
||||||
|
&& this.familyMemberData .startPage != undefined
|
||||||
|
&& this.familyMemberData.startPage !=''
|
||||||
|
){
|
||||||
|
if (this.familyMemberData.startPage == 'WALLET'){
|
||||||
|
this.startFamilyMemberReward();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ionViewWillEnter() {
|
ionViewWillEnter() {
|
||||||
this.etag = '' + Date.now();
|
this.etag = '' + Date.now();
|
||||||
@@ -58,6 +75,14 @@ export class FamilymemberPage implements OnInit {
|
|||||||
this.navctr.back();
|
this.navctr.back();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
startFamilyMemberReward(){
|
||||||
|
var wallet = this.familyMemberWalletData;
|
||||||
|
// if (wallet.length> 0){
|
||||||
|
// this.startAddfund(wallet[0])
|
||||||
|
// debugger;
|
||||||
|
// }
|
||||||
|
// debugger;
|
||||||
|
}
|
||||||
|
|
||||||
jobActive(item){
|
jobActive(item){
|
||||||
this.router.navigate(['jobactive'],{state: item});
|
this.router.navigate(['jobactive'],{state: item});
|
||||||
|
|||||||
Reference in New Issue
Block a user