Email roll to schools function

busManager/coord/context_helpers.py

@@ -1,6 +1,6 @@
 from django.db.models import Q
 
-from coord.models import Bus, BusStop, TravellerRoute, Driver, Traveller, Shuttle, School
+from coord.models import Bus, BusStop, TravellerRoute, Driver, Traveller, Shuttle
 
 
 def bus_roll_context(queryset=None):
@@ -40,14 +40,10 @@ def bus_roll_context(queryset=None):
     return {'routes': bus_routes}
 
 
-def school_roll_context(queryset=None):
+def school_roll_context(queryset):
     school_list = []
-    if queryset is None:
-        schools = School.objects.all()
-    else:
-        schools = queryset
 
-    for school in schools:
+    for school in queryset:
         school_routes = []
         query = Q(traveller__school=school) | Q(traveller__shuttle__school=school)
         for bus in Bus.objects.all():
@@ -64,9 +60,13 @@ def school_roll_context(queryset=None):
                 is_fared = "---"
                 if traveller.eligibility_status == "2":
                     is_fared = "Y"
+                shuttle_name = " "
+                if traveller.shuttle:
+                    shuttle_name = traveller.shuttle.bus
                 travellers.append({
                     'display': display_name,
                     'isFared': is_fared,
+                    'shuttle': shuttle_name,
                     'stop': f"#{bus_stop.get_stop_number()} - {bus_stop.address}",
                     'am_time': bus_stop.am_time,
                     'pm_time': bus_stop.pm_time