From e580dc6519da9ef9b14a783252cf6af5074a8064 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Fri, 24 Nov 2023 09:27:09 -0500
Subject: [PATCH] active tasks

---
 src/app/pages/activetask/activetask.page.html | 14 ++++-----
 src/app/pages/jobreview/jobreview.page.html   | 31 ++++++++++---------
 src/app/pages/jobreview/jobreview.page.ts     |  2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/src/app/pages/activetask/activetask.page.html b/src/app/pages/activetask/activetask.page.html
index 1908706..6cd8778 100644
--- a/src/app/pages/activetask/activetask.page.html
+++ b/src/app/pages/activetask/activetask.page.html
@@ -22,13 +22,13 @@
                 <!--      <ion-icon slot="end" name="bookmark-outline" color="primary"></ion-icon>-->
             </div>
 
-            <div class="row">
-                <ion-label class="bg_text">{{jobData.contract}}</ion-label>
-                <div class="rate">
-                    <!--        <ion-icon name="star-half-outline" color="warning"></ion-icon>-->
-                    <!--        <ion-label class="review"> ({{jobData.interest_count}} interest)</ion-label>-->
-                </div>
-            </div>
+<!--            <div class="row">-->
+<!--                <ion-label class="bg_text">{{jobData.contract}}</ion-label>-->
+<!--                <div class="rate">-->
+<!--                    &lt;!&ndash;        <ion-icon name="star-half-outline" color="warning"></ion-icon>&ndash;&gt;-->
+<!--                    &lt;!&ndash;        <ion-label class="review"> ({{jobData.interest_count}} interest)</ion-label>&ndash;&gt;-->
+<!--                </div>-->
+<!--            </div>-->
 
             <ion-label class="color_text">Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}}</ion-label>
 
diff --git a/src/app/pages/jobreview/jobreview.page.html b/src/app/pages/jobreview/jobreview.page.html
index 9f3ec6d..d788b42 100644
--- a/src/app/pages/jobreview/jobreview.page.html
+++ b/src/app/pages/jobreview/jobreview.page.html
@@ -26,13 +26,13 @@
         <ion-label class="bold_text">{{jobData.title}}</ion-label>
       </div>
 
-      <div class="row">
-        <ion-label class="bg_text">{{jobData.contract}}</ion-label>
-        <div class="rate">
-          <!--        <ion-icon name="star-half-outline" color="warning"></ion-icon>-->
-          <ion-label class="review"> Due date : {{jobData.delivery_date |date}} </ion-label>
-        </div>
-      </div>
+<!--      <div class="row">-->
+<!--        <ion-label class="bg_text">{{jobData.contract}}</ion-label>-->
+<!--        <div class="rate">-->
+<!--          &lt;!&ndash;        <ion-icon name="star-half-outline" color="warning"></ion-icon>&ndash;&gt;-->
+<!--          <ion-label class="review"> Due date : {{jobData.delivery_date |date}} </ion-label>-->
+<!--        </div>-->
+<!--      </div>-->
 
       <ion-label class="color_text">Price: {{jobData.price*0.01| number : '1.2-2'}} {{jobData.currency}}</ion-label>
 
@@ -43,7 +43,7 @@
         </div>
       </div>
 
-      <ion-card>
+      <ion-card  style="background-color: lavender; margin-bottom: 10px;">
         <ion-card-content>
           This job is in review, you can accept or reject completion.
         </ion-card-content>
@@ -57,17 +57,17 @@
       </ion-card>
 
 
-      <ion-segment [(ngModel)]="tabs">
-        <ion-segment-button value="activities">
-          <ion-label>Activities</ion-label>
-        </ion-segment-button>
+      <ion-segment  class="common_segment" [(ngModel)]="tabs">
         <ion-segment-button value="message">
-          <ion-label>Send Message</ion-label>
+          <ion-label>Response</ion-label>
+        </ion-segment-button>
+        <ion-segment-button value="activities">
+        <ion-label>Activities</ion-label>
         </ion-segment-button>
       </ion-segment>
 
       <div *ngIf="tabs =='activities'" class="lesson">
-            <app-taskactivities [jobData]="jobData"></app-taskactivities>
+
       </div>
 
       <div *ngIf="tabs =='message'" class="lesson">
@@ -87,6 +87,9 @@
         </ion-card>
 
       </div>
+
+      <app-taskactivities [jobData]="jobData"></app-taskactivities>
+
     </div>
 
 
diff --git a/src/app/pages/jobreview/jobreview.page.ts b/src/app/pages/jobreview/jobreview.page.ts
index beba7ac..848c296 100644
--- a/src/app/pages/jobreview/jobreview.page.ts
+++ b/src/app/pages/jobreview/jobreview.page.ts
@@ -11,7 +11,7 @@ import {WrenchService} from "../../services/wrench.service";
 })
 export class JobreviewPage implements OnInit {
   jobData: any;
-  tabs = 'activities';
+  tabs = 'message';
   item_banner:string = 'default.jpg';
   constructor(
       private navctr: NavController,