Merge branch 'release/v13.56'

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

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',
          ]
 

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('rower_exportsettings_view')
-    url = reverse('workouts_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)