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

Merge branch 'hotfix/v7.07'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-06-27 21:12:56 +02:00
parent c15e0f8ad2 ca598438a1
commit 9439fa33ac
1 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
rowers/dataprepnodjango.py
View File

@@ -1037,7 +1037,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
hr=hr, hr=hr,
pace=p * 1e3, pace=p * 1e3,
spm=spm, spm=spm,
velo=velo, # velo=velo,
cumdist=cumdist, cumdist=cumdist,
ftime=niceformat(t2), ftime=niceformat(t2),
fpace=nicepaceformat(p2), fpace=nicepaceformat(p2),
@@ -1051,7 +1051,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
distance=distance, distance=distance,
drivespeed=drivespeed, drivespeed=drivespeed,
rhythm=rhythm, rhythm=rhythm,
distanceperstroke=distanceperstroke, # distanceperstroke=distanceperstroke,
) )
) )
@@ -1225,40 +1225,6 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
if id != 0: if id != 0:
data['workoutid'] = id data['workoutid'] = id
data = data[['averageforce',
'cumdist',
'distance',
'distanceperstroke',
'driveenergy',
'drivelength',
'drivespeed',
'forceratio',
'fpace',
'ftime',
'hr',
'pace',
'peakforce',
'power',
'spm',
'time',
'velo',
'workoutstate',
'x_right',
'wash',
'catch',
'slip',
'finish',
'peakforceangle',
'totalangle',
'effectiveangle',
'efficiency',
'ergpace',
'nowindpace',
'equivergpower',
'fergpace',
'fnowindpace',
'workoutid']]
if debug: if debug:
engine = create_engine(database_url_debug, echo=False) engine = create_engine(database_url_debug, echo=False)
else: else: