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

tests pass

Browse Source
This commit is contained in:
Sander Roosendaal
2022-01-18 14:43:27 +01:00
parent da50e33899
commit e5a8c484f2
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/dataprep.py
View File

@@ -2204,10 +2204,10 @@ def new_workout_from_file(r, f2,
# Get workout type from fit & tcx # Get workout type from fit & tcx
if (fileformat == 'fit'): # pragma: no cover if (fileformat == 'fit'): # pragma: no cover
workouttype = get_workouttype_from_fit(f2,workouttype=workouttype) workouttype = get_workouttype_from_fit(f2,workouttype=workouttype)
if (fileformat == 'tcx'): #if (fileformat == 'tcx'):
workouttype_from_tcx = get_workouttype_from_tcx(f2,workouttype=workouttype) # workouttype_from_tcx = get_workouttype_from_tcx(f2,workouttype=workouttype)
if workouttype not in mytypes.otwtypes and workouttype_from_tcx not in mytypes.otwtypes: # if workouttype != 'rower' and workouttype_from_tcx not in mytypes.otwtypes:
workouttype = workouttype_from_tcx # workouttype = workouttype_from_tcx
# handle non-Painsled by converting it to painsled compatible CSV # handle non-Painsled by converting it to painsled compatible CSV
if (fileformat != 'csv'): if (fileformat != 'csv'):

1
rowers/tests/test_user.py
View File

@@ -117,6 +117,7 @@ class UserPreferencesTest(TestCase):
'usersmooth':2, 'usersmooth':2,
'defaultlandingpage':'workout_edit_view', 'defaultlandingpage':'workout_edit_view',
'defaultlandingpage2':'workout_delete', 'defaultlandingpage2':'workout_delete',
'defaultlandingpage3': 'workout_view',
'first_name': self.u.first_name, 'first_name': self.u.first_name,
'last_name': self.u.last_name, 'last_name': self.u.last_name,
'email':self.u.email 'email':self.u.email

BIN
rowers/tests/testdata/testdata.tcx.gz vendored Normal file
View File

Binary file not shown.