Merge branch 'release/v12.35'
This commit is contained in:
@@ -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:
|
||||||
|
|||||||
Reference in New Issue
Block a user