Moved where active status is displayed.
Cleaned up logout redirects Added suburbs admin page back. Wasn't able to create new suburbs Made active status check to any traveller save function
This commit is contained in:
+10
-18
@@ -234,7 +234,7 @@ class Traveller(models.Model):
|
||||
created_on = models.DateTimeField(auto_now_add=True, blank=True, null=True)
|
||||
last_edit = models.DateTimeField(auto_now=True, blank=True, null=True)
|
||||
is_archived = models.BooleanField(default=False, verbose_name="Archived")
|
||||
is_active = models.BooleanField(default=True, verbose_name='Active')
|
||||
is_active = models.BooleanField(default=False, verbose_name='Active')
|
||||
notes = models.TextField(blank=True, verbose_name='Admin Notes')
|
||||
shuttle = models.ForeignKey(Shuttle, on_delete=models.SET_NULL, blank=True, null=True)
|
||||
|
||||
@@ -244,6 +244,10 @@ class Traveller(models.Model):
|
||||
def __str__(self):
|
||||
return f"{self.first_name} {self.last_name}"
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
self._update_active_status()
|
||||
super(Traveller, self).save(*args, **kwargs)
|
||||
|
||||
def _is_active(self):
|
||||
today = datetime.today()
|
||||
today = datetime(today.year, today.month, today.day)
|
||||
@@ -255,7 +259,7 @@ class Traveller(models.Model):
|
||||
end_date = datetime(self.travel_end_date.year, self.travel_end_date.month, self.travel_end_date.day)
|
||||
return end_date >= today
|
||||
|
||||
def update_active_status(self):
|
||||
def _update_active_status(self):
|
||||
new_start_date = None
|
||||
new_end_date = None
|
||||
|
||||
@@ -270,21 +274,9 @@ class Traveller(models.Model):
|
||||
if new_end_date is None or new_end_date < route_end:
|
||||
new_end_date = route_end
|
||||
|
||||
updated = False
|
||||
if self.travel_start_date != new_start_date:
|
||||
self.travel_start_date = new_start_date
|
||||
updated = True
|
||||
if self.travel_end_date != new_end_date:
|
||||
self.travel_end_date = new_end_date
|
||||
updated = True
|
||||
|
||||
is_active = self._is_active()
|
||||
if self.is_active != is_active:
|
||||
self.is_active = is_active
|
||||
updated = True
|
||||
|
||||
if updated:
|
||||
self.save()
|
||||
self.travel_start_date = new_start_date
|
||||
self.travel_end_date = new_end_date
|
||||
self.is_active = self._is_active()
|
||||
|
||||
def fare_paying(self):
|
||||
if self.eligibility_status != "2":
|
||||
@@ -347,7 +339,7 @@ class TravellerRoute(models.Model):
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
super(TravellerRoute, self).save(*args, **kwargs)
|
||||
# self.traveller.update_active_status()
|
||||
self.traveller.save()
|
||||
|
||||
def active_stops(self):
|
||||
stops = 0
|
||||
|
||||
Reference in New Issue
Block a user