add timezone data to schedule (#721) (#729)

frab · Nov 5, 2020 · 9acb723 · 9acb723
1 parent 5639157
commit 9acb723
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 0 deletions.
diff --git a/app/models/conference.rb b/app/models/conference.rb
@@ -100,6 +100,10 @@ def timezone
     attributes['timezone']
   end
 
+  def timezone_IANA
+    ActiveSupport::TimeZone::MAPPING[timezone] or timezone
+  end
+
   def timeslot_duration
     return parent.timeslot_duration if sub_conference?
     attributes['timeslot_duration']

diff --git a/app/views/public/schedule/index.json.jbuilder b/app/views/public/schedule/index.json.jbuilder
@@ -14,6 +14,7 @@ json.schedule do
     end
     json.daysCount @conference.days.length
     json.timeslot_duration duration_to_time(@conference.timeslot_duration)
+    json.time_zone_name @conference.timezone_IANA
     index = 1
     json.days @conference.days do |day|
       json.index index

diff --git a/app/views/public/schedule/index.xml.haml b/app/views/public/schedule/index.xml.haml
@@ -11,6 +11,7 @@
       %end= @conference.last_day.end_date.strftime('%Y-%m-%d')
     %days= @conference.days.length
     %timeslot_duration= duration_to_time(@conference.timeslot_duration)
+    %time_zone_name= @conference.timezone_IANA
     - if @conference.program_export_base_url.present?
       %base_url= @conference.program_export_base_url
     - else

diff --git a/test/controllers/public/schedule_controller_test.rb b/test/controllers/public/schedule_controller_test.rb
@@ -16,13 +16,15 @@ class Public::ScheduleControllerTest < ActionController::TestCase
     schedule = Hash.from_xml(response.body)['schedule']
     assert_includes schedule.keys, 'conference'
     assert_includes schedule.keys, 'day'
+    assert_includes schedule['conference'].keys, 'time_zone_name'
   end
 
   test 'displays json schedule' do
     get :index, format: :json, params: { conference_acronym: @conference.acronym }
     assert_response :success
     schedule = JSON.parse(response.body)['schedule']
     assert_includes schedule.keys, 'conference'
+    assert_includes schedule['conference'].keys, 'time_zone_name'
   end
 
   test 'displays ical schedule' do