From 0186c6917785d37be0508a0eeefba80deb147123 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Mon, 4 Dec 2023 07:32:40 -0500
Subject: [PATCH] job actions buttons

---
 src/app/pages/activetask/activetask.page.html | 44 ++++++++++++++-----
 src/app/pages/jobpastdue/jobpastdue.page.html |  8 ++--
 src/app/pages/jobreview/jobreview.page.html   | 10 ++---
 3 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/app/pages/activetask/activetask.page.html b/src/app/pages/activetask/activetask.page.html
index 6cd8778..098b03d 100644
--- a/src/app/pages/activetask/activetask.page.html
+++ b/src/app/pages/activetask/activetask.page.html
@@ -112,21 +112,45 @@
                     <!--                  &lt;!&ndash;        <ion-label class="color">See all</ion-label>&ndash;&gt;-->
                     <!--              </div>-->
 
-                    <ion-card>
-                        <!--                  <ion-card-header>-->
-                        <!--                      <ion-card-subtitle>Completed the task?</ion-card-subtitle>-->
-                        <!--                  </ion-card-header>-->
-
-                        <ion-card-content>
+                    <ion-card  style="background-color: #f4f4fb;
+                    font-weight: bolder;
+                    color:darkblue;
+                    font-size: 10px;">
+                        <ion-card-content style="padding: 2px;">
                             <ion-grid>
                                 <ion-row>
-                                    <ion-col>
-                                        <div color="warning"  class="ion-text-wrap task_button" (click)="taskCancel()">Send cancellation request</div>
+                                    <ion-col style="font-size: 12px;">
+                                        Checking the requirements and delivery details is essential to ensure fast approval.
                                     </ion-col>
-                                    <ion-col>
-                                        <div color="secondary"  class="ion-text-wrap task_button cpl" (click)="taskCompleted()">Send completion Message</div>
+                                </ion-row>
+                                <ion-row>
+                                    <ion-col style="padding: 5px 0px 25px 0px;">
+                                        <ion-button
+                                                color="secondary"
+                                                size="small"
+                                                shape="round"
+                                                expand="block"
+                                                fill="solid"
+                                                (click)="taskCompleted()">Task is Completed</ion-button>
                                     </ion-col>
                                 </ion-row>
+                                <ion-row>
+                                    <ion-col>
+                                        <ion-button
+                                                color="danger"
+                                                size="small"
+                                                shape="round"
+                                                fill="solid"
+                                                (click)="taskCancel()"
+                                        >Cancel Request</ion-button><span
+                                            style="font-size: 12px; color:red;padding-top: 5px;">
+                                        I am not able to perform this task.</span>
+<!--                                        <div color=danger  class="ion-text-wrap task_button" (click)="taskCancel()">Send cancellation request</div>-->
+                                    </ion-col>
+<!--                                    <ion-col>-->
+<!--                                        <div color="secondary"  class="ion-text-wrap task_button cpl" (click)="taskCompleted()">Send completion Message</div>-->
+<!--                                    </ion-col>-->
+                                </ion-row>
                             </ion-grid>
 
                             <ion-label class="description">{{interest_status}}
diff --git a/src/app/pages/jobpastdue/jobpastdue.page.html b/src/app/pages/jobpastdue/jobpastdue.page.html
index 4bbe90b..f74c53f 100644
--- a/src/app/pages/jobpastdue/jobpastdue.page.html
+++ b/src/app/pages/jobpastdue/jobpastdue.page.html
@@ -52,16 +52,16 @@
         <!--      </div>-->
       </div>
 
-      <ion-card>
-        <ion-card-content>
+        <ion-card  style="background-color: #ebebf8; font-weight: bolder; color:darkred">
+            <ion-card-content style="padding: 5px;">
           This task is already past the due date. You can extend the timeline or cancel the job.
         </ion-card-content>
 
         <ion-grid>
           <ion-row>
-            <ion-col><ion-button color="secondary" expand="block" fill="outline" (click)="extendJobDueDate()">Extend Date</ion-button></ion-col>
+            <ion-col><ion-button color="secondary" size="small" shape="round" expand="block" fill="solid" (click)="extendJobDueDate()">Extend Date</ion-button></ion-col>
             <ion-col></ion-col>
-            <ion-col> <ion-button color="danger" expand="block" fill="outline" (click)="cancelThisJob()">Cancel Task</ion-button></ion-col>
+            <ion-col> <ion-button color="danger" size="small" shape="round" expand="block" fill="solid" (click)="cancelThisJob()">Cancel Task</ion-button></ion-col>
           </ion-row>
         </ion-grid>
       </ion-card>
diff --git a/src/app/pages/jobreview/jobreview.page.html b/src/app/pages/jobreview/jobreview.page.html
index 3e5155c..384afaa 100644
--- a/src/app/pages/jobreview/jobreview.page.html
+++ b/src/app/pages/jobreview/jobreview.page.html
@@ -51,15 +51,15 @@
       </div>
 
     <div style=" margin-bottom: 30px;">
-        <ion-card  style="background-color: lavender;">
-            <ion-card-content>
+        <ion-card  style="background-color: #ebebf8; font-weight: bolder; color:darkgreen">
+            <ion-card-content style="padding: 5px;">
                 This job is in review, you can accept or reject completion.
             </ion-card-content>
-            <ion-grid style="background-color: white;">
+            <ion-grid>
                 <ion-row>
-                    <ion-col> <ion-button color="danger" expand="block" fill="outline" (click)="rejectCompletetion()">Reject</ion-button></ion-col>
+                    <ion-col> <ion-button color="danger" size="small" shape="round" expand="block" fill="solid" (click)="rejectCompletetion()">Reject</ion-button></ion-col>
                     <ion-col></ion-col>
-                    <ion-col><ion-button color="secondary" expand="block" fill="solid" (click)="acceptCompletetion()">Accept</ion-button></ion-col>
+                    <ion-col><ion-button color="secondary" size="small" shape="round" expand="block" fill="solid" (click)="acceptCompletetion()">Accept</ion-button></ion-col>
                 </ion-row>
             </ion-grid>
             <div style="color: red; width: 100%; text-align: center;">{{response_result}}</div>