Merge branch 'release/v3.60'

rowers/dataprep.py

@@ -19,6 +19,7 @@ from django.utils.timezone import get_current_timezone
 thetimezone = get_current_timezone()
 from rowingdata import (
     TCXParser,RowProParser,ErgDataParser,TCXParserNoHR,
+    CoxMateParser,
     BoatCoachParser,RowPerfectParser,BoatCoachAdvancedParser,
     MysteryParser,
     painsledDesktopParser,speedcoachParser,ErgStickParser,
@@ -672,6 +673,11 @@ def handle_nonpainsled(f2,fileformat,summary=''):
     if (fileformat == 'ergdata'):
 	row = ErgDataParser(f2)
 
+            
+    # handle CoxMate
+    if (fileformat == 'coxmate'):
+	row = CoxMateParser(f2)
+
     # handle Mike
     if (fileformat == 'bcmike'):
         row = BoatCoachAdvancedParser(f2)

rowers/dataprepnodjango.py

@@ -315,6 +315,10 @@ def handle_nonpainsled(f2,fileformat,summary=''):
     if (fileformat == 'ergdata'):
 	row = ErgDataParser(f2)
 
+    # handle CoxMate
+    if (fileformat == 'coxmate'):
+	row = CoxMateParser(f2)
+
     # handle Mike
     if (fileformat == 'bcmike'):
         row = BoatCoachAdvancedParser(f2)