From 13a1d9d3943f94c4b21fb01a6b709aeeee6b864a Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Sat, 30 Mar 2024 16:08:18 -0400
Subject: [PATCH] New Ticket Status Fix Ticket Listing is asset_Details

---
 client_asset_details.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/client_asset_details.php b/client_asset_details.php
index 29c43e4f..5dcfeae0 100644
--- a/client_asset_details.php
+++ b/client_asset_details.php
@@ -64,6 +64,7 @@ if (isset($_GET['asset_id'])) {
     // Related Tickets Query
     $sql_related_tickets = mysqli_query($mysqli, "SELECT * FROM tickets 
         LEFT JOIN users on ticket_assigned_to = user_id
+        LEFT JOIN ticket_statuses ON ticket_status_id = ticket_status
         WHERE ticket_asset_id = $asset_id
         ORDER BY ticket_number DESC"
     );
@@ -429,7 +430,8 @@ if (isset($_GET['asset_id'])) {
                                 $ticket_number = intval($row['ticket_number']);
                                 $ticket_subject = nullable_htmlentities($row['ticket_subject']);
                                 $ticket_priority = nullable_htmlentities($row['ticket_priority']);
-                                $ticket_status = nullable_htmlentities($row['ticket_status']);
+                                $ticket_status_name = nullable_htmlentities($row['ticket_status_name']);
+                                $ticket_status_color = nullable_htmlentities($row['ticket_status_color']);
                                 $ticket_created_at = nullable_htmlentities($row['ticket_created_at']);
                                 $ticket_updated_at = nullable_htmlentities($row['ticket_updated_at']);
                                 if (empty($ticket_updated_at)) {
@@ -443,14 +445,6 @@ if (isset($_GET['asset_id'])) {
                                 }
                                 $ticket_closed_at = nullable_htmlentities($row['ticket_closed_at']);
 
-                                if ($ticket_status == "Open") {
-                                    $ticket_status_display = "<span class='p-2 badge badge-primary'>$ticket_status</span>";
-                                } elseif ($ticket_status == "Working") {
-                                    $ticket_status_display = "<span class='p-2 badge badge-success'>$ticket_status</span>";
-                                } else {
-                                    $ticket_status_display = "<span class='p-2 badge badge-secondary'>$ticket_status</span>";
-                                }
-
                                 if ($ticket_priority == "High") {
                                     $ticket_priority_display = "<span class='p-2 badge badge-danger'>$ticket_priority</span>";
                                 } elseif ($ticket_priority == "Medium") {
@@ -462,7 +456,7 @@ if (isset($_GET['asset_id'])) {
                                 }
                                 $ticket_assigned_to = intval($row['ticket_assigned_to']);
                                 if (empty($ticket_assigned_to)) {
-                                    if ($ticket_status == "Closed") {
+                                    if ($ticket_status == 5) {
                                         $ticket_assigned_to_display = "<p>Not Assigned</p>";
                                     } else {
                                         $ticket_assigned_to_display = "<p class='text-danger'>Not Assigned</p>";
@@ -477,7 +471,9 @@ if (isset($_GET['asset_id'])) {
                                     <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><span class="badge badge-pill badge-secondary p-3"><?php echo "$ticket_prefix$ticket_number"; ?></span></a></td>
                                     <td><a href="ticket.php?ticket_id=<?php echo $ticket_id; ?>"><?php echo $ticket_subject; ?></a></td>
                                     <td><?php echo $ticket_priority_display; ?></td>
-                                    <td><?php echo $ticket_status_display; ?></td>
+                                    <td>
+                                        <span class="p-2 badge badge-<?php echo $ticket_status_color; ?>"><?php echo $ticket_status_name; ?></span>
+                                    </td>
                                     <td><?php echo $ticket_assigned_to_display; ?></td>
                                     <td><?php echo $ticket_updated_at_display; ?></td>
                                     <td><?php echo $ticket_created_at; ?></td>