From ea83a40668f4b1fe9368d86365d7bde1c2530902 Mon Sep 17 00:00:00 2001 From: John Mullins Date: Mon, 26 Aug 2024 14:30:34 +1000 Subject: [PATCH] Adding rounding to farepaying status Added route filtering by traveller ID instead of traveller object --- 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 6490a60..71aaccd 100644 --- a/busManager/coord/models.py +++ b/busManager/coord/models.py @@ -6,7 +6,7 @@ from django.db import models class Setting(models.Model): name = models.CharField(max_length=20, unique=True) - value = models.CharField(max_length=20, blank=True) + value = models.CharField(max_length=50, blank=True) def __str__(self): return self.name @@ -230,7 +230,7 @@ class Traveller(models.Model): new_start_date = None new_end_date = None - for travellerRoute in TravellerRoute.objects.filter(traveller=self): + for travellerRoute in TravellerRoute.objects.filter(traveller=self.id): route_start = travellerRoute.travel_start_date route_end = travellerRoute.travel_end_date if route_start is not None: @@ -259,7 +259,7 @@ class Traveller(models.Model): stops += stop.active_stops() if stops > 1: stops = 1 - return f"${str(cost * stops)}" + return f"${round(cost*stops)}" def _repopulate_address(self): families = self.get_families()