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

Merge branch 'develop' into feature/sensorfusion

Browse Source
This commit is contained in:
Sander Roosendaal
2017-03-08 16:12:41 +01:00
parent 433aa348a2 870d9466e7
commit 5be668ebf0
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/.#interactiveplots.py Normal file
View File

@@ -0,0 +1 @@
E408191@CZ27LT9RCGN72.15972:1488820163

5
rowers/dataprep.py
View File

@@ -753,11 +753,12 @@ def getrowdata_db(id=0,doclean=False):
return data,row return data,row
# Fetch a subset of the data from the DB # Fetch a subset of the data from the DB
def getsmallrowdata_db(columns,ids=[],doclean=True): def getsmallrowdata_db(columns,ids=[],doclean=True,workstrokesonly=True):
prepmultipledata(ids) prepmultipledata(ids)
data = read_cols_df_sql(ids,columns) data = read_cols_df_sql(ids,columns)
if doclean: if doclean:
data = clean_df_stats(data,ignorehr=True) data = clean_df_stats(data,ignorehr=True,
workstrokesonly=workstrokesonly)
return data return data

3
rowers/interactiveplots.py
View File

@@ -1167,7 +1167,8 @@ def interactive_flex_chart2(id=0,promember=0,
'power','hr','spm','driveenergy', 'power','hr','spm','driveenergy',
'time','pace','workoutstate','time'] 'time','pace','workoutstate','time']
rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True) rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True,
workstrokesonly=workstrokesonly)
rowdata.dropna(axis=1,how='all',inplace=True) rowdata.dropna(axis=1,how='all',inplace=True)
rowdata.dropna(axis=0,how='any',inplace=True) rowdata.dropna(axis=0,how='any',inplace=True)

1
rowers/views.py
View File

@@ -3430,6 +3430,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
yparam1=yparam1,yparam2=yparam2, yparam1=yparam1,yparam2=yparam2,
plottype=plottype,workouttype=workouttype, plottype=plottype,workouttype=workouttype,
reststrokes=reststrokes) reststrokes=reststrokes)
f.save()
if request.method == 'POST' and 'workstrokesonly' in request.POST: if request.method == 'POST' and 'workstrokesonly' in request.POST:
workstrokesonly = request.POST['workstrokesonly'] workstrokesonly = request.POST['workstrokesonly']