[KE] Add speaker to Hansard search parameters

mysociety · Feb 1, 2019 · 9dcb3a3 · 9dcb3a3
1 parent 553becc
commit 9dcb3a3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/pombola/search/templates/search/hansard.html b/pombola/search/templates/search/hansard.html
@@ -28,6 +28,11 @@ <h2>Search in Hansard</h2>
                 <option value="adate"{% if order == 'adate' %} selected{% endif %}>Oldest first</option>
               </select>
 
+              <div>
+                <label for="speaker-name">Speaker name</label>
+                <input id="speaker-name" type="text" name="speaker" type="text" value="{{ speaker }}">
+              </div>
+
             <input type="submit" value="Search" class="button">
         </div>
 

diff --git a/pombola/search/views.py b/pombola/search/views.py
@@ -275,6 +275,7 @@ def parse_params(self):
             self.query = self.request.GET.get('q', '')
             self.page = self.request.GET.get('page')
             self.order = self.request.GET.get('order')
+            self.speaker = self.request.GET.get('speaker', '')
 
         def get_data(self):
             from pombola.hansard.models import Entry
@@ -290,6 +291,8 @@ def get_data(self):
                 data_query = data_query.order_by('-start_date')
             if self.order == 'adate':
                 data_query = data_query.order_by('start_date')
+            if self.speaker != '':
+                data_query = data_query.filter(speaker_names=self.speaker)
 
             result = defaults.copy()
             result['results'] = data_query.highlight()
@@ -311,6 +314,7 @@ def get_context_data(self, **kwargs):
             context = super(HansardSearchView, self).get_context_data(**kwargs)
             context['query'] = self.query
             context['order'] = self.order
+            context['speaker'] = self.speaker
 
             query_dict = self.request.GET.copy()
             if 'page' in query_dict: