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 + + @@ -117,4 +122,4 @@ {% block extra_css %} -{% endblock %} \ No newline at end of file +{% endblock %} 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 @@

- - - - - {% if show_board %} - - {% endif %} - - - - {% for trip in trips %} - - - - - + + + {% if operator.show_trip_id %} + + {% else %} + + {% endif %} + + {% if show_board %} + + {% endif %} + + + + {% for trip in trips %} + + + {% if operator.show_trip_id %} + + {% endif %} + + {% if show_board %} {% if trip.trip_board.board_type == "duty" %} @@ -308,4 +314,4 @@

{% endif %} -{% endblock %} \ No newline at end of file +{% endblock %} 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})

RouteTripTo
{% if trip.trip_display_id %}{{ trip.trip_display_id }}{% else %}{{ trip.pk }}{% endif %}{{ trip.trip_end_location }}
RouteTripTimeTo
{% if trip.trip_display_id %}{{ trip.trip_display_id }}{% else %}{{ trip.pk }}{% endif %}{{ trip.trip_end_location }}{{ trip.trip_board.duty_name }}