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

flex chart for swim data

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-13 18:08:54 +01:00
parent dea6ad21a3
commit 39c489b935
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/dataprep.py
View File

@@ -1707,6 +1707,7 @@ def getrowdata_db(id=0, doclean=False, convertnewtons=True,
def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,compute=True): def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,compute=True):
# prepmultipledata(ids) # prepmultipledata(ids)
if ids: if ids:
csvfilenames = ['media/strokedata_{id}.parquet.gz'.format(id=id) for id in ids] csvfilenames = ['media/strokedata_{id}.parquet.gz'.format(id=id) for id in ids]
else: else:
@@ -1716,6 +1717,7 @@ def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,comput
columns = [c for c in columns if c != 'None'] columns = [c for c in columns if c != 'None']
columns = list(set(columns)) columns = list(set(columns))
if len(ids)>1: if len(ids)>1:
for id,f in zip(ids,csvfilenames): for id,f in zip(ids,csvfilenames):
try: try:

6
rowers/interactiveplots.py
View File

@@ -3475,16 +3475,16 @@ def interactive_flex_chart2(id=0,promember=0,
columns = [xparam,yparam1,yparam2, columns = [xparam,yparam1,yparam2,
'ftime','distance','fpace', 'ftime','distance','fpace',
'power','hr','spm','driveenergy', 'power','hr','spm','driveenergy',
'time','pace','workoutstate','time'] 'time','pace','workoutstate']
rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True, rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True,
workstrokesonly=workstrokesonly) workstrokesonly=workstrokesonly)
if rowdata.empty: if len(rowdata)<2:
rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True, rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True,
workstrokesonly=False) workstrokesonly=False)
workstrokesonly=False workstrokesonly=False
if rowdata.empty: if len(rowdata)<2:
rowdata = dataprep.getsmallrowdata_db(columns,ids=[id], rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],
doclean=False, doclean=False,
workstrokesonly=False) workstrokesonly=False)