-
-
{{jobData?.title}}
-
+
-
-
-
-
-
-
-
-
Reward : {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency_code}}
@@ -48,6 +37,23 @@
+
+
+
This task depends on the task below
+
{{linkedJob.title}}
+
Description
+
{{linkedJob.description}}
+
Delivery Details
+
{{linkedJob.description}}
+
+
+ Return
+
+
+
+
+
+
Are you interested in the task?
@@ -61,9 +67,6 @@
-
-
-
Task Details
@@ -73,7 +76,6 @@
Have questions ?
-
@@ -138,64 +140,39 @@
-
-
- Send Message to Task Owner?
-
+
+
+ Send Message to Task Owner?
+
-
+
-
-
-
-
-
-
-
-
- Send Message
-
-
-
-
-
- {{interest_msg_status}}
-
+
+
+
+
+
+
+
+
+ Send Message
+
+
+
+
+
+ {{interest_msg_status}}
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/src/app/pages/marketdetail/marketdetail.page.ts b/src/app/pages/marketdetail/marketdetail.page.ts
index af1548a..4b54366 100644
--- a/src/app/pages/marketdetail/marketdetail.page.ts
+++ b/src/app/pages/marketdetail/marketdetail.page.ts
@@ -4,6 +4,7 @@ import {Router} from "@angular/router";
import { WrenchService } from 'src/app/services/wrench.service';
import {SessionDataProviderService} from "../../store/session-data-provider.service";
import {WaitingInterestService} from "../../store/waiting-interest.service";
+import {MarketDataService} from "../../store/market-data.service";
@Component({
@@ -17,26 +18,40 @@ export class MarketdetailPage implements OnInit {
session_image_server:string='';
curr_session:string='';
offer_code:string='';
-
+ offer_depend_uid:string="";
+ linkedJob:[];
jobData: any;
+ jobOpen:boolean =false;
constructor(
private navctr: NavController,
private router: Router,
public sessionDataProviderService: SessionDataProviderService,
private wrenchService: WrenchService,
+ public marketDataService:MarketDataService,
private waitingInterestService:WaitingInterestService,
private loadingCtrl: LoadingController
) {
this.jobData = this.router.getCurrentNavigation().extras.state;
- //debugger;
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);
+ this.offer_depend_uid="";
if (this.jobData==undefined){
this.onBack();
}
this.offer_code = this.jobData.offer_code;
+ this.offer_depend_uid = this.jobData.offer_depend_uid;
+
+ if ( this.offer_depend_uid !=''){
+ const linkedJobList = this.marketDataService.filterDependJob(this.offer_depend_uid);
+ if (linkedJobList?.length> 0){
+ this.linkedJob = linkedJobList[0];
+ }
+ }
+ else{
+ this.jobOpen= true;
+ }
}
interestStatus: boolean= false;
diff --git a/src/app/pages/my-course/my-course.page.html b/src/app/pages/my-course/my-course.page.html
index 41cf83a..f313859 100644
--- a/src/app/pages/my-course/my-course.page.html
+++ b/src/app/pages/my-course/my-course.page.html
@@ -30,7 +30,11 @@
-
+
+
{{item.price*0.01| number : '1.2-2'}} {{item.currency_code}}
Timeline: {{item.timeline_days}} days
diff --git a/src/app/pages/my-course/my-course.page.scss b/src/app/pages/my-course/my-course.page.scss
index 12147c8..36bd1e7 100644
--- a/src/app/pages/my-course/my-course.page.scss
+++ b/src/app/pages/my-course/my-course.page.scss
@@ -18,6 +18,7 @@ ion-content {
width: 50px;
border-radius: 100%;
min-width: 50px;
+ background-color: aliceblue;
}
.content {
background-color: white;
diff --git a/src/app/pages/my-course/my-course.page.ts b/src/app/pages/my-course/my-course.page.ts
index 77814cb..3e3d231 100644
--- a/src/app/pages/my-course/my-course.page.ts
+++ b/src/app/pages/my-course/my-course.page.ts
@@ -43,6 +43,7 @@ export class MyCoursePage implements OnInit {
this.jobsData = this.marketDataService.jobsData;
}
+
/*
getJobsData - refresh from central call - not direct call to API
*/
diff --git a/src/app/pages/ownersjob/ownersjob.page.html b/src/app/pages/ownersjob/ownersjob.page.html
index 255759e..e16deb4 100644
--- a/src/app/pages/ownersjob/ownersjob.page.html
+++ b/src/app/pages/ownersjob/ownersjob.page.html
@@ -66,15 +66,15 @@
Depends on
+ label="Depends on task"
+ value="{{depend_uid}}">
None
- {{item.title}}
+ {{item.title}}
diff --git a/src/app/pages/ownersjob/ownersjob.page.ts b/src/app/pages/ownersjob/ownersjob.page.ts
index 20c0916..034b1d3 100644
--- a/src/app/pages/ownersjob/ownersjob.page.ts
+++ b/src/app/pages/ownersjob/ownersjob.page.ts
@@ -41,6 +41,7 @@ export class OwnersjobPage implements OnInit {
this.onBack();
}
this.depend_uid = this.jobData.depend_uid;
+ console.log("DEPEND UID == > " ,this.depend_uid)
// debugger;
this.socketToolsService.joinSocketRoom("full-markets-jobs" );
this.socketToolsService.joinSocketRoom("market" );
diff --git a/src/app/store/market-data.service.ts b/src/app/store/market-data.service.ts
index 2f943e9..d509dd2 100644
--- a/src/app/store/market-data.service.ts
+++ b/src/app/store/market-data.service.ts
@@ -15,6 +15,12 @@ export class MarketDataService {
action:11200, member_id: number, uid: string, sessionid: string, limit: number, page:1
};
+ filterDependJob(offer_depend_uid){
+ return this.jobsData.filter(
+ (item:any) => (item.job_uid == offer_depend_uid)
+ );
+ }
+
jobsTotalData:any;
jobsData: [];
getJobsData(){