From 86a3ad139df3c57e111549aaeaff0afb5b63d5da Mon Sep 17 00:00:00 2001
From: John Mullins <john.mullins@education.vic.gov.au>
Date: Tue, 5 Sep 2023 11:14:42 +1000
Subject: [PATCH] Added shuttles to bus roll

---
 busManager/coord/context_helpers.py              | 11 +++++++++--
 busManager/coord/templates/reports/bus_roll.html | 15 ++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/busManager/coord/context_helpers.py b/busManager/coord/context_helpers.py
index e5d895f..f77913d 100644
--- a/busManager/coord/context_helpers.py
+++ b/busManager/coord/context_helpers.py
@@ -34,9 +34,16 @@ def bus_roll_context(queryset=None):
             }
             bus_route.append(stop_result)
 
-        # Todo Add shuttles
+        shuttle_travellers = []
+        has_shuttle = False
+        for shuttle in Shuttle.objects.filter(bus=bus):
+            has_shuttle = True
+            for traveller in Traveller.objects.filter(shuttle=shuttle):
+                shuttle_travellers.append({
+                    'display': f"{traveller} ({traveller.get_year_level_display()}, {traveller.school})",
+                })
 
-        bus_routes.append({'bus': bus, 'stops': bus_route})
+        bus_routes.append({'bus': bus, 'stops': bus_route, 'has_shuttle': has_shuttle, 'shuttle_travellers': shuttle_travellers})
     return {'routes': bus_routes}
 
 
diff --git a/busManager/coord/templates/reports/bus_roll.html b/busManager/coord/templates/reports/bus_roll.html
index f4e9928..34783d3 100644
--- a/busManager/coord/templates/reports/bus_roll.html
+++ b/busManager/coord/templates/reports/bus_roll.html
@@ -1,5 +1,7 @@
 <style>
-
+    @page {
+        margin: 2cm;
+    }
     table.stopHeader th {
         text-align: left;
         min-width: 150px;
@@ -65,5 +67,16 @@
         </table>
         <br>
     {% endfor %}
+    {% if route.has_shuttle %}
+        <p style="page-break-after: always">
+        <h1 style="font-size: 2.5em">{{ route.bus.route_name }} (Shuttle)</h1>
+        <table class="traveller">
+            {% for traveller in route.shuttle_travellers %}
+                <tr>
+                    <td style="padding-top: 3px; padding-left: 2px; text-align: left">{{ traveller.display }}</td>
+                </tr>
+            {% endfor %}
+        </table>
+    {% endif %}
     <p style="page-break-after: always">
 {% endfor %}
\ No newline at end of file