From ca598438a1c411b413baba6ddfceb7e28e65235a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 27 Jun 2018 21:12:05 +0200 Subject: [PATCH] removing velo --- rowers/dataprepnodjango.py | 38 ++------------------------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index 0be353b4..351ebb11 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -1037,7 +1037,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, hr=hr, pace=p * 1e3, spm=spm, - velo=velo, +# velo=velo, cumdist=cumdist, ftime=niceformat(t2), fpace=nicepaceformat(p2), @@ -1051,7 +1051,7 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, distance=distance, drivespeed=drivespeed, rhythm=rhythm, - distanceperstroke=distanceperstroke, +# distanceperstroke=distanceperstroke, ) ) @@ -1224,40 +1224,6 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, # write data if id given if id != 0: 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: engine = create_engine(database_url_debug, echo=False)