Changed bus roll paginator
This commit is contained in:
John Mullins
@@ -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}
|
||||
|
||||
|
||||
|
||||
@@ -18,56 +18,61 @@
|
||||
</style>
|
||||
|
||||
{% for route in routes %}
|
||||
{% for page in route.route_pages %}
|
||||
<h1 style="font-size: 2.5em">{{ route.route_name }}</h1>
|
||||
{% for stop in page.stops %}
|
||||
<table class="stopHeader">
|
||||
<h1 style="font-size: 2.5em">{{ route.route_name }}</h1>
|
||||
<p style="text-align:right; font-size:12px">
|
||||
Total Travellers: {{ route.traveller_count }}<br>
|
||||
Seating Capacity: {{ route.seating_capacity }}
|
||||
</p>
|
||||
{% for stop in route.route_stops %}
|
||||
{% if stop.page_break %}
|
||||
<div style="page-break-before: always"></div>
|
||||
<h1 style="font-size: 2.5em">{{ route.route_name }}</h1>
|
||||
{% endif %}
|
||||
<table class="stopHeader">
|
||||
<tr>
|
||||
<th style="width: 100%"></th>
|
||||
<th style="width: 20%">Pickup Time</th>
|
||||
<th style="width: 25%">Drop-off Time</th>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>Stop Number #{{ stop.stop_num }}</b> {{ stop.name }}</td>
|
||||
<td>{{ stop.am }}</td>
|
||||
<td>{{ stop.pm }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<table class="traveller">
|
||||
<tr>
|
||||
<th style="width: 100%; text-align: left">Student</th>
|
||||
<th style="width: 10%">Fare</th>
|
||||
<th style="width: 8%">Mon AM</th>
|
||||
<th style="width: 8%">Mon PM</th>
|
||||
<th style="width: 8%">Tue AM</th>
|
||||
<th style="width: 8%">Tue PM</th>
|
||||
<th style="width: 8%">Wed AM</th>
|
||||
<th style="width: 8%">Wed PM</th>
|
||||
<th style="width: 8%">Thu AM</th>
|
||||
<th style="width: 8%">Thu PM</th>
|
||||
<th style="width: 8%">Fri AM</th>
|
||||
<th style="width: 8%">Fri PM</th>
|
||||
</tr>
|
||||
{% for traveller in stop.travellers %}
|
||||
<tr>
|
||||
<th style="width: 100%"></th>
|
||||
<th style="width: 20%">Pickup Time</th>
|
||||
<th style="width: 25%">Drop-off Time</th>
|
||||
<td style="padding-top: 3px; padding-left: 2px; text-align: left">{{ traveller.display }}</td>
|
||||
<td style="padding-top: 3px; text-align: center"><b>{{ traveller.isFared }}</b></td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>Stop Number #{{ stop.stop_num }}</b> {{ stop.name }}</td>
|
||||
<td>{{ stop.am }}</td>
|
||||
<td>{{ stop.pm }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
<table class="traveller">
|
||||
<tr>
|
||||
<th style="width: 100%; text-align: left">Student</th>
|
||||
<th style="width: 10%">Fare</th>
|
||||
<th style="width: 8%">Mon AM</th>
|
||||
<th style="width: 8%">Mon PM</th>
|
||||
<th style="width: 8%">Tue AM</th>
|
||||
<th style="width: 8%">Tue PM</th>
|
||||
<th style="width: 8%">Wed AM</th>
|
||||
<th style="width: 8%">Wed PM</th>
|
||||
<th style="width: 8%">Thu AM</th>
|
||||
<th style="width: 8%">Thu PM</th>
|
||||
<th style="width: 8%">Fri AM</th>
|
||||
<th style="width: 8%">Fri PM</th>
|
||||
</tr>
|
||||
{% for traveller in stop.travellers %}
|
||||
<tr>
|
||||
<td style="padding-top: 3px; padding-left: 2px; text-align: left">{{ traveller.display }}</td>
|
||||
<td style="padding-top: 3px; text-align: center"><b>{{ traveller.isFared }}</b></td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
<br>
|
||||
{% endfor %}
|
||||
<p style="page-break-after: always">
|
||||
{% endfor %}
|
||||
</table>
|
||||
<br>
|
||||
{% endfor %}
|
||||
{% if route.has_shuttle %}
|
||||
<h1 style="font-size: 2.5em">{{ route.route_name }} (Shuttle)</h1>
|
||||
|
||||
Reference in New Issue
Block a user