From 5fd3bbfa8794b8fa7120bfc507e10645711cf7c4 Mon Sep 17 00:00:00 2001 From: John Mullins Date: Wed, 11 Oct 2023 12:59:15 +1100 Subject: [PATCH] Added start_date clause to traveller.is_active() function --- busManager/coord/models.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/busManager/coord/models.py b/busManager/coord/models.py index 27fdd52..9c9312e 100644 --- a/busManager/coord/models.py +++ b/busManager/coord/models.py @@ -249,10 +249,14 @@ class Traveller(models.Model): def is_active(self): if self.is_archived: return False + if not self.travel_start_date: + return False + if datetime(self.travel_start_date.year, self.travel_start_date.month, self.travel_start_date.day) > datetime.today(): + return False if not self.travel_end_date: return True - end_date = datetime(self.travel_end_date.year, self.travel_end_date.month,self.travel_end_date.day) + end_date = datetime(self.travel_end_date.year, self.travel_end_date.month, self.travel_end_date.day) return end_date > datetime.today() def fare_paying(self):