Merge branch 'develop' into feature/magicintervals

rowers/views/importviews.py

@@ -564,6 +564,9 @@ def workout_nkimport_view(request,userid=0,after=0,before=0):
     startdatestring = startdate.strftime('%Y-%m-%d')
     enddatestring = enddate.strftime('%Y-%m-%d')
 
+    request.session['startdate'] = startdatestring
+    request.session['enddate'] = enddatestring
+
     before = arrow.get(enddate)
     before = str(int(before.timestamp()*1000))
 
@@ -1601,6 +1604,18 @@ def workout_getrp3importview(request,externalid):
 
 @login_required()
 def workout_getimportview(request,externalid,source = 'c2',do_async=True):
+    if 'startdate' in request.session and source == 'nk': # pragma: no cover
+        startdate = request.session.get('startdate')
+        enddate = request.session.get('enddate')
+
+        try:
+            result = importsources[source].get_workout(request.user,externalid,do_async=do_async,
+                                                   startdate=startdate,enddate=enddate)
+        except NoTokenError:
+            return HttpResponseRedirect(reverse(importauthorizeviews[source]))
+
+        url = reverse(importlistviews[source])
+        return HttpResponseRedirect(url)
     try:
         result = importsources[source].get_workout(request.user,externalid,
                                                             do_async=do_async)

rowers/views/workoutviews.py

@@ -4906,12 +4906,16 @@ def workout_upload_api(request):
 
         w = Workout.objects.get(id=id)
         if timezone is not None: # pragma: no cover
+
             w.startdatetime = w.startdatetime.astimezone(pytz.timezone(timezone))
+
             w.workoutdate = w.startdatetime.strftime('%Y-%m-%d')
-            w.starttime = w.starttime.strftime('%H:%M:%S')
+            w.starttime = w.startdatetime.strftime('%H:%M:%S')
+
             w.timezone = timezone
             w.save()
 
+            
 
 
         if make_plot: # pragma: no cover