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

Merge branch 'release/v13.01'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-06-21 18:19:44 +02:00
parent fd221af3c6 c04954daed
commit 4104dc48e2
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rowers/plannedsessions.py
View File

@@ -1379,16 +1379,28 @@ def default_class(r,w,race):
if standards.count()==0: if standards.count()==0:
# omit weight # omit weight
standards = CourseStandard.objects.filter(agemin__lt=age,agemax__gt=age, standards = CourseStandard.objects.filter(
boatclass=boatclass, agemin__lt=age,agemax__gt=age,
adaptiveclass=adaptiveclass, boatclass=boatclass,
boattype=boattype, adaptiveclass=adaptiveclass,
).order_by("agemax","-agemin","boattype","sex") boattype=boattype,
).order_by(
"agemax","-agemin","boattype","sex","weightcategory",
"referencespeed"
)
if standards.count()==0: if standards.count()==0:
standards = CourseStandard.objects.filter(agemin__lt=age,agemax__gt=age, standards = CourseStandard.objects.filter(
boattype=boattype).order_by("agemax","-agemin","boattype","sex") agemin__lt=age,agemax__gt=age,
boattype=boattype
).order_by(
"agemax","-agemin","boattype","sex",
"weightcategory","referencespeed")
if standards.count()==0: if standards.count()==0:
standards = CourseStandard.objects.filter(agemin__lt=age,agemax__gt=age).order_by("agemax","-agemin","boattype","sex") standards = CourseStandard.objects.filter(
agemin__lt=age,agemax__gt=age
).order_by(
"agemax","-agemin","boattype","sex",
"weightcategory","referencespeed")
if standards.count()==0: if standards.count()==0:
# boolean, boattype, boatclass, adaptiveclass, weightclass, sex, coursestandard, # boolean, boattype, boatclass, adaptiveclass, weightclass, sex, coursestandard,