diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index ee26aca6..0be353b4 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -1032,27 +1032,28 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, data = DataFrame( - dict( - time = t*1e3, - hr = hr, - pace = p*1e3, - spm = spm, - cumdist = cumdist, - ftime = niceformat(t2), - fpace = nicepaceformat(p2), + dict( + time=t * 1e3, + hr=hr, + pace=p * 1e3, + spm=spm, velo=velo, - driveenergy=driveenergy, - distanceperstroke=distanceperstroke, - power=power, + cumdist=cumdist, + ftime=niceformat(t2), + fpace=nicepaceformat(p2), + driveenergy=driveenergy, + power=power, workoutstate=workoutstate, - averageforce=averageforce, - drivelength=drivelength, - peakforce=peakforce, + averageforce=averageforce, + drivelength=drivelength, + peakforce=peakforce, forceratio=forceratio, - distance=distance, - drivespeed=drivespeed, - ) - ) + distance=distance, + drivespeed=drivespeed, + rhythm=rhythm, + distanceperstroke=distanceperstroke, + ) + ) if bands: # HR bands