From fd518a854b4e37a7948e589c4653dfa55d635ce4 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 28 Nov 2016 09:39:24 +0100 Subject: [PATCH] smoothen+otwpower --- rowers/dataprep.py | 6 +++++- rowers/tasks.py | 1 + rowers/views.py | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 5a5cb7d6..c8c5dc80 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -89,7 +89,7 @@ def rdata(file,rower=rrower()): def delete_strokedata(id): engine = create_engine(database_url, echo=False) - query = sa.text('DELETE FROM strokedata * WHERE workoutid={id};'.format( + query = sa.text('DELETE FROM strokedata WHERE workoutid={id};'.format( id=id, )) with engine.connect() as conn, conn.begin(): @@ -100,6 +100,10 @@ def delete_strokedata(id): conn.close() engine.dispose() +def update_strokedata(id,df): + delete_strokedata(id) + rowdata = dataprep(df,id=id,bands=True,barchart=True,otwpower=True) + def testdata(time,distance,pace,spm): t1 = np.issubdtype(time,np.number) t2 = np.issubdtype(distance,np.number) diff --git a/rowers/tasks.py b/rowers/tasks.py index 5637644b..e9606cea 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -116,6 +116,7 @@ def handle_otwsetpower(f1,boattype,weightvalue,first_name,last_name,email,workou # save data rowdata.write_csv(f1) + dataprep.update_strokedata(workoutid,rowdata.df) # send email fullemail = first_name + " " + last_name + " " + "<" + email + ">" diff --git a/rowers/views.py b/rowers/views.py index 5ad543ee..dd72faee 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -2041,6 +2041,7 @@ def workout_undo_smoothenpace_view(request,id=0,message="",successmessage=""): row.df[' Stroke500mPace (sec/500m)'] = 500./velo row.write_csv(filename) + dataprep.update_strokedata(id,row.df) url = "/rowers/workout/"+str(id)+"/advanced" @@ -2077,6 +2078,7 @@ def workout_smoothenpace_view(request,id=0,message="",successmessage=""): row.df = row.df.fillna(0) row.write_csv(filename) + dataprep.update_strokedata(id,row.df) url = "/rowers/workout/"+str(id)+"/advanced"