rojabo v2
This commit is contained in:
@@ -1062,7 +1062,7 @@ def workout_rojaboimport_view(request, message="", userid=0):
|
||||
if (res.status_code != 200): # pragma: no cover
|
||||
if (res.status_code == 401):
|
||||
r = getrower(request.user)
|
||||
if (r.stravatoken == '') or (r.stravatoken is None):
|
||||
if (r.rojabo_token == '') or (r.rojabo_token is None):
|
||||
s = "Token doesn't exist. Need to authorize"
|
||||
return HttpResponseRedirect("/rowers/me/rojaboauthorize/")
|
||||
message = "Something went wrong in workout_rojaboimport_view"
|
||||
@@ -1114,20 +1114,34 @@ def workout_rojaboimport_view(request, message="", userid=0):
|
||||
# get steps if there are any
|
||||
steps = []
|
||||
try:
|
||||
steps.append(rojabostuff.stepsconvert(item['warm_up']))
|
||||
steps = steps+rojabo_stuff.stepsconvert(
|
||||
item['warm_up']['steps'],
|
||||
warmup=True
|
||||
)
|
||||
except KeyError:
|
||||
pass
|
||||
try:
|
||||
steps.append(rojabostuff.stepsconvert(item['primary']))
|
||||
steps = steps + rojabo_stuff.stepsconvert(
|
||||
item['primary']['steps'],
|
||||
startid=len(steps)
|
||||
)
|
||||
except KeyError:
|
||||
pass
|
||||
try:
|
||||
steps.append(rojabostuff.stepsconvert(item['cool_down']))
|
||||
steps = steps + rojabo_stuff.stepsconvert(
|
||||
item['cool_down']['steps'],
|
||||
cooldown=True,
|
||||
startid=len(steps))
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
if steps:
|
||||
ps.steps = steps
|
||||
ps.steps = {
|
||||
'name':'',
|
||||
'sport':'rowing',
|
||||
'filename':'',
|
||||
'steps': steps,
|
||||
}
|
||||
ps.save()
|
||||
|
||||
messages.info(request,'Saved planned session {id}'.format(id=ps.id))
|
||||
|
||||
Reference in New Issue
Block a user