Merge branch 'release/v4.04'

rowers/dataprep.py

@@ -22,7 +22,7 @@ from rowingdata import (
     TCXParser,RowProParser,ErgDataParser,TCXParserNoHR,
     CoxMateParser,
     BoatCoachParser,RowPerfectParser,BoatCoachAdvancedParser,
-    MysteryParser,
+    MysteryParser,BoatCoachOTWParser,
     painsledDesktopParser,speedcoachParser,ErgStickParser,
     SpeedCoach2Parser,FITParser,fitsummarydata,
     make_cumvalues,
@@ -742,6 +742,10 @@ def handle_nonpainsled(f2,fileformat,summary=''):
     if (fileformat == 'boatcoach'):
 	row = BoatCoachParser(f2)
 
+    # handle BoatCoach OTW
+    if (fileformat == 'boatcoachotw'):
+        row = BoatCoachOTWParser(f2)
+        
     # handle painsled desktop
     if (fileformat == 'painsleddesktop'):
 	row = painsledDesktopParser(f2)

rowers/dataprepnodjango.py

@@ -325,6 +325,10 @@ def handle_nonpainsled(f2,fileformat,summary=''):
     if (fileformat == 'bcmike'):
         row = BoatCoachAdvancedParser(f2)
             
+    # handle BoatCoach OTW
+    if (fileformat == 'boatcoachotw'):
+        row = BoatCoachOTWParser(f2)
+
     # handle BoatCoach
     if (fileformat == 'boatcoach'):
 	row = BoatCoachParser(f2)

rowers/types.py

@@ -24,6 +24,7 @@ workoutsources = (
     ('rowperfect3','rowperfect3'),
     ('ergdata','ergdata'),
     ('boatcoach','boatcoach'),
+    ('boatcoachotw','boatcoachotw'),
     ('bcmike','boatcoach (develop)'),
     ('painsleddesktop','painsleddesktop'),
     ('speedcoach','speedcoach'),