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

Sort / use limited nr of columns on flexchart SQL query

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-04 14:29:19 +01:00
parent 4f70c57f5f
commit a636ed198e
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rowers/interactiveplots.py
View File

@@ -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]