diff --git a/busManager/coord/context_helpers.py b/busManager/coord/context_helpers.py index ab41e89..8b4912d 100644 --- a/busManager/coord/context_helpers.py +++ b/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): diff --git a/busManager/coord/models.py b/busManager/coord/models.py index f016fa7..f6243fc 100644 --- a/busManager/coord/models.py +++ b/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): - return Traveller.objects.filter(shuttle=self, is_active=True).count() + def traveller_count(self, date=None): + count = 0 + for traveller in Traveller.objects.filter(shuttle=self): + if traveller._is_active(date): + count += 1 + return count class Driver(models.Model): diff --git a/busManager/coord/templates/reports/bus_roll.html b/busManager/coord/templates/reports/bus_roll.html index 2ca9384..28c4001 100644 --- a/busManager/coord/templates/reports/bus_roll.html +++ b/busManager/coord/templates/reports/bus_roll.html @@ -87,7 +87,7 @@
Date: {{ date }}
- Total Travellers: {{ shuttle_route.shuttle.traveller_count }}
+ Total Travellers: {{ shuttle_route.traveller_count }}