Private
Public Access
1
0

draft view and chart for multi comparison

This commit is contained in:
Sander Roosendaal
2017-02-18 11:55:14 +01:00
parent 33afb8800b
commit 46358ba4d4
6 changed files with 109 additions and 39 deletions

View File

@@ -26,7 +26,7 @@ from rowers.forms import (
StatsOptionsForm,PredictedPieceForm,DateRangeForm,DeltaDaysForm,
EmailForm, RegistrationForm, RegistrationFormTermsOfService,
RegistrationFormUniqueEmail,CNsummaryForm,UpdateWindForm,
UpdateStreamForm,WorkoutMultipleCompareForm,
UpdateStreamForm,WorkoutMultipleCompareForm,ChartParamChoiceForm
)
from rowers.models import Workout, User, Rower, WorkoutForm,FavoriteChart
from rowers.models import (
@@ -2027,12 +2027,10 @@ def team_comparison_select(request,
(Q(notes__icontains=q) for q in query_list))
)
workouts1 = workouts
form = WorkoutMultipleCompareForm()
form.fields["workouts"].queryset = workouts1
form.fields["workouts"].queryset = workouts
chartform = ChartParamChoiceForm()
return render(request, 'team_compare_select.html',
{'workouts': workouts,
@@ -2043,9 +2041,28 @@ def team_comparison_select(request,
'enddate':enddate,
'team':theteam,
'form':form,
'chartform':chartform,
})
@login_required()
def multi_compare_view(request):
if request.method == 'POST':
form = WorkoutMultipleCompareForm(request.POST)
chartform = ChartParamChoiceForm(request.POST)
if form.is_valid() and chartform.is_valid():
cd = form.cleaned_data
workouts = cd['workouts']
xparam = chartform.cleaned_data['xparam']
yparam = chartform.cleaned_data['yparam']
ids = [w.id for w in workouts]
res = interactive_multiple_compare_chart(ids,xparam,yparam)
return HttpResponse("Form is valid")
else:
return HttpResponse("Form is not valid")
else:
url = reverse(workouts_view)
return HttpResponseRedirect(url)
# List Workouts
@login_required()
def workouts_view(request,message='',successmessage='',