From c3ce8490d7d91522bdeee27d2500da0780f51823 Mon Sep 17 00:00:00 2001
From: Olusesan Ameye <ses66181@gmail.com>
Date: Sat, 30 Jul 2022 12:18:06 -0400
Subject: [PATCH] fix

---
 www/application/controllers/Proj.php              |  9 ++++++++-
 www/application/views/compo/compo_msg4_accord.php | 10 +++++++++-
 www/site3/assets/media/svg/files/bmp.svg          |  1 +
 www/site3/assets/media/svg/files/png.svg          |  1 +
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 www/site3/assets/media/svg/files/bmp.svg
 create mode 100644 www/site3/assets/media/svg/files/png.svg

diff --git a/www/application/controllers/Proj.php b/www/application/controllers/Proj.php
index 4ef1ea1c..4fd03549 100644
--- a/www/application/controllers/Proj.php
+++ b/www/application/controllers/Proj.php
@@ -689,7 +689,7 @@ $data = $this->getSessionArray();
 
         
         
-                
+                $file_icon = "<img style=\"width:25px; height:25px;\" alt=\"Icon\" src=\"/site3/assets/media/svg/files/pdf.svg\">";
                 
         $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 "
@@ -697,6 +697,12 @@ $data = $this->getSessionArray();
                 . "LEFT JOIN members m ON m.id=jc.member_id "
                 . "WHERE jc.contract='" . $data['contract_id'] . "' ORDER by jc.id DESC";
 
+        $sqlMsg = "SELECT to_char(jc.created, 'YYYY-MM-DD HH24:MI') AS date1, '<b>'||(CASE WHEN jc.msg_type='FILE' THEN ' - ' 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, "
+            . " jc.msg_type, jc.message "
+            . "FROM jobs_contract_message jc "
+            . "LEFT JOIN members m ON m.id=jc.member_id "
+            . "WHERE jc.contract='" . $data['contract_id'] . "' ORDER by jc.id DESC";
 
         $query_message = $this->db->query($sqlMsg);
         
@@ -1050,6 +1056,7 @@ $data = $this->getSessionArray();
         } else {
             $result = "Files were not uploaded${d_txt}";
         }
+       // echo $result;
         return $result;
     }
 
