From 4e15e98801ad8b5015260ce1039cf45d025ae2f7 Mon Sep 17 00:00:00 2001
From: John Mullins <john.mullins@education.vic.gov.au>
Date: Fri, 25 Aug 2023 10:28:44 +1000
Subject: [PATCH] Removed name from Shuttles. Based just on bus and school
 Formatting cleanups

---
 busManager/coord/models.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/busManager/coord/models.py b/busManager/coord/models.py
index f8bb83d..9625ff9 100644
--- a/busManager/coord/models.py
+++ b/busManager/coord/models.py
@@ -11,6 +11,7 @@ class Setting(models.Model):
     def __str__(self):
         return self.name
 
+
 class Suburb(models.Model):
     STATE = [
         ("VIC", "Victoria"),
@@ -86,14 +87,13 @@ class Bus(models.Model):
 
 class Shuttle(models.Model):
     bus = models.ForeignKey(Bus, on_delete=models.CASCADE)
-    name = models.CharField(max_length=20)
     school = models.ForeignKey(School, on_delete=models.CASCADE)
 
     class Meta:
         ordering = ["school__name"]
 
     def __str__(self):
-        return f"{self.name}, {self.bus.route_name} -> {self.school.name}"
+        return f"{self.bus.route_name} -> {self.school.shortName}"
 
 
 class Driver(models.Model):
@@ -236,7 +236,7 @@ class Traveller(models.Model):
             stops += stop.active_stops()
         if stops > 1:
             stops = 1
-        return f"${str(cost*stops)}"
+        return f"${str(cost * stops)}"
 
 
 class TravellerRoute(models.Model):