From 06d84526331c76662b7af5f7e595be19a18533e0 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 16 Jul 2020 15:51:57 +0200 Subject: [PATCH 1/2] updated requirements --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 709ee448..9e308079 100644 --- a/requirements.txt +++ b/requirements.txt @@ -30,7 +30,7 @@ coreschema==0.0.4 coverage==4.5.3 cryptography==2.9.2 cycler==0.10.0 -dask==2.6.0 +dask==2.20.0 decorator==4.4.0 defusedxml==0.5.0 Django==2.1.7 @@ -138,7 +138,7 @@ oauth2==1.9.0.post1 oauthlib==3.0.1 openapi-codec==1.3.2 packaging==19.0 -pandas==0.24.2 +pandas==1.0.5 pandocfilters==1.4.2 param==1.8.2 parso==0.3.4 From b0d7952fe3bee9427424a95dd9a2487217027149 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 16 Jul 2020 21:41:59 +0200 Subject: [PATCH 2/2] reinstating strava auto import --- rowers/models.py | 2 +- rowers/views/importviews.py | 43 ++++++++++++++++--------------------- 2 files changed, 19 insertions(+), 26 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 015e3780..9aab3e1b 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -3442,7 +3442,7 @@ class RowerExportForm(ModelForm): 'runkeeper_auto_export', 'sporttracks_auto_export', 'strava_auto_export', - #'strava_auto_import', + 'strava_auto_import', 'trainingpeaks_auto_export', ] diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index ae113b17..97321fff 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -665,11 +665,9 @@ def rower_process_callback(request): r.save() - successmessage = "Tokens stored. Good to go" + successmessage = "Tokens stored. Good to go. Please check your import/export settings" messages.info(request,successmessage) - - url = reverse('workouts_view') - + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) @@ -706,10 +704,9 @@ def rower_process_polarcallback(request): r.save() - successmessage = "Tokens stored. Good to go" + successmessage = "Tokens stored. Good to go. Please check your import/export settings" messages.info(request,successmessage) - url = reverse('workouts_view') - + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) @@ -726,9 +723,9 @@ def rower_process_garmincallback(request): r.garminrefreshtoken = garminrefreshtoken r.save() - successmessage = "Tokens stored. Good to go" + successmessage = "Tokens stored. Good to go. Please check your import/export settings" messages.info(request,successmessage) - url = reverse('workouts_view') + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) # Process Strava Callback @@ -766,14 +763,14 @@ def rower_process_stravacallback(request): r.save() 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) - url = reverse('workouts_view') + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) else: message = "Something went wrong with the Strava authorization" messages.error(request,message) - url = reverse('workouts_view') + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) @@ -798,10 +795,9 @@ def rower_process_runkeepercallback(request): r.save() - successmessage = "Tokens stored. Good to go" + successmessage = "Tokens stored. Good to go. Please check your import/export settings" messages.info(request,successmessage) - url = reverse('workouts_view') - + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) @@ -826,10 +822,9 @@ def rower_process_sporttrackscallback(request): r.save() - successmessage = "Tokens stored. Good to go" + successmessage = "Tokens stored. Good to go. Please check your import/export settings" messages.info(request,successmessage) - url = reverse('workouts_view') - + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) @@ -853,10 +848,9 @@ def rower_process_underarmourcallback(request): r.save() - successmessage = "Tokens stored. Good to go" + successmessage = "Tokens stored. Good to go. Please check your import/export settings" messages.info(request,successmessage) - url = reverse('workouts_view') - + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) @@ -879,10 +873,9 @@ def rower_process_tpcallback(request): r.save() - successmessage = "Tokens stored. Good to go" + successmessage = "Tokens stored. Good to go. Please check your import/export settings" messages.info(request,successmessage) - url = reverse('workouts_view') - + url = reverse('rower_exportsettings_view') return HttpResponseRedirect(url) @@ -1069,7 +1062,7 @@ def strava_webhook_view(request): f.write('Rower not found') return HttpResponse(status=200) 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) else: timestamp = time.strftime('%b-%d-%Y_%H%M', t)