Merge branch 'release/v18.10.6'

rowers/integrations/nk.py

@@ -116,14 +116,10 @@ class NKIntegration(SyncIntegration):
         before = kwargs.get('before',0)
         after = kwargs.get('after',0)
 
-        # For debugging
-        #startdate = '2021-01-01'
-        #enddate = '2021-06-01'
-        #before = arrow.get(enddate)
-        #before = str(int(before.timestamp()*1000))
-        
-        #after = arrow.get(startdate)
-        #after = str(int(after.timestamp()*1000))
+        if after > before:
+            temp = before
+            before = after
+            after = temp
         
         r = self.rower
         authorizationstring = str('Bearer ' + r.nktoken)
@@ -141,6 +137,8 @@ class NKIntegration(SyncIntegration):
 
         res = requests.get(url, headers=headers, params=params)
         if (res.status_code != 200):  # pragma: no cover
+            dologging('nklog.log',res.status_code)
+            dologging('nklog.log',res.text)
             raise NoTokenError("No NK Token")
 
 

rowers/views/importviews.py

@@ -394,7 +394,10 @@ def workout_import_view(request, source='c2'):
             ids = tdict['workoutid']
             nkids = [int(id) for id in ids]
             for nkid in nkids:
-                _ = integration.get_workout(nkid)
+                try:
+                    _ = integration.get_workout(nkid, startdate=startdate, enddate=enddate)
+                except NoTokenError:
+                    pass
             messages.info(
                 request,
                 'Your {source} workouts will be imported in the background.'