smoothen+otwpower

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)

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 + ">"

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"