From d856a9c0c3db22650f04bdceccdfe7eff341d865 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Tue, 7 Nov 2023 23:29:04 -0500
Subject: [PATCH] page clean

---
 src/app/pages/joblist/joblist.page.html       | 26 +++++++++-----
 src/app/pages/jobmanager/jobmanager.page.html | 36 ++++++++++++-------
 src/app/pages/jobmanager/jobmanager.page.ts   |  6 ++--
 src/app/pages/mycoupons/mycoupons.page.html   | 14 ++++----
 src/app/pages/payment/payment.page.html       | 14 ++++----
 .../pendingoffers/pendingoffers.page.html     | 26 +++++++++-----
 6 files changed, 76 insertions(+), 46 deletions(-)

diff --git a/src/app/pages/joblist/joblist.page.html b/src/app/pages/joblist/joblist.page.html
index 8eea4e7..3dcf577 100644
--- a/src/app/pages/joblist/joblist.page.html
+++ b/src/app/pages/joblist/joblist.page.html
@@ -1,8 +1,18 @@
+<ion-header mode="ios" class="ion-no-border">
+  <ion-toolbar>
+    <ion-buttons slot="start" (click)="onBack()">
+      <ion-button>
+        <ion-icon name="arrow-back-outline"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-title>My Jobs</ion-title>
+  </ion-toolbar>
+</ion-header>
 
 <ion-content>
   <div class="bg_image back_image" [style.backgroundImage]="'url(https://www.wrenchboard.com/assets/images/apps/joblist.jpg)'">
     <div class="ion-padding">
-      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
+<!--      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>-->
     </div>
   </div>
   <div class="boxed_contents">
@@ -73,10 +83,10 @@
 
 </ion-content>
 
-<ion-footer>
-  <ion-toolbar>
-    <div class="button" (click)="onBack()">
-      <ion-label class="text">Return</ion-label>
-    </div>
-  </ion-toolbar>
-</ion-footer>
+<!--<ion-footer>-->
+<!--  <ion-toolbar>-->
+<!--    <div class="button" (click)="onBack()">-->
+<!--      <ion-label class="text">Return</ion-label>-->
+<!--    </div>-->
+<!--  </ion-toolbar>-->
+<!--</ion-footer>-->
diff --git a/src/app/pages/jobmanager/jobmanager.page.html b/src/app/pages/jobmanager/jobmanager.page.html
index 0d47e10..aefc3e9 100644
--- a/src/app/pages/jobmanager/jobmanager.page.html
+++ b/src/app/pages/jobmanager/jobmanager.page.html
@@ -1,18 +1,28 @@
+<ion-header mode="ios" class="ion-no-border">
+  <ion-toolbar>
+    <ion-buttons slot="start" (click)="onBack()">
+      <ion-button>
+        <ion-icon name="arrow-back-outline"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-title>Jobs Manager</ion-title>
+  </ion-toolbar>
+</ion-header>
 
 <ion-content>
   <div class="bg_image back_image" [style.backgroundImage]="'url(assets/images/jobmanager.jpg)'">
     <div class="ion-padding">
-      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
+<!--      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>-->
     </div>
   </div>
 
   <div class="ion-padding">
     <div class="boxed_contents">
 
-      <div class="flex">
-        <ion-label class="bold_text">Jobs Manager</ion-label>
-        <!--      <ion-icon slot="end" name="bookmark-outline" color="primary"></ion-icon>-->
-      </div>
+<!--      <div class="flex">-->
+<!--        <ion-label class="bold_text">Jobs Manager</ion-label>-->
+<!--        &lt;!&ndash;      <ion-icon slot="end" name="bookmark-outline" color="primary"></ion-icon>&ndash;&gt;-->
+<!--      </div>-->
 
 <!--      <div class="row">-->
 <!--        <ion-label class="bg_text">.....</ion-label>-->
@@ -55,7 +65,7 @@
         </div>
       </div>
 
-      <ion-segment [(ngModel)]="tabs">
+      <ion-segment class="common_segment" [(ngModel)]="tabs">
         <ion-segment-button value="active">
           <ion-label>Active ({{total_active}})</ion-label>
         </ion-segment-button>
@@ -135,10 +145,10 @@
   </div>
 </ion-content>
 
