From bb44ecec3f28b13bc9a0d91411bc55d57f3e2396 Mon Sep 17 00:00:00 2001
From: johnnyq <johnny@pittpc.com>
Date: Wed, 28 May 2025 18:13:44 -0400
Subject: [PATCH] Trips UI/UX - Move Client at the end column for consistency

---
 trips.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/trips.php b/trips.php
index 03b42718..84412bb4 100644
--- a/trips.php
+++ b/trips.php
@@ -113,13 +113,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 Date <?php if ($sort == 'trip_date') { echo $order_icon; } ?>
                             </a>
                         </th>
-                        <?php if (!$client_url) { ?>
-                        <th>
-                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
-                                Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
-                            </a>
-                        </th>
-                        <?php } ?>
                         <th>
                             <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=user_name&order=<?php echo $disp; ?>">
                                 Driver <?php if ($sort == 'user_name') { echo $order_icon; } ?>
@@ -145,6 +138,13 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                 Miles <?php if ($sort == 'trip_miles') { echo $order_icon; } ?>
                             </a>
                         </th>
+                        <?php if (!$client_url) { ?>
+                        <th>
+                            <a class="text-dark" href="?<?php echo $url_query_strings_sort; ?>&sort=client_name&order=<?php echo $disp; ?>">
+                                Client <?php if ($sort == 'client_name') { echo $order_icon; } ?>
+                            </a>
+                        </th>
+                        <?php } ?>
                         <th class="text-center">Action</th>
                     </tr>
                     </thead>
@@ -192,14 +192,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                                     <?php echo $trip_date; ?>
                                 </a>
                             </td>
-                            <?php if (!$client_url) { ?>
-                            <td><?php echo $client_name_display; ?></td>
-                            <?php } ?>
                             <td><?php echo $user_name_display; ?></td>
                             <td><?php echo $trip_purpose; ?></td>
                             <td><?php echo $trip_source; ?></td>
                             <td><?php echo $trip_destination; ?></td>
                             <td><?php echo "$trip_miles $round_trip_display"; ?></td>
+                            <?php if (!$client_url) { ?>
+                            <td><?php echo $client_name_display; ?></td>
+                            <?php } ?>
                             <td>
                                 <div class="dropdown dropleft text-center">
                                     <button class="btn btn-secondary btn-sm" type="button" data-toggle="dropdown">