Private
Public Access
1
0

improved export settings for offline processing

This commit is contained in:
Sander Roosendaal
2018-08-27 12:39:32 +02:00
parent 1c3ef2f629
commit 5243bb4016
2 changed files with 88 additions and 47 deletions

View File

@@ -9893,6 +9893,9 @@ def workout_upload_view(request,
except KeyError:
upload_to_tp = False
response = {}
if request.method == 'POST':
form = DocumentsForm(request.POST,request.FILES)
@@ -10040,7 +10043,7 @@ def workout_upload_view(request,
request.session['async_tasks'] = [(jobid,'make_plot')]
# upload to C2
if (upload_to_c2) or (w.user.c2_auto_export and isprorower(w.user)):
if (upload_to_c2):
try:
message,id = c2stuff.workout_c2_upload(request.user,w)
except NoTokenError:
@@ -10051,7 +10054,7 @@ def workout_upload_view(request,
else:
messages.error(request,message)
if (upload_to_strava) or (w.user.strava_auto_export and isprorower(w.user)):
if (upload_to_strava):
try:
message,id = stravastuff.workout_strava_upload(
request.user,w
@@ -10064,7 +10067,7 @@ def workout_upload_view(request,
else:
messages.error(request,message)
if (upload_to_st) or (w.user.sporttracks_auto_export and isprorower(w.user)):
if (upload_to_st):
try:
message,id = sporttracksstuff.workout_sporttracks_upload(
request.user,w
@@ -10077,7 +10080,7 @@ def workout_upload_view(request,
else:
messages.error(request,message)
if (upload_to_rk) or (w.user.runkeeper_auto_export and isprorower(w.user)):
if (upload_to_rk):
try:
message,id = runkeeperstuff.workout_runkeeper_upload(
request.user,w
@@ -10092,7 +10095,7 @@ def workout_upload_view(request,
messages.error(request,message)
if (upload_to_ua) or (w.user.mapmyfitness_auto_export and isprorower(w.user)):
if (upload_to_ua):
try:
message,id = underarmourstuff.workout_ua_upload(
request.user,w
@@ -10107,7 +10110,7 @@ def workout_upload_view(request,
messages.error(request,message)
if (upload_to_tp) or (w.user.trainingpeaks_auto_export and isprorower(w.user)):
if (upload_to_tp):
try:
message,id = tpstuff.workout_tp_upload(
request.user,w
@@ -10150,6 +10153,24 @@ def workout_upload_view(request,
return response
else:
if not is_ajax:
if r.c2_auto_export and isprorower(r):
uploadoptions['upload_to_C2'] = True
if r.strava_auto_export and isprorower(r):
uploadoptions['upload_to_Strava'] = True
if r.sporttracks_auto_export and isprorower(r):
uploadoptions['upload_to_SportTracks'] = True
if r.runkeeper_auto_export and isprorower(r):
uploadoptions['upload_to_RunKeeper'] = True
if r.trainingpeaks_auto_export and isprorower(r):
uploadoptions['upload_to_TrainingPeaks'] = True
if r.mapmyfitness_auto_export and isprorower(r):
uploadoptions['upload_to_MapMyFitness'] = True
form = DocumentsForm(initial=docformoptions)
optionsform = UploadOptionsForm(initial=uploadoptions)
return render(request, 'document_form.html',