From dd190ff4effc5831cb80b6cf546e8efbcc48d515 Mon Sep 17 00:00:00 2001
From: Shay <shaneyboybusiness@gmail.com>
Date: Sun, 25 Jan 2026 13:23:13 +0000
Subject: [PATCH 1/3] Add checkbox for showing Trip IDs in operator edit form

---
 fleet/templates/edit_operator.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fleet/templates/edit_operator.html b/fleet/templates/edit_operator.html
index ea25f01d..971f74b2 100755
--- a/fleet/templates/edit_operator.html
+++ b/fleet/templates/edit_operator.html
@@ -92,6 +92,11 @@
         Show Livery Border
     </label>
 
+    <label for="show_trip_id">
+    <input type="checkbox" name="show_trip_id" {% if operator.show_trip_id %}checked{% endif %}>
+    Show Trip IDs
+    </label>
+
     <button style="min-width: 150px;" class="btn delete-btn" type="button"
         onclick='window.location.href="{% url 'reset_operator' operator.operator_slug %}"'>Reset Fleet</button>
 
@@ -117,4 +122,4 @@
 {% block extra_css %}
 <link rel="stylesheet" href="{% static 'css/narrow.css' %}">
 <link rel="stylesheet" href="{% static 'css/select2.css' %}">
-{% endblock %}
\ No newline at end of file
+{% endblock %}

From 98c99a385bc421f9a0b83e1d10afa155381290f3 Mon Sep 17 00:00:00 2001
From: Shay <shaneyboybusiness@gmail.com>
Date: Sun, 25 Jan 2026 13:28:38 +0000
Subject: [PATCH 2/3] Add show_trip_id attribute to operator

---
 fleet/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fleet/views.py b/fleet/views.py
index a4128e36..807eb347 100644
--- a/fleet/views.py
+++ b/fleet/views.py
@@ -3856,6 +3856,7 @@ def operator_edit(request, operator_slug):
         operator.region.set(region_ids)
 
         operator.show_livery_border = request.POST.get('show_livery_border') == 'on'
+        operator.show_trip_id = request.POST.get('show_trip_id') == 'on'
 
         if request.POST.get('group', None) == "":
             group_instance = None
@@ -7249,4 +7250,4 @@ def boards_api(request, operator_slug):
             'type': board.board_type
         })
 
-    return JsonResponse({'results': results})
\ No newline at end of file
+    return JsonResponse({'results': results})

From c97f37969c66dab2f7186f6af8e87ff8e49e4455 Mon Sep 17 00:00:00 2001
From: Shay <shaneyboybusiness@gmail.com>
Date: Sun, 25 Jan 2026 13:32:08 +0000
Subject: [PATCH 3/3] Refactor vehicle detail table structure

---
 fleet/templates/vehicle_detail.html | 64 ++++++++++++++++-------------
 1 file changed, 35 insertions(+), 29 deletions(-)

diff --git a/fleet/templates/vehicle_detail.html b/fleet/templates/vehicle_detail.html
index 58229633..efd89598 100755
--- a/fleet/templates/vehicle_detail.html
+++ b/fleet/templates/vehicle_detail.html
@@ -239,34 +239,40 @@ <h1>
 <div class="table-wrapper">
     <table>
         <thead>
-            <tr>
-                <th scope="col">Route</th>
-                <th scope="col" colspan="2">Trip</th>
-                <th scope="col">To</th>
-                {% if show_board %}
-                    <th scope="col"></th>
-                {% endif %}
-            </tr>
-        </thead>
-        <tbody>
-            {% for trip in trips %}
-            <tr id="journey-{{ trip.pk }}" class="{% if trip.trip_missed %}missed{% endif %} {% if trip.trip_start_at > now %}early{% endif %}">
-                <td class="link">
-                    {% if trip.trip_route.route_num %}
-                        <a href="/operator/{{  operator.operator_slug  }}/route/{{ trip.trip_route.id }}/#{{ trip.trip_start_at|date:"H:i" }}">{{ trip.trip_route.route_num }}</a>
-                    {% else %}
-                        {{ trip.trip_route_num }}
-                    {% endif %}
-                </td>
-                <td class="tabular">{% if trip.trip_display_id %}{{ trip.trip_display_id }}{% else %}{{ trip.pk }}{% endif %}</td>
-                <td class="link tabular">
-                    {% if trip.trip_route.route_num %}
-                        <a href="/operator/{{  operator.operator_slug  }}/route/{{ trip.trip_route.id }}/#{{ trip.trip_start_at|date:"H:i" }}">{{ trip.trip_start_at|date:"H:i" }}</a>
-                    {% else %}
-                        {{ trip.trip_start_at|date:"H:i" }}
-                    {% endif %}
-                </td>
-                <td>{{ trip.trip_end_location }}</td>
+    <tr>
+        <th scope="col">Route</th>
+        {% if operator.show_trip_id %}
+            <th scope="col" colspan="2">Trip</th>
+        {% else %}
+            <th scope="col">Time</th>
+        {% endif %}
+        <th scope="col">To</th>
+        {% if show_board %}
+            <th scope="col"></th>
+        {% endif %}
+    </tr>
+</thead>
+<tbody>
+    {% for trip in trips %}
+    <tr id="journey-{{ trip.pk }}" class="{% if trip.trip_missed %}missed{% endif %} {% if trip.trip_start_at > now %}early{% endif %}">
+        <td class="link">
+            {% if trip.trip_route.route_num %}
+                <a href="/operator/{{  operator.operator_slug  }}/route/{{ trip.trip_route.id }}/#{{ trip.trip_start_at|date:"H:i" }}">{{ trip.trip_route.route_num }}</a>
+            {% else %}
+                {{ trip.trip_route_num }}
+            {% endif %}
+        </td>
+        {% if operator.show_trip_id %}
+            <td class="tabular">{% if trip.trip_display_id %}{{ trip.trip_display_id }}{% else %}{{ trip.pk }}{% endif %}</td>
+        {% endif %}
+        <td class="link tabular">
+            {% if trip.trip_route.route_num %}
+                <a href="/operator/{{  operator.operator_slug  }}/route/{{ trip.trip_route.id }}/#{{ trip.trip_start_at|date:"H:i" }}">{{ trip.trip_start_at|date:"H:i" }}</a>
+            {% else %}
+                {{ trip.trip_start_at|date:"H:i" }}
+            {% endif %}
+        </td>
+        <td>{{ trip.trip_end_location }}</td>
                 {% if show_board %}
                     {% if trip.trip_board.board_type == "duty" %}
                         <td><a href="/operator/{{ operator.operator_slug }}/duty/{{ trip.trip_board.id }}/">{{ trip.trip_board.duty_name }}</a></td>
@@ -308,4 +314,4 @@ <h1>
     {% endif %}
 </nav>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}