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

better modality form in multi compare

Browse Source
This commit is contained in:
Sander Roosendaal
2018-09-05 22:19:18 +02:00
parent 6b77408a0c
commit 53affc41e2
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/forms.py
View File

@@ -540,7 +540,7 @@ class TrendFlexModalForm(forms.Form):
initial = types.waterboattype) initial = types.waterboattype)
rankingonly = forms.BooleanField(initial=False, rankingonly = forms.BooleanField(initial=False,
label='Only Ranking Pieces', label='Only Ranking Pieces',
required=True) required=False)
# This form sets options for the summary stats page # This form sets options for the summary stats page

17
rowers/views.py
View File

@@ -5112,6 +5112,10 @@ def team_comparison_select(request,
else: else:
waterboattype = types.waterboattype waterboattype = types.waterboattype
if 'rankingonly' in request.session:
rankingonly = request.session['rankingonly']
else:
rankingonly = False
if 'modalities' in request.session: if 'modalities' in request.session:
modalities = request.session['modalities'] modalities = request.session['modalities']
@@ -5130,8 +5134,6 @@ def team_comparison_select(request,
enddate = dateform.cleaned_data['enddate'] enddate = dateform.cleaned_data['enddate']
startdatestring = startdate.strftime('%Y-%m-%d') startdatestring = startdate.strftime('%Y-%m-%d')
enddatestring = enddate.strftime('%Y-%m-%d') enddatestring = enddate.strftime('%Y-%m-%d')
request.session['startdate'] = startdatestring
request.session['enddate'] = enddatestring
else: else:
dateform = DateRangeForm(initial={ dateform = DateRangeForm(initial={
'startdate':startdate, 'startdate':startdate,
@@ -5153,6 +5155,11 @@ def team_comparison_select(request,
waterboattype = [b[0] for b in types.boattypes] waterboattype = [b[0] for b in types.boattypes]
if 'rankingonly' in modalityform.cleaned_data:
rankingonly = modalityform.cleaned_data['rankingonly']
else:
rankingonly = False
request.session['modalities'] = modalities request.session['modalities'] = modalities
request.session['waterboattype'] = waterboattype request.session['waterboattype'] = waterboattype
@@ -5203,6 +5210,9 @@ def team_comparison_select(request,
startdatetime__lte=enddate, startdatetime__lte=enddate,
workouttype__in=modalities).order_by("-date", "-starttime").exclude(boattype__in=negtypes) workouttype__in=modalities).order_by("-date", "-starttime").exclude(boattype__in=negtypes)
if rankingonly:
workouts = [w for w in workouts if w.rankingpiece]
query = request.GET.get('q') query = request.GET.get('q')
if query: if query:
query_list = query.split() query_list = query.split()
@@ -5224,7 +5234,8 @@ def team_comparison_select(request,
chartform = ChartParamChoiceForm(initial={'teamid':0}) chartform = ChartParamChoiceForm(initial={'teamid':0})
modalityform = TrendFlexModalForm(initial={ modalityform = TrendFlexModalForm(initial={
'modality':modality, 'modality':modality,
'waterboattype':waterboattype 'waterboattype':waterboattype,
'rankingonly':rankingonly,
}) })