diff --git a/busManager/coord/context_helpers.py b/busManager/coord/context_helpers.py
index fde6e17..4da4a39 100644
--- a/busManager/coord/context_helpers.py
+++ b/busManager/coord/context_helpers.py
@@ -4,7 +4,7 @@ from coord.models import Bus, BusStop, TravellerRoute, Driver, Traveller, Shuttl
def bus_roll_context(queryset=None):
- table_header_size = 5
+ table_header_size = 4
page_max_size = 45
bus_routes = []
if queryset is None:
@@ -13,19 +13,11 @@ def bus_roll_context(queryset=None):
buses = queryset
for bus in buses:
- route_pages = []
- page_stops = []
- page_size = 0
+ route_stops = []
+ page_size = 3 # Account for traveller numbers at the top of the first page
+ traveller_count = 0
for bus_stop in BusStop.objects.filter(bus=bus):
traveller_routes = TravellerRoute.objects.filter(busStop=bus_stop)
- page_size += table_header_size + traveller_routes.count()
- if page_size > page_max_size:
- route_pages.append({
- 'stops': page_stops
- })
- page_stops = []
- page_size = table_header_size + traveller_routes.count()
-
traveller_list = []
for trav_route in traveller_routes:
traveller = trav_route.traveller
@@ -38,12 +30,23 @@ def bus_roll_context(queryset=None):
'display': f"{traveller} ({traveller.get_year_level_display()}, {traveller.school.shortName})",
'isFared': is_fared
})
- page_stops.append({
+
+ stop_size = len(traveller_list)
+ traveller_count += stop_size
+ page_break = False
+ page_size += table_header_size + stop_size
+ if page_size > page_max_size:
+ if len(route_stops) > 0: # Don't break the page if it's the first stop
+ page_break = True
+ page_size = table_header_size + stop_size
+
+ route_stops.append({
'stop_num': bus_stop.get_stop_number(),
'name': bus_stop.address,
'am': bus_stop.am_time,
'pm': bus_stop.pm_time,
- 'travellers': traveller_list
+ 'travellers': traveller_list,
+ 'page_break': page_break
})
shuttle_travellers = []
@@ -55,7 +58,7 @@ def bus_roll_context(queryset=None):
'display': f"{traveller} ({traveller.get_year_level_display()}, {traveller.school})",
})
- bus_routes.append({'route_name': bus.route_name, 'company': bus.company, 'route_pages': route_pages, 'has_shuttle': has_shuttle, 'shuttle_travellers': shuttle_travellers})
+ bus_routes.append({'route_name': bus.route_name, 'company': bus.company, 'traveller_count': traveller_count, 'seating_capacity': bus.seating_capacity, 'route_stops': route_stops, '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 cd6e304..d214cc4 100644
--- a/busManager/coord/templates/reports/bus_roll.html
+++ b/busManager/coord/templates/reports/bus_roll.html
@@ -18,56 +18,61 @@
{% for route in routes %}
- {% for page in route.route_pages %}
-
{{ route.route_name }}
- {% for stop in page.stops %}
-
+
{% endfor %}
{% if route.has_shuttle %}
{{ route.route_name }} (Shuttle)