diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 17fc7ee9..b10ecd8d 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1207,6 +1207,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower', except KeyError: pass + # remove zero power + row.df[' Power (watts)'].replace(to_replace=0,method='ffill', inplace=True) + if dosmooth: # auto smoothing pace = row.df[' Stroke500mPace (sec/500m)'].values diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 891e7a14..5c1d998a 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -442,7 +442,6 @@ def interactive_activitychart2(workouts, startdate, enddate, stack='type', 'colors': mytypes.color_map, } - script, div = get_chart("/activity_bar", chart_data, debug=False) return script, div diff --git a/rowers/models.py b/rowers/models.py index 4b40e835..54cab176 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -4460,6 +4460,8 @@ class WorkoutForm(ModelForm): 'duration': forms.TimeInput(format='%H:%M:%S.%f'), } + boatname = forms.CharField(widget=forms.Textarea, required=False) + def __init__(self, *args, **kwargs): super(WorkoutForm, self).__init__(*args, **kwargs) self.fields['private'] = forms.BooleanField(initial=False, diff --git a/rowers/mytypes.py b/rowers/mytypes.py index afc90c8b..a7848954 100644 --- a/rowers/mytypes.py +++ b/rowers/mytypes.py @@ -373,7 +373,7 @@ color_map = { 'coastal': 'navy', # '#bcbd22', 'c-boat': 'lightsteelblue', # '#ffbb78', 'churchboat': 'midnightblue', # '#17becf', - 'Ride': 'hotpink', # '#3182bd', + 'Ride': 'deeppink', # '#3182bd', 'Bike': 'deeppink', 'bike': 'deeppink', # '#e6550d', 'Run': 'green', # '#ff9896', diff --git a/rowers/tests/test_units.py b/rowers/tests/test_units.py index 9fb66dac..198deef6 100644 --- a/rowers/tests/test_units.py +++ b/rowers/tests/test_units.py @@ -160,7 +160,7 @@ class ForceUnits(TestCase): df = dataprep.read_data(['averageforce'],ids=[13]) df = dataprep.remove_nulls_pl(df) average_N = int(df['averageforce'].mean()) - self.assertEqual(average_N,122) + self.assertEqual(average_N,119) @override_settings(TESTING=True) class TestForceUnit(TestCase): diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index e41b27e9..8736c7be 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