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

remember form

Browse Source
This commit is contained in:
Sander Roosendaal
2022-11-02 19:44:20 +01:00
parent ae8d38f08a
commit f4cb5f1c4a
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/views/analysisviews.py
View File

@@ -135,6 +135,7 @@ def analysis_new(request,
chartform = AnalysisChoiceForm(request.POST) chartform = AnalysisChoiceForm(request.POST)
if chartform.is_valid(): if chartform.is_valid():
options['form'] = chartform.cleaned_data
for key, value in chartform.cleaned_data.items(): for key, value in chartform.cleaned_data.items():
options[key] = value options[key] = value
@@ -237,6 +238,11 @@ def analysis_new(request,
if id: if id:
form.fields["workouts"].initial = [firstworkout] form.fields["workouts"].initial = [firstworkout]
chartform = AnalysisChoiceForm(initial={'function': function}) chartform = AnalysisChoiceForm(initial={'function': function})
try:
chartformoptions = options['form']
chartform = AnalysisChoiceForm(initial=chartformoptions)
except KeyError:
pass
selectedworkouts = Workout.objects.none() selectedworkouts = Workout.objects.none()
else: else:
selectedworkouts = Workout.objects.filter(id__in=ids) selectedworkouts = Workout.objects.filter(id__in=ids)
@@ -1982,8 +1988,6 @@ class SavedAnalysisView(UserPassesTestMixin, View):
request.session['analyses'] = [a.id for a in self.selected] request.session['analyses'] = [a.id for a in self.selected]
# now should redirect to analysis # now should redirect to analysis
self.script, self.div = self.chart(self.selected) self.script, self.div = self.chart(self.selected)
else:
print(form.errors)
return render(request, self.template_name, return render(request, self.template_name,
{ {