Removed print statements

Added custom_name attribute to shuttles
This commit is contained in:
John Mullins
2023-09-14 14:28:15 +10:00
parent c40b6f764b
commit 78434588e2
2 changed files with 7 additions and 3 deletions
-2
View File
@@ -275,10 +275,8 @@ class TravellerAdmin(MyImportExportModelAdmin, CloneModelAdmin, admin.ModelAdmin
return "Multiple"
def save_model(self, request, obj, form, change):
print("Saving")
if obj.is_archived and obj.travel_end_date is None:
obj.is_archived = False
print("Pulling out of archive")
super().save_model(request, obj, form, change)
+7 -1
View File
@@ -97,12 +97,18 @@ class Bus(models.Model):
class Shuttle(models.Model):
bus = models.ForeignKey(Bus, on_delete=models.CASCADE)
school = models.ForeignKey(School, on_delete=models.CASCADE)
custom_name = models.CharField(max_length=10, blank=True)
class Meta:
ordering = ["school__name"]
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):
count = 0