From 4535c030601583c91a5da174c00ad8d758c8ef3e Mon Sep 17 00:00:00 2001
From: Tanner Prestegard <tanner.prestegard@ligo.org>
Date: Tue, 19 Jun 2018 13:20:46 -0500
Subject: [PATCH] Fixing time selectors on event view page
Javascript time zone selectors assumed the server time zone to be
America/Chicago, which we changed in
ab72e160d21077c760523a0383054a678169f204, so we fixed that here.
Also fixed assumptions that LLO is in the same time zone as the
server.
---
gracedb/templates/gracedb/event_detail_script.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gracedb/templates/gracedb/event_detail_script.js b/gracedb/templates/gracedb/event_detail_script.js
index 105ac2ba9..a9d41a2d0 100644
--- a/gracedb/templates/gracedb/event_detail_script.js
+++ b/gracedb/templates/gracedb/event_detail_script.js
@@ -565,7 +565,7 @@ require([
// Convert the 'created' times to UTC.
logs = logs.map( function(obj) {
- var server_t = moment.tz(obj.created, 'America/Chicago');
+ var server_t = moment.tz(obj.created, 'UTC');
obj.created = server_t.clone().tz('UTC').format(TIME_DISP_FMT);
return obj;
});
@@ -615,10 +615,10 @@ require([
return timeHeaderContainer;
},
renderCell: function(object, value, node, options) {
- var server_t = moment.tz(object.created, 'America/Chicago');
+ var server_t = moment.tz(object.created, 'UTC');
var t = put(node, 'time[name="time-log"]', server_t.format(TIME_DISP_FMT));
put(t, '[utc="$"]', server_t.clone().tz('UTC').format(TIME_DISP_FMT));
- put(t, '[llo="$"]', server_t.format(TIME_DISP_FMT));
+ put(t, '[llo="$"]', server_t.clone().tz('America/Chicago').format(TIME_DISP_FMT));
put(t, '[lho="$"]', server_t.clone().tz('America/Los_Angeles').format(TIME_DISP_FMT));
put(t, '[virgo="$"]', server_t.clone().tz('Europe/Rome').format(TIME_DISP_FMT));
return t;
@@ -775,10 +775,10 @@ require([
//return ts;
},
renderCell: function(object, value, node, options) {
- var server_t = moment.tz(object.created, 'America/Chicago');
+ var server_t = moment.tz(object.created, 'UTC');
var t = put(node, 'time[name="time-audit-log"]', server_t.format(TIME_DISP_FMT));
put(t, '[utc="$"]', server_t.clone().tz('UTC').format(TIME_DISP_FMT));
- put(t, '[llo="$"]', server_t.format(TIME_DISP_FMT));
+ put(t, '[llo="$"]', server_t.clone().tz('America/Chicago').format(TIME_DISP_FMT));
put(t, '[lho="$"]', server_t.clone().tz('America/Los_Angeles').format(TIME_DISP_FMT));
put(t, '[virgo="$"]', server_t.clone().tz('Europe/Rome').format(TIME_DISP_FMT));
return t;
--
GitLab