strava done

rowers/views.py

@@ -5651,10 +5651,33 @@ def workout_stravaimport_view(request,message=""):
 	    url = reverse(workouts_view)
 	    return HttpResponseRedirect(url)
     else:
-	data = res.json()
+        workouts = []
+        r = Rower.objects.get(user=request.user)
+        stravaids = [int(item['id']) for item in res.json()]
+        knownstravaids = uniqify([
+            w.uploadedtostrava for w in Workout.objects.filter(user=r)
+            ])
+        newids = [stravaid for stravaid in stravaids if not stravaid in knownstravaids]
+        
+	for item in res.json():
+            d = int(float(item['distance']))
+            i = item['id']
+            if i in knownstravaids:
+                nnn = ''
+            else:
+                nnn = 'NEW'
+            n = item['name']
+            ttot = str(datetime.timedelta(seconds=int(float(item['elapsed_time']))))
+            s = item['start_date']
+            r = item['type']
+            keys = ['id','distance','duration','starttime','type','name','new']
+	    values = [i,d,ttot,s,r,n,nnn]
+	    res = dict(zip(keys,values))
+	    workouts.append(res)
+
 
 	return render(request,'strava_list_import.html',
-		      {'data':data,
+		      {'workouts':workouts,
                        'teams':get_my_teams(request.user),
 		       })
 
@@ -6047,14 +6070,45 @@ def workout_getsporttracksworkout_all(request):
             data = res.json()
 
             id,message = add_workout_from_stdata(request.user,sporttracksid,data)
-            print sporttracksid,id
             if id==0:
                 messages.error(request,message)
 
             else:
                 w = Workout.objects.get(id=id)
                 w.uploadedtosporttracks=sporttracksid
-                print 'saved'
+                w.save()
+
+    url = reverse(workouts_view)
+    return HttpResponseRedirect(url)
+
+
+# Imports all new workouts from SportTracks
+@login_required()
+def workout_getstravaworkout_all(request):
+    res = stravastuff.get_strava_workout_list(request.user)
+    if (res.status_code == 200):
+        r = Rower.objects.get(user=request.user)
+        stravaids = [int(item['id']) for item in res.json()]
+        knownstravaids = uniqify([
+            w.uploadedtostrava for w in Workout.objects.filter(user=r)
+            ])
+        newids = [stravaid for stravaid in stravaids if not stravaid in knownstravaids]
+
+        for stravaid in newids:
+            res = stravastuff.get_strava_workout(request.user,stravaid)
+            strokedata = res[1]
+            data = res[0]
+            
+            id,message = add_workout_from_strokedata(request.user,stravaid,data,strokedata,
+                                                     source='strava',
+                                                     workoutsource='strava')
+
+            if id==0:
+                messages.error(request,message)
+
+            else:
+                w = Workout.objects.get(id=id)
+                w.uploadedtostrava=stravaid
                 w.save()
 
     url = reverse(workouts_view)