diff --git a/rowers/mytypes.py b/rowers/mytypes.py index 93dae725..e3dd7b46 100644 --- a/rowers/mytypes.py +++ b/rowers/mytypes.py @@ -18,6 +18,7 @@ workouttypes = ( ('c-boat','Dutch C boat'), ('churchboat','Finnish Church boat'), ('Ride','Ride'), + ('Bike','Bike'), ('Run','Run'), ('NordicSki','NordicSki'), ('Swim','Swim'), @@ -31,6 +32,7 @@ workouttypes = ( ('InlineSkate','InlineSkate'), ('Kayaking','Kayaking'), ('Workout','Workout'), + ('Yoga','Yoga'), ('other','Other'), ) @@ -60,6 +62,7 @@ stravamapping = collections.OrderedDict({ 'InlineSkate':'InlineSkate', 'Kayaking':'Kayaking', 'Workout':'Workout', + 'Yoga':'Yoga', 'other':'Workout', }) @@ -91,6 +94,7 @@ stmapping = collections.OrderedDict({ 'InlineSkate':'Skating:InlineSkate', 'Kayaking':'Other:Kayaking', 'Workout':'Other:Workout', + 'Yoga':'Other', 'other':'Other', }) @@ -122,7 +126,7 @@ rkmapping = collections.OrderedDict({ 'Kayaking':'Other', 'Workout':'Other', 'other':'Other', - + 'Yoga':'Other', }) polarmapping = collections.OrderedDict({ @@ -152,7 +156,7 @@ polarmapping = collections.OrderedDict({ 'Kayaking':'Kayaking', 'Workout':'Other Indoor', 'other':'Other Indoor', - + 'Yoga':'Yoga', }) tpmapping = collections.OrderedDict({ @@ -182,7 +186,7 @@ tpmapping = collections.OrderedDict({ 'Kayaking':'other', 'Workout':'other', 'other':'other', - + 'Yoga':'other', }) c2mapping = collections.OrderedDict({ @@ -212,6 +216,7 @@ c2mapping = collections.OrderedDict({ 'Kayaking':None, 'Workout':None, 'other':None, + 'Yoga':None, }) diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index 4e1078a7..f2af5b3c 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -319,7 +319,11 @@ def get_workout(user,stravaid): if t is not None: nr_rows = len(t) else: - return(0,"Error: Time data wasnt found") + duration = int(workoutsummary['elapsed_time']) + t = pd.Series(range(duration+1)) + + nr_rows = len(t) + if nr_rows == 0: return (0,"Error: Time data had zero length") diff --git a/rowers/tests/test_analysis.py b/rowers/tests/test_analysis.py index 790e6aec..5c2eb0b2 100644 --- a/rowers/tests/test_analysis.py +++ b/rowers/tests/test_analysis.py @@ -1075,10 +1075,10 @@ class WorkoutStatsTestNew(TestCase): workouts = self.user_workouts script, div = boxplotdata(workouts,options) - script, div = trendflexdata(workouts,options) +# script, div = trendflexdata(workouts,options) # script, div = histodata(workouts,options) -# script, div = flexalldata(workouts,options) -# script, div = statsdata(workouts,options) + script, div = flexalldata(workouts,options) + script, div = statsdata(workouts,options) script, div = comparisondata(workouts,options) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 6baa0ec0..437d7799 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