diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index d21c61a2..59291631 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1174,8 +1174,8 @@ def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='', yparamname = axlabels[yparam] if xparam=='distance': - xaxmax = datadf['x1'].max() - xaxmin = datadf['x1'].min() + xaxmax = datadf['x'].max() + xaxmin = datadf['x'].min() else: xaxmax = yaxmaxima[xparam] xaxmin = yaxminima[xparam] diff --git a/rowers/views.py b/rowers/views.py index 7de845ab..0b17d389 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3456,6 +3456,8 @@ def multiflex_view(request,userid=0, groupby = chartform.cleaned_data['groupby'] binsize = chartform.cleaned_data['binsize'] + if binsize <= 0: + binsize = 1 spmmin = chartform.cleaned_data['spmmin'] spmmax = chartform.cleaned_data['spmmax'] @@ -3569,6 +3571,8 @@ def multiflex_view(request,userid=0, groupby = chartform.cleaned_data['groupby'] binsize = chartform.cleaned_data['binsize'] + if binsize <= 0: + binsize = 1 spmmin = chartform.cleaned_data['spmmin'] spmmax = chartform.cleaned_data['spmmax'] @@ -3616,7 +3620,7 @@ def multiflex_view(request,userid=0, datadf.dropna(axis=0,how='any',inplace=True) - + datemapping = { w.id:w.date for w in workouts }