diff --git a/src/app/pages/jobactive/jobactive.page.html b/src/app/pages/jobactive/jobactive.page.html index 9aebaab..9ee4215 100644 --- a/src/app/pages/jobactive/jobactive.page.html +++ b/src/app/pages/jobactive/jobactive.page.html @@ -1,6 +1,6 @@ -
+
diff --git a/src/app/pages/jobactive/jobactive.page.scss b/src/app/pages/jobactive/jobactive.page.scss index 8fd1874..790c17c 100644 --- a/src/app/pages/jobactive/jobactive.page.scss +++ b/src/app/pages/jobactive/jobactive.page.scss @@ -3,6 +3,8 @@ ion-content { .back_image { width: 100%; height: 130px; + background-size: contain; + background-repeat: no-repeat; .back { font-size: 25px; diff --git a/src/app/pages/jobinterest/jobinterest.page.html b/src/app/pages/jobinterest/jobinterest.page.html index c1e8d84..481a5f2 100644 --- a/src/app/pages/jobinterest/jobinterest.page.html +++ b/src/app/pages/jobinterest/jobinterest.page.html @@ -52,7 +52,7 @@
-
+
{{item.title}} diff --git a/src/app/pages/jobmanager/jobmanager.page.html b/src/app/pages/jobmanager/jobmanager.page.html index 915745f..09efe8c 100644 --- a/src/app/pages/jobmanager/jobmanager.page.html +++ b/src/app/pages/jobmanager/jobmanager.page.html @@ -57,7 +57,7 @@
-
+
{{item.title}} @@ -79,8 +79,7 @@
-
- +
{{item.title}} {{item.description}} @@ -100,8 +99,7 @@
-
- +
{{item.title}} {{item.description}} diff --git a/src/app/pages/joboffers/joboffers.page.html b/src/app/pages/joboffers/joboffers.page.html index f14388f..27bf264 100644 --- a/src/app/pages/joboffers/joboffers.page.html +++ b/src/app/pages/joboffers/joboffers.page.html @@ -8,12 +8,14 @@
- You have 00 offer(s) + You have {{total_offers}} offer(s)
- Silhouette of mountains +
+ {{item.title}} +
{{item.title}} Expiration:{{item.expire}} @@ -22,8 +24,8 @@ {{item.job_description}} - Reject - Start Now + Reject + Start Now
diff --git a/src/app/pages/joboffers/joboffers.page.scss b/src/app/pages/joboffers/joboffers.page.scss index 1c3d010..f2e682d 100644 --- a/src/app/pages/joboffers/joboffers.page.scss +++ b/src/app/pages/joboffers/joboffers.page.scss @@ -364,6 +364,21 @@ ion-card{ ion-card-subtitle{ color: red; } + .top_banner{ + width: 100%; + //background-color: #2dd36f; + margin-left: auto; + margin-right: auto; + text-align: center; + .offer_banner{ + width: auto; + height: 130px; + background-size: contain; + background-repeat: no-repeat; + + } + } + } ion-footer { diff --git a/src/app/pages/joboffers/joboffers.page.ts b/src/app/pages/joboffers/joboffers.page.ts index e9dadfd..bc4f116 100644 --- a/src/app/pages/joboffers/joboffers.page.ts +++ b/src/app/pages/joboffers/joboffers.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import {NavController} from "@ionic/angular"; +import {AlertController, NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import { WrenchService } from 'src/app/services/wrench.service'; import {SessionDataProviderService} from "../../store/session-data-provider.service"; @@ -17,6 +17,7 @@ export class JoboffersPage implements OnInit { private navctr: NavController, private router: Router, public sessionDataProviderService: SessionDataProviderService, + private alertController:AlertController, private wrenchService: WrenchService ) { } @@ -43,6 +44,7 @@ export class JoboffersPage implements OnInit { limit:20, page:1, offset:number }; + total_offers:number = 0; myOffersTotalData:any; myOffersData: []; getMyOffersData(){ @@ -58,9 +60,57 @@ export class JoboffersPage implements OnInit { console.log("myOffersTotalData RETURN->", this.myOffersTotalData); this.myOffersData = this.myOffersTotalData.result_list; console.log("myOffersData RETURN DATA->", this.myOffersData); + this.total_offers = this.myOffersData.length; } ); } + + async requestStart(item) { + const alert = await this.alertController.create({ + header: "Ready to start", + message: "You will start the task now, offer shall be completed in allocated timeline.", + buttons: [ + { + text: "Cancel", + role: "cancel", + handler: () => { + this.getMyOffersData(); + }, + }, + { + text: "Start Now", + handler: () => { + this.getMyOffersData(); + }, + }, + ], + }); + await alert.present(); + } + + async requestReject(item) { + const alert = await this.alertController.create({ + header: "Confirm Reject", + message: "This task will go away, you dont have to do anything.", + buttons: [ + { + text: "Cancel", + role: "cancel", + handler: () => { + this.getMyOffersData(); + }, + }, + { + text: "Reject", + handler: () => { + this.getMyOffersData(); + }, + }, + ], + }); + await alert.present(); + } + } diff --git a/src/app/pages/pendinterest/pendinterest.page.scss b/src/app/pages/pendinterest/pendinterest.page.scss index 1c3cf7a..8fd1874 100644 --- a/src/app/pages/pendinterest/pendinterest.page.scss +++ b/src/app/pages/pendinterest/pendinterest.page.scss @@ -2,7 +2,7 @@ ion-content { .back_image { width: 100%; - height: 230px; + height: 130px; .back { font-size: 25px;