From c0b676cc81e63f393e250c11c81ab26dc896adec Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 8 Jun 2020 15:53:27 +0200 Subject: [PATCH] points as float --- rowers/models.py | 4 ++-- rowers/tasks.py | 2 +- rowers/templates/virtualevent.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index dd533aa0..7f7d7df0 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -2965,7 +2965,7 @@ class VirtualRaceResult(models.Model): race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE) duration = models.TimeField(default=datetime.time(1,0)) distance = models.IntegerField(default=0) - points = models.IntegerField(default=0) + points = models.FloatField(default=0) boatclass = models.CharField(choices=boatclasses, max_length=40, default='water', @@ -3052,7 +3052,7 @@ class IndoorVirtualRaceResult(models.Model): duration = models.TimeField(default=datetime.time(1,0)) distance = models.IntegerField(default=0) referencespeed = models.FloatField(default=5.0) - points = models.IntegerField(default=0) + points = models.FloatField(default=0) boatclass = models.CharField(choices=boatclasses, max_length=40, default='rower', diff --git a/rowers/tasks.py b/rowers/tasks.py index 9c74aab9..f1eb59d8 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -494,7 +494,7 @@ def handle_check_race_course(self, if coursedistance == 0: coursedistance = coursemeters velo = coursedistance/coursetimeseconds - points = int(100*(2.-referencespeed/velo)) + points = 100*(2.-referencespeed/velo) query = 'UPDATE rowers_virtualraceresult SET coursecompleted = 1, duration = "{duration}", distance = {distance}, workoutid = {workoutid}, startsecond = {startsecond}, endsecond = {endsecond}, points={points} WHERE id={recordid}'.format( recordid=recordid, duration=totaltime_sec_to_string(coursetimeseconds), diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html index fc4936a9..e4b744ea 100644 --- a/rowers/templates/virtualevent.html +++ b/rowers/templates/virtualevent.html @@ -324,7 +324,7 @@ {{ result.duration |durationprint:"%H:%M:%S.%f" }} {{ result.distance }} m {% if race.coursestandards %} - {{ result.points }} + {{ result.points|sigdig:2 }} {% endif %}