From 64de3fcd8c21e81d85499cbe6b859b24fecb5b16 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Wed, 17 Jun 2020 22:15:39 +0000
Subject: [PATCH] Ensure UTC time is shown throughout the interim request,
approval, and announcement workflow. Fixes #2974. Commit ready for merge. -
Legacy-Id: 18016
---
ietf/meeting/tests_views.py | 4 ++++
ietf/templates/meeting/interim_request_details.html | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index 9878606cc..170fbb64b 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -1977,6 +1977,10 @@ class InterimTests(TestCase):
login_testing_unauthorized(self,"secretary",url)
r = self.client.get(url)
self.assertEqual(r.status_code, 200)
+ start_time = meeting.session_set.first().official_timeslotassignment().timeslot.time.strftime('%H:%M')
+ utc_start_time = meeting.session_set.first().official_timeslotassignment().timeslot.utc_start_time().strftime('%H:%M')
+ self.assertIn(start_time, unicontent(r))
+ self.assertIn(utc_start_time, unicontent(r))
def test_interim_request_details_announcement(self):
'''Test access to Announce / Skip Announce features'''
diff --git a/ietf/templates/meeting/interim_request_details.html b/ietf/templates/meeting/interim_request_details.html
index 9d3aaf0ac..c0c51f2b3 100644
--- a/ietf/templates/meeting/interim_request_details.html
+++ b/ietf/templates/meeting/interim_request_details.html
@@ -31,7 +31,7 @@
<dt>Date</dt>
<dd>{{ assignment.timeslot.time|date:"Y-m-d" }}
<dt>Start Time</dt>
- <dd>{{ assignment.timeslot.time|date:"H:i" }}
+ <dd>{{ assignment.timeslot.time|date:"H:i" }} {% if meeting.time_zone != 'UTC' %}( {{ assignment.timeslot.utc_start_time|date:"H:i"}} UTC ){% endif %}
<dt>Duration</dt>
<dd>{{ assignment.session.requested_duration|format_timedelta }}
<dt>Remote Instructions</dt>