diff --git a/rowers/forms.py b/rowers/forms.py
index c73770fc..7de91fdb 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -25,6 +25,10 @@ class LoginForm(forms.Form):
username = forms.CharField()
password = forms.CharField(widget=forms.PasswordInput())
+# search form
+class SearchForm(forms.Form):
+ q = forms.CharField(max_length=255,required=False,initial='Search')
+
# simple form for Contact page. Sends email to info@rowsandall.com
class EmailForm(forms.Form):
firstname = forms.CharField(max_length=255)
diff --git a/rowers/templates/workoutstats.html b/rowers/templates/workoutstats.html
index d4976046..dbfed1f4 100644
--- a/rowers/templates/workoutstats.html
+++ b/rowers/templates/workoutstats.html
@@ -93,7 +93,7 @@
{% for key, value in stats.items %}
- {% if value.std > 2 %}
+ {% if value.std > 10 %}
| {{ value.verbosename }} |
{{ value.mean|floatformat:0 }} |
{{ value.wmean|floatformat:0 }} |
diff --git a/rowers/views.py b/rowers/views.py
index b00e6e38..a0a4cfeb 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -50,7 +50,7 @@ from rowers.forms import (
RaceResultFilterForm,PowerIntervalUpdateForm,FlexAxesForm,
FlexOptionsForm,DataFrameColumnsForm,OteWorkoutTypeForm,
MetricsForm,DisqualificationForm,disqualificationreasons,
- disqualifiers
+ disqualifiers,SearchForm,
)
from django.core.urlresolvers import reverse, reverse_lazy
@@ -6994,6 +6994,9 @@ def workouts_view(request,message='',successmessage='',
reduce(operator.and_,
(Q(notes__icontains=q) for q in query_list))
)
+ searchform = SearchForm(initial={'q':query})
+ else:
+ searchform = SearchForm()
paginator = Paginator(workouts,20) # show 25 workouts per page
page = request.GET.get('page')
@@ -7038,6 +7041,7 @@ def workouts_view(request,message='',successmessage='',
{'workouts': workouts,
'active': 'nav-workouts',
'rower':r,
+ 'searchform':searchform,
'breadcrumbs':breadcrumbs,
'dateform':dateform,
'startdate':startdate,
@@ -8496,10 +8500,16 @@ def workout_data_view(request, id=0):
datadf.sort_values(['ftime'],inplace=True)
- datadf.drop(labels=[
+ columns = datadf.columns.values
+
+ to_be_dropped = [
'id','time','hr_an','hr_at','hr_bottom','hr_max',
'hr_tr','hr_ut1','hr_ut2','x_right',
- ],inplace=True,axis=1)
+ ]
+
+ to_be_dropped = [c for c in to_be_dropped if c in columns]
+
+ datadf.drop(labels=to_be_dropped,inplace=True,axis=1)
cols = ['ftime','cumdist','fpace','spm',