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

reinstating strava auto import

Browse Source
This commit is contained in:
Sander Roosendaal
2020-07-16 21:41:59 +02:00
parent 06d8452633
commit b0d7952fe3
2 changed files with 19 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/models.py
View File

@@ -3442,7 +3442,7 @@ class RowerExportForm(ModelForm):
'runkeeper_auto_export', 'runkeeper_auto_export',
'sporttracks_auto_export', 'sporttracks_auto_export',
'strava_auto_export', 'strava_auto_export',
#'strava_auto_import', 'strava_auto_import',
'trainingpeaks_auto_export', 'trainingpeaks_auto_export',
] ]

43
rowers/views/importviews.py
View File

@@ -665,11 +665,9 @@ def rower_process_callback(request):
r.save() r.save()
successmessage = "Tokens stored. Good to go" successmessage = "Tokens stored. Good to go. Please check your import/export settings"
messages.info(request,successmessage) messages.info(request,successmessage)
url = reverse('rower_exportsettings_view')
url = reverse('workouts_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -706,10 +704,9 @@ def rower_process_polarcallback(request):
r.save() r.save()
successmessage = "Tokens stored. Good to go" successmessage = "Tokens stored. Good to go. Please check your import/export settings"
messages.info(request,successmessage) messages.info(request,successmessage)
url = reverse('workouts_view') url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -726,9 +723,9 @@ def rower_process_garmincallback(request):
r.garminrefreshtoken = garminrefreshtoken r.garminrefreshtoken = garminrefreshtoken
r.save() r.save()
successmessage = "Tokens stored. Good to go" successmessage = "Tokens stored. Good to go. Please check your import/export settings"
messages.info(request,successmessage) messages.info(request,successmessage)
url = reverse('workouts_view') url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
# Process Strava Callback # Process Strava Callback
@@ -766,14 +763,14 @@ def rower_process_stravacallback(request):
r.save() r.save()
id = stravastuff.set_strava_athlete_id(r.user) id = stravastuff.set_strava_athlete_id(r.user)
successmessage = "Tokens stored. Good to go" successmessage = "Tokens stored. Good to go. Please check your import/export settings"
messages.info(request,successmessage) messages.info(request,successmessage)
url = reverse('workouts_view') url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
message = "Something went wrong with the Strava authorization" message = "Something went wrong with the Strava authorization"
messages.error(request,message) messages.error(request,message)
url = reverse('workouts_view') url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -798,10 +795,9 @@ def rower_process_runkeepercallback(request):
r.save() r.save()
successmessage = "Tokens stored. Good to go" successmessage = "Tokens stored. Good to go. Please check your import/export settings"
messages.info(request,successmessage) messages.info(request,successmessage)
url = reverse('workouts_view') url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -826,10 +822,9 @@ def rower_process_sporttrackscallback(request):
r.save() r.save()
successmessage = "Tokens stored. Good to go" successmessage = "Tokens stored. Good to go. Please check your import/export settings"
messages.info(request,successmessage) messages.info(request,successmessage)
url = reverse('workouts_view') url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -853,10 +848,9 @@ def rower_process_underarmourcallback(request):
r.save() r.save()
successmessage = "Tokens stored. Good to go" successmessage = "Tokens stored. Good to go. Please check your import/export settings"
messages.info(request,successmessage) messages.info(request,successmessage)
url = reverse('workouts_view') url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -879,10 +873,9 @@ def rower_process_tpcallback(request):
r.save() r.save()
successmessage = "Tokens stored. Good to go" successmessage = "Tokens stored. Good to go. Please check your import/export settings"
messages.info(request,successmessage) messages.info(request,successmessage)
url = reverse('workouts_view') url = reverse('rower_exportsettings_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -1069,7 +1062,7 @@ def strava_webhook_view(request):
f.write('Rower not found') f.write('Rower not found')
return HttpResponse(status=200) return HttpResponse(status=200)
ws = Workout.objects.filter(uploadedtostrava=stravaid) ws = Workout.objects.filter(uploadedtostrava=stravaid)
if ws.count()==0: if ws.count()==0 and r.strava_auto_import:
job = stravastuff.async_get_workout(r.user,stravaid) job = stravastuff.async_get_workout(r.user,stravaid)
else: else:
timestamp = time.strftime('%b-%d-%Y_%H%M', t) timestamp = time.strftime('%b-%d-%Y_%H%M', t)