sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

points as float

Browse Source
This commit is contained in:
Sander Roosendaal
2020-06-08 15:53:27 +02:00
parent b4e091323b
commit c0b676cc81
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/models.py
View File

@@ -2965,7 +2965,7 @@ class VirtualRaceResult(models.Model):
race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE) race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE)
duration = models.TimeField(default=datetime.time(1,0)) duration = models.TimeField(default=datetime.time(1,0))
distance = models.IntegerField(default=0) distance = models.IntegerField(default=0)
points = models.IntegerField(default=0) points = models.FloatField(default=0)
boatclass = models.CharField(choices=boatclasses, boatclass = models.CharField(choices=boatclasses,
max_length=40, max_length=40,
default='water', default='water',
@@ -3052,7 +3052,7 @@ class IndoorVirtualRaceResult(models.Model):
duration = models.TimeField(default=datetime.time(1,0)) duration = models.TimeField(default=datetime.time(1,0))
distance = models.IntegerField(default=0) distance = models.IntegerField(default=0)
referencespeed = models.FloatField(default=5.0) referencespeed = models.FloatField(default=5.0)
points = models.IntegerField(default=0) points = models.FloatField(default=0)
boatclass = models.CharField(choices=boatclasses, boatclass = models.CharField(choices=boatclasses,
max_length=40, max_length=40,
default='rower', default='rower',

2
rowers/tasks.py
View File

@@ -494,7 +494,7 @@ def handle_check_race_course(self,
if coursedistance == 0: if coursedistance == 0:
coursedistance = coursemeters coursedistance = coursemeters
velo = coursedistance/coursetimeseconds 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( 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, recordid=recordid,
duration=totaltime_sec_to_string(coursetimeseconds), duration=totaltime_sec_to_string(coursetimeseconds),

2
rowers/templates/virtualevent.html
View File

@@ -324,7 +324,7 @@
<td>{{ result.duration |durationprint:"%H:%M:%S.%f" }}</td> <td>{{ result.duration |durationprint:"%H:%M:%S.%f" }}</td>
<td>{{ result.distance }} m</td> <td>{{ result.distance }} m</td>
{% if race.coursestandards %} {% if race.coursestandards %}
<td>{{ result.points }}</td> <td>{{ result.points|sigdig:2 }}</td>
{% endif %} {% endif %}
<td> <td>
<a href="/rowers/workout/{{ result.workoutid|encode }}/view/entry/{{ result.id }}/"> <a href="/rowers/workout/{{ result.workoutid|encode }}/view/entry/{{ result.id }}/">