From 23c47623479ff769bb85dc984765c1d8b4e02120 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ses66181@gmail.com>
Date: Sat, 9 Apr 2022 12:53:16 -0400
Subject: [PATCH] fix

---
 www/application/controllers/Proj.php          |  7 +-
 www/application/views/jobs/common/jobside.php | 14 ++--
 .../views/jobs/view_completejob.php           | 68 ++++++++++++-------
 www/application/views/jobs/view_manage.php    |  4 +-
 4 files changed, 58 insertions(+), 35 deletions(-)

diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php
index 2e574be9..ae03ca62 100644
--- a/www/application/controllers/Proj.php
+++ b/www/application/controllers/Proj.php
@@ -912,9 +912,10 @@ $data = $this->getSessionArray();
 
 
 
-            $this->load->view('users/view_header_user', $data);
-            $this->load->view('jobs/view_completejob', $data);
-            $this->load->view('users/view_footer_user', $data);
+          //  $this->load->view('users/view_header_user', $data);
+           // $this->load->view('jobs/view_completejob', $data);
+           // $this->load->view('users/view_footer_user', $data);
+            $this->renderSecurePage('jobs/view_completejob', $data);
         }
     }
 
diff --git a/www/application/views/jobs/common/jobside.php b/www/application/views/jobs/common/jobside.php
index 5aadb8f7..f2abc1e8 100644
--- a/www/application/views/jobs/common/jobside.php
+++ b/www/application/views/jobs/common/jobside.php
@@ -1,18 +1,16 @@
 <!--begin::Col-->
 <div class="col-xl-3">
 
-
-        <div class="card card-xl-stretch mb-xl-8">
+        <div class="card card-xl-stretch mb-xl-8" >
             <!--begin::Header-->
             <div class="card-header border-0 bg-info py-5">
                 <h3 class="card-title fw-bolder text-white">Jobs</h3>
-
             </div>
             <!--end::Header-->
             <!--begin::Body-->
             <div class="card-body p-0">
                 <!--begin::Chart-->
-                <div class="mixed-widget-2-chart card-rounded-bottom bg-info" data-kt-color="info" style="height: 200px; min-height: 200px;">
+                <div class="mixed-widget-2-chart card-rounded-bottom bg-info" data-kt-color="info" style="height: 100px; min-height: 100px;">
                 </div>
                 <!--end::Chart-->
                 <!--begin::Stats-->
@@ -31,7 +29,7 @@
 																</svg>
 															</span>
                             <!--end::Svg Icon-->
-                            <a href="#" class="text-warning fw-bold fs-6">Weekly Sales</a>
+                            <a href="/jobs/manage" class="text-warning fw-bold fs-6">My Jobs</a>
                         </div>
                         <!--end::Col-->
                         <!--begin::Col-->
@@ -44,7 +42,7 @@
 																</svg>
 															</span>
                             <!--end::Svg Icon-->
-                            <a href="#" class="text-primary fw-bold fs-6">New Projects</a>
+                            <a href="/jobs/startcreate" class="text-primary fw-bold fs-6">New Job</a>
                         </div>
                         <!--end::Col-->
                     </div>
@@ -61,7 +59,7 @@
 																</svg>
 															</span>
                             <!--end::Svg Icon-->
-                            <a href="#" class="text-danger fw-bold fs-6 mt-2">Item Orders</a>
+                            <a href="/proj/pastdue" class="text-danger fw-bold fs-6 mt-2">Past due</a>
                         </div>
                         <!--end::Col-->
                         <!--begin::Col-->
@@ -74,7 +72,7 @@
 																</svg>
 															</span>
                             <!--end::Svg Icon-->
-                            <a href="#" class="text-success fw-bold fs-6 mt-2">Bug Reports</a>
+                            <a href="/proj/complete" class="text-success fw-bold fs-6 mt-2">History</a>
                         </div>
                         <!--end::Col-->
                     </div>
diff --git a/www/application/views/jobs/view_completejob.php b/www/application/views/jobs/view_completejob.php
index 6c7b9963..6555e227 100644
--- a/www/application/views/jobs/view_completejob.php
+++ b/www/application/views/jobs/view_completejob.php
@@ -13,30 +13,52 @@
     }
     // -->
 </script>
-<div class="content-wrapper">
-    <!-- Quick stats boxes -->
-    <?php include('common/jobstrip.php'); ?>
-    <!-- /quick stats boxes -->
+<?php include('common/jobstrip.php'); ?>
 
-    <!-- Marketing campaigns -->
-    <div class="panel panel-flat">
-                <div class="panel-heading">
-           
-               <h5> Completed Job(s)/Task(s)</h5>
-            
-        </div>
-        
-        <div class="panel-heading" style="height: 550px;">
-            <div class="table-responsive">  
-                <?php echo $job_table ?>
 
+<!--begin::Row-->
+<div class="row g-5 g-xl-8">
+
+    <?php include('common/jobside.php'); ?>
+    <!--begin::Col-->
+    <div class="col-xl-9">
+        <!--begin::Tables Widget 5-->
+        <div class="card card-xl-stretch mb-5 mb-xl-8">
+            <!--begin::Header-->
+            <div class="card-header border-0 pt-5">
+                <h3 class="card-title align-items-start flex-column">
+                    Completed Job(s)/Task(s)
+                </h3>
+                <div class="card-toolbar">
+
+                </div>
             </div>
-             <div class="panel-heading">
-            <?php echo $links; ?>
-        </div>
-        </div>
-    </div>
-    <!-- /marketing campaigns -->
-</div>
-<!-- /main content -->
+            <!--end::Header-->
+
+
+            <!--begin::Body-->
+            <div class="card-body py-3">
+                <div class="tab-content">
+                    <!--begin::Tap pane-->
+                    <div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
+                        <!--begin::Table container-->
+                        <?php echo $job_table ?>
+                        <!--end::Table-->
+                    </div>
+                    <!--end::Tap pane-->
+                    <?php echo $links; ?>
+                </div>
+            </div>
+            <!--end::Body-->
+        </div>
+        <!--end::Tables Widget 5-->
+    </div>
+    <!--end::Col-->
+
+</div>
+<!--end::Row-->
+
+
+
+
 
diff --git a/www/application/views/jobs/view_manage.php b/www/application/views/jobs/view_manage.php
index cd2ba895..5c5c7540 100644
--- a/www/application/views/jobs/view_manage.php
+++ b/www/application/views/jobs/view_manage.php
@@ -26,6 +26,8 @@
 
 <!--begin::Row-->
 <div class="row g-5 g-xl-8">
+
+    <?php include('common/jobside.php'); ?>
     <!--begin::Col-->
     <div class="col-xl-9">
         <!--begin::Tables Widget 5-->
@@ -77,7 +79,7 @@
         <!--end::Tables Widget 5-->
     </div>
     <!--end::Col-->
-   <?php include('common/jobside.php'); ?>
+
 </div>
 <!--end::Row-->