From efd5647d64700687b977e67e3c0f7fb9e2ed782e Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ses66181@gmail.com>
Date: Sun, 31 Jul 2022 13:01:42 -0400
Subject: [PATCH] fix

---
 www/application/controllers/Proj.php          |  6 ++
 .../libraries/Users_Controller.php            |  2 +-
 .../compo/active_jobs/active_jobs_nojob.php   | 35 +++++++++
 .../compo/active_jobs/active_jobs_table.php   | 47 ++++++++++++
 .../views/compo/comp_active_jobs.php          | 54 ++------------
 .../views/compo/compo_msg4_accord.php         |  2 +-
 .../views/jobs/uploads/file_table.php         |  9 +--
 www/application/views/jobs/view_activejob.php | 73 +------------------
 .../views/jobs/view_manageinterest_modal.php  | 46 ++++++++----
 9 files changed, 133 insertions(+), 141 deletions(-)
 create mode 100644 www/application/views/compo/active_jobs/active_jobs_nojob.php
 create mode 100644 www/application/views/compo/active_jobs/active_jobs_table.php

diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php
index b24fb4b1..d147b137 100644
--- a/www/application/controllers/Proj.php
+++ b/www/application/controllers/Proj.php
@@ -1087,6 +1087,12 @@ class Proj extends Users_Controller {
         return array($result, $uploaded);
     }
 
+    public function demo() {
+        $data = $this->getSessionArray();
+
+        $this->renderSecurePage('jobs/view_demo', $data);
+    }
+
     public function upload() {
         $data = $this->getSessionArray();
         
diff --git a/www/application/libraries/Users_Controller.php b/www/application/libraries/Users_Controller.php
index 054b1719..193d5889 100644
--- a/www/application/libraries/Users_Controller.php
+++ b/www/application/libraries/Users_Controller.php
@@ -30,7 +30,7 @@ class Users_Controller extends WRB_Controller {
 
 
         $jbx = "''/proj/thisjob''";
-        $mysql = "SELECT  '<b>ID:</b><a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br><b>Timeline:</b>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01  AS Project,"
+        $mysql = "SELECT  '<a href=\"#\" onclick=\"showJobModal('''||mc.contract||''');\" >'||mc.contract||'</a><br>'||mc.timeline_days||' day(s)<br><b>Price:</b>'||mc.price*0.01  AS Project,"
             . " '<b>Title: </b>'||mc.title||'<br><b>Description: </b>'||mc.description AS description,'\/proj\/thisjob' AS qpath, mc.id AS offer_id,"
             . " (CASE WHEN mc.status=4 THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\"  name=\"manage\" class=\"btn btn-info btn-xs btn-block\" value=\"Review\">' "
             . " WHEN mc.status = 1 AND mc.delivery_date > now() THEN '<input type=submit onclick=\"return post_nav_find_action($jbx, '||mc.id||')\"  name=\"manage\" class=\"btn btn-success btn-xs btn-block\" value=\"View\">' "
diff --git a/www/application/views/compo/active_jobs/active_jobs_nojob.php b/www/application/views/compo/active_jobs/active_jobs_nojob.php
new file mode 100644
index 00000000..3e1002d8
--- /dev/null
+++ b/www/application/views/compo/active_jobs/active_jobs_nojob.php
@@ -0,0 +1,35 @@
+<!--begin::Content-->
+<div class="content d-flex flex-column flex-column-fluid" id="kt_content">
+    <!--begin::Post-->
+    <div class="post d-flex flex-column-fluid" id="kt_post">
+        <!--begin::Container-->
+        <div id="kt_content_container" class="container-xxl">
+            <!--begin::Card-->
+            <div class="card">
+                <!--begin::Card body-->
+                <div class="card-body">
+                    <!--begin::Heading-->
+                    <div class="card-px text-center pt-15 pb-15">
+                        <!--begin::Title-->
+                        <h2 class="fs-2x fw-bolder mb-0">No Current active job or tasks</h2>
+                        <!--end::Title-->
+                        <!--begin::Description-->
+                        <p class="text-gray-400 fs-4 fw-bold py-7">Click on the below buttons to
+                            <br />search jobs.</p>
+                        <!--end::Description-->
+                        <!--begin::Action-->
+                        <a href="/jobs/market" class="btn btn-primary btn-sm er fs-6 px-8 py-4" >Browse Jobs</a>
+                        <!--end::Action-->
+                    </div>
+                    <!--end::Heading-->
+
+                </div>
+                <!--end::Card body-->
+            </div>
+            <!--end::Card-->
+        </div>
+        <!--end::Container-->
+    </div>
+    <!--end::Post-->
+</div>
+<!--end::Content-->
\ No newline at end of file
diff --git a/www/application/views/compo/active_jobs/active_jobs_table.php b/www/application/views/compo/active_jobs/active_jobs_table.php
new file mode 100644
index 00000000..e16ca7ae
--- /dev/null
+++ b/www/application/views/compo/active_jobs/active_jobs_table.php
@@ -0,0 +1,47 @@
+<table class="table table-row-dashed table-row-gray-200 align-middle gs-0 gy-4">
+    <!--begin::Table head-->
+    <thead>
+    <tr class="border-0">
+        <th class="p-0 min-w-180px">Job</th>
+        <th class="p-0 min-w-180px">Title/Description</th>
+        <th class="p-0 min-w-90px">Status</th>
+        <th class="p-0 min-w-50px"></th>
+    </tr>
+    </thead>
+    <!--end::Table head-->
+    <!--begin::Table body-->
+    <tbody>
+    <?php
+    foreach ($job_table_result as $row)
+    {
+        ?>
+        <tr>
+
+            <td>
+                <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">  <?= $row->project ?></a>
+            </td>
+            <td><?= $row->description ?></td>
+            <td class="text-end">
+                <span class="badge badge-light-success"></span>
+            </td>
+            <td class="text-end">
+                <a href="#" onclick="return post_nav_find_action('<?=$row->qpath?>','<?=$row->offer_id?>')"  class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
+                    <!--begin::Svg Icon | path: icons/duotune/arrows/arr064.svg-->
+                    <span class="svg-icon svg-icon-2">
+                                                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                                                    <rect opacity="0.5" x="18" y="13" width="13" height="2" rx="1" transform="rotate(-180 18 13)" fill="black" />
+                                                    <path d="M15.4343 12.5657L11.25 16.75C10.8358 17.1642 10.8358 17.8358 11.25 18.25C11.6642 18.6642 12.3358 18.6642 12.75 18.25L18.2929 12.7071C18.6834 12.3166 18.6834 11.6834 18.2929 11.2929L12.75 5.75C12.3358 5.33579 11.6642 5.33579 11.25 5.75C10.8358 6.16421 10.8358 6.83579 11.25 7.25L15.4343 11.4343C15.7467 11.7467 15.7467 12.2533 15.4343 12.5657Z" fill="black" />
+                                                    </svg>
+                                                </span>
+                    <!--end::Svg Icon-->
+                </a>
+            </td>
+        </tr>
+        <?php
+    }
+    ?>
+
+
+    </tbody>
+    <!--end::Table body-->
+</table>
\ No newline at end of file
diff --git a/www/application/views/compo/comp_active_jobs.php b/www/application/views/compo/comp_active_jobs.php
index 799ab2b7..ec0a4b6d 100644
--- a/www/application/views/compo/comp_active_jobs.php
+++ b/www/application/views/compo/comp_active_jobs.php
@@ -18,54 +18,16 @@
                     <div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
                         <!--begin::Table container-->
                         <div class="table-responsive">
+                            <?
+                            if (count($job_table_result) >  0 ){
+                                include 'active_jobs/active_jobs_table.php';
+                            }
+                            else{
+                                include 'active_jobs/active_jobs_nojob.php';
+                            }
+                            ?>
                             <!--begin::Table-->
-                            <table class="table table-row-dashed table-row-gray-200 align-middle gs-0 gy-4">
-                                <!--begin::Table head-->
-                                <thead>
-                                <tr class="border-0">
-                                    <th class="p-0 min-w-180px">Job</th>
-                                    <th class="p-0 min-w-180px">Title/Description</th>
-                                    <th class="p-0 min-w-90px">Status</th>
-                                    <th class="p-0 min-w-50px"></th>
-                                </tr>
-                                </thead>
-                                <!--end::Table head-->
-                                <!--begin::Table body-->
-                                <tbody>
-                                <?php
-                                foreach ($job_table_result as $row)
-                                {
-                                    ?>
-                                    <tr>
 
-                                        <td>
-                                            <a href="#" class="text-dark fw-bolder text-hover-primary mb-1 fs-6">  <?= $row->project ?></a>
-                                        </td>
-                                        <td><?= $row->description ?></td>
-                                        <td class="text-end">
-                                            <span class="badge badge-light-success"></span>
-                                        </td>
-                                        <td class="text-end">
-                                            <a href="#" onclick="return post_nav_find_action('<?=$row->qpath?>','<?=$row->offer_id?>')"  class="btn btn-sm btn-icon btn-bg-light btn-active-color-primary">
-                                                <!--begin::Svg Icon | path: icons/duotune/arrows/arr064.svg-->
-                                                <span class="svg-icon svg-icon-2">
-                                                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
-                                                    <rect opacity="0.5" x="18" y="13" width="13" height="2" rx="1" transform="rotate(-180 18 13)" fill="black" />
-                                                    <path d="M15.4343 12.5657L11.25 16.75C10.8358 17.1642 10.8358 17.8358 11.25 18.25C11.6642 18.6642 12.3358 18.6642 12.75 18.25L18.2929 12.7071C18.6834 12.3166 18.6834 11.6834 18.2929 11.2929L12.75 5.75C12.3358 5.33579 11.6642 5.33579 11.25 5.75C10.8358 6.16421 10.8358 6.83579 11.25 7.25L15.4343 11.4343C15.7467 11.7467 15.7467 12.2533 15.4343 12.5657Z" fill="black" />
-                                                    </svg>
-                                                </span>
-                                                <!--end::Svg Icon-->
-                                            </a>
-                                        </td>
-                                    </tr>
-                                    <?php
-                                }
-                                ?>
-
-
-                                </tbody>
-                                <!--end::Table body-->
-                            </table>
                         </div>
                         <!--end::Table-->
                     </div>
diff --git a/www/application/views/compo/compo_msg4_accord.php b/www/application/views/compo/compo_msg4_accord.php
index ad0e9a21..bb54ad37 100644
--- a/www/application/views/compo/compo_msg4_accord.php
+++ b/www/application/views/compo/compo_msg4_accord.php
@@ -7,7 +7,7 @@ foreach($message_result as $row){
         $pieces = explode(".", $row->message);
      //   echo $pieces[0]; // piece1
       //  echo "----". $pieces[1]; // piece2
-        $file_icon = "<img style='width:25px; height:25px;' alt='Icon' src='/site3/assets/media/svg/files/".$pieces[1].".svg'>";
+        $file_icon = "<img style='width:25px; height:25px;' alt='Icon' src='/site3/assets/media/svg/files/".$pieces[count( $pieces)-1].".svg'>";
     }
 ?>
     <div class="accordion-item">
diff --git a/www/application/views/jobs/uploads/file_table.php b/www/application/views/jobs/uploads/file_table.php
index 702b6943..1d34b84d 100644
--- a/www/application/views/jobs/uploads/file_table.php
+++ b/www/application/views/jobs/uploads/file_table.php
@@ -1,17 +1,10 @@
-<!--begin::Toolbar-->
 <div class="d-flex flex-wrap flex-stack my-5">
-    <!--begin::Heading-->
     <h3 class="fw-bolder my-2">Uploaded Files
         <span class="fs-6 text-gray-400 fw-bold ms-1">+<?=count($files_only)?></span></h3>
-    <!--end::Heading-->
-    <!--begin::Controls-->
     <div class="d-flex my-2">
 
     </div>
-    <!--end::Controls-->
 </div>
-<!--end::Toolbar-->
-<!--begin::Row-->
 <div class="row g-6 g-xl-9 mb-6 mb-xl-9">
     <?php
 
@@ -27,7 +20,7 @@
                     <a href="../../demo8/dist/apps/file-manager/files.html" class="text-gray-800 text-hover-primary d-flex flex-column">
                         <!--begin::Image-->
                         <div class="symbol symbol-60px mb-5">
-                            <img src="/site3/assets/media/svg/files/<?=$pieces[1]?>.svg" alt="" />
+                            <img src="/site3/assets/media/svg/files/<?=$pieces[count( $pieces)-1]?>.svg" alt="" />
                         </div>
                         <!--end::Image-->
                         <!--begin::Title-->
diff --git a/www/application/views/jobs/view_activejob.php b/www/application/views/jobs/view_activejob.php
index 223de1d0..c01cf711 100644
--- a/www/application/views/jobs/view_activejob.php
+++ b/www/application/views/jobs/view_activejob.php
@@ -17,76 +17,9 @@
 <?php include('common/jobstrip.php');?>
 <div class="row g-5 g-xl-8">
     <div class="col-xl-6">
-        <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">
-                    <span class="card-label fw-bolder fs-3 mb-1">Active Task </span>
-                </h3>
-                <div class="card-toolbar">
-
-                </div>
-            </div>
-            <!--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-->
-                        <div class="table-responsive">
-
-                            <table class="table align-middle gs-0 gy-3">
-                                <!--begin::Table head-->
-                                <thead>
-
-                                <tr style="font-weight: bolder;">
-                                    <th class="p-0 " style="width: 120px;">Job</th>
-                                    <th class="p-0 min-w-160px">Title/<br>Description</th>
-                                    <th class="p-0 w-100px"></th>
-                                </tr>
-                                </thead>
-                                <!--end::Table head-->
-                                <!--begin::Table body-->
-                                <tbody>
-                                <?php
-                                foreach( $job_table_result as $row){
-                                   // var_dump($row);
-                                   // echo $row['project'];
-                                    ?>
-                                    <tr style="height: 60px;">
-                                        <td>
-                                            <?=$row->project?><br>
-                                        </td>
-                                        <td>
-                                            <?=$row->description?>
-                                        </td>
-
-                                        <td class="text-end">
-                                            <?=$row->manage ?>
-                                        </td>
-                                    </tr>
-                                    <?php
-                                }
-                                ?>
-
-
-                                </tbody>
-                                <!--end::Table body-->
-                            </table>
-
-                        </div>
-
-                        <?php echo $links; ?>
-
-                    </div>
-                    <!--end::Tap pane-->
-
-                </div>
-            </div>
-            <!--end::Body-->
-        </div>
-        <!--end::Tables Widget 5-->
+        <?php
+        include(VIEWPATH.'/compo/comp_active_jobs.php');
+        ?>
     </div>
     <!--end::Col-->
     <!--begin::Col-->
diff --git a/www/application/views/jobs/view_manageinterest_modal.php b/www/application/views/jobs/view_manageinterest_modal.php
index 0acd5408..956eed61 100644
--- a/www/application/views/jobs/view_manageinterest_modal.php
+++ b/www/application/views/jobs/view_manageinterest_modal.php
@@ -1,19 +1,35 @@
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal">&times;</button>
-                <h5 class="modal-title"><?php echo $client; ?></h5>
+<div class="modal-dialog modal-dialog-centered mw-650px">
+        <div class="modal-content">
+            <div class="modal-header pb-0 border-0 justify-content-end">
+                <div class="btn btn-sm btn-icon btn-active-color-primary" data-bs-dismiss="modal">
+                    <span class="svg-icon svg-icon-1">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+                        <rect opacity="0.5" x="6" y="17.3137" width="16" height="2" rx="1" transform="rotate(-45 6 17.3137)" fill="black" />
+                        <rect x="7.41422" y="6" width="16" height="2" rx="1" transform="rotate(45 7.41422 6)" fill="black" />
+                    </svg>
+                </span>
+                </div>
             </div>
+            <div class="modal-body scroll-y mx-5 mx-xl-18 pt-0 pb-15">
+                <div class="text-center mb-13">
+                    <h1 class="mb-3"><?=$client;?></h1>
+                    <div class="text-muted fw-bold fs-5"><?=$client_description; ?></div>
+                </div>
+                <div id="kt_modal_users_search_handler" data-kt-search-keypress="true" data-kt-search-min-length="2" data-kt-search-enter="enter" data-kt-search-layout="inline">
+                    <div class="py-5">
+                        <div data-kt-search-element="suggestions">
+                            <h3 class="fw-bold mb-5">Skills:</h3>
+                            <div class="mh-375px scroll-y me-n7 pe-7">
+                                <?=$skills_set; ?>
+                            </div>
 
-            <div class="modal-body">
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-link" data-dismiss="modal">Close</button>
+                            </div>
 
-                <h6 class="text-semibold">Introduction</h6>
-                <p><?php echo $client_description; ?>.</p>
-
-                <hr>
-
-                <h6 class="text-semibold">Skills</h6>
-                <p><?php echo $skills_set; ?></p>
-            </div>
-
-            <div class="modal-footer">
-                <button type="button" class="btn btn-link" data-dismiss="modal">Close</button>
+                        </div>
+                    </div>
+                </div>
             </div>
+        </div>
+    </div>