Merge branch 'develop' into feature/opaqueid

2019-01-31 08:54:40 +01:00
parent c4e350f970 735d4433a7
commit 7a942dc473
13 changed files with 542 additions and 13 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -36,9 +36,12 @@ from rowingdata import (
    SpeedCoach2Parser, FITParser, fitsummarydata,
    RitmoTimeParser,KinoMapParser,
    make_cumvalues,cumcpdata,ExcelTemplate,
-    summarydata, get_file_type,
+    summarydata, get_file_type, 
 )

+from rowingdata.csvparsers import HumonParser
+
+
 from rowers.metrics import axes,calc_trimp,rowingmetrics
 from rowers.models import strokedatafields

@@ -1160,6 +1163,7 @@ parsers = {
    'ergstick': ErgStickParser,
    'fit': FITParser,
    'ergdata': ErgDataParser,
+    'humon': HumonParser,
    }

 def parsenonpainsled(fileformat,f2,summary):