diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index 463cf22..6aecc57 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -135,21 +135,20 @@ --> -
+
- + My Jobs - + - - + + - - + diff --git a/src/app/pages/home/home.page.scss b/src/app/pages/home/home.page.scss index 384547f..f0230cd 100644 --- a/src/app/pages/home/home.page.scss +++ b/src/app/pages/home/home.page.scss @@ -52,7 +52,7 @@ ion-header { } } .job_fab{ - margin-top: 30px; + margin-top: 50px; } ion-content { diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts index faf2c9c..e7fc6cb 100644 --- a/src/app/pages/home/home.page.ts +++ b/src/app/pages/home/home.page.ts @@ -3,7 +3,8 @@ import { Router } from '@angular/router'; import { SessionDataProviderService } from 'src/app/store/session-data-provider.service'; import { BlogDataService } from 'src/app/store/blog-data.service'; import { WrenchService } from 'src/app/services/wrench.service'; -import { OnesignalService } from 'src/app/services/onesignal.service'; +import { OnesignalService } from 'src/app/services/onesignal.service';// +//import * as stream from "stream"; @Component({ selector: 'app-home', @@ -13,9 +14,10 @@ import { OnesignalService } from 'src/app/services/onesignal.service'; export class HomePage implements OnInit { firstname: string = ''; - have_jobs:number = 0; + active_job_count:number = 0; blogData: []; accountType:string=""; + constructor( private router: Router, public sessionDataProviderService: SessionDataProviderService, @@ -27,6 +29,7 @@ export class HomePage implements OnInit { this.firstname = this.sessionDataProviderService.firstname; this.blogData = this.blogDataService.blogData; + this.active_job_count = this.sessionDataProviderService.active_job_count; } ngOnInit() { @@ -168,8 +171,23 @@ export class HomePage implements OnInit { } } - myJobs(){ - this.router.navigate(['jobmanager']); + fabitem : {card_type: string}; + myJobs(num){ + + switch(num){ + case 1: + this.fabitem = {card_type:'active'}; + break; + + case 2: + this.fabitem = {card_type:'REVIEWJOB'}; + break; + + case 3: + this.fabitem = {card_type:'PASTDUEJOB'}; + break; + } + this.router.navigate(['jobmanager'],{state: this.fabitem}); } selBlogResult:any; getOneBlog(item){ diff --git a/src/app/pages/jobmanager/jobmanager.page.ts b/src/app/pages/jobmanager/jobmanager.page.ts index de68527..8fb411a 100644 --- a/src/app/pages/jobmanager/jobmanager.page.ts +++ b/src/app/pages/jobmanager/jobmanager.page.ts @@ -22,7 +22,7 @@ menuData:any; private wrenchService: WrenchService ) { this.menuData = this.router.getCurrentNavigation().extras.state; - switch(this.menuData.card_type){ + switch(this.menuData?.card_type){ case 'REVIEWJOB': this.tabs ='review'; break; diff --git a/src/app/store/session-data-provider.service.ts b/src/app/store/session-data-provider.service.ts index 51ac6b1..02005c8 100644 --- a/src/app/store/session-data-provider.service.ts +++ b/src/app/store/session-data-provider.service.ts @@ -71,6 +71,7 @@ export class SessionDataProviderService { pref_email:number=0; pref_phone:number=0; promo:number=0; + active_job_count:number =0; session_contructed:boolean = false; @@ -102,6 +103,7 @@ export class SessionDataProviderService { this.pref_email= loginResult.pref_email; this.pref_phone = loginResult.pref_phone; this.promo=loginResult.promo; + this.active_job_count = loginResult.active_job_count; //this.pushNotificationProvider.tagUser(this.session); this.session_contructed = true;