Merge branch 'develop' into bugfix/strava

rowers/tests/test_errorpages.py

@@ -14,7 +14,8 @@ class TestErrorPages(TestCase):
 
         factory = RequestFactory()
         request = factory.get('/')
-        response = error404_view(request)
+        e = None
+        response = error404_view(request,e )
 
         self.assertEqual(response.status_code, 404)
         self.assertIn('404 Page not found', str(response.content))
@@ -22,7 +23,7 @@ class TestErrorPages(TestCase):
         self.assertEqual(response.status_code, 500)
         self.assertIn('500 Internal Server Error', str(response.content))
 
-        response = error400_view(request)
+        response = error400_view(request, e)
         self.assertEqual(response.status_code, 400)
 
 

rowers/underarmourstuff.py

@@ -416,11 +416,13 @@ def add_workout_from_data(user,importid,data,strokedata,
 
     # position, distance, speed, cadence, power, 
 
+    try:
         res = splituadata(timeseries['distance'])
-
         distance = res[1]
-
         times_distance = res[0]
+    except KeyError:
+        message = "Error. No distance data"
+        return (0,message)
 
 
     try:

rowers/views/workoutviews.py

@@ -1798,7 +1798,12 @@ def workout_downloadwind_view(request,id=0,
         windspeed = winddata[0]
         windbearing = winddata[1]
         message = winddata[2]
+        try:
             row.notes += "\n"+message
+        except TypeError:
+            if message:
+                row.notes += message
+                
         row.save()
         rowdata.add_wind(windspeed,windbearing)
         rowdata.write_csv(f1,gzip=True)
@@ -1865,7 +1870,12 @@ def workout_downloadmetar_view(request,id=0,
         windspeed = winddata[0]
         windbearing = winddata[1]
         message = winddata[2]
+        try:
             row.notes += "\n"+message
+        except TypeError:
+            if message:
+                row.notes += message
+        
         row.save()
         rowdata.add_wind(windspeed,windbearing)
         rowdata.write_csv(f1,gzip=True)