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

bug fix underarmour import

Browse Source
This commit is contained in:
Sander Roosendaal
2018-05-17 12:20:06 +02:00
parent da918be5d9
commit 9fabd6a2e8
2 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rowers/underarmourstuff.py
View File

@@ -8,7 +8,7 @@ import requests
import requests.auth import requests.auth
import json import json
from django.utils import timezone from django.utils import timezone
from datetime import datetime from datetime import datetime,timedelta
import numpy as np import numpy as np
from dateutil import parser from dateutil import parser
import time import time
@@ -104,7 +104,7 @@ def underarmour_open(user):
expires_in = res[1] expires_in = res[1]
refresh_token = res[2] refresh_token = res[2]
expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in) expirydatetime = timezone.now()+timedelta(seconds=expires_in)
r = getrower(request.user) r = getrower(request.user)
r.underarmourtoken = access_token r.underarmourtoken = access_token
@@ -205,10 +205,12 @@ def get_underarmour_workout_list(user):
'Api-Key': UNDERARMOUR_CLIENT_KEY, 'Api-Key': UNDERARMOUR_CLIENT_KEY,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.ua.com/v7.1/workout/?user="+str(get_userid(r.underarmourtoken)) url = "https://api.ua.com/v7.1/workout/?user="+str(get_userid(r.underarmourtoken))+"&order_by=-start_datetime"
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
return s return s
# Get workout summary data by Underarmour ID # Get workout summary data by Underarmour ID
@@ -261,7 +263,7 @@ def createunderarmourworkoutdata(w):
spm = row.df[' Cadence (stokes/min)'].astype(int) spm = row.df[' Cadence (stokes/min)'].astype(int)
spm[0] = spm[1] spm[0] = spm[1]
hr = row.df[' HRCur (bpm)'].astype(int) hr = row.df[' HRCur (bpm)'].astype(int)
haslatlon=1 haslatlon=1
try: try:
@@ -408,7 +410,8 @@ def get_userid(access_token):
'Api-Key': UNDERARMOUR_CLIENT_KEY, 'Api-Key': UNDERARMOUR_CLIENT_KEY,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.ua.com/v7.1/user/self"
url = "https://api.ua.com/v7.1/user/self/"
response = requests.get(url,headers=headers) response = requests.get(url,headers=headers)
me_json = response.json() me_json = response.json()

36
rowers/views.py
View File

@@ -9561,25 +9561,23 @@ def workout_underarmourimport_view(request,message=""):
workouts = [] workouts = []
items = res.json()['_embedded']['workouts'] items = res.json()['_embedded']['workouts']
for item in items: for item in items:
if 'has_time_series' in item: s = item['start_datetime']
if item['has_time_series']: i,r = underarmourstuff.get_idfromuri(request.user,item['_links'])
s = item['start_datetime'] n = item['name']
i,r = underarmourstuff.get_idfromuri(request.user,item['_links']) try:
n = item['name'] d = item['aggregates']['distance_total']
try: except KeyError:
d = item['aggregates']['distance_total'] d = 0
except KeyError: try:
d = 0 ttot = item['aggregates']['active_time_total']
try: except KeyError:
ttot = item['aggregates']['active_time_total'] ttot = 0
except KeyError:
ttot = 0 keys = ['id','distance','duration','starttime','type']
values = [i,d,ttot,s,r]
keys = ['id','distance','duration','starttime','type'] thedict = dict(zip(keys,values))
values = [i,d,ttot,s,r]
thedict = dict(zip(keys,values)) workouts.append(thedict)
workouts.append(thedict)
return render(request,'underarmour_list_import.html', return render(request,'underarmour_list_import.html',
{'workouts':workouts, {'workouts':workouts,