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

small fixes and additional logging for rp3

Browse Source
This commit is contained in:
Sander Roosendaal
2021-10-12 18:01:20 +02:00
parent 851e4814ae
commit 6145530dc2
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/rp3stuff.py
View File

@@ -12,6 +12,8 @@ import gzip
import base64 import base64
from io import BytesIO from io import BytesIO
from rowers.utils import dologging
import django_rq import django_rq
queue = django_rq.get_queue('default') queue = django_rq.get_queue('default')
queuelow = django_rq.get_queue('low') queuelow = django_rq.get_queue('low')
@@ -135,6 +137,7 @@ def get_rp3_workouts(rower,do_async=True): # pragma: no cover
if (res.status_code != 200): if (res.status_code != 200):
return 0 return 0
dologging('rp3_import.log',res.json())
workouts_list = pd.json_normalize(res.json()['data']['workouts']) workouts_list = pd.json_normalize(res.json()['data']['workouts'])
try: try:
rp3ids = workouts_list['id'].values rp3ids = workouts_list['id'].values
@@ -150,6 +153,7 @@ def get_rp3_workouts(rower,do_async=True): # pragma: no cover
for id in newids: for id in newids:
startdatetime = workouts_list.loc[id,'executed_at'] startdatetime = workouts_list.loc[id,'executed_at']
dologging('rp3_import.log',startdatetime)
job = myqueue( job = myqueue(
queuehigh, queuehigh,

2
rowers/tasks.py
View File

@@ -2929,6 +2929,8 @@ def handle_rp3_async_workout(userid,rp3token,rp3id,startdatetime,max_attempts,de
with open(filename,'wb') as f: with open(filename,'wb') as f:
#dologging('rp3_import.log',res.text)
dologging('rp3_import.log','Rp3 ID = {id}'.format(id=rp3id))
f.write(res.content) f.write(res.content)
uploadoptions = { uploadoptions = {

6
rowers/views/workoutviews.py
View File

@@ -4824,7 +4824,7 @@ def workout_upload_api(request):
stravaid = post_data.get('stravaid','') stravaid = post_data.get('stravaid','')
c2id = post_data.get('c2id','') c2id = post_data.get('c2id','')
nkid = post_data.get('nkid','') nkid = post_data.get('nkid','')
rp3id = post_data.get('nkid','') rp3id = post_data.get('rp3id','')
garminid = post_data.get('garminid',0) garminid = post_data.get('garminid',0)
startdatetime = post_data.get('startdatetime','') startdatetime = post_data.get('startdatetime','')
@@ -4893,6 +4893,7 @@ def workout_upload_api(request):
make_plot = optionsform.cleaned_data['make_plot'] make_plot = optionsform.cleaned_data['make_plot']
plottype = optionsform.cleaned_data['plottype'] plottype = optionsform.cleaned_data['plottype']
upload_to_c2 = optionsform.cleaned_data['upload_to_C2'] upload_to_c2 = optionsform.cleaned_data['upload_to_C2']
upload_to_strava = optionsform.cleaned_data['upload_to_Strava'] upload_to_strava = optionsform.cleaned_data['upload_to_Strava']
upload_to_st = optionsform.cleaned_data['upload_to_SportTracks'] upload_to_st = optionsform.cleaned_data['upload_to_SportTracks']
upload_to_tp = optionsform.cleaned_data['upload_to_TrainingPeaks'] upload_to_tp = optionsform.cleaned_data['upload_to_TrainingPeaks']
@@ -6229,6 +6230,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
) )
messages.info(request,'We are checking your time on the course in the background') messages.info(request,'We are checking your time on the course in the background')
vals = None
# feeling lucky / ruptures # feeling lucky / ruptures
if request.method == 'POST' and "ruptures" in request.POST: if request.method == 'POST' and "ruptures" in request.POST:
df = pd.DataFrame({ df = pd.DataFrame({
@@ -6444,7 +6446,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
}) })
savebutton = 'savestringform' savebutton = 'savestringform'
vals = None
# we are saving the results obtained from the power update form # we are saving the results obtained from the power update form
elif request.method == 'POST' and 'selector' in request.POST: elif request.method == 'POST' and 'selector' in request.POST:
powerupdateform = PowerIntervalUpdateForm(request.POST) powerupdateform = PowerIntervalUpdateForm(request.POST)