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

Merge branch 'develop' into feature/embeddedvideo

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-13 20:21:47 +01:00
parent 5bc54bd143 dea6ad21a3
commit 6a597e43b3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/dataprep.py
View File

@@ -1532,7 +1532,8 @@ def new_workout_from_file(r, f2,
workoutsource=workoutsource, workoutsource=workoutsource,
summary=summary, summary=summary,
inboard=inboard, oarlength=oarlength, inboard=inboard, oarlength=oarlength,
title=title title=title,
forceunit='N'
) )
return (id, message, f2) return (id, message, f2)

4
rowers/tests/test_units.py
View File

@@ -116,7 +116,7 @@ class ForceUnits(TestCase):
f.close() f.close()
w = Workout.objects.get(id=13) w = Workout.objects.get(id=13)
self.assertEqual(w.forceunit,'lbs') self.assertEqual(w.forceunit,'N')
df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13]) df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13])
average_N = int(df['averageforce'].mean()) average_N = int(df['averageforce'].mean())
@@ -151,7 +151,7 @@ class ForceUnits(TestCase):
f.close() f.close()
w = Workout.objects.get(id=13) w = Workout.objects.get(id=13)
self.assertEqual(w.forceunit,'lbs') self.assertEqual(w.forceunit,'N')
df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13]) df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13])
average_N = int(df['averageforce'].mean()) average_N = int(df['averageforce'].mean())