sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'feature/datafusion' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-09-21 14:50:15 +02:00
parent 1969e7266e f82cbfc28c
commit f09f560f1e
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/mytypes.py
View File

@@ -77,7 +77,7 @@ stmapping = collections.OrderedDict({
'water':'Rowing', 'water':'Rowing',
'rower':'Rowing', 'rower':'Rowing',
'skierg':'Skiing:Nordic', 'skierg':'Skiing:Nordic',
'bike':'Cycling', 'Bike':'Cycling',
'bikeerg':'Cycling', 'bikeerg':'Cycling',
'dynamic':'Rowing', 'dynamic':'Rowing',
'slides':'Rowing', 'slides':'Rowing',
@@ -110,7 +110,7 @@ rkmapping = collections.OrderedDict({
'water':'Rowing', 'water':'Rowing',
'rower':'Rowing', 'rower':'Rowing',
'skierg':'Cross-Country Skiing', 'skierg':'Cross-Country Skiing',
'bike':'Cycling', 'Bike':'Cycling',
'bikeerg':'Cycling', 'bikeerg':'Cycling',
'dynamic':'Rowing', 'dynamic':'Rowing',
'slides':'Rowing', 'slides':'Rowing',
@@ -141,7 +141,7 @@ polarmapping = collections.OrderedDict({
'water':'Rowing', 'water':'Rowing',
'rower':'Rowing', 'rower':'Rowing',
'skierg':'Skiing', 'skierg':'Skiing',
'bike':'Cycling', 'Bike':'Cycling',
'bikeerg':'Cycling', 'bikeerg':'Cycling',
'dynamic':'Rowing', 'dynamic':'Rowing',
'slides':'Rowing', 'slides':'Rowing',
@@ -172,8 +172,8 @@ tpmapping = collections.OrderedDict({
'water':'rowing', 'water':'rowing',
'rower':'rowing', 'rower':'rowing',
'skierg':'xc-ski', 'skierg':'xc-ski',
'bike':'bike', 'Bike':'bike',
'bikeerg':'bike', 'Bikeerg':'bike',
'dynamic':'rowing', 'dynamic':'rowing',
'slides':'rowing', 'slides':'rowing',
'paddle':'other', 'paddle':'other',
@@ -203,7 +203,7 @@ c2mapping = collections.OrderedDict({
'water':'water', 'water':'water',
'rower':'rower', 'rower':'rower',
'skierg':'skierg', 'skierg':'skierg',
'bike':'bike', 'Bike':'bike',
'bikeerg':'bike', 'bikeerg':'bike',
'dynamic':'dynamic', 'dynamic':'dynamic',
'slides':'slides', 'slides':'slides',

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

5
rowers/views/importviews.py
View File

@@ -100,7 +100,10 @@ def workout_strava_upload_view(request,id=0):
if w.workouttype in mytypes.rowtypes: if w.workouttype in mytypes.rowtypes:
activity_type = r.stravaexportas activity_type = r.stravaexportas
else: else:
activity_type = mytypes.stravamapping[w.workouttype] try:
activity_type = mytypes.stravamapping[w.workouttype]
except KeyError:
activity_type = 'Ride'
res,mes = stravastuff.handle_stravaexport( res,mes = stravastuff.handle_stravaexport(
f,w.name, f,w.name,