diff --git a/src/app/pages/familylogin/familylogin.page.ts b/src/app/pages/familylogin/familylogin.page.ts index 07d23fc..68e8f80 100644 --- a/src/app/pages/familylogin/familylogin.page.ts +++ b/src/app/pages/familylogin/familylogin.page.ts @@ -13,6 +13,7 @@ import {BannersDataService} from "../../store/banners-data.service"; import {UserWalletService} from "../../store/user-wallet.service"; import {IntervalRefreshService} from "../../store/interval-refresh.service"; import {FamilyDataService} from "../../store/family-data.service"; +import {SocketToolsService} from "../../services/socket-tools.service"; @Component({ selector: 'app-familylogin', @@ -43,19 +44,27 @@ export class FamilyloginPage implements OnInit { public intervalRefreshService: IntervalRefreshService, public familyDataService:FamilyDataService, private loadingCtrl: LoadingController, + public socketToolsService:SocketToolsService + ) { } ngOnInit() { - const checkName = async () => { + const checkName = async () => { const { value } = await Preferences.get({ key: 'family_username' }); this.username=value; - - //console.log(`Hello ${value}!`); - }; + }; } + async joinLoginSockets(){ + this.socketToolsService.stop(); + setTimeout(()=>{ + this.socketToolsService.setupSocket("NO-NEED-SEND"); + this.socketToolsService.joinSocketRoom("full-market-jobs" ); + }, 5000); + } + loginData: { username: string, pin: string, sessionid: string, action: '11025',login_mode: '1105' }; @@ -101,12 +110,13 @@ export class FamilyloginPage implements OnInit { } async startUpCalls(){ - this.intervalRefreshService.startIntervalCalls(); // anything with interval call + await this.intervalRefreshService.startIntervalCalls(); // anything with interval call + await this.joinLoginSockets(); this.getBlogData(); - this.tasksDataService.getJobsData(); - this.userWalletService.getWalletData(); - this.bannersDataService.getBannersData(); - this.familyDataService.getFamilySuggestList(); + await this.tasksDataService.getJobsData(); + await this.userWalletService.getWalletData(); + await this.bannersDataService.getBannersData(); + await this.familyDataService.getFamilySuggestList(); } async showAlert(mtitle: string, amessage: string) { diff --git a/src/app/pages/my-course/my-course.page.html b/src/app/pages/my-course/my-course.page.html index 10c7e60..2b2bbe6 100644 --- a/src/app/pages/my-course/my-course.page.html +++ b/src/app/pages/my-course/my-course.page.html @@ -1,10 +1,5 @@ - - - - - Find Task @@ -14,7 +9,7 @@ - Available + Available ({{job_count}}) Pending @@ -47,17 +42,7 @@
- - - - - - - - -
- diff --git a/src/app/pages/my-course/my-course.page.ts b/src/app/pages/my-course/my-course.page.ts index 93d19d6..e02f1fe 100644 --- a/src/app/pages/my-course/my-course.page.ts +++ b/src/app/pages/my-course/my-course.page.ts @@ -14,7 +14,7 @@ export class MyCoursePage implements OnInit { tabs: any = 'on'; session_image_server:string=''; curr_session:string=''; - + job_count:number =0; constructor( private router: Router, public sessionDataProviderService: SessionDataProviderService, @@ -33,10 +33,6 @@ export class MyCoursePage implements OnInit { this.getJobsData(); } - onCourseDetail() { - this.router.navigate(['course-detail']); - } - viewMarketItem(item) { this.router.navigate(['marketdetail'],{state: item}); } @@ -47,34 +43,17 @@ export class MyCoursePage implements OnInit { this.jobsData = this.marketDataService.jobsData; } - usrData: { - action:11200, member_id: number, uid: string, sessionid: string, limit:20, page:1 - }; - + /* + getJobsData - refresh from central call - not direct call to API + */ jobsTotalData:any; jobsData: []; async getJobsData(){ - this.curr_session = this.sessionDataProviderService.session; var interval = setInterval( ()=> { this.jobsData = this.marketDataService.jobsData; + this.job_count = this.marketDataService.jobsData.length; this.session_image_server = this.marketDataService.session_image_server; }, 5000); - - - // this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, sessionid: this.sessionDataProviderService.session , limit:20, page:1} - // this.wrenchService.getJobsData(this.usrData).subscribe( - // jobsTotalData => { - // this.jobsTotalData = jobsTotalData; - // console.log("PAH HX RETURN->", this.jobsTotalData); - // this.jobsData = this.jobsTotalData.result_list; - // this.session_image_server = this.jobsTotalData.session_image_server; - // - // // debugger; - // console.log("JOBS RETURN DATA->", this.jobsData); - // // this.blogDataService.setBlogData(this.blogResult.blog_data); - // } - // ); - } } diff --git a/src/app/pages/mytasks/mytasks.page.html b/src/app/pages/mytasks/mytasks.page.html index 85cd8c9..186cb04 100644 --- a/src/app/pages/mytasks/mytasks.page.html +++ b/src/app/pages/mytasks/mytasks.page.html @@ -26,16 +26,16 @@ -
-
- Available Task(s) -
+ + + + -
+
- + WrenchBoard Tasks Current Tasks @@ -114,14 +114,15 @@
-
+
-
+ {{(item.title.length > 30) ? item.title.substring(0,29)+"...": item.title }} + Reward : {{item.price*0.01| number : '1.2-2'}} {{item.currency_code}} - Timeline: {{item.timeline_days}} days + Due : {{item.delivery_date | date}} Timeline: {{item.timeline_days}} days
@@ -129,27 +130,6 @@
- - - - - - - - - - - - - - - - - - - - -
diff --git a/src/app/pages/transaction/transaction.page.html b/src/app/pages/transaction/transaction.page.html index 0f3bba1..eb28485 100644 --- a/src/app/pages/transaction/transaction.page.html +++ b/src/app/pages/transaction/transaction.page.html @@ -17,6 +17,33 @@
+
+ + + {{item.description}} + Balance {{item.amount*0.01 | number : '1.2-2'}} + + + + + + + + + + + + + +
+ Redeem +
+ + + + + +
@@ -39,7 +66,7 @@ -
+
diff --git a/src/app/pages/transaction/transaction.page.ts b/src/app/pages/transaction/transaction.page.ts index 778e027..80b62aa 100644 --- a/src/app/pages/transaction/transaction.page.ts +++ b/src/app/pages/transaction/transaction.page.ts @@ -11,6 +11,7 @@ import {RecipientsService} from "../../store/recipients.service"; styleUrls: ['./transaction.page.scss'], }) export class TransactionPage implements OnInit { +account_type:string = ''; constructor( private router: Router, @@ -19,15 +20,14 @@ export class TransactionPage implements OnInit { private wrenchService: WrenchService, public recipientsService: RecipientsService ) { - - addEventListener('app-wallet-refresh', () => { + this.account_type = this.sessionDataProviderService.account_type; + // debugger; + addEventListener('app-wallet-refresh', () => { this.getWalletData(); }); } ngOnInit() { - // this.getWalletData(); - // this.getPaymentHxData(); } onBack() { @@ -40,7 +40,6 @@ export class TransactionPage implements OnInit { } addCredit(item){ - // debugger; this.router.navigate(['addcredit'],{state: item}); } onReceipt(item) { @@ -53,20 +52,28 @@ export class TransactionPage implements OnInit { }; getWalletData(){ this.usrData = {action:11200, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, sessionid: this.sessionDataProviderService.session, limit:20, page:1 } - this.wrenchService.getUserWallets(this.usrData).subscribe( - walletResult => { - this.walletResult = walletResult; - console.log("BANNERS RETURN->", this.walletResult); - this.walletData = this.walletResult.result_list; - // debugger; - console.log("BANNERS RETURN DATA->", this.walletData); - // this.blogDataService.setBlogData(this.blogResult.blog_data); - } - ); + if (this.sessionDataProviderService.account_type == 'FAMILY'){ + //wallet for kids + this.wrenchService.getFamilyUserWallets(this.usrData).subscribe( + walletResult => { + this.walletResult = walletResult; + console.log("KIDS BANNERS RETURN->", this.walletResult); + this.walletData = this.walletResult.result_list; + } + ); + }else { + // wallet for full account + this.wrenchService.getUserWallets(this.usrData).subscribe( + walletResult => { + this.walletResult = walletResult; + console.log("BANNERS RETURN->", this.walletResult); + this.walletData = this.walletResult.result_list; + } + ); + } } - // paymentHxData:any; paymentData: []; getPaymentHxData(){ @@ -87,6 +94,9 @@ export class TransactionPage implements OnInit { startRedeem(item){ this.router.navigate(['redeem'],{state: item} ); } + startFamilyRedeem(item){ + // this.router.navigate(['redeem'],{state: item} ); + } } /* 'limit' => int 20 diff --git a/src/app/services/socket-tools.service.ts b/src/app/services/socket-tools.service.ts index da067b8..4e8e8d5 100644 --- a/src/app/services/socket-tools.service.ts +++ b/src/app/services/socket-tools.service.ts @@ -37,11 +37,13 @@ export class SocketToolsService { this.socket.on('receive_message', () => { console.log("app-taskactivities-refresh 001"); const event = new Event("app-taskactivities-refresh"); + alert("app-taskactivities-refresh 000"); dispatchEvent(event); }); this.socket.on('received_refreshmarket_jobs', (data) => { console.log("received_refreshmarket_jobs 002"); + alert("received_refreshmarket_jobs 002"); debugger }); diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index 7cad653..02a535b 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -207,6 +207,10 @@ export class WrenchService { return this.getPostData("getwallets", usrData); } + getFamilyUserWallets(usrData) { + return this.getPostData("familywallet", usrData); + } + pendingJobExtend(reqData){ return this.getPostData("pendingjobextend", reqData); }