From b1f59c51c4a637f4ffa2e990b4c195a8dc6d3ea0 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 7 Jul 2020 22:22:43 +0200 Subject: [PATCH] adding ref speed --- rowers/plannedsessions.py | 10 ++++++---- rowers/views/racesviews.py | 7 ++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 83c68a7a..fd54565c 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -1404,12 +1404,12 @@ def default_class(r,w,race): if standards.count()==0: # boolean, boattype, boatclass, adaptiveclass, weightclass, sex, coursestandard, - return False,'1x','water',None,'hwt','male',None + return False,'1x','water',None,'hwt','male',5.0,None if standards.count()>0: # find optimum standard s = standards[0] - return True,s.boattype,s.boatclass,s.adaptiveclass,s.weightclass,s.sex,s + return True,s.boattype,s.boatclass,s.adaptiveclass,s.weightclass,s.sex,s.referencespeed,s # No Course Standard return True,boattype,boatclass,adaptiveclass,weightclass,sex,None @@ -1472,7 +1472,7 @@ def add_workout_indoorrace(ws,race,r,recordid=0,doregister=False): ) except IndoorVirtualRaceResult.DoesNotExist: if doregister: - hasinitial,boattype,boatclass,adaptiveclass,weightclass,sex,initialcategory = default_class(r,ws[0],race) + hasinitial,boattype,boatclass,adaptiveclass,weightclass,sex,referencespeed,initialcategory = default_class(r,ws[0],race) if hasinitial: record = IndoorVirtualRaceResult( userid = r.id, @@ -1483,6 +1483,7 @@ def add_workout_indoorrace(ws,race,r,recordid=0,doregister=False): boatclass=boatclass, sex=sex, age = age, + referencespeed=referencespeed, entrycategory=initialcategory, ) record.save() @@ -1624,7 +1625,7 @@ def add_workout_race(ws,race,r,splitsecond=0,recordid=0,doregister=False): ) except VirtualRaceResult.DoesNotExist: if doregister: - hasinitial,boattype,boatclass,adaptiveclass,weightclass,sex,initialcategory = default_class(r,ws[0],race) + hasinitial,boattype,boatclass,adaptiveclass,weightclass,sex,referencespeed,initialcategory = default_class(r,ws[0],race) if hasinitial: record = VirtualRaceResult( userid = r.id, @@ -1637,6 +1638,7 @@ def add_workout_race(ws,race,r,splitsecond=0,recordid=0,doregister=False): sex=sex, age = age, entrycategory=initialcategory, + referencespeed=referencespeed, ) record.save() add_rower_race(r,race) diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index cb12d553..8fd04b04 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -1631,7 +1631,7 @@ def virtualevent_addboat_view(request,id=0): raise Http404("Virtual Challenge does not exist") categories = None - hasinitial,boattype,boatclass,adaptiveclass,weightclass,sex,initialcategory = default_class(r,None,race) + hasinitial,boattype,boatclass,adaptiveclass,weightclass,sex,referencespeed,initialcategory = default_class(r,None,race) if race.coursestandards is not None: categories = CourseStandard.objects.filter( standardcollection=race.coursestandards).order_by("name") @@ -1918,7 +1918,7 @@ def virtualevent_register_view(request,id=0): raise Http404("Virtual Challenge does not exist") categories = None - hasinitial,boattype,boatclass,adaptiveclass,weightclass,sex,initialcategory = default_class(r,None,race) + hasinitial,boattype,boatclass,adaptiveclass,weightclass,sex,referencespeed,initialcategory = default_class(r,None,race) if race.coursestandards is not None: categories = CourseStandard.objects.filter( standardcollection=race.coursestandards).order_by("name") @@ -2943,7 +2943,7 @@ def virtualevent_submit_result_view(request,id=0,workoutid=0): ) if records.count() == 0: - hasinitial,boattype,boatclass,adaptiveclass,weightclass,sex,initialcategory = default_class(r,None,race) + hasinitial,boattype,boatclass,adaptiveclass,weightclass,sex,referencespeed,initialcategory = default_class(r,None,race) if not hasinitial: messages.error(request,"Sorry, you have to register first") url = reverse('virtualevent_view', @@ -2961,6 +2961,7 @@ def virtualevent_submit_result_view(request,id=0,workoutid=0): sex=sex, age=calculate_age(r.birthdate), entrycategory=initialcategory, + referencespeed=referencespeed, ) record.save() records = [record]