workout list nk import working

rowers/views/importviews.py

@@ -776,14 +776,10 @@ def rower_process_garmincallback(request):
 # Process NK Callback
 @login_required()
 def rower_process_nkcallback(request):
-    uri = request.build_absolute_uri()
-    uri = 'https://dunav.ngrok.io/'+uri[22:]
-    print(uri)
-
     # do stuff
     try:
         code = request.GET.get('code',None)
-        res = nkstuff.get_token(code,uri)
+        res = nkstuff.get_token(code)
     except MultiValueDictKeyError:
         message = "The resource owner or authorization server denied the request"
         messages.error(request,message)
@@ -791,8 +787,6 @@ def rower_process_nkcallback(request):
         url = reverse('rower_exportsettings_view')
         return HttpResponseRedirect(url)
 
-    uri = request.build_absolute_uri()
-
     access_token = res[0]
     if access_token == 0:
         message = res[1]
@@ -805,12 +799,14 @@ def rower_process_nkcallback(request):
 
     expires_in = res[1]
     refresh_token = res[2]
+    nk_owner_id = res[3]
     expirydatetime = timezone.now()+datetime.timedelta(seconds=expires_in)
 
     r = getrower(request.user)
     r.nktoken = access_token
     r.nktokenexpirydate = expirydatetime
     r.nkrefreshtoken = refresh_token
+    r.nk_owner_id = nk_owner_id
 
     r.save()
 
@@ -836,7 +832,7 @@ def workout_nkimport_view(request,userid=0):
             if (r.stravatoken == '') or (r.stravatoken is None):
                 s = "Token doesn't exist. Need to authorize"
                 return HttpResponseRedirect("/rowers/me/stravaauthorize/")
-        message = "Something went wrong in workout_stravaimport_view"
+        message = "Something went wrong in workout_nkimport_view"
         messages.error(request,message)
         url = reverse('workouts_view')
         return HttpResponseRedirect(url)
@@ -846,7 +842,7 @@ def workout_nkimport_view(request,userid=0):
     nkdata = [{
         'id':int(item['id']),
         'elapsed_time':item['elapsedTime'],
-        'start_date':item['startTime'],
+        'start_date':arrow.get(item['startTime']),
     } for item in res.json()]
 
     workouts = []
@@ -857,12 +853,17 @@ def workout_nkimport_view(request,userid=0):
         n = item['name']
         nnn = ''
         ttot = str(datetime.timedelta(seconds=int(float(item['elapsedTime'])/1000.)))
-        s = item['startTime']
+        s = arrow.get(item['startTime'],tzinfo=r.defaulttimezone).format(arrow.FORMAT_W3C)
+        #s = arrow.get(item['startTime']).to(r.defaulttimezone).isoformat()
         keys = ['id','distance','duration','starttime','name','new']
         values = [i,d,ttot,s,n,nnn]
         res = dict(zip(keys, values))
         workouts.append(res)
 
+    workouts = workouts[::-1]
+
+    print(workouts)
+
     breadcrumbs = [
         {
             'url':'/rowers/list-workouts/',