From f04f55334e4326c3ff98b704e03f72ce6f2f415d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 29 Jul 2017 11:14:48 +0200 Subject: [PATCH] workouts list gets last 30 days for small graph --- rowers/views.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/rowers/views.py b/rowers/views.py index 9d8493a5..abf842ce 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -4014,6 +4014,9 @@ def workouts_view(request,message='',successmessage='', enddate = startdate startdate = s + # start date for the small graph + activity_startdate = enddate-datetime.timedelta(days=30) + if teamid: try: theteam = Team.objects.get(id=teamid) @@ -4024,10 +4027,16 @@ def workouts_view(request,message='',successmessage='', workouts = Workout.objects.filter(team=theteam, startdatetime__gte=startdate, 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': workouts = Workout.objects.filter(team=theteam,user=r, startdatetime__gte=startdate, 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: @@ -4035,6 +4044,9 @@ def workouts_view(request,message='',successmessage='', workouts = Workout.objects.filter(user=r, startdatetime__gte=startdate, 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') if query: