adding preferred_event, gw_events, and em_events to superevent search results

gracedb/superevents/search_flex.py

@@ -70,6 +70,9 @@ def flexigridResponse(request, objects):
                 object.superevent_id]), object.superevent_id),
             #Labels
             " ".join(["""<span onmouseover="tooltip.show(tooltiptext('%s', '%s', '%s'));" onmouseout="tooltip.hide();" style="color: %s"> %s </span>""" % (label.label.name, label.creator.username, label.created, label.label.defaultColor, label.label.name) for label in object.labelling_set.all()]),
+            str(object.preferred_event.graceid()),
+            " ".join([ev.graceid() for ev in object.get_internal_events()]),
+            " ".join([ev.graceid() for ev in object.get_external_events()]),
             t_start_times.get('gps', ""),
             t_0_times.get('gps', ""),
             t_end_times.get('gps', ""),

gracedb/templates/search/query.html

@@ -36,16 +36,19 @@ onload="document.search_form.query.focus();"
         url: '{% url "mainsearch"  %}?query={{raw_query|urlencode}}&query_type={{query_type}}&results_format=F',
         datatype: 'json',
         mtype: "GET",
-        colNames : ["UID", "Labels", "t_start", "t_0", "t_end", "is_gw", "Links", "Submitted", "Submitted By",
+        colNames : ["UID", "Labels", "Preferred Event", "GW events", "External events", "t_start", "t_0", "t_end", "is_gw", "Links", "Submitted", "Submitted By",
         ],
         colModel : [
            {name : 'id',     index: 'id', width : 30, sortable : true, align: 'left', hidden: false},
            {name : 'labels', index: 'labels', width : 40, sortable : false, align: 'left'},
-           {name : 't_start',  t_start: 't_start', width : 20, sortable : false, align: 'left', hidden: false},
+           {name : 'preferred_event', index: 'preferred_event', width : 20, sortable : true, align: 'left', hidden: false},
+           {name : 'gw_events', index: 'gw_events', width : 50, sortable : false, align: 'left', hidden: false},
+           {name : 'em_events', index: 'em_events', width : 50, sortable : false, align: 'left', hidden: true},
+           {name : 't_start',  index: 't_start', width : 20, sortable : false, align: 'left', hidden: true},
            {name : 't_0',  index: 't_0', width : 20, sortable : false, align: 'left', hidden: false},
-           {name : 't_end',  index: 't_end', width : 20, sortable : false, align: 'left', hidden: false},
-           {name : 'is_gw', index: 'is_gw', width : 20, sortable : true, align: 'left'},
-           {name : 'links',   index: 'links', width : 30, sortable : false, align: 'center'},
+           {name : 't_end',  index: 't_end', width : 20, sortable : false, align: 'left', hidden: true},
+           {name : 'is_gw', index: 'is_gw', width : 20, sortable : true, align: 'left', hidden: true},
+           {name : 'links',   index: 'links', width : 20, sortable : false, align: 'center'},
            {name : 'created', index: 'created', width : 40, sortable : true, align: 'left'},
            {name : 'submitter', index: 'submitter', width : 60, sortable : true, align: 'left'},