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

Merge branch 'release/v12.35'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-10 11:59:36 +02:00
parent b9f830f5a9 e60c6373f8
commit 10e996f8f5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/views/analysisviews.py
View File

@@ -4839,7 +4839,7 @@ def history_view_data(request,userid=0):
ignoreadvanced=True) ignoreadvanced=True)
totalmeters,totalhours, totalminutes,totalseconds = get_totals(g_workouts) totalmeters,totalhours, totalminutes,totalseconds = get_totals(g_workouts)
# meters, duration per workout type # meters, duration per workout type
wtypes = list(set([w.workouttype for w in g_workouts])) wtypes = list(set([w.workouttype for w in g_workouts]))
@@ -4910,7 +4910,7 @@ def history_view_data(request,userid=0):
totalseconds=totalseconds) totalseconds=totalseconds)
else: else:
a_workouts = g_workouts.filter(workouttype=typeselect) a_workouts = g_workouts.filter(workouttype=typeselect)
hours,minutes,seconds = get_totals(a_workouts) meters, hours,minutes,seconds = get_totals(a_workouts)
totalseconds = 3600*hours+60*minutes+seconds totalseconds = 3600*hours+60*minutes+seconds
ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts]) ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts])
try: try: