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

added test if splitsdata is available

Browse Source
This commit is contained in:
Sander Roosendaal
2017-01-04 12:32:19 +01:00
parent 467471437e
commit 2f5b256481
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/views.py
View File

@@ -319,7 +319,8 @@ def checkworkoutuser(user,workout):
except Rower.DoesNotExist:
return(False)
def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'):
def add_workout_from_strokedata(user,importid,data,strokedata,
source='c2',splitdata=None):
workouttype = data['type']
if workouttype not in [x[0] for x in Workout.workouttypes]:
workouttype = 'water'
@@ -3691,14 +3692,21 @@ def workout_getc2workout_view(request,c2id):
res = c2stuff.get_c2_workout(request.user,c2id)
if (res.status_code == 200):
data = res.json()['data']
splitdata = None
if 'splits' in data:
splitdata = data['splits']
if 'intervals' in data:
splitdata = data['intervals']
if 'stroke_data' in data:
# test = data['stroke_data']
res2 = c2stuff.get_c2_workout_strokes(request.user,c2id)
# 2016-07-27 added below if statement (balkanboy error report)
if res2.status_code == 200:
strokedata = pd.DataFrame.from_dict(res2.json()['data'])
id = add_workout_from_strokedata(request.user,c2id,data,strokedata,
source='c2')
id = add_workout_from_strokedata(request.user,c2id,
data,strokedata,
splitdata=None,
source='c2')
w = Workout.objects.get(id=id)
w.uploadedtoc2=c2id
w.save()