-<ion-footer>
-  <ion-toolbar>
-    <div class="button" (click)="onBack()">
-      <ion-label class="text">Return</ion-label>
-    </div>
-  </ion-toolbar>
-</ion-footer>
+<!--<ion-footer>-->
+<!--  <ion-toolbar>-->
+<!--    <div class="button" (click)="onBack()">-->
+<!--      <ion-label class="text">Return</ion-label>-->
+<!--    </div>-->
+<!--  </ion-toolbar>-->
+<!--</ion-footer>-->
diff --git a/src/app/pages/jobmanager/jobmanager.page.ts b/src/app/pages/jobmanager/jobmanager.page.ts
index 08d271e..40a5097 100644
--- a/src/app/pages/jobmanager/jobmanager.page.ts
+++ b/src/app/pages/jobmanager/jobmanager.page.ts
@@ -96,15 +96,15 @@ menuData:any;
           switch (job_mode){
             case "ACTIVE":
               this.jobManagerActiveData = this.jobManagerActiveTotalData.result_list;
-              this.total_active = this.jobManagerActiveData.length;
+              this.total_active = this.jobManagerActiveData?.length;
               break;
             case "PASTDUE":
               this.jobManagerPastDueData = this.jobManagerActiveTotalData.result_list;
-              this.total_pastdue = this.jobManagerPastDueData.length;
+              this.total_pastdue = this.jobManagerPastDueData?.length;
               break;
             case "REVIEW":
               this.jobManagerReviewData = this.jobManagerActiveTotalData.result_list;
-              this.total_review = this.jobManagerReviewData.length;
+              this.total_review = this.jobManagerReviewData?.length;
               break;
           }
           console.log("getManagerJobsData RETURN DATA->", this.jobManagerActiveData);
diff --git a/src/app/pages/mycoupons/mycoupons.page.html b/src/app/pages/mycoupons/mycoupons.page.html
index 8ca377e..ec8303b 100644
--- a/src/app/pages/mycoupons/mycoupons.page.html
+++ b/src/app/pages/mycoupons/mycoupons.page.html
@@ -207,10 +207,10 @@
 
 </ion-content>
 
-<ion-footer>
-  <ion-toolbar>
-    <div class="button" (click)="onBack()">
-      <ion-label class="text">Return</ion-label>
-    </div>
-  </ion-toolbar>
-</ion-footer>
+<!--<ion-footer>-->
+<!--  <ion-toolbar>-->
+<!--    <div class="button" (click)="onBack()">-->
+<!--      <ion-label class="text">Return</ion-label>-->
+<!--    </div>-->
+<!--  </ion-toolbar>-->
+<!--</ion-footer>-->
diff --git a/src/app/pages/payment/payment.page.html b/src/app/pages/payment/payment.page.html
index 791cae7..2fd53ea 100644
--- a/src/app/pages/payment/payment.page.html
+++ b/src/app/pages/payment/payment.page.html
@@ -160,10 +160,10 @@
 
 </ion-content>
 
-<ion-footer>
-  <ion-toolbar>
-    <div class="button" (click)="onBack()">
-      <ion-label class="text"> Return</ion-label>
-    </div>
-  </ion-toolbar>
-</ion-footer>
+<!--<ion-footer>-->
+<!--  <ion-toolbar>-->
+<!--    <div class="button" (click)="onBack()">-->
+<!--      <ion-label class="text"> Return</ion-label>-->
+<!--    </div>-->
+<!--  </ion-toolbar>-->
+<!--</ion-footer>-->
diff --git a/src/app/pages/pendingoffers/pendingoffers.page.html b/src/app/pages/pendingoffers/pendingoffers.page.html
index 68e5ccd..d535b4c 100644
--- a/src/app/pages/pendingoffers/pendingoffers.page.html
+++ b/src/app/pages/pendingoffers/pendingoffers.page.html
@@ -1,6 +1,16 @@
+<ion-header mode="ios" class="ion-no-border">
+  <ion-toolbar>
+    <ion-buttons slot="start" (click)="onBack()">
+      <ion-button>
+        <ion-icon name="arrow-back-outline"></ion-icon>
+      </ion-button>
+    </ion-buttons>
+    <ion-title>Pending Offers</ion-title>
+  </ion-toolbar>
+</ion-header>
 
 <ion-content>
-      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>
+<!--      <ion-icon slot="start" name="arrow-back" class="back" (click)="onBack()"></ion-icon>-->
 
 
   <div class="ion-padding">
@@ -57,10 +67,10 @@
   </div>
 </ion-content>
 
-<ion-footer>
-  <ion-toolbar>
-    <div class="button" (click)="onBack()">
-      <ion-label class="text">Return</ion-label>
-    </div>
-  </ion-toolbar>
-</ion-footer>
+<!--<ion-footer>-->
+<!--  <ion-toolbar>-->
+<!--    <div class="button" (click)="onBack()">-->
+<!--      <ion-label class="text">Return</ion-label>-->
+<!--    </div>-->
+<!--  </ion-toolbar>-->
+<!--</ion-footer>-->