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

C2 splits on import

Browse Source
This commit is contained in:
Sander Roosendaal
2017-01-09 16:08:08 +01:00
parent 9d92287b71
commit 29180b3f78
2 changed files with 82 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
rowers/views.py
View File

@@ -3697,35 +3697,12 @@ def workout_getc2workout_view(request,c2id):
res = c2stuff.get_c2_workout(request.user,c2id)
if (res.status_code == 200):
data = res.json()['data']
<<<<<<< HEAD
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,
splitdata=None,
source='c2')
w = Workout.objects.get(id=id)
w.uploadedtoc2=c2id
w.save()
url = "/rowers/workout/"+str(id)+"/edit"
return HttpResponseRedirect(url)
else:
message = json.loads(s.text)['message']
url = reverse(workout_c2import_view,
kwargs={
'message':message,
})
return HttpResponseRedirect(url)
=======
if 'splits' in data['workout']:
splitdata = data['workout']['splits']
if 'intervals' in data['workout']:
splitdata = data['workout']['intervals']
if data['stroke_data']:
res2 = c2stuff.get_c2_workout_strokes(request.user,c2id)
else:
@@ -3742,10 +3719,19 @@ def workout_getc2workout_view(request,c2id):
source='c2')
w = Workout.objects.get(id=id)
w.uploadedtoc2=c2id
w.save()
if splitdata:
try:
w.summary = c2stuff.summaryfromsplitdata(splitdata,data,w.csvfilename)
except:
with open("media/c2splitdata.log","a") as errorlog:
errorstring = str(sys.exc_info()[0])
timestr = strftime("%Y%m%d-%H%M%S")
errorlog.write(timestr+errorstring+"\r\n")
errorlog.write("views.py line 952\r\n")
w.save()
url = "/rowers/workout/"+str(id)+"/edit"
return HttpResponseRedirect(url)
>>>>>>> develop
else:
# message = json.loads(s.text)['message']
message = json.loads(res2.text)['message']