Added reports to top left admin menu bar

Combined summary pages
Changed admin panel to index

busManager/coord/views.py

@@ -2,80 +2,24 @@ from django.contrib.admin.views.decorators import staff_member_required
 from django.shortcuts import render
 from django.views.generic import ListView
 
-from .context_helpers import bus_roll_context, emergency_contacts_context
+from .context_helpers import *
 from .email_helpers import render_to_pdf
 from .models import Company, Bus, Traveller, BusStop, TravellerRoute, Shuttle, Driver
 
 
 @staff_member_required
-def bus_numbers(request):
-    buses = []
-    for bus in Bus.objects.all():
-
-        drivers = ""
-        for driver in Driver.objects.filter(bus=bus):
-            driver_name = f"{driver.first_name} {driver.last_name}"
-            if drivers == "":
-                drivers = driver_name
-            else:
-                drivers += f", {driver_name}"
-
-        route_travellers = Traveller.objects.filter(bus_stops__bus=bus).count()
-        over_capacity = route_travellers > bus.seating_capacity
-        shuttle = Shuttle.objects.filter(bus=bus).first()
-        if shuttle:
-            shuttle = shuttle.school.shortName
-            shuttle_travellers = Traveller.objects.filter(shuttle__bus=bus).count()
-            over_capacity = over_capacity or int(shuttle_travellers) > bus.seating_capacity
-        else:
-            shuttle = ""
-            shuttle_travellers = ""
-        buses.append({
-            'route_name': bus.route_name,
-            'drivers': drivers,
-            'route_travellers': route_travellers,
-            'shuttle': shuttle,
-            'shuttle_travellers': shuttle_travellers,
-            'seating_capacity': bus.seating_capacity,
-            'over_capacity': over_capacity,
-        })
-    return render(request, 'reports/bus_numbers.html', {'buses': buses})
+def bus_summary(request):
+    return render(request, 'reports/bus_summary.html', bus_summary_context())
 
 
 @staff_member_required
-def bus_summary(request, queryset=None):
-    bus_routes = []
-    if queryset is None:
-        buses = Bus.objects.all()
-    else:
-        buses = queryset
-
-    for bus in buses:
-
-        drivers = ""
-        for driver in Driver.objects.filter(bus=bus):
-            driver_name = f"{driver.first_name} {driver.last_name}"
-            if drivers == "":
-                drivers = driver_name
-            else:
-                drivers += f", {driver_name}"
-
-        stops = []
-        for bus_stop in BusStop.objects.filter(bus=bus):
-            stops.append(bus_stop)
-
-        bus_routes.append({
-            'bus': bus,
-            'drivers': drivers,
-            'stops': stops
-        })
-    return render(request, 'reports/bus_summary.html', {'routes': bus_routes})
+def emergency_contacts(request):
+    return render_to_pdf('reports/emergency_contacts.html', emergency_contacts_context())
 
 
 @staff_member_required
-def emergency_contacts(request, queryset=None):
-    pdf = render_to_pdf('reports/emergency_contacts.html', emergency_contacts_context(queryset))
-    return pdf
+def bus_roll(request):
+    return render_to_pdf('reports/bus_roll.html', bus_roll_context())
 
 
 @staff_member_required