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

join works

Browse Source
This commit is contained in:
Sander Roosendaal
2017-11-23 17:19:17 +01:00
parent fbdf017676
commit b1c642c968
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rowers/views.py
View File

@@ -46,7 +46,7 @@ from rowers.forms import (
RegistrationFormUniqueEmail,CNsummaryForm,UpdateWindForm,
UpdateStreamForm,WorkoutMultipleCompareForm,ChartParamChoiceForm,
FusionMetricChoiceForm,BoxPlotChoiceForm,MultiFlexChoiceForm,
TrendFlexModalForm,WorkoutSplitForm,
TrendFlexModalForm,WorkoutSplitForm,WorkoutJoinParamForm,
)
from rowers.models import Workout, User, Rower, WorkoutForm,FavoriteChart
from rowers.models import (
@@ -4207,14 +4207,20 @@ def workouts_join_view(request):
if request.method == 'POST' and 'workouts' in request.POST:
form = WorkoutMultipleCompareForm(request.POST)
if form.is_valid():
paramform = WorkoutJoinParamForm(request.POST)
if form.is_valid() and paramform.is_valid():
workout_name = paramform.cleaned_data['workout_name']
set_private = paramform.cleaned_data['set_private']
cd = form.cleaned_data
workouts = cd['workouts']
ids = [int(w.id) for w in workouts]
request.session['ids'] = ids
id,message = dataprep.join_workouts(r,ids)
id,message = dataprep.join_workouts(r,ids,
title=workout_name,
setprivate=set_private)
if message:
messages.error(request,message)
@@ -4227,7 +4233,8 @@ def workouts_join_view(request):
return HttpResponseRedirect(url)
else:
return HttpResponse("Form is not valid")
return HttpResponse("form is not valid")
else:
url = reverse(workouts_join_select)
return HttpResponseRedirect(url)
@@ -4368,7 +4375,7 @@ def workouts_join_select(request,
else:
theid = 0
chartform = ChartParamChoiceForm(initial={'teamid':0})
joinparamform = WorkoutJoinParamForm()
modalityform = TrendFlexModalForm(initial={
'modality':modality,
'waterboattype':waterboattype
@@ -4385,7 +4392,7 @@ def workouts_join_select(request,
'enddate':enddate,
'team':theteam,
'form':form,
'chartform':chartform,
'joinparamform':joinparamform,
'modalityform':modalityform,
'teams':get_my_teams(request.user),
})