diff --git a/rowers/dataprep.py b/rowers/dataprep.py index d360703a..4bc4feaf 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -2204,10 +2204,10 @@ def new_workout_from_file(r, f2, # Get workout type from fit & tcx if (fileformat == 'fit'): # pragma: no cover workouttype = get_workouttype_from_fit(f2,workouttype=workouttype) - if (fileformat == 'tcx'): - workouttype_from_tcx = get_workouttype_from_tcx(f2,workouttype=workouttype) - if workouttype not in mytypes.otwtypes and workouttype_from_tcx not in mytypes.otwtypes: - workouttype = workouttype_from_tcx + #if (fileformat == 'tcx'): + # workouttype_from_tcx = get_workouttype_from_tcx(f2,workouttype=workouttype) + # if workouttype != 'rower' and workouttype_from_tcx not in mytypes.otwtypes: + # workouttype = workouttype_from_tcx # handle non-Painsled by converting it to painsled compatible CSV if (fileformat != 'csv'): diff --git a/rowers/tests/test_user.py b/rowers/tests/test_user.py index b79d6fa7..125ec651 100644 --- a/rowers/tests/test_user.py +++ b/rowers/tests/test_user.py @@ -117,6 +117,7 @@ class UserPreferencesTest(TestCase): 'usersmooth':2, 'defaultlandingpage':'workout_edit_view', 'defaultlandingpage2':'workout_delete', + 'defaultlandingpage3': 'workout_view', 'first_name': self.u.first_name, 'last_name': self.u.last_name, 'email':self.u.email diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz new file mode 100644 index 00000000..c18cd7ab Binary files /dev/null and b/rowers/tests/testdata/testdata.tcx.gz differ