diff --git a/rowers/mytypes.py b/rowers/mytypes.py index afa2df9f..6a10e967 100644 --- a/rowers/mytypes.py +++ b/rowers/mytypes.py @@ -77,7 +77,7 @@ stmapping = collections.OrderedDict({ 'water':'Rowing', 'rower':'Rowing', 'skierg':'Skiing:Nordic', - 'bike':'Cycling', + 'Bike':'Cycling', 'bikeerg':'Cycling', 'dynamic':'Rowing', 'slides':'Rowing', @@ -110,7 +110,7 @@ rkmapping = collections.OrderedDict({ 'water':'Rowing', 'rower':'Rowing', 'skierg':'Cross-Country Skiing', - 'bike':'Cycling', + 'Bike':'Cycling', 'bikeerg':'Cycling', 'dynamic':'Rowing', 'slides':'Rowing', @@ -141,7 +141,7 @@ polarmapping = collections.OrderedDict({ 'water':'Rowing', 'rower':'Rowing', 'skierg':'Skiing', - 'bike':'Cycling', + 'Bike':'Cycling', 'bikeerg':'Cycling', 'dynamic':'Rowing', 'slides':'Rowing', @@ -172,8 +172,8 @@ tpmapping = collections.OrderedDict({ 'water':'rowing', 'rower':'rowing', 'skierg':'xc-ski', - 'bike':'bike', - 'bikeerg':'bike', + 'Bike':'bike', + 'Bikeerg':'bike', 'dynamic':'rowing', 'slides':'rowing', 'paddle':'other', @@ -203,7 +203,7 @@ c2mapping = collections.OrderedDict({ 'water':'water', 'rower':'rower', 'skierg':'skierg', - 'bike':'bike', + 'Bike':'bike', 'bikeerg':'bike', 'dynamic':'dynamic', 'slides':'slides', diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index d519c395..8929267f 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 78791344..55746feb 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -100,8 +100,11 @@ def workout_strava_upload_view(request,id=0): if w.workouttype in mytypes.rowtypes: activity_type = r.stravaexportas else: - activity_type = mytypes.stravamapping[w.workouttype] - + try: + activity_type = mytypes.stravamapping[w.workouttype] + except KeyError: + activity_type = 'Ride' + res,mes = stravastuff.handle_stravaexport( f,w.name, r.stravatoken,