Added dates to bus rolls
This commit is contained in:
@@ -1,9 +1,12 @@
|
||||
import datetime
|
||||
|
||||
from django.db.models import Q
|
||||
|
||||
from coord.models import Bus, BusStop, TravellerRoute, Driver, Traveller, Shuttle
|
||||
|
||||
|
||||
def bus_roll_context(queryset=None, include_bus_stops=True):
|
||||
date = datetime.date.today().strftime('%Y-%m-%d')
|
||||
bus_routes = []
|
||||
if queryset is None:
|
||||
buses = Bus.objects.all()
|
||||
@@ -20,7 +23,7 @@ def bus_roll_context(queryset=None, include_bus_stops=True):
|
||||
shuttle_routes.append(shuttle_route_context(shuttle))
|
||||
|
||||
bus_routes.append({'bus': bus, 'route_stops': route_stops, 'shuttle_routes': shuttle_routes})
|
||||
return {'routes': bus_routes}
|
||||
return {'routes': bus_routes, 'date': date}
|
||||
|
||||
|
||||
def school_roll_context(queryset):
|
||||
@@ -73,7 +76,7 @@ def traveller_roll_context(queryset):
|
||||
|
||||
|
||||
def route_paged_context(bus):
|
||||
table_header_size = 4
|
||||
table_header_size = 5
|
||||
page_max_size = 45
|
||||
page_size = 3 # Account for traveller numbers at the top of the first page
|
||||
route_stops = []
|
||||
|
||||
Reference in New Issue
Block a user