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

Merge tag 'v7.06' into develop

Browse Source 
test
This commit is contained in:
Sander Roosendaal
2018-06-27 21:08:52 +02:00
parent 9d2c7c04ac c15e0f8ad2
commit 0e64ff0bb4
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rowers/dataprepnodjango.py
View File

@@ -1033,16 +1033,15 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
data = DataFrame( data = DataFrame(
dict( dict(
time = t*1e3, time=t * 1e3,
hr = hr, hr=hr,
pace = p*1e3, pace=p * 1e3,
spm = spm, spm=spm,
cumdist = cumdist,
ftime = niceformat(t2),
fpace = nicepaceformat(p2),
velo=velo, velo=velo,
cumdist=cumdist,
ftime=niceformat(t2),
fpace=nicepaceformat(p2),
driveenergy=driveenergy, driveenergy=driveenergy,
distanceperstroke=distanceperstroke,
power=power, power=power,
workoutstate=workoutstate, workoutstate=workoutstate,
averageforce=averageforce, averageforce=averageforce,
@@ -1051,6 +1050,8 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
forceratio=forceratio, forceratio=forceratio,
distance=distance, distance=distance,
drivespeed=drivespeed, drivespeed=drivespeed,
rhythm=rhythm,
distanceperstroke=distanceperstroke,
) )
) )