added OTE split

rowers/dataprep.py

@@ -91,7 +91,7 @@ columndict = {
     'finish':'finish',
     'peakforceangle':'peakforceangle',
     'wash':'wash',
-    'slip':'wash',
+    'slip':'slip',
     'workoutstate':' WorkoutState',
     }
     
@@ -107,13 +107,17 @@ def get_latlon(id):
         
     rowdata = rdata(w.csvfilename)
     try:
-	latitude = rowdata.df.ix[:,' latitude']
+        try:
-        longitude = rowdata.df.ix[:,' longitude']
+	    latitude = rowdata.df.ix[:,' latitude']
-    except KeyError:
+            longitude = rowdata.df.ix[:,' longitude']
-        latitude = 0*rowdata.df.ix[:,'TimeStamp (sec)']
+        except KeyError:
-        latitude = 0*rowdata.df.ix[:,'TimeStamp (sec)']
+            latitude = 0*rowdata.df.ix[:,'TimeStamp (sec)']
-
+            longitude = 0*rowdata.df.ix[:,'TimeStamp (sec)']
-    return [latitude,longitude]
+        return [latitude,longitude]
+    except AttributeError:
+        return [pd.Series([]),pd.Series([])]
+        
+    return [pd.Series([]),pd.Series([])]
 
 def get_workouts(ids,userid):
     goodids = []
@@ -822,6 +826,10 @@ def new_workout_from_file(r,f2,
 
 def split_workout(r,parent,splitsecond,splitmode):
     data,row = getrowdata_db(id=parent.id)
+    latitude,longitude = get_latlon(parent.id)
+    if not latitude.empty and not longitude.empty:
+        data[' latitude'] = latitude
+        data[' longitude'] = longitude
 
     data['time'] = data['time']/1000.
     

rowers/templates/advancededit.html

@@ -133,18 +133,30 @@
       Plot the Power Histogram of this workout
     </p>
   </div>
-  <div class="grid_2 suffix_2 omega">
+  <div class="grid_2">
     <p>
     {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
     <a class="button blue small" href="/rowers/workout/fusion/{{ workout.id }}/">Sensor Fusion</a>
     {% else %}
-      <a class="button blue small" href="/rowers/promembership">Dist Metrics Plot</a>
+      <a class="button blue small" href="/rowers/promembership">Sensor Fusion</a>
       {% endif %}
     </p>
     <p>
       Merge data from another source into this workout
     </p>
   </div>
+  <div class="grid_2 omega">
+    <p>
+    {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
+    <a class="button blue small" href="/rowers/workout/{{ workout.id }}/split">Split Workout</a>
+    {% else %}
+      <a class="button blue small" href="/rowers/promembership">Split Workout</a>
+      {% endif %}
+    </p>
+    <p>
+      Split workout into two seperate workouts
+    </p>
+  </div>
 </div>
 </div>
 <div id="advancedplots" class="grid_6 omega">

rowers/templates/advancedotw.html

@@ -195,7 +195,7 @@
     {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %}
     <a class="button blue small" href="/rowers/workout/fusion/{{ workout.id }}/">Sensor Fusion</a>
     {% else %}
-      <a class="button blue small" href="/rowers/promembership">Split Workout</a>
+      <a class="button blue small" href="/rowers/promembership">Sensor Fusion</a>
       {% endif %}
     </p>
     <p>