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

Merge tag 'v2.29' into develop

Browse Source 
bug fix flexall
This commit is contained in:
Sander Roosendaal
2017-04-26 08:54:02 +02:00
parent fd52eef007 fb0dc2a23b
commit c2264857b5
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/interactiveplots.py
View File

@@ -888,12 +888,12 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
datadf = dataprep.getsmallrowdata_db(columns,ids=ids,doclean=False)
try:
tests = rowdata[yparam2]
tests = datadf[yparam2]
except KeyError:
yparam2 = 'None'
try:
tests = rowdata[yparam1]
tests = datadf[yparam1]
except KeyError:
yparam1 = 'None'
@@ -903,14 +903,6 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
yparamname2 = axlabels[yparam2]
#datadf = datadf[datadf[yparam1] > 0]
#datadf = datadf[datadf[xparam] > 0]
#if yparam2 != 'None':
# datadf = datadf[datadf[yparam2] > 0]
# check if dataframe not empty
if datadf.empty:
return ['','<p>No non-zero data in selection</p>','','']