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

adding dist

Browse Source
This commit is contained in:
Sander Roosendaal
2021-12-31 13:06:47 +01:00
parent 0fc1a7db28
commit 5dd00dcc39
3 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/views/analysisviews.py
View File

@@ -2336,6 +2336,7 @@ def history_view(request,userid=0):
wminutes=wminutes,
wseconds=wseconds,
)
ddict['distance'] = wmeters
ddict['nrworkouts'] = a_workouts.count()
listofdicts.append(ddict)
@@ -2439,9 +2440,11 @@ def history_view_data(request,userid=0):
yaxis = request.GET.get('yaxis','duration')
if yaxis.lower() not in ['duration','rscore','trimp']: # pragma: no cover
if yaxis.lower() not in ['duration','rscore','trimp','distance']: # pragma: no cover
yaxis = 'duration'
g_workouts = Workout.objects.filter(
user=r,
startdatetime__gte=activity_startdate,
@@ -2535,9 +2538,11 @@ def history_view_data(request,userid=0):
totalsdict['nrworkouts'] = g_workouts.count()
# activity chart
activity_script, activity_div = interactive_activitychart2(g_workouts,startdate,enddate,yaxis=yaxis)
# interactive hr pie chart
if typeselect == 'All':
totalseconds = 3600*totalhours+60*totalminutes+totalseconds