From c2abc5e7c80db088a06c04772628ba1843566ce1 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 11 Feb 2024 08:23:01 -0500 Subject: [PATCH] workers page --- .../workers-dash/workers-dash.component.html | 2 +- .../workers-dash/workers-dash.component.scss | 8 ++++---- .../workers-dash/workers-dash.component.ts | 18 +++++++++++++----- src/app/pages/home/home.page.html | 2 +- src/app/pages/mytasks/mytasks.page.ts | 11 +++++++++-- src/app/store/banners-data.service.ts | 4 ++++ 6 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/app/components/workers-dash/workers-dash.component.html b/src/app/components/workers-dash/workers-dash.component.html index 0b283d7..769be47 100644 --- a/src/app/components/workers-dash/workers-dash.component.html +++ b/src/app/components/workers-dash/workers-dash.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/app/components/workers-dash/workers-dash.component.scss b/src/app/components/workers-dash/workers-dash.component.scss index 837a7ef..6b3b10f 100644 --- a/src/app/components/workers-dash/workers-dash.component.scss +++ b/src/app/components/workers-dash/workers-dash.component.scss @@ -8,12 +8,12 @@ .extra-grid{ margin: 10px 0px 10px 0px; padding: 0px; - height: 160px; + height: 140px; .ext-col{ padding: 5px; //background-color: #2dd36f; - height: 160px; + height: 140px; .ext-in{ &.bg{ background-image: url("https://www.wrenchboard.com/assets/images/apps/xt/task.png"); @@ -41,7 +41,7 @@ } } background-color: antiquewhite; - height: 150px; + height: 130px; border-radius: 10px; box-shadow: 1px 1px lightgray; @@ -50,7 +50,7 @@ .ban-text{ font-size: 24px; font-weight: bolder; - padding-top: 60px; + padding-top: 40px; padding-left: 20px; // color: #8b198e; } diff --git a/src/app/components/workers-dash/workers-dash.component.ts b/src/app/components/workers-dash/workers-dash.component.ts index 778a717..4b7ef39 100644 --- a/src/app/components/workers-dash/workers-dash.component.ts +++ b/src/app/components/workers-dash/workers-dash.component.ts @@ -35,6 +35,7 @@ export class WorkersDashComponent implements OnInit { public sessionDataProviderService: SessionDataProviderService, public usersoffersDataService:UsersoffersDataService) { this.refreshJobsData(); + this.getJobsData(); } ngOnInit() {} @@ -81,16 +82,23 @@ export class WorkersDashComponent implements OnInit { } pastDue(){ - //this.router.navigate(['activetask'],{state: item}); - this.router.navigate(['tabs/mytasks']); + let item: { + 'tab': 'PASTDUE' + }; + this.router.navigate(['tabs/mytasks'],{state: item}); } reView(){ -///tabs/mytasks - this.router.navigate(['tabs/mytasks']); + let item: { + 'tab': 'REVIEW' + }; + this.router.navigate(['tabs/mytasks'],{state: item}); } activeTasks(){ - this.router.navigate(['tabs/mytasks']); + let item: { + 'tab': 'ACTIVE' + }; + this.router.navigate(['tabs/mytasks'],{state: item}); } onDetails(item) { // var pageToNavigate = 'detail'; diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index 741889d..23b9e5f 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -52,7 +52,7 @@ -
+
diff --git a/src/app/pages/mytasks/mytasks.page.ts b/src/app/pages/mytasks/mytasks.page.ts index 6f86ab7..f885049 100644 --- a/src/app/pages/mytasks/mytasks.page.ts +++ b/src/app/pages/mytasks/mytasks.page.ts @@ -14,7 +14,7 @@ export class MytasksPage implements OnInit { tabs: any = 'tasks'; - + extraData:any; active_offers_count:number =0; active_job_count:number =0; pastdue_job_count:number =0; @@ -28,7 +28,10 @@ export class MytasksPage implements OnInit { private wrenchService: WrenchService, public tasksDataService:TasksDataService, public usersoffersDataService:UsersoffersDataService - ) { } + ) { + // this.extraData = this.router.getCurrentNavigation().extras.state; + // debugger; + } myOffersData :[]; ngOnInit() { @@ -90,6 +93,10 @@ export class MytasksPage implements OnInit { } + activeSeleted(item) { + this.router.navigate(['activetask'],{state: item}); + } + // getPastDueJobsData(){ // diff --git a/src/app/store/banners-data.service.ts b/src/app/store/banners-data.service.ts index a857f49..a9b431b 100644 --- a/src/app/store/banners-data.service.ts +++ b/src/app/store/banners-data.service.ts @@ -52,6 +52,10 @@ export class BannersDataService { console.log("BANNERS RETURN->", this.bannerResult); this.bannerData = this.bannerResult.result_list; + if ( this.bannerResult.home_dash_type != ''){ + // debugger; + this.sessionDataProviderService.home_dash_type = this.bannerResult.home_dash_type; + } this.homebannerCount = this.bannerData?.length; } );