Merge branch 'feature/restapitesting' into develop

2016-11-06 17:56:41 +01:00
parent 689749567b 1a1b1d403f
commit 52f6d180df
1262 changed files with 32398 additions and 0 deletions
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -371,6 +371,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'):
 		       ' Stroke500mPace (sec/500m)':pace,
 		       ' DragFactor':np.zeros(nr_rows),
 		       ' Power (watts)':power,
+		       ' DragFactor':np.zeros(nr_rows),
 		       ' DriveLength (meters)':np.zeros(nr_rows),
 		       ' StrokeDistance (meters)':strokelength,
 		       ' DriveTime (ms)':np.zeros(nr_rows),