sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into bugfix/strava

Browse Source
This commit is contained in:
Sander Roosendaal
2019-04-14 17:04:39 -04:00
parent e164f03464 374a06462f
commit 1d5e0696fe
5 changed files with 714 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

692
rowers/migrations/0001_initial.py Normal file
View File

File diff suppressed because one or more lines are too long

5
rowers/tests/test_errorpages.py
View File

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

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

12
rowers/underarmourstuff.py
View File

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

14
rowers/views/workoutviews.py
View File

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