From eb3b15c6f516561c4b288d428dfa691d15673450 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sun, 27 Aug 2023 14:17:24 -0400 Subject: [PATCH] home format --- src/app/pages/activetask/activetask.page.html | 367 +++++++++--------- src/app/pages/home/home.page.html | 20 + src/app/pages/home/home.page.ts | 1 + src/app/pages/mytasks/mytasks.page.ts | 5 +- 4 files changed, 208 insertions(+), 185 deletions(-) diff --git a/src/app/pages/activetask/activetask.page.html b/src/app/pages/activetask/activetask.page.html index 1a450af..e4ca7ec 100644 --- a/src/app/pages/activetask/activetask.page.html +++ b/src/app/pages/activetask/activetask.page.html @@ -1,189 +1,190 @@ -
-
- +
+
+
+ +
+
+
+
+ {{jobData.title}} + +
+ +
+ {{jobData.contract}} +
+ + +
+
+ + Price: {{jobData.price*0.01}} {{jobData.currency}} + +
+
+ + Timeline: {{jobData.timeline_days}} days +
+ + + + +
+ +
+ + + Details + + + Send Updates + + + Actions + + + +
+ + + + + + + + + + + + +
+ Description + {{jobData.job_description}} + + + Delivery Details + {{jobData.description}} + +
+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + Send Updates + {{interest_msg_status}} + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + +
Send cancellation request
+ + +
Send completion Message
+ + + + + {{interest_status}} + + + + + + + + + + + + + + +
+
+ +
+ + + Task is pat due date + + + + Request Extension + + +
+ +
+ + + Task is in Review + + + THis task is in review , the owner will give feedback soon. + +
+ + + + + +
-
- -
-
- {{jobData.title}} - -
- -
- {{jobData.contract}} -
- - -
-
- - Price: {{jobData.price*0.01}} {{jobData.currency}} - -
-
- - Timeline: {{jobData.timeline_days}} days -
- - - - -
- -
- - - Details - - - Send Updates - - - Actions - - - -
- - - - - - - - - - - - -
- Description - {{jobData.job_description}} - - - Delivery Details - {{jobData.description}} - -
- - -
- -
- - - - - - - - - - - - - - - - - - - - Send Updates - {{interest_msg_status}} - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - -
Send cancellation request
- - -
Send completion Message
- - - - - {{interest_status}} - - - - - - - - - - - - - - -
-
- -
- - - Task is pat due date - - - - Request Extension - - -
- -
- - - Task is in Review - - - THis task is in review , the owner will give feedback soon. - -
- - - - - -
diff --git a/src/app/pages/home/home.page.html b/src/app/pages/home/home.page.html index 9e766b3..00a7225 100644 --- a/src/app/pages/home/home.page.html +++ b/src/app/pages/home/home.page.html @@ -107,6 +107,26 @@
--> +
+ + + + Jobs + + + + + + + + + + + + + + +
diff --git a/src/app/pages/home/home.page.ts b/src/app/pages/home/home.page.ts index 67e7020..1531e57 100644 --- a/src/app/pages/home/home.page.ts +++ b/src/app/pages/home/home.page.ts @@ -13,6 +13,7 @@ import { WrenchService } from 'src/app/services/wrench.service'; export class HomePage implements OnInit { firstname: string = ''; + have_jobs:number = 0; blogData: []; constructor( diff --git a/src/app/pages/mytasks/mytasks.page.ts b/src/app/pages/mytasks/mytasks.page.ts index 6f1fc3f..2924176 100644 --- a/src/app/pages/mytasks/mytasks.page.ts +++ b/src/app/pages/mytasks/mytasks.page.ts @@ -78,8 +78,9 @@ export class MytasksPage implements OnInit { this.jobsPastDueData =AllResult.filter((item) => item.status_description == 'PASTDUE') this.jobsInReviewData =AllResult.filter((item) => item.status_description == 'REVIEW') this.active_job_count = this.jobsData.length; - this.review_job_count = this.jobsPastDueData.length; - this.pastdue_job_count = this.jobsInReviewData.length; + this.review_job_count = this.jobsInReviewData.length; + this.pastdue_job_count = this.jobsPastDueData.length; + // debugger; } ); }