From 2d01bbccad09202415e37fd33df9c0507aa0333d Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ses66181@gmail.com>
Date: Sun, 17 Jul 2022 15:16:12 -0400
Subject: [PATCH] fix

---
 www/application/controllers/Proj.php        |  4 ++--
 www/application/views/jobs/view_thisjob.php | 22 ++++++++++++---------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php
index 4ec05d60..58623bbc 100644
--- a/www/application/controllers/Proj.php
+++ b/www/application/controllers/Proj.php
@@ -668,7 +668,7 @@ $data = $this->getSessionArray();
         
                 
                 
-        $sqlMsg = "SELECT to_char(jc.created, 'YYYY-MM-DD HH24:MI') AS date1, '<b>'||(CASE WHEN jc.msg_type='FILE' THEN 'FILE' ELSE '' END) ||'</b>'||m.firstname AS title,"
+        $sqlMsg = "SELECT to_char(jc.created, 'YYYY-MM-DD HH24:MI') AS date1, '<b>'||(CASE WHEN jc.msg_type='FILE' THEN 'FILE' ELSE '' END) ||'</b>'||m.firstname AS title,jc.id as msg_id,"
                 . "(CASE WHEN jc.msg_type='FILE' THEN '<a target=\"_blank\" href=\"/smedia/" . ($is_live ? "LIVE" : "TEST") . "/contract/" . $data['contract_id'] . "/'||jc.message||'\">'||jc.message||'</a>' ELSE jc.message END) AS msg "
                 . "FROM jobs_contract_message jc "
                 . "LEFT JOIN members m ON m.id=jc.member_id "
@@ -685,7 +685,7 @@ $data = $this->getSessionArray();
         
         $data['message_result'] =  $query_message->result();
         
-        $data['message_result_show'] = $this->messageAccordion($data['message_result']);
+       // $data['message_result_show'] = $this->messageAccordion($data['message_result']);
         
 
         $mysql3 = "SELECT  *,(delivery_date::date- now()::date)::int AS remaining_days FROM members_jobs_contract WHERE id= " . $jobID;
diff --git a/www/application/views/jobs/view_thisjob.php b/www/application/views/jobs/view_thisjob.php
index ec5e6af2..9adeb089 100644
--- a/www/application/views/jobs/view_thisjob.php
+++ b/www/application/views/jobs/view_thisjob.php
@@ -17,7 +17,13 @@
 
 <div class="row g-5 g-xl-8">
     <div class="col-xl-12">
-        <div class="card card-xl-stretch mb-5 mb-xl-8">
+
+    </div>
+</div>
+
+<div class="row g-5 g-xl-8">
+    <div class="col-xl-8">
+        <div class="card mb-5 mb-xl-8">
             <div class="card-header border-0 pt-5">
                 <h3 class="card-title align-items-start flex-column">
                     <a href="<?php echo $redirect_to; ?>" class="label label-flat border-warning text-primary-600"> <i class="icon-arrow-left52 position-left"></i> Return to List </a> <span class="card-label fw-bolder fs-3 mb-1"><?=$this_job_result->title?></span>
@@ -48,12 +54,9 @@
                 </div>
             </div>
         </div>
-    </div>
-</div>
 
-<div class="row g-5 g-xl-8">
-    <div class="col-xl-8">
-        <div class="card card-xl-stretch mb-5 mb-xl-8">
+
+        <div class="card mb-5 mb-xl-8">
       
             <div class="card-body py-3">
                 <div class="tab-content">
@@ -61,7 +64,7 @@
                         <div class="table-responsive">
                       
 
-                        <ul class="nav nav-tabs nav-line-tabs mb-5 fs-6">
+        <ul class="nav nav-tabs nav-line-tabs mb-5 fs-6">
             <li class="nav-item">
                 <a class="nav-link active" data-bs-toggle="tab" href="#kt_tab_pane_1">Send Message</a>
             </li>
@@ -200,14 +203,15 @@
                 <div class="tab-content">
                     <div class="tab-pane fade show active" id="kt_table_widget_5_tab_1">
                         <div class="table-responsive">
-                        <?=$message_result_show?>        
+                            <?php
+                            include(VIEWPATH.'/compo/compo_msg4_accord.php');
+                            ?>
                         </div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
-    <!--end::Col-->
 </div>