From b7b24d7de659cefacf07e60d0940a2cc4379b617 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Wed, 28 May 2025 18:08:08 -0400
Subject: [PATCH] UI/UX Expenses - Combined Category and Description Column
 with secondary text seperation and expanded Truncation of Description from 50
 chars to 60 chars

---
 expenses.php | 19 ++++++++++---------
 tickets.php  |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/expenses.php b/expenses.php
index 6b330e12..9e1da9ec 100644
--- a/expenses.php
+++ b/expenses.php
@@ -228,19 +228,18 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     Date <?php if ($sort == 'expense_date') { echo $order_icon; } ?>
                                 </a>
                             </th>
-                            <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_name&order=<?php echo $disp; ?>">
-                                    Vendor <?php if ($sort == 'vendor_name') { echo $order_icon; } ?>
-                                </a>
-                            </th>
                             <th>
                                 <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=category_name&order=<?php echo $disp; ?>">
                                     Category <?php if ($sort == 'category_name') { echo $order_icon; } ?>
                                 </a>
+                                /
+                                <a class="text-secondary" href="?<?php echo $url_query_strings_sort; ?>&sort=expense_description&order=<?php echo $disp; ?>">
+                                    Description <?php if ($sort == 'expense_description') { echo $order_icon; } ?>
+                                </a>
                             </th>
                             <th>
-                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=expense_description&order=<?php echo $disp; ?>">
-                                    Description <?php if ($sort == 'expense_description') { echo $order_icon; } ?>
+                                <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=vendor_name&order=<?php echo $disp; ?>">
+                                    Vendor <?php if ($sort == 'vendor_name') { echo $order_icon; } ?>
                                 </a>
                             </th>
                             <th class="text-right">
@@ -313,9 +312,11 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                         <?php echo $expense_date; ?>
                                     </a>
                                 </td>
+                                <td>
+                                    <?php echo $category_name; ?>
+                                    <div class="text-secondary"><small><?php echo truncate($expense_description, 60); ?></small></div>
+                                </td>
                                 <td><?php echo $vendor_name; ?></td>
-                                <td><?php echo $category_name; ?></td>
-                                <td><?php echo truncate($expense_description, 50); ?></td>
                                 <td class="text-bold text-right"><?php echo numfmt_format_currency($currency_format, $expense_amount, $expense_currency_code); ?></td>
                                 <td><?php echo $account_name; ?></td>
                                 <td><?php echo $client_name_display; ?></td>
diff --git a/tickets.php b/tickets.php
index 68250ab7..6cce70e0 100644
--- a/tickets.php
+++ b/tickets.php
@@ -214,7 +214,7 @@ $sql_categories = mysqli_query(
                                     <span class="d-none d-xl-inline ml-2">View</span>
                                 </button>
                                 <div class="dropdown-menu">
-                                    <a class="dropdown-item " href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'list']))); ?>">List</a>
+                                    <a class="dropdown-item" href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'list']))); ?>">List</a>
                                     <div class="dropdown-divider"></div>
                                     <a class="dropdown-item " href="<?=htmlspecialchars('?' . http_build_query(array_merge($_GET, ['view' => 'compact']))); ?>">Compact List</a>
                                     <?php if ($status !== 'Closed') {?>