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

Merge branch 'develop' into feature/freecoach

Browse Source
This commit is contained in:
Sander Roosendaal
2019-05-15 22:04:32 +02:00
parent a53823c375 b9f8914121
commit 58197b6b62
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/dataprep.py
View File

@@ -1200,6 +1200,7 @@ def parsenonpainsled(fileformat,f2,summary):
hasrecognized = True hasrecognized = True
except KeyError: except KeyError:
hasrecognized = False hasrecognized = False
return None, hasrecognized, '', 'unknown'
# handle speed coach GPS 2 # handle speed coach GPS 2
if (fileformat == 'speedcoach2'): if (fileformat == 'speedcoach2'):

7
rowers/stravastuff.py
View File

@@ -316,7 +316,10 @@ def get_workout(user,stravaid):
coords = get_strava_stream(r,'latlng',stravaid) coords = get_strava_stream(r,'latlng',stravaid)
power = get_strava_stream(r,'power',stravaid) power = get_strava_stream(r,'power',stravaid)
nr_rows = len(t) if t is not None:
nr_rows = len(t)
else:
return(0,"Error: Time data wasnt found")
if nr_rows == 0: if nr_rows == 0:
return (0,"Error: Time data had zero length") return (0,"Error: Time data had zero length")
@@ -701,7 +704,7 @@ def handle_strava_import_stroke_data(title,
coords = get_strava_stream(r,'latlng',stravaid) coords = get_strava_stream(r,'latlng',stravaid)
power = get_strava_stream(r,'power',stravaid) power = get_strava_stream(r,'power',stravaid)
if nr_rows is not None: if t is not None:
nr_rows = len(t) nr_rows = len(t)
else: else:
return 0 return 0