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

bla

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-22 08:53:46 +02:00
parent c9c6aeab63
commit ecdb961989
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/views/analysisviews.py
View File

@@ -136,17 +136,6 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0):
'enddate':enddate, '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 = [] negtypes = []
@@ -168,6 +157,8 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0):
if b[0] not in waterboattype: if b[0] not in waterboattype:
negtypes.append(b[0]) negtypes.append(b[0])
if theteam is not None and (theteam.viewing == 'allmembers' or theteam.manager == request.user): if theteam is not None and (theteam.viewing == 'allmembers' or theteam.manager == request.user):
workouts = Workout.objects.filter(team=theteam, workouts = Workout.objects.filter(team=theteam,
startdatetime__gte=startdate, startdatetime__gte=startdate,
@@ -191,6 +182,7 @@ def analysis_new(request,userid=0,function='boxplot',teamid=0):
"-date", "-starttime" "-date", "-starttime"
).exclude(boattype__in=negtypes) ).exclude(boattype__in=negtypes)
if rankingonly: if rankingonly:
workouts = workouts.exclude(rankingpiece=False) workouts = workouts.exclude(rankingpiece=False)