diff --git a/gracedb/superevents/search_flex.py b/gracedb/superevents/search_flex.py index 3d69446f600e6184ccb05cd573e055bf19b3ce2a..b1b98173330df3cd08037010924e871ab0ef4922 100644 --- a/gracedb/superevents/search_flex.py +++ b/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', ""), diff --git a/gracedb/templates/search/query.html b/gracedb/templates/search/query.html index 4d6fc35218c1a428999a7eb7ecc1ed05176d3b30..fcf3d91e959723c7daebcd1e49428a520b7c9a94 100644 --- a/gracedb/templates/search/query.html +++ b/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'},