Private
Public Access
1
0

Merge branch 'hotfix/v6.97'

This commit is contained in:
Sander Roosendaal
2018-06-21 14:18:20 +02:00
2 changed files with 6 additions and 3 deletions
+2 -2
View File
@@ -2222,7 +2222,7 @@ def interactive_chart(id=0,promember=0,intervaldata = {}):
# add shaded bar chart areas
if intervaldata:
if intervaldata != {}:
intervaldf = pd.DataFrame(intervaldata)
intervaldf['itime'] = intervaldf['itime']*1.e3
intervaldf['time'] = intervaldf['itime'].cumsum()
@@ -2237,7 +2237,7 @@ def interactive_chart(id=0,promember=0,intervaldata = {}):
)
plot.quad(left='time',top='value',bottom='bottom',
right='time_r',source=intervalsource,color='pink',
right='time_r',source=intervalsource,color='mediumvioletred',
y_range_name='spmax',fill_alpha=0.2,line_alpha=0.2)
script, div = components(plot)
+3
View File
@@ -11342,7 +11342,10 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
pace_secs = 120.0
else:
power = 0
try:
pace_secs = float(value_pace)
except ValueError:
pace_secs = float(value_pace.replace(',','.'))
if powerorpace == 'power' and power is not None:
try: