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

Merge branch 'develop' into feature/experimental_metrics

Browse Source
This commit is contained in:
Sander Roosendaal
2017-09-22 12:31:04 +02:00
parent 6db8b17ad6 199d105cc7
commit 955e7198df
6 changed files with 47 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/views.py
View File

@@ -4342,17 +4342,17 @@ def workouts_view(request,message='',successmessage='',
if theteam.viewing == 'allmembers' or theteam.manager == request.user:
workouts = Workout.objects.filter(team=theteam,
startdatetime__gte=startdate,
startdatetime__lte=enddate).order_by("-date", "-starttime")
startdatetime__lte=enddate).order_by("-startdatetime")
g_workouts = Workout.objects.filter(team=theteam,
startdatetime__gte=activity_startdate,
startdatetime__lte=activity_enddate).order_by("-date", "-starttime")
elif theteam.viewing == 'coachonly':
workouts = Workout.objects.filter(team=theteam,user=r,
startdatetime__gte=startdate,
startdatetime__lte=enddate).order_by("-date","-starttime")
startdatetime__lte=enddate).order_by("-startdatetime")
g_workouts = Workout.objects.filter(team=theteam,user=r,
startdatetime__gte=activity_startdate,
enddatetime__lte=activity_enddate).order_by("-date","-starttime")
enddatetime__lte=activity_enddate).order_by("-startdatetime")
else:
@@ -4362,7 +4362,7 @@ def workouts_view(request,message='',successmessage='',
startdatetime__lte=enddate).order_by("-date", "-starttime")
g_workouts = Workout.objects.filter(user=r,
startdatetime__gte=activity_startdate,
startdatetime__lte=activity_enddate).order_by("-date","-starttime")
startdatetime__lte=activity_enddate).order_by("-startdatetime")
query = request.GET.get('q')
if query: