From 2435bc6a24839f4221b9c6926a6cdda325a1243d Mon Sep 17 00:00:00 2001
From: Brian Moe <brian.moe@ligo.org>
Date: Tue, 24 Jan 2012 11:02:31 -0600
Subject: [PATCH] Added 'instruments' to event_{list,detail} display.
---
gracedb/views.py | 2 ++
templates/gracedb/event_detail.html | 4 ++++
templates/gracedb/event_list.html | 7 ++++---
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/gracedb/views.py b/gracedb/views.py
index db33f7962..a98dbef5e 100644
--- a/gracedb/views.py
+++ b/gracedb/views.py
@@ -806,6 +806,8 @@ def flexigridResponse(request, objects):
event_times.get('gps',""),
#event_times['utc'],
+ object.instruments,
+
scientific(object.far),
'<a href="%s">Data</a> <a href="%s">Wiki</a>' %
diff --git a/templates/gracedb/event_detail.html b/templates/gracedb/event_detail.html
index c552f2f68..525289ca4 100644
--- a/templates/gracedb/event_detail.html
+++ b/templates/gracedb/event_detail.html
@@ -23,6 +23,7 @@
<th>Labels</th>
<th>Group</th>
<th>Type</th>
+ <th>Instruments</th>
<th>
{{ "gps"|timeselect:"gps" }}
Event Time
@@ -45,6 +46,7 @@
</td>
<td>{{ object.group.name }} </td>
<td>{{ object.get_analysisType_display }} </td>
+ <td>{{ object.instruments }}</td>
<td>{% if object.gpstime%}
<!-- <span title="{{ object.gpstime|gpsdate }}">{{ object.gpstime }}</span> -->
{{ object.gpstime|multiTime:"gps" }}
@@ -66,6 +68,7 @@
<th>Labels</th>
<th>Group</th>
<th>Type</th>
+ <th>Instruments</th>
<th>
{{ "ngps"|timeselect:"gps" }}
Event Time
@@ -89,6 +92,7 @@
</td>
<td>{{ object.group.name }} </td>
<td>{{ object.get_analysisType_display }} </td>
+ <td>{{ object.instruments }}</td>
<td>{% if object.gpstime%}
{{ object.gpstime|multiTime:"ngps" }}
{% endif %}</td>
diff --git a/templates/gracedb/event_list.html b/templates/gracedb/event_list.html
index 939d804e2..377ce6c32 100644
--- a/templates/gracedb/event_list.html
+++ b/templates/gracedb/event_list.html
@@ -48,16 +48,17 @@
url: '{% url search %}/flex?query={{rawquery|urlencode}}',
datatype: 'json',
mtype: "GET",
- colNames : ["UID", "Labels", "Neighbors (+/-5sec)", "Group", "Type", "Event Time", "FAR", "Links", "Submitted", "Submitted By",
+ colNames : ["UID", "Labels", "Neighbors (+/-5sec)", "Group", "Type", "Event Time", "Instruments", "FAR", "Links", "Submitted", "Submitted By",
],
colModel : [
{name : 'id', index: 'id', width : 50, sortable : true, align: 'left', hidden: false},
- {name : 'labels', index: 'labels', width : 100, sortable : false, align: 'left'},
+ {name : 'labels', index: 'labels', width : 70, sortable : false, align: 'left'},
{name : 'neighbors', index: 'neighbors', width : 100, sortable : false, align: 'left'},
{name : 'group', index: 'group', width : 50, sortable : false, align: 'left', hidden: true},
- {name : 'analysisType', index: 'analysisType', width : 90, sortable : true, align: 'right', hide: false},
+ {name : 'analysisType', index: 'analysisType', width : 70, sortable : true, align: 'right', hide: false},
{name : 'gpstime', index: 'gpstime', width : 90, sortable : true, align: 'right'},
+ {name : 'instruments', index: 'instruments', width : 50, sortable : true, align: 'right', hidden: false},
{name : 'far', index: 'far', width : 80, sortable : true, align: 'right', hidden: false},
{name : 'links', index: 'links', width : 80, sortable : false, align: 'center'},
{name : 'created', index: 'created', width : 100, sortable : true, align: 'right'},
--
GitLab