From c089fee7950ebf7d03c355fe87b6361b0c553950 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 12 Nov 2019 22:09:19 +0100 Subject: [PATCH 1/2] force unit correction --- rowers/dataprep.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 8005afb4..0b50fc05 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1439,7 +1439,8 @@ def new_workout_from_file(r, f2, workoutsource=workoutsource, summary=summary, inboard=inboard, oarlength=oarlength, - title=title + title=title, + forceunit='N' ) return (id, message, f2) From dea6ad21a3727f31598d234d05378f095dde6b77 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 12 Nov 2019 22:14:34 +0100 Subject: [PATCH 2/2] bug fix --- rowers/tests/test_units.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rowers/tests/test_units.py b/rowers/tests/test_units.py index 107c263f..7546603a 100644 --- a/rowers/tests/test_units.py +++ b/rowers/tests/test_units.py @@ -116,7 +116,7 @@ class ForceUnits(TestCase): f.close() w = Workout.objects.get(id=13) - self.assertEqual(w.forceunit,'lbs') + self.assertEqual(w.forceunit,'N') df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13]) average_N = int(df['averageforce'].mean()) @@ -151,7 +151,7 @@ class ForceUnits(TestCase): f.close() w = Workout.objects.get(id=13) - self.assertEqual(w.forceunit,'lbs') + self.assertEqual(w.forceunit,'N') df = dataprep.getsmallrowdata_db(['averageforce'],ids=[13]) average_N = int(df['averageforce'].mean())