From 998a70163404c9d8ba73ff3f2f5d9d98d38c7e86 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Mon, 26 Feb 2024 16:50:12 -0500
Subject: [PATCH] UI: Show assigned contact in asset dropdown select menu in
 tickets

---
 ticket_add_modal.php        | 8 +++++---
 ticket_edit_asset_modal.php | 5 +++--
 ticket_edit_modal.php       | 5 +++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ticket_add_modal.php b/ticket_add_modal.php
index a14ffb22..79fe9745 100644
--- a/ticket_add_modal.php
+++ b/ticket_add_modal.php
@@ -212,11 +212,13 @@
                                             <option value="0">- None -</option>
                                             <?php
 
-                                            $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                                            $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON contact_id = asset_contact_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
                                             while ($row = mysqli_fetch_array($sql_assets)) {
                                                 $asset_id_select = intval($row['asset_id']);
-                                                $asset_name_select = nullable_htmlentities($row['asset_name']); ?>
-                                                <option value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+                                                $asset_name_select = nullable_htmlentities($row['asset_name']);
+                                                $asset_contact_name_select = nullable_htmlentities($row['contact_name']);
+                                            ?>
+                                                <option value="<?php echo $asset_id_select; ?>"><?php echo "$asset_name_select - $asset_contact_name_select"; ?></option>
 
                                             <?php } ?>
                                         </select>
diff --git a/ticket_edit_asset_modal.php b/ticket_edit_asset_modal.php
index 25418bcb..ae47d9a9 100644
--- a/ticket_edit_asset_modal.php
+++ b/ticket_edit_asset_modal.php
@@ -23,12 +23,13 @@
                                 <option value="0">- None -</option>
                                 <?php
 
-                                $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                                $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON contact_id = asset_contact_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
                                 while ($row = mysqli_fetch_array($sql_assets)) {
                                     $asset_id_select = intval($row['asset_id']);
                                     $asset_name_select = nullable_htmlentities($row['asset_name']);
+                                    $asset_contact_name_select = nullable_htmlentities($row['contact_name']);
                                     ?>
-                                    <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+                                    <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo "$asset_name_select - $asset_contact_name_select"; ?></option>
 
                                     <?php
                                 }
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index 2313e61a..2a880afb 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -136,12 +136,13 @@
                                         <option value="0">- None -</option>
                                         <?php
 
-                                        $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
+                                        $sql_assets = mysqli_query($mysqli, "SELECT * FROM assets LEFT JOIN contacts ON contact_id = asset_contact_id WHERE asset_client_id = $client_id AND asset_archived_at IS NULL ORDER BY asset_name ASC");
                                         while ($row = mysqli_fetch_array($sql_assets)) {
                                             $asset_id_select = intval($row['asset_id']);
                                             $asset_name_select = nullable_htmlentities($row['asset_name']);
+                                            $asset_contact_name_select = nullable_htmlentities($row['contact_name']);
                                             ?>
-                                            <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo $asset_name_select; ?></option>
+                                            <option <?php if ($asset_id == $asset_id_select) { echo "selected"; } ?> value="<?php echo $asset_id_select; ?>"><?php echo "$asset_name_select - $asset_contact_name_select"; ?></option>
 
                                             <?php
                                         }