From a636ed198e6be78f4e95b60f5b9bf5165fd6bcdb Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 4 Dec 2016 14:29:19 +0100 Subject: [PATCH] Sort / use limited nr of columns on flexchart SQL query --- rowers/interactiveplots.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 2be3c390..d7a53f19 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -930,16 +930,18 @@ def interactive_flex_chart2(id=0,promember=0, 'peakforceangle': 20, } - rowdata,row = dataprep.getrowdata_db(id=id) - #columns = [xparam,yparam1,yparam2, - # 'ftime','distance','fpace', - # 'power','hr','spm', - # 'time','pace'] - #rowdata = dataprep.getsmallrowdata_db(columns,ids=[id]) - #row = Workout.objects.get(id=id) + #rowdata,row = dataprep.getrowdata_db(id=id) + columns = [xparam,yparam1,yparam2, + 'ftime','distance','fpace', + 'power','hr','spm', + 'time','pace','workoutstate'] + rowdata = dataprep.getsmallrowdata_db(columns,ids=[id]) + row = Workout.objects.get(id=id) if rowdata.empty: return "","CSV Data File Not Found" - + else: + rowdata.sort_values(by='time',ascending=True,inplace=True) + workoutstateswork = [1,4,5,8,9,6,7] workoutstatesrest = [3] workoutstatetransition = [0,2,10,11,12,13]