From 39c489b9356811bcd1c0cd8f39c742c6f4b632e8 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 13 Nov 2019 18:08:54 +0100 Subject: [PATCH] flex chart for swim data --- rowers/dataprep.py | 2 ++ rowers/interactiveplots.py | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 0b50fc05..f041b8ab 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1707,6 +1707,7 @@ def getrowdata_db(id=0, doclean=False, convertnewtons=True, def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,compute=True): # prepmultipledata(ids) + if ids: csvfilenames = ['media/strokedata_{id}.parquet.gz'.format(id=id) for id in ids] 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 = list(set(columns)) + if len(ids)>1: for id,f in zip(ids,csvfilenames): try: diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index c4ab7eb1..6224c108 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -3475,16 +3475,16 @@ def interactive_flex_chart2(id=0,promember=0, columns = [xparam,yparam1,yparam2, 'ftime','distance','fpace', 'power','hr','spm','driveenergy', - 'time','pace','workoutstate','time'] + 'time','pace','workoutstate'] rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True, workstrokesonly=workstrokesonly) - if rowdata.empty: + if len(rowdata)<2: rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True, workstrokesonly=False) workstrokesonly=False - if rowdata.empty: + if len(rowdata)<2: rowdata = dataprep.getsmallrowdata_db(columns,ids=[id], doclean=False, workstrokesonly=False)