diff --git a/www/application/views/compo/compo_msg4_accord.php b/www/application/views/compo/compo_msg4_accord.php
index 831a383d..afefb4ad 100644
--- a/www/application/views/compo/compo_msg4_accord.php
+++ b/www/application/views/compo/compo_msg4_accord.php
@@ -1,13 +1,21 @@
 <div class="accordion" id="kt_accordion_1">
 <?php
 foreach($message_result as $row){
+    $msg_type = $row->msg_type;
+    $file_icon = "";
+    if( $msg_type === 'FILE'){
+        $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'>";
+    }
 ?>
     <div class="accordion-item">
         <h2 class="accordion-header" id="kt_accordion_1_header_1">
             <button class="accordion-button fs-4 fw-semibold" 
                     type="button" data-bs-toggle="collapse" data-bs-target="#kt_accordion_1_<?=$row->msg_id?>" 
                     aria-expanded="true" aria-controls="kt_accordion_1_body_1">
-                <?=$row->title . "-".$row->date1?>
+              <?=$file_icon?>  <?=$row->title . "-".$row->date1?>
             </button>
         </h2>
         <div id="kt_accordion_1_<?=$row->msg_id?>" class="accordion-collapse collapse" aria-labelledby="kt_accordion_1_header_1" data-bs-parent="#kt_accordion_1">
diff --git a/www/site3/assets/media/svg/files/bmp.svg b/www/site3/assets/media/svg/files/bmp.svg
new file mode 100644
index 00000000..311aad8c
--- /dev/null
+++ b/www/site3/assets/media/svg/files/bmp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 64 64"><path fill="#eee" d="M55 18H42V5a1 1 0 0 0-1-1H13a1 1 0 0 0-1 1v28a1 1 0 0 0 1 1h27v16H13a1 1 0 0 0-1 1v8a1 1 0 0 0 1 1h42a1 1 0 0 0 1-1V19a1 1 0 0 0-1-1Z"/><rect width="34" height="20" x="8" y="32" fill="#ef5350" rx="1" ry="1"/><path fill="#e0e0e0" d="m55.71 18.29-14-14A1 1 0 0 0 40 5v14a1 1 0 0 0 1 1h14a1 1 0 0 0 .71-1.71Z"/><path fill="#fff" d="M14 46v-8h3a2.39 2.39 0 0 1 1.16.25 2 2 0 0 1 1.1 1.91 1.77 1.77 0 0 1-.79 1.63 2.07 2.07 0 0 1 1.27 2 2 2 0 0 1-1.21 2A3.58 3.58 0 0 1 17 46zm1.69-4.81h.95a1 1 0 0 0 .6-.14.84.84 0 0 0 .31-.71.75.75 0 0 0-.31-.68 1.31 1.31 0 0 0-.7-.13h-.85zm0 3.29H17a1.3 1.3 0 0 0 .64-.12 1 1 0 0 0 0-1.61 1.32 1.32 0 0 0-.68-.13h-1.31zM20.93 46v-8h2.59L25 42.9l1.51-4.9H29v8h-1.67v-5.12L25.75 46h-1.53l-1.6-5.12V46zm9.75 0v-8h2.66a2.79 2.79 0 0 1 1.9.58 2.41 2.41 0 0 1 .83 1.92 2.54 2.54 0 0 1-.35 1.33 2.2 2.2 0 0 1-1 .88 2.67 2.67 0 0 1-1.15.23h-1.2V46zm1.69-4.52h.94a1.13 1.13 0 0 0 .81-.28 1 1 0 0 0 .29-.76q0-.92-1.1-.92h-.94z"/></svg>
\ No newline at end of file
diff --git a/www/site3/assets/media/svg/files/png.svg b/www/site3/assets/media/svg/files/png.svg
new file mode 100644
index 00000000..e06f15a7
--- /dev/null
+++ b/www/site3/assets/media/svg/files/png.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="2048" height="2048" fill-rule="evenodd" clip-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision"><path fill="none" d="M0 0h2048v2048H0z"/><path fill="none" d="M255.999 255.999h1536v1536h-1536z"/><path fill="#ef9a9a" d="m1303.19 263.999 328.759 329.158h-269.982c-32.328 0-58.776-26.448-58.776-58.776V263.999z"/><path fill="#ffcdd2" d="M454.851 263.999h848.395v268.747c0 33.228 27.184 60.411 60.411 60.411h268.344V1408c0 22-17.999 40-40 40H454.852c-22 0-39.998-18-39.998-40V304c0-22 17.999-40 39.999-40z"/><path fill="#d32f2f" fill-rule="nonzero" d="M671.999 763.342H1408v64.002H671.999zM671.999 987.337H1408v64.003H671.999z"/><path fill="#d32f2f" d="M337.396 1226.19h1373.21c22.375 0 42.735 9.234 57.51 24.108 14.738 14.835 23.887 35.238 23.887 57.618v394.353c0 22.381-9.15 42.782-23.887 57.618-14.777 14.874-35.136 24.109-57.51 24.109H337.396c-22.373 0-42.735-9.235-57.512-24.109-14.736-14.833-23.885-35.234-23.885-57.618v-394.353c0-22.381 9.149-42.783 23.885-57.618 14.775-14.874 35.137-24.108 57.512-24.108z"/><path fill="#fff" fill-rule="nonzero" d="M533.791 1684.05v-357.917h115.916c43.917 0 72.584 1.833 85.917 5.417 20.5 5.333 37.75 17 51.584 35 13.833 18 20.75 41.25 20.75 69.667 0 22-4 40.5-12 55.416-8 15-18.084 26.75-30.417 35.334-12.25 8.5-24.75 14.166-37.417 16.917-17.25 3.415-42.25 5.166-75 5.166H606.04v135h-72.249zm72.25-297.333v101.5h39.5c28.5 0 47.583-1.834 57.167-5.584 9.583-3.75 17.083-9.584 22.582-17.583 5.417-8 8.168-17.25 8.168-27.833 0-13-3.834-23.75-11.5-32.25-7.583-8.417-17.333-13.75-29-15.834-8.667-1.667-26.001-2.417-52-2.417H606.04zm261.916 297.333v-357.917h70.334l146.5 239v-239h67.167v357.917h-72.583l-144.25-233.417v233.417h-67.168zm526.917-131.583v-60.333h155.75v142.583c-15.166 14.667-37.083 27.583-65.833 38.75-28.75 11.083-57.833 16.667-87.25 16.667-37.417 0-70.084-7.834-97.917-23.5-27.833-15.75-48.75-38.168-62.75-67.416-14-29.25-21-61-21-95.334 0-37.25 7.834-70.417 23.417-99.417 15.667-28.916 38.5-51.167 68.666-66.584 22.917-11.916 51.501-17.832 85.667-17.832 44.416 0 79.167 9.333 104.084 27.917 25 18.666 41.083 44.416 48.25 77.332l-71.75 13.417c-5.083-17.584-14.584-31.5-28.5-41.667-13.916-10.166-31.25-15.25-52.084-15.25-31.582 0-56.666 10-75.333 30-18.666 20.084-27.916 49.75-27.916 89.168 0 42.415 9.417 74.332 28.333 95.583 18.833 21.249 43.583 31.833 74.166 31.833 15.167 0 30.335-3 45.584-8.918 15.166-5.916 28.25-13.165 39.166-21.582v-45.417h-82.749z"/></svg>
\ No newline at end of file