Removed print statements
Added custom_name attribute to shuttles
This commit is contained in:
@@ -275,10 +275,8 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
|
|||||||
return "Multiple"
|
return "Multiple"
|
||||||
|
|
||||||
def save_model(self, request, obj, form, change):
|
def save_model(self, request, obj, form, change):
|
||||||
print("Saving")
|
|
||||||
if obj.is_archived and obj.travel_end_date is None:
|
if obj.is_archived and obj.travel_end_date is None:
|
||||||
obj.is_archived = False
|
obj.is_archived = False
|
||||||
print("Pulling out of archive")
|
|
||||||
super().save_model(request, obj, form, change)
|
super().save_model(request, obj, form, change)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -97,12 +97,18 @@ class Bus(models.Model):
|
|||||||
class Shuttle(models.Model):
|
class Shuttle(models.Model):
|
||||||
bus = models.ForeignKey(Bus, on_delete=models.CASCADE)
|
bus = models.ForeignKey(Bus, on_delete=models.CASCADE)
|
||||||
school = models.ForeignKey(School, on_delete=models.CASCADE)
|
school = models.ForeignKey(School, on_delete=models.CASCADE)
|
||||||
|
custom_name = models.CharField(max_length=10, blank=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
ordering = ["school__name"]
|
ordering = ["school__name"]
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return f"{self.school.shortName} <-> {self.bus.route_name}"
|
custom_name = self.custom_name
|
||||||
|
if custom_name:
|
||||||
|
custom_name = f" ({self.custom_name})"
|
||||||
|
else:
|
||||||
|
custom_name = ""
|
||||||
|
return f"{self.school.shortName} <-> {self.bus.route_name}{custom_name}"
|
||||||
|
|
||||||
def traveller_count(self):
|
def traveller_count(self):
|
||||||
count = 0
|
count = 0
|
||||||
|
|||||||
Reference in New Issue
Block a user