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

Merge tag 'v5.98' into develop

Browse Source 
releasing plan v1.0
This commit is contained in:
Sander Roosendaal
2018-03-03 10:44:42 +01:00
parent 8e0de9163f c3fd328b5f
commit 0108cb3079
8 changed files with 152 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/interactiveplots.py
View File

@@ -2639,18 +2639,18 @@ def interactive_flex_chart2(id=0,promember=0,
rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True,
workstrokesonly=False)
workstrokesonly=False
try:
tests = rowdata[yparam2]
except KeyError:
yparam2 = 'None'
try:
tests = rowdata[yparam1]
except KeyError:
yparam1 = 'None'
rowdata.dropna(axis=1,how='all',inplace=True)
# test if we have drive energy
nowork = 1
@@ -2671,7 +2671,7 @@ def interactive_flex_chart2(id=0,promember=0,
row = Workout.objects.get(id=id)
if rowdata.empty:
return "","No valid data"
return "","No valid data",'','',workstrokesonly
else:
try:
rowdata.sort_values(by='time',ascending=True,inplace=True)
@@ -2691,7 +2691,7 @@ def interactive_flex_chart2(id=0,promember=0,
try:
tseconds = rowdata.ix[:,'time']
except KeyError:
return '','No time data - cannot make flex plot','',''
return '','No time data - cannot make flex plot','','',workstrokesonly
try:
@@ -3099,7 +3099,7 @@ def interactive_flex_chart2(id=0,promember=0,
try:
distmax = 100+100*int(rowdata['distance'].max()/100.)
except KeyError:
except (KeyError,ValueError):
distmax = 100
slider_dist_min = Slider(start=0,end=distmax,value=0,step=1,