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

Merge branch 'develop' into feature/embeddedvideo

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-11 21:57:23 +01:00
parent 9ded10d692 680c64a43c
commit 7329fb4f3b
10 changed files with 166 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/views/workoutviews.py
View File

@@ -1665,8 +1665,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)
@@ -1683,9 +1684,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:
@@ -1752,7 +1755,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,
@@ -2891,6 +2893,7 @@ def workout_data_view(request, id=0):
'catch','finish','peakforceangle','wash','slip','rhythm',
'effectiveangle','totalangle','distanceperstroke','velo']
cols = [c for c in cols if c in datadf.columns]
tcols = ['ftime','cumdist','fpace','spm','hr','power']