From bb2283635e07ec93ecaeca0b68b432f0dbdb0568 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 17 May 2017 09:44:47 +0200 Subject: [PATCH] bug fix --- rowers/dataprep.py | 8 ++++---- rowers/views.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index e25bc255..ba78268e 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -96,13 +96,13 @@ from scipy.signal import savgol_filter import datetime def get_workouts(ids,userid): - workouts = [] + goodids = [] for id in ids: w = Workout.objects.get(id=id) - if w.user.user.id == userid: - workouts.append[w] + if int(w.user.user.id) == int(userid): + goodids.append(id) - return workouts + return [Workout.objects.get(id=id) for id in goodids] def filter_df(datadf,fieldname,value,largerthan=True): diff --git a/rowers/views.py b/rowers/views.py index 7e6461b8..376fa0d1 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3111,7 +3111,7 @@ def boxplot_view(request,userid=0, }) else: return HttpResponse("Form is not valid") - if request.method == 'POST' and 'ids' in request.session: + elif request.method == 'POST' and 'ids' in request.session: chartform = BoxPlotChoiceForm(request.POST) if chartform.is_valid(): plotfield = chartform.cleaned_data['yparam']