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

Merge branch 'bugfix/strava' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-04-14 17:44:08 -04:00
parent 374a06462f 8556a28d4e
commit 5139577cd9
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
cvkbrno/migrations/__init__.py
View File

1
paidplans.json Normal file
View File

File diff suppressed because one or more lines are too long

0
rowers/migrations/__init__.py
View File

12
rowers/stravastuff.py
View File

@@ -316,11 +316,10 @@ def get_workout(user,stravaid):
latlongjson = get_strava_stream(r,'latlng',stravaid) latlongjson = get_strava_stream(r,'latlng',stravaid)
powerjson = get_strava_stream(r,'power',stravaid) powerjson = get_strava_stream(r,'power',stravaid)
try: try:
t = np.array(timejson.json()[0]['data']) t = np.array(timejson.json()[0]['data'])
nr_rows = len(t) nr_rows = len(t)
d = np.array(distancejson.json()[1]['data']) d = np.array(distancejson.json()[0]['data'])
if nr_rows == 0: if nr_rows == 0:
return (0,"Error: Time data had zero length") return (0,"Error: Time data had zero length")
@@ -331,24 +330,24 @@ def get_workout(user,stravaid):
return (0,"something went wrong with the Strava import") return (0,"something went wrong with the Strava import")
try: try:
spm = np.array(spmjson.json()[1]['data']) spm = np.array(spmjson.json()[0]['data'])
except: except:
spm = np.zeros(nr_rows) spm = np.zeros(nr_rows)
try: try:
power = np.array(powerjson.json()[1]['data']) power = np.array(powerjson.json()[0]['data'])
except IndexError: except IndexError:
power = np.zeros(nr_rows) power = np.zeros(nr_rows)
try: try:
hr = np.array(hrjson.json()[1]['data']) hr = np.array(hrjson.json()[0]['data'])
except IndexError: except IndexError:
hr = np.zeros(nr_rows) hr = np.zeros(nr_rows)
except KeyError: except KeyError:
hr = np.zeros(nr_rows) hr = np.zeros(nr_rows)
try: try:
velo = np.array(velojson.json()[1]['data']) velo = np.array(velojson.json()[0]['data'])
except IndexError: except IndexError:
velo = np.zeros(nr_rows) velo = np.zeros(nr_rows)
except KeyError: except KeyError:
@@ -389,7 +388,6 @@ def get_workout(user,stravaid):
'power':power, 'power':power,
'strokelength':strokelength, 'strokelength':strokelength,
}) })
# startdatetime = datetime.datetime.strptime(startdatetime,"%Y-%m-%d-%H:%M:%S") # startdatetime = datetime.datetime.strptime(startdatetime,"%Y-%m-%d-%H:%M:%S")

2
rowers/views/importviews.py
View File

@@ -1408,7 +1408,9 @@ def workout_getimportview(request,externalid,source = 'c2'):
except ValueError: except ValueError:
pass pass
if strokedata.empty: if strokedata.empty:
print('aap')
distance = data['distance'] distance = data['distance']
c2id = data['id'] c2id = data['id']
workouttype = mytypes.c2mappinginv[data['type']] workouttype = mytypes.c2mappinginv[data['type']]