diff --git a/src/app/components/interest-card/interest-card.component.html b/src/app/components/interest-card/interest-card.component.html index fcca5f9..9cbb1fb 100644 --- a/src/app/components/interest-card/interest-card.component.html +++ b/src/app/components/interest-card/interest-card.component.html @@ -14,55 +14,39 @@ Interest Date : {{intData.sent | date}} + + + {{job_hx_button}} + - + + - -
-
Job History
- Completed : {{intData.client_jobs_completed}} - Active : {{intData.client_jobs_active}} - Pending : {{intData.client_offers_pending}} - Uncompleted : {{intData.client_jobs_missed}} +
+ Completed : {{job_completed}} + Active : {{job_active}} + % Completed : {{job_percent_complete}}
- - - - - - - - - - - - - - - - - - +
+ Last Complt. : {{job_last_date}} + Uncompleted : {{job_uncompleted}} + Pending : {{job_pending}} +
+ + - - - - Approve Start - - - - Reject - - - - - - - + + + + + Reject + + + Approve Start \ No newline at end of file diff --git a/src/app/components/interest-card/interest-card.component.scss b/src/app/components/interest-card/interest-card.component.scss index 9d9f910..305ac8d 100644 --- a/src/app/components/interest-card/interest-card.component.scss +++ b/src/app/components/interest-card/interest-card.component.scss @@ -18,12 +18,12 @@ .job-hx{ background-color: white; border-radius: 10px; - font-size: 14px; + font-size: 12px; font-weight: bolder; color:black; ion-label{ font-weight: bold; - font-size: 14px; + font-size: 12px; margin-left: 20px; color:rebeccapurple; } diff --git a/src/app/components/interest-card/interest-card.component.ts b/src/app/components/interest-card/interest-card.component.ts index ccb8244..50c716a 100644 --- a/src/app/components/interest-card/interest-card.component.ts +++ b/src/app/components/interest-card/interest-card.component.ts @@ -1,5 +1,5 @@ import {Component, Input, OnInit} from '@angular/core'; -import {NavController} from "@ionic/angular"; +import {AlertController, LoadingController, NavController} from "@ionic/angular"; import {Router} from "@angular/router"; import {SessionDataProviderService} from "../../store/session-data-provider.service"; import {WrenchService} from "../../services/wrench.service"; @@ -17,7 +17,9 @@ currData:any; constructor( private navctr: NavController, private router: Router, public sessionDataProviderService: SessionDataProviderService, - private wrenchService: WrenchService) { + private wrenchService: WrenchService, + private alertController: AlertController, + private loadingCtrl: LoadingController) { } @@ -28,6 +30,67 @@ currData:any; } + job_active: string= "0"; // 1 (length=1) + job_completed: string= "0"; // 7 (length=1) + job_last_date: string= "0"; // 2023-11-28 (length=10) + job_pending: string= "0"; // 1 (length=1) + job_percent_complete: string= "0"; // 58 (length=3) + job_rejected: string= "0"; // 0 (length=1) + job_uncompleted: string= "0"; // 0 (length=1) + + job_hx_button :string = "Open Job History"; + job_hx_open:boolean = false; + statsResult:any; + + reqStatsData: { + action:number, + uid: string, + sessionid: string, + interest_uid: string, + client_uid: number + }; + async jobHx(intDataR){ + + if ( this.job_hx_open==true) { + this.job_hx_open = false; + this.job_hx_button = "Open Job History"; + return 0; + } + + const loading = await this.loadingCtrl.create({ + message: 'Loading...', + duration: 5000, + }); + + this.reqStatsData = { + action:13024, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session, + interest_uid: this.intData.interest_uid, + client_uid: this.intData.client_uid, + }; + await loading.present(); + this.wrenchService.interestStats(this.reqStatsData).subscribe( + statsResult => { + loading.dismiss(); + this.statsResult = statsResult; + console.log("assigResult RETURN->", this.statsResult); + if ( this.statsResult != undefined ){ + this.job_hx_button = "Close Job History"; + this.job_hx_open = true; + this.job_active= this.statsResult.job_active; // 1 (length=1) + this.job_completed= this.statsResult.job_completed; // 7 (length=1) + this.job_last_date= this.statsResult.job_last_date; // 2023-11-28 (length=10) + this.job_pending= this.statsResult.job_pending; // 1 (length=1) + this.job_percent_complete= this.statsResult.job_percent_complete; // 58 (length=3) + this.job_rejected= this.statsResult.job_rejected; // 0 (length=1) + this.job_uncompleted= this.statsResult.job_uncompleted; // 0 (length=1) + } + } + ); + + } + async approveStart(intDataR){ var reqData = { diff --git a/src/app/pages/jobinterest/jobinterest.page.html b/src/app/pages/jobinterest/jobinterest.page.html index 1f2af5c..2e67362 100644 --- a/src/app/pages/jobinterest/jobinterest.page.html +++ b/src/app/pages/jobinterest/jobinterest.page.html @@ -20,46 +20,9 @@
Jobs Interest -
-
- .... -
- - -
-
- - - -
- - - - - - - - - - - - -
- - -
-
- - -
- - - - -
@@ -68,7 +31,7 @@
{{item.title}} {{item.description}} - {{item.client_name}} : {{item.offer_code}} {{item.price*0.01}} {{item.currency}} + {{item.client_name}} : {{item.price*0.01 | number : '1.2-2'}} {{item.currency}} Expire: {{item.expire}}
@@ -76,49 +39,8 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
\ No newline at end of file diff --git a/src/app/pages/jobintprocess/jobintprocess.page.html b/src/app/pages/jobintprocess/jobintprocess.page.html index c519985..7e17dc7 100644 --- a/src/app/pages/jobintprocess/jobintprocess.page.html +++ b/src/app/pages/jobintprocess/jobintprocess.page.html @@ -23,25 +23,36 @@ -
- {{jobData.offer_code}} -
- - ({{jobData.interest_count}} interest) -
-
+ + + + + + + - Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}} + + + + + + + + + Reward : {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency_code}}
Timeline: {{jobData.timeline_days}} days
+
+ + Interest:{{jobData.interest_count}} +
- diff --git a/src/app/pages/jobintprocess/jobintprocess.page.scss b/src/app/pages/jobintprocess/jobintprocess.page.scss index 5200b68..f18e106 100644 --- a/src/app/pages/jobintprocess/jobintprocess.page.scss +++ b/src/app/pages/jobintprocess/jobintprocess.page.scss @@ -13,6 +13,10 @@ ion-content { } } + .job-hx-part{ + font-size: 12px; + font-weight: normal; + } .flex { display: flex; justify-content: space-between; diff --git a/src/app/pages/jobintprocess/jobintprocess.page.ts b/src/app/pages/jobintprocess/jobintprocess.page.ts index 9b01679..db1df37 100644 --- a/src/app/pages/jobintprocess/jobintprocess.page.ts +++ b/src/app/pages/jobintprocess/jobintprocess.page.ts @@ -28,6 +28,7 @@ export class JobintprocessPage implements OnInit { console.log("XXXXX 1", this.router.getCurrentNavigation().extras); console.log("XXXXX 2", this.router.getCurrentNavigation().extras.state); //console.log("XXXXX 3", this.router.getCurrentNavigation().extras.state.ID); + // debugger; if (this.jobData==undefined){ this.onBack(); } diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index 5911425..7cad653 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -179,6 +179,10 @@ export class WrenchService { return this.getPostData("assigntask", reqData); } + interestStats(reqData){ + return this.getPostData("intereststats", reqData); + } + marketMessages(reqData){ return this.getPostData("message", reqData); }