Rudimentary search on event label.

gracedb/forms.py

 
 from django import forms
-from models import Event, User, Group
+from models import Event, User, Group, Label
 
 class CreateEventForm(forms.Form):
     groupChoices = [("","")]+[(g.name, g.name) for g in Group.objects.all()]
@@ -12,11 +12,16 @@ class CreateEventForm(forms.Form):
 
 class EventSearchForm(forms.Form):
     groupChoices = [("","")]+[(g.name, g.name) for g in Group.objects.all()]
+
     typeChoices= [("","")]+list(Event.ANALYSIS_TYPE_CHOICES)
+
     submitterIds = Event.objects.values_list('submitter',flat=True).distinct()
     submitterList = User.objects.filter(id__in=submitterIds).order_by('name')
     submitterChoices = [("","")]+ [ (u.id, u.name) for u in submitterList]
 
+    labelChoices = [ ("hi%d"%n,"bye%d"%n) for n in [1,2,3]]
+    labelChoices = [ (label.id, label.name) for label in Label.objects.all() ]
+
     graceidStart = forms.CharField(required=False)
     graceidEnd = forms.CharField(required=False)
     group = forms.ChoiceField(choices=groupChoices, required=False)
@@ -25,3 +30,4 @@ class EventSearchForm(forms.Form):
     gpsEnd = forms.IntegerField(min_value=0, required=False, label="GPS End")
     submitter = forms.ChoiceField(choices=submitterChoices, required=False)
 
+    labels = forms.MultipleChoiceField(choices=labelChoices, required=False)

gracedb/views.py

@@ -355,6 +355,7 @@ def search(request):
             submitter = form.cleaned_data['submitter']
             groupname = form.cleaned_data['group']
             typename = form.cleaned_data['type']
+            labels = form.cleaned_data['labels']
             gpsStart =  form.cleaned_data['gpsStart']
             gpsEnd =  form.cleaned_data['gpsEnd']
 
@@ -399,6 +400,9 @@ def search(request):
             if typename:
                 objects = objects.filter(analysisType=typename)
 
+            if labels:
+                objects = objects.filter(labels__in=labels)
+
             return object_list(request, objects, extra_context={'title':"Query Results"})
 
 

templates/gracedb/query.html

 {% extends "base.html" %}
 
-{% block title %}Query{% endblock %}
-{% block heading %}Query{% endblock %}
+{% block title %}Search{% endblock %}
+{% block heading %}Search{% endblock %}
 {% block pageid %}search{% endblock %}
 
 {% block content %}
@@ -12,5 +12,5 @@
 <tr><td></td><td><input type="Submit"/></td></tr>
 </table>
 </form>
-    
+
 {% endblock %}