From ee87f512d7880d5ddd7b5de40ca9d548f9732b38 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 11 Jul 2017 20:47:49 +0200 Subject: [PATCH 1/2] sticky palette --- rowers/views.py | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index 9b7c46a2..b3bd7431 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3344,6 +3344,17 @@ def user_multiflex_select(request, r = getrower(user) + if 'options' in request.session: + options = request.session['options'] + else: + options = {} + + try: + palette = request.session['palette'] + except KeyError: + palette = 'monochrome_blue' + + if 'startdate' in request.session: startdate = iso8601.parse_date(request.session['startdate']) @@ -3395,7 +3406,9 @@ def user_multiflex_select(request, form = WorkoutMultipleCompareForm() form.fields["workouts"].queryset = workouts - chartform = MultiFlexChoiceForm() + chartform = MultiFlexChoiceForm(initial={ + 'palette':palette + }) messages.info(request,successmessage) messages.error(request,message) @@ -3437,9 +3450,9 @@ def multiflex_view(request,userid=0, ploterrorbars = False try: - palette = options['palette'] + palette = request.session['palette'] except KeyError: - palette = 'blue_green' + palette = 'monochrome_blue' workstrokesonly = not includereststrokes From cc170c4847348de9ff0f9d7b499f632bb13241cd Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 11 Jul 2017 20:53:33 +0200 Subject: [PATCH 2/2] multiflex select form remembers options --- rowers/views.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/rowers/views.py b/rowers/views.py index b3bd7431..44c96150 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3354,6 +3354,16 @@ def user_multiflex_select(request, except KeyError: palette = 'monochrome_blue' + try: + includereststrokes = request.session['includereststrokes'] + except KeyError: + includereststrokes = False + + try: + ploterrorbars = request.session['ploterrorbars'] + except: + ploterrobars = False + if 'startdate' in request.session: startdate = iso8601.parse_date(request.session['startdate']) @@ -3407,7 +3417,9 @@ def user_multiflex_select(request, form.fields["workouts"].queryset = workouts chartform = MultiFlexChoiceForm(initial={ - 'palette':palette + 'palette':palette, + 'ploterrorbars':ploterrorbars, + 'includereststrokes':includereststrokes, }) messages.info(request,successmessage)