Merge branch 'feature/searchfix' into develop

rowers/forms.py

@@ -63,8 +63,8 @@ class LoginForm(forms.Form):
 class SearchForm(forms.Form):
     q = forms.CharField(max_length=255,required=False,
                         widget=forms.TextInput(
-                            attrs={'placeholder': 'Search'}),
-                        label='Search')
+                            attrs={'placeholder': 'keyword or leave empty'}),
+                        label='Filter by Keyword')
 
     
     

rowers/templates/list_workouts.html

@@ -69,27 +69,20 @@
     {{ the_div |safe }}
   </li>
   <li class="grid_2">
-    <p>
+    <p>Filter on date
       <form enctype="multipart/form-data"  method="post">
         <table>
           {{ dateform.as_table }}
         </table>
         {% csrf_token %}
-        <input name='daterange' type="submit" value="Submit">
-      </form>
     </p>
-    {% if team %}
+    <p>and keyword</p>
     <p>
-      <form id="searchform" action="/rowers/list-workouts/team/{{ team.id }}/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}/"
-            method="get" accept-charset="utf-8">
-        {% else %}
-        <form id="searchform" action="/rowers/list-workouts/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }}/"
-              method="get" accept-charset="utf-8">
-          {% endif %}
-          {{ searchform }}
-          <input type="submit" value="GO">
-        </input>
-        </form>
+      {{ searchform }}
+    </p>
+    <p>
+      <input name='daterange' type="submit" value="Submit">
+    </form>
     </p>
     <p>
     {% if rankingonly and not team %}

rowers/views/workoutviews.py

@@ -1178,12 +1178,15 @@ def workouts_view(request,message='',successmessage='',
     startdate = datetime.datetime.combine(startdate,datetime.time())
     enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
 
-    
+    query = None
     if request.method == 'POST':
         dateform = DateRangeForm(request.POST)
+        searchform = SearchForm(request.POST)
         if dateform.is_valid():
             startdate = dateform.cleaned_data['startdate']
             enddate = dateform.cleaned_data['enddate']
+        if searchform.is_valid():
+            query = searchform.cleaned_data['q']
     else:
         dateform = DateRangeForm(initial={
             'startdate':startdate,
@@ -1293,7 +1296,6 @@ def workouts_view(request,message='',successmessage='',
     for w in workoutsnohr:
         res = dataprep.workout_trimp(w)
         
-    query = request.GET.get('q')
     if query:
         query_list = query.split()
         workouts = workouts.filter(

static/css/rowsandall2.css

@@ -70,7 +70,7 @@ body {
 }
 
 .yellow {
-    color: #cccc00;
+    color: #1c75bc;
     font-size: 1.2em;
     height: auto;
     padding: 0px;