Fixed shuttle count

busManager/coord/context_helpers.py

@@ -122,7 +122,7 @@ def shuttle_route_context(shuttle, date=None):
             shuttle_travellers.append({
                 'display': f"{traveller} ({traveller.get_year_level_display()}, {traveller.school})",
             })
-    return {'shuttle': shuttle, 'shuttle_travellers': shuttle_travellers}
+    return {'shuttle': shuttle, 'shuttle_travellers': shuttle_travellers, 'traveller_count': shuttle.traveller_count(date)}
 
 
 def school_travellerRoute_context(school, date=None):

busManager/coord/models.py

@@ -112,8 +112,12 @@ class Shuttle(models.Model):
             custom_name = ""
         return f"{self.school.shortName} <-> {self.bus.route_name}{custom_name}"
 
-    def traveller_count(self):
+    def traveller_count(self, date=None):
-        return Traveller.objects.filter(shuttle=self, is_active=True).count()
+        count = 0
+        for traveller in Traveller.objects.filter(shuttle=self):
+            if traveller._is_active(date):
+                count += 1
+        return count
 
 
 class Driver(models.Model):

busManager/coord/templates/reports/bus_roll.html

@@ -87,7 +87,7 @@
         <h1 style="font-size: 2.5em">{{ shuttle_route.shuttle }}</h1>
         <p style="text-align:right; font-size:12px">
             Date: {{ date }}<br>
-            Total Travellers: {{ shuttle_route.shuttle.traveller_count }}
+            Total Travellers: {{ shuttle_route.traveller_count }}
         </p>
         <table class="traveller">
             {% for traveller in shuttle_route.shuttle_travellers %}