Private
Public Access
1
0

Merge branch 'release/v6.93'

This commit is contained in:
Sander Roosendaal
2018-06-14 21:15:35 +02:00
2 changed files with 12 additions and 5 deletions
+5
View File
@@ -2140,6 +2140,11 @@ def interactive_chart(id=0,promember=0):
except KeyError:
datadf['spm'] = 0
try:
pace = datadf['pace']
except KeyError:
datadf['pace'] = 0
#datadf,row = dataprep.getrowdata_db(id=id)
#if datadf.empty:
#return "","No Valid Data Available"
+6 -4
View File
@@ -11342,15 +11342,17 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
if powerorpace == 'power' and power is not None:
try:
rowdata.updateinterval_metric(' Power (watts)',power,mode='larger',
debug=False,smoothwindow=15)
rowdata.updateinterval_metric(
' Power (watts)',power,mode='larger',
debug=False,smoothwindow=15.)
except:
messages.error(request,'Error updating power')
elif powerorpace == 'pace':
try:
velo = 500./pace_secs
rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',velo,mode='larger',
debug=False,smoothwindow=15)
rowdata.updateinterval_metric(
' AverageBoatSpeed (m/s)',velo,mode='larger',
debug=False,smoothwindow=15.)
except:
messages.error(request,'Error updating pace')