First cut at approvals. Changed alert filename to file URL.

gracedb/forms.py

@@ -22,3 +22,7 @@ class EventSearchForm(forms.Form):
     group = forms.ChoiceField(choices=groupChoices, required=False)
     type = forms.ChoiceField(choices=typeChoices, required=False)
     submitter = forms.ChoiceField(choices=submitterChoices, required=False)
+
+    ligoApproved = forms.BooleanField(initial=False, required=False, label="LIGO Approved Only")
+    virgoApproved = forms.BooleanField(initial=False, required=False, label="Virgo Approved Only")
+

gracedb/models.py

@@ -95,7 +95,14 @@ class Event(models.Model):
         return "https://www.lsc-group.phys.uwm.edu/twiki/bin/view/Sandbox/%s" % self.uid
 
     def clusterurl(self):
-        return "pcdev1.phys.uwm.edu:/archive/gracedb/data/%s" % self.uid
+        #return "pcdev1.phys.uwm.edu:/archive/gracedb/data/%s" % self.uid
+        return "file://pcdev1.phys.uwm.edu/archive/gracedb/data/%s" % self.uid
+
+    def ligoApproved(self):
+        return self.approval_set.filter(approvingCollaboration='L').count()
+
+    def virgoApproved(self):
+        return self.approval_set.filter(approvingCollaboration='V').count()
 
 class Approval(models.Model):
     COLLABORATION_CHOICES = ( ('L','LIGO'), ('V','Virgo'), )

gracedb/views.py

@@ -114,6 +114,11 @@ def search(request):
                 objects = objects.filter(group=group)
             if typename:
                 objects = objects.filter(analysisType=typename)
+            if form.cleaned_data['ligoApproved']:
+                objects = objects.filter(approval__approvingCollaboration='L')
+
+            if form.cleaned_data['virgoApproved']:
+                objects = objects.filter(approval__approvingCollaboration='V')
             return object_list(request, objects, extra_context={'title':"Query Results"})
 
 

templates/gracedb/event_list.html

@@ -8,7 +8,11 @@
 
 {% if object_list.count %}
 <table>
+    <tr>    <th colspan="2">Approvals</th>
+    </tr>
     <tr>
+            <th>LIGO</th>
+            <th>Virgo</th>
             <th>UID</th>
             <th>Submitter</th>
             <th>Group</th>
@@ -19,6 +23,24 @@
 
 {% for obj in object_list %}
     <tr class={% cycle 'odd' 'even' %}>
+        <!--
+            https://archie.phys.uwm.edu/media/img/admin/icon-no.gif
+            https://archie.phys.uwm.edu/media/img/admin/icon-yes.gif
+        -->
+        <td align="center">
+            {% if obj.ligoApproved %}
+                <img src="/media/img/admin/icon-yes.gif"/>
+            {% else %}
+                <img src="/media/img/admin/icon-no.gif"/>
+            {% endif %}
+        </td>
+        <td align="center">
+            {% if obj.virgoApproved %}
+                <img src="/media/img/admin/icon-yes.gif"/>
+            {% else %}
+                <img src="/media/img/admin/icon-no.gif"/>
+            {% endif %}
+        </td>
         <td>{{ obj.uid }}</td>
         <td>{{ obj.submitter }} </td>
         <td>{{ obj.group }} </td>