UA done

rowers/views.py

@@ -60,6 +60,7 @@ import stravastuff
 from stravastuff import StravaNoTokenError
 import sporttracksstuff
 import underarmourstuff
+from underarmourstuff import UnderArmourNoTokenError,underarmour_open
 import tpstuff
 import runkeeperstuff
 import ownapistuff
@@ -1035,19 +1036,6 @@ def add_workout_from_underarmourdata(user,importid,data):
 
     
 
-# Checks if user has UnderArmour token, renews them if they are expired
-def underarmour_open(user):
-    r = Rower.objects.get(user=user)
-    if (r.underarmourtoken == '') or (r.underarmourtoken is None):
-	s = "Token doesn't exist. Need to authorize"
-	raise UnderarmourNoTokenError("User has no token")
-    else:
-	if (timezone.now()>r.underarmourtokenexpirydate):
-	    thetoken = underarmourstuff.rower_underarmour_token_refresh(user)
-	else:
-	    thetoken = r.underarmourtoken
-
-    return thetoken
 
 # Checks if user has UnderArmour token, renews them if they are expired
 def tp_open(user):
@@ -1441,7 +1429,7 @@ def workout_underarmour_upload_view(request,id=0):
 
     try:
 	thetoken = underarmour_open(r.user)
-    except UnderarmourNoTokenError:
+    except UnderArmourNoTokenError:
 	return HttpResponseRedirect("/rowers/me/underarmourauthorize/")
 
     # ready to upload. Hurray
@@ -5895,6 +5883,14 @@ def workout_upload_view(request,message="",
                         )
                 except RunKeeperNoTokenError:
                     pass
+
+            if (upload_to_ua):
+                try:
+                    uamessage,uaid = underarmourstuff.workout_ua_upload(
+                        request.user,w
+                    )
+                except UnderArmourNoTokenError:
+                    pass
                     
             if message:
 	        url = reverse(workout_edit_view,