Merge branch 'develop' into feature/cp2

2020-10-02 07:01:19 +02:00
parent 52725cb593 5b107f3ca9
commit 02fde2811f
3 changed files with 48 additions and 22 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1602,7 +1602,10 @@ def get_workouttype_from_fit(filename,workouttype='water'):
    fittype = 'rowing'
    for record in records:
        if record.name in ['sport','lap']:
-            fittype = record.get_values()['sport'].lower()
+            try:
+                fittype = record.get_values()['sport'].lower()
+            except KeyError:
+                return 'water'
            try:
                workouttype = mytypes.fitmappinginv[fittype]
            except KeyError:
--- a/rowers/migrations/0001_initial.py
+++ b/rowers/migrations/0001_initial.py