From 781d76d639de359453ce630bbb058b792aadc8c0 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 11 Nov 2019 15:22:41 +0100 Subject: [PATCH] fixing workout charts --- rowers/views/workoutviews.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index b2aadeef..29c2e8c2 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -1202,8 +1202,9 @@ def workouts_view(request,message='',successmessage='', 'enddate':enddate, }) - startdate = datetime.datetime.combine(startdate,datetime.time()) - enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59)) + usertimezone = pytz.timezone(r.defaulttimezone) + startdate = datetime.datetime.combine(startdate,datetime.time()).astimezone(usertimezone) + enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59)).astimezone(usertimezone) #enddate = enddate+datetime.timedelta(days=1) @@ -1220,9 +1221,11 @@ def workouts_view(request,message='',successmessage='', activity_startdate = enddate-datetime.timedelta(days=15) try: - if utc.localize(enddate) > timezone.now(): + if enddate > timezone.now(): activity_enddate = timezone.now() + activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone) activity_startdate = activity_enddate-datetime.timedelta(days=15) + activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0) else: activity_enddate = enddate except ValueError: @@ -1289,7 +1292,6 @@ def workouts_view(request,message='',successmessage='', startdatetime__gte=activity_startdate, startdatetime__lte=activity_enddate).order_by("-startdatetime") - if g_workouts.count() == 0: g_workouts = Workout.objects.filter( user=r,