Added reports to top left admin menu bar
Combined summary pages Changed admin panel to index
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
from coord.models import Bus, BusStop, TravellerRoute, Driver
|
||||
from coord.models import Bus, BusStop, TravellerRoute, Driver, Traveller, Shuttle
|
||||
|
||||
|
||||
def bus_roll_context(queryset=None):
|
||||
@@ -78,3 +78,48 @@ def emergency_contacts_context(queryset=None):
|
||||
bus_routes.append({'bus': bus, 'drivers': drivers, 'travellers': traveller_list})
|
||||
|
||||
return {'routes': bus_routes}
|
||||
|
||||
|
||||
def bus_summary_context():
|
||||
bus_routes = []
|
||||
for bus in Bus.objects.all():
|
||||
|
||||
drivers = []
|
||||
for driver in Driver.objects.filter(bus=bus):
|
||||
drivers.append(driver)
|
||||
|
||||
stops = []
|
||||
for bus_stop in BusStop.objects.filter(bus=bus):
|
||||
stops.append(bus_stop)
|
||||
|
||||
traveller_count = 0
|
||||
for travellerRoute in TravellerRoute.objects.filter(busStop__bus=bus):
|
||||
if travellerRoute.traveller.is_active():
|
||||
traveller_count += 1
|
||||
|
||||
shuttle_name = ""
|
||||
shuttle_count = 0
|
||||
for shuttle in Shuttle.objects.filter(bus=bus):
|
||||
if shuttle_name == "":
|
||||
shuttle_name = shuttle.school.shortName
|
||||
else:
|
||||
shuttle_name += f", {shuttle.school.shortName}"
|
||||
|
||||
for traveller in Traveller.objects.filter(shuttle=shuttle):
|
||||
if traveller.is_active():
|
||||
shuttle_count += 1
|
||||
|
||||
over_capacity = traveller_count > bus.seating_capacity or shuttle_count > bus.seating_capacity
|
||||
if shuttle_count == 0:
|
||||
shuttle_count = ""
|
||||
|
||||
bus_routes.append({
|
||||
'bus': bus,
|
||||
'drivers': drivers,
|
||||
'stops': stops,
|
||||
'traveller_count': traveller_count,
|
||||
'shuttle_name': shuttle_name,
|
||||
'shuttle_count': shuttle_count,
|
||||
'over_capacity': over_capacity,
|
||||
})
|
||||
return {'routes': bus_routes}
|
||||
|
||||
Reference in New Issue
Block a user