From a4247ea61f4ce3817bdeb4fd1aed605bf49de4f2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 30 Jan 2019 21:02:12 +0100 Subject: [PATCH] humon support --- rowers/dataprep.py | 6 +++++- rowers/templates/list_workouts.html | 27 ++++++++++++++++++++++++-- rowers/tests/testdata/testdata.csv.gz | Bin 11426 -> 11426 bytes rowers/tests/testdata/testdata.tcx | 2 +- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index ee9df88f..16da3650 100644 --- 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): diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index 7699a488..27afb708 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -221,9 +221,32 @@ {% endif %} - Flex - Delete + + + + + + + + + + + + + + + + + + diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 5f4c0eb6565a58f9c9b51f1d59e89f063ab76f69..b9cf17d524779ef686d55d2a955c2634107009ca 100644 GIT binary patch delta 16 XcmZ1!xhRrdzMF%Chbd?y`)nNmDx3tD delta 16 XcmZ1!xhRrdzMF%i|486Q_SrfBGPniX diff --git a/rowers/tests/testdata/testdata.tcx b/rowers/tests/testdata/testdata.tcx index 7ce99249..f4ffb8ca 100644 --- a/rowers/tests/testdata/testdata.tcx +++ b/rowers/tests/testdata/testdata.tcx @@ -2502,7 +2502,7 @@ - <Element 'Notes' at 0x12c27940> + <Element 'Notes' at 0x13ffc240>