From f893ad7626e3a82a2789281931a3e41a7d87f798 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 11 Jul 2020 20:42:17 +0200 Subject: [PATCH] bug fix points score --- rowers/templates/course_form_update.html | 1 - rowers/templates/virtualevent.html | 2 +- rowers/views/racesviews.py | 10 +++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/rowers/templates/course_form_update.html b/rowers/templates/course_form_update.html index ce63e459..7a5dca80 100644 --- a/rowers/templates/course_form_update.html +++ b/rowers/templates/course_form_update.html @@ -254,7 +254,6 @@ success: function(result) { console.log('got something back'); console.log(result); if (result.result == 1) { - setTimeout(1000); window.location.href = result.url; } else { console.log(result," reloading"); diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html index 90d6bfed..a76e0f54 100644 --- a/rowers/templates/virtualevent.html +++ b/rowers/templates/virtualevent.html @@ -94,7 +94,7 @@ {% if race.sessiontype == 'race' %} - Course{{ race.course }} + Course{{ race.course }} {% else %} diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index 455ab0f5..de462794 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -9,6 +9,7 @@ from rowers.scoring import * from django.contrib.gis.geoip2 import GeoIP2 from django import forms +from rowers.plannedsessions import timefield_to_seconds_duration # distance of course from lat_lon in km def howfaris(lat_lon,course): @@ -3500,7 +3501,14 @@ def virtualevent_entry_edit_view(request,id=0,entryid=0): return HttpResponseRedirect(returnurl) if record.points != 0: - record.points = record.points*record.referencespeed/referencespeed + if race.sessiontype == 'race': + coursedistance = race.course.distance + else: + coursedistance = record.distance + v = coursedistance/timefield_to_seconds_duration(record.duration) + points = 100.*(2-(referencespeed/v)) + record.points = points + record.teamname = teamname record.weightcategory=weightcategory