New reports

Added per term fare paid to traveller model
Fixed parent in emergency contacts report

busManager/coord/views.py

@@ -13,8 +13,34 @@ from .models import Company, Bus, Traveller, BusStop, TravellerRoute, Shuttle, D
 def bus_numbers(request):
     buses = []
     for bus in Bus.objects.all():
-        num_travellers = Traveller.objects.filter(bus_stops__bus=bus).count()
-        buses.append({'route_name': bus.route_name, 'num_travellers': num_travellers})
+
+        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})
 
 
@@ -52,11 +78,43 @@ def bus_roll(request, queryset=None):
             # print(traveller_list)
             bus_route.append(stop_result)
 
+        # Todo Add shuttles
+
         bus_routes.append({'route_name': bus.route_name, 'stops': bus_route})
 
     return render(request, 'reports/bus_roll.html', {'routes': bus_routes})
 
 
+@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})
+
+
 @staff_member_required
 def emergency_contacts(request, queryset=None):
     if queryset is None:
@@ -70,11 +128,11 @@ def emergency_contacts(request, queryset=None):
         for travellerRoute in TravellerRoute.objects.filter(busStop__bus=bus):
             traveller = travellerRoute.traveller
             parent_a = ""
-            if travellerRoute.traveller.guardian_A_firstname:
-                parent_a = f"{traveller.guardian_A_firstname} {traveller.guardian_A_lastname} ({traveller.guardian_A_phone})"
+            if travellerRoute.traveller.parent_A_firstname:
+                parent_a = f"{traveller.parent_A_firstname} {traveller.parent_A_lastname} ({traveller.parent_A_phone})"
             parent_b = ""
-            if travellerRoute.traveller.guardian_B_firstname:
-                parent_b = f"{traveller.guardian_B_firstname} {traveller.guardian_B_lastname} ({traveller.guardian_B_phone})"
+            if travellerRoute.traveller.parent_B_firstname:
+                parent_b = f"{traveller.parent_B_firstname} {traveller.parent_B_lastname} ({traveller.parent_B_phone})"
             contact_a = ""
             if travellerRoute.traveller.emergency_contact_A_firstname:
                 contact_a = f"{traveller.emergency_contact_A_firstname} {traveller.emergency_contact_A_lastname} ({traveller.emergency_contact_A_phone})"