diff --git a/src/app/pages/marketdetail/marketdetail.page.ts b/src/app/pages/marketdetail/marketdetail.page.ts index 4b54366..4b2fd90 100644 --- a/src/app/pages/marketdetail/marketdetail.page.ts +++ b/src/app/pages/marketdetail/marketdetail.page.ts @@ -33,9 +33,7 @@ export class MarketdetailPage implements OnInit { ) { this.jobData = this.router.getCurrentNavigation().extras.state; - 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); + //console.log("XXXXX 1", this.router.getCurrentNavigation().extras); this.offer_depend_uid=""; if (this.jobData==undefined){ this.onBack(); @@ -47,13 +45,36 @@ export class MarketdetailPage implements OnInit { const linkedJobList = this.marketDataService.filterDependJob(this.offer_depend_uid); if (linkedJobList?.length> 0){ this.linkedJob = linkedJobList[0]; + this.verifyCompletion(this.offer_depend_uid); } } else{ this.jobOpen= true; } } + reqVerifyResult:any; + verifyCompletion(linkedJobUid:string){ + let linkedJobRedData= { + action:13033, + member_id: this.sessionDataProviderService.member_id, + uid: this.sessionDataProviderService.member_uid, + sessionid: this.sessionDataProviderService.session , + offer_depend_uid: linkedJobUid + }; + + // verifycompleted + // console.log(linkedJobRedData); + this.wrenchService.verifyJobCompleted(linkedJobRedData).subscribe( + reqVerifyResult => { + this.reqVerifyResult = reqVerifyResult; + const completedList = this.reqVerifyResult.result_list.filter((item)=>( item.job_uid == '"+linkedJobUid+"' ) ); + if(completedList?.length > 0 ){ + this.jobOpen= true; + } + } + ); + } interestStatus: boolean= false; interestDate: string ='10-10-2020'; ngOnInit() { @@ -91,13 +112,15 @@ export class MarketdetailPage implements OnInit { duration: 3000, }); - this.reqData = {action:13033, + this.reqData = { + action:13033, member_id: this.sessionDataProviderService.member_id, uid: this.sessionDataProviderService.member_uid, sessionid: this.sessionDataProviderService.session , msg_type: "JOB", offer_code:this.jobData.offer_code, - yourmessage:''} + yourmessage:'' + } loading.present(); this.wrenchService.sendMarketInterest(this.reqData).subscribe( @@ -131,7 +154,7 @@ export class MarketdetailPage implements OnInit { offer_code:this.jobData.offer_code, yourmessage: this.yourmessage } - loading.present(); + await loading.present(); this.wrenchService.sendMarketMessage(this.reqData).subscribe( reqResult => { this.InterestReqResult = reqResult; diff --git a/src/app/services/wrench.service.ts b/src/app/services/wrench.service.ts index 8df5f06..db93667 100644 --- a/src/app/services/wrench.service.ts +++ b/src/app/services/wrench.service.ts @@ -268,6 +268,10 @@ export class WrenchService { sendMarketInterest(reqData){ return this.getPostData("marketinterest", reqData); } + + verifyJobCompleted(reqData){ + return this.getPostData("verifycompleted", reqData); + } sendMarketMessage(reqData){ return this.getPostData("marketmessage", reqData); }