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

workouts list gets last 30 days for small graph

Browse Source
This commit is contained in:
Sander Roosendaal
2017-07-29 11:14:48 +02:00
parent 186f6064bd
commit f04f55334e
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/views.py
View File

@@ -4014,6 +4014,9 @@ def workouts_view(request,message='',successmessage='',
enddate = startdate enddate = startdate
startdate = s startdate = s
# start date for the small graph
activity_startdate = enddate-datetime.timedelta(days=30)
if teamid: if teamid:
try: try:
theteam = Team.objects.get(id=teamid) theteam = Team.objects.get(id=teamid)
@@ -4024,10 +4027,16 @@ def workouts_view(request,message='',successmessage='',
workouts = Workout.objects.filter(team=theteam, workouts = Workout.objects.filter(team=theteam,
startdatetime__gte=startdate, startdatetime__gte=startdate,
startdatetime__lte=enddate).order_by("-date", "-starttime") startdatetime__lte=enddate).order_by("-date", "-starttime")
g_workouts = Workout.objects.filter(team=theteam,
startdatetime__gte=activity_startdate,
startdatetime__lte=enddate).order_by("-date", "-starttime")
elif theteam.viewing == 'coachonly': elif theteam.viewing == 'coachonly':
workouts = Workout.objects.filter(team=theteam,user=r, workouts = Workout.objects.filter(team=theteam,user=r,
startdatetime__gte=startdate, startdatetime__gte=startdate,
startdatetime__lte=enddate).order_by("-date","-starttime") startdatetime__lte=enddate).order_by("-date","-starttime")
g_workouts = Workout.objects.filter(team=theteam,user=r,
startdatetime__gte=activity_startdate,
enddatetime__lte=enddate).order_by("-date","-starttime")
else: else:
@@ -4035,6 +4044,9 @@ def workouts_view(request,message='',successmessage='',
workouts = Workout.objects.filter(user=r, workouts = Workout.objects.filter(user=r,
startdatetime__gte=startdate, startdatetime__gte=startdate,
startdatetime__lte=enddate).order_by("-date", "-starttime") startdatetime__lte=enddate).order_by("-date", "-starttime")
g_workouts = Workout.objects.filter(user=r,
startdatetime__gte=activity_startdate,
startdatetime__lte=enddate).order_by("-date","-starttime")
query = request.GET.get('q') query = request.GET.get('q')
if query: if query: