From ecdb961989c2e2abc6cac85cd0efd05b8df59fee Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 22 May 2019 08:53:46 +0200 Subject: [PATCH] bla --- rowers/views/analysisviews.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 62662335..06908081 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -136,17 +136,6 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0): 'enddate':enddate, }) - if 'modalities' in request.session: - modalities = request.session['modalities'] - if len(modalities) > 1: - modality = 'all' - else: - modality = modalities[0] - else: - modalities = [m[0] for m in mytypes.workouttypes] - modality = 'all' - - negtypes = [] @@ -168,6 +157,8 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0): if b[0] not in waterboattype: negtypes.append(b[0]) + + if theteam is not None and (theteam.viewing == 'allmembers' or theteam.manager == request.user): workouts = Workout.objects.filter(team=theteam, startdatetime__gte=startdate, @@ -191,6 +182,7 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0): "-date", "-starttime" ).exclude(boattype__in=negtypes) + if rankingonly: workouts = workouts.exclude(rankingpiece=False)