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

fixing workout charts

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-11 15:22:41 +01:00
parent dc425445b2
commit 781d76d639
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/views/workoutviews.py
View File

@@ -1202,8 +1202,9 @@ def workouts_view(request,message='',successmessage='',
'enddate':enddate, 'enddate':enddate,
}) })
startdate = datetime.datetime.combine(startdate,datetime.time()) usertimezone = pytz.timezone(r.defaulttimezone)
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59)) 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) #enddate = enddate+datetime.timedelta(days=1)
@@ -1220,9 +1221,11 @@ def workouts_view(request,message='',successmessage='',
activity_startdate = enddate-datetime.timedelta(days=15) activity_startdate = enddate-datetime.timedelta(days=15)
try: try:
if utc.localize(enddate) > timezone.now(): if enddate > timezone.now():
activity_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_enddate-datetime.timedelta(days=15)
activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0)
else: else:
activity_enddate = enddate activity_enddate = enddate
except ValueError: except ValueError:
@@ -1289,7 +1292,6 @@ def workouts_view(request,message='',successmessage='',
startdatetime__gte=activity_startdate, startdatetime__gte=activity_startdate,
startdatetime__lte=activity_enddate).order_by("-startdatetime") startdatetime__lte=activity_enddate).order_by("-startdatetime")
if g_workouts.count() == 0: if g_workouts.count() == 0:
g_workouts = Workout.objects.filter( g_workouts = Workout.objects.filter(
user=r, user=r,