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

Merge branch 'release/v13.00'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-06-21 18:05:22 +02:00
parent 03bf9f07c9 14bc64b3db
commit fd221af3c6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/plannedsessions.py
View File

@@ -1372,8 +1372,9 @@ def default_class(r,w,race):
boatclass=boatclass,
adaptiveclass=adaptiveclass,
boattype=boattype,
weightclass=weightclass
).order_by("agemax","-agemin","boattype")
weightclass=weightclass,
sex=sex,
).order_by("agemax","-agemin","boattype","sex")
if standards.count()==0:
@@ -1382,12 +1383,12 @@ def default_class(r,w,race):
boatclass=boatclass,
adaptiveclass=adaptiveclass,
boattype=boattype,
)
).order_by("agemax","-agemin","boattype","sex")
if standards.count()==0:
standards = CourseStandard.objects.filter(agemin__lt=age,agemax__gt=age,
boattype=boattype)
boattype=boattype).order_by("agemax","-agemin","boattype","sex")
if standards.count()==0:
standards = CourseStandard.objects.filter(agemin__lt=age,agemax__gt=age)
standards = CourseStandard.objects.filter(agemin__lt=age,agemax__gt=age).order_by("agemax","-agemin","boattype","sex")
if standards.count()==0:
# boolean, boattype, boatclass, adaptiveclass, weightclass, sex, coursestandard,