Dataprep upon upload

rowers/dataprep.py

@@ -156,10 +156,21 @@ def read_cols_df_sql(ids,col1,col2,col3):
     for column in columns:
         cls += column+', '
     cls = cls[:-2]
-    query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid IN {ids}'.format(
-        columns = cls,
-        ids = tuple(ids),
+    if len(ids) == 0:
+        query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid=0'.format(
+            columns = cls,
+            ))
+    elif len(ids) == 1:
+        query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid={id}'.format(
+            id = ids[0],
+            columns = cls,
+            ))
+    else:
+        query = sa.text('SELECT {columns} FROM strokedata WHERE workoutid IN {ids}'.format(
+            columns = cls,
+            ids = tuple(ids),
         ))
+        
     df = pd.read_sql_query(query,engine)
     return df
         

rowers/interactiveplots.py

@@ -71,6 +71,7 @@ def interactive_histoall(theworkouts):
     TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,resize,crosshair'
 
     ids = [w.id for w in theworkouts]
+
     rowdata = dataprep.getsmallrowdata_db('power','power','power',ids=ids)
 
     histopwr = rowdata['power'].values

rowers/views.py

@@ -2870,10 +2870,6 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
 		u = request.user
 		r = Rower.objects.get(user=u)
 
-		res = interactive_chart(id)
-		script = res[0]
-		div = res[1]
-
 		rowdata = rdata(f1)
 		hascoordinates = 1
                 if rowdata != 0:
@@ -2906,8 +2902,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
 				   'gmscript': gmscript,
 				   'gmdiv': gmdiv,
 				   })
-#				   'interactiveplot':script,
-#				   'the_div':div})
+
 		else:
 		    return render(request, 'workout_form.html',
 				  {'form':form,
@@ -2919,8 +2914,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
 				   'gmscript': gmscript,
 				   'gmdiv': gmdiv,
 				   })
-#				   'interactiveplot':script,
-#				   'the_div':div})
+
 
 	except Workout.DoesNotExist:
 	    form = WorkoutForm(
@@ -3658,6 +3652,8 @@ def workout_upload_view(request,message=""):
 			    startdatetime=workoutstartdatetime)
 
 		w.save()
+                # put stroke data in database
+                res = dataprep.dataprep(row.df,id=w.id,bands=True,barchart=True,otwpower=True)
 
 		# Make Plot
 		if (make_plot):