Added shuttles to bus roll

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}
 
 

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 %}