<%= neatly_printed_date_range(event.start, event.end) %>
+ <% if TeSS::Config.feature.fetch('timezone_controls') %> + <%= render partial: 'events/event_time_div', locals: {event: event} %> + <% else %> +<%= neatly_printed_date_range(event.start, event.end) %>
+ <% end %> <% if event.onsite? %> <% location = [event.city, event.country].reject { |field_value| field_value.blank? }.join(", ") %> diff --git a/app/views/events/_event_time_div.html.erb b/app/views/events/_event_time_div.html.erb new file mode 100644 index 000000000..d0da18de8 --- /dev/null +++ b/app/views/events/_event_time_div.html.erb @@ -0,0 +1,16 @@ +<% # Fake the timezone if passed as an argument + if local_assigns[:timezone] + saved_timezone = event.timezone + event.timezone = timezone + end %> ++ <%= t('events.date') %>: + <%= neatly_printed_date_range(event.start_local, event.end_local) %> + <% unless event.timezone %> + <%= t('events.no_timezone_provided_gmt_assumed') %> + <% end %> +
+ <%= display_attribute(event, :timezone) {|v| normalized_icu_timezone(v) } %> ++ + + <%= t('events.timezone_controls.all_events_in_local_html') %> + + <% if local_assigns[:browser_timezone] %> + + <%= t('events.timezone_controls.all_events_in_timezone_html', + timezone: normalized_icu_timezone(browser_timezone)) %> + + <% end %> + + + <% if local_assigns[:browser_timezone] %> + + <%= t('events.timezone_controls.controls_show') %> + + <% end %> +
+ + <% if local_assigns[:browser_timezone] %> +- Date: - <%= neatly_printed_date_range(@event.start, @event.end) %> -
- <%= display_attribute(@event, :timezone) %> + + <% if TeSS::Config.feature.fetch('timezone_controls') %> + <%= render partial: 'events/event_timezone_control' %> + <%= render partial: 'event_time_div', locals: {event: @event} %> + <% else %> + ++ Date: + <%= neatly_printed_date_range(@event.start, @event.end) %> +
+ <%= display_attribute(@event, :timezone) %> + <% end %> + <%= display_attribute(@event, :duration) %> <%= display_attribute(@event, :language) { |value| render_language_name(value) } %> diff --git a/app/views/static/home/_upcoming_events.html.erb b/app/views/static/home/_upcoming_events.html.erb index 31d223e67..acbf2a5ce 100644 --- a/app/views/static/home/_upcoming_events.html.erb +++ b/app/views/static/home/_upcoming_events.html.erb @@ -1,7 +1,14 @@ <% cache(['home', 'upcoming_events', @events]) do %>When you register with %{site_name} we ask for a username, password and email address.
@@ -631,13 +632,39 @@ en: title: 'Add a title for your training event.' url: 'Location where the event and its details are advertised on the internet.' providers: The organisation providing the event metadata. + no_timezone_provided_gmt_assumed: > + (no timezone provided, GMT assumed.) prompts: language: 'Select a language...' long: 'Long events' + date: 'Date' + labels: + start: 'Start (in specified time zone)' + end: 'End (in specified time zone)' + view_event: 'View event' pick_date: 'Pick a range of dates for a better collection of events.' show_past_events: one: Show %{count} past event other: Show %{count} past events + info_button_header: 'What are events in %{site}?' + info_button_body_html: >- +An event in %{site} is a link to a single training event sourced by a + provider along with description and other meta information (e.g. date, location, audience, + ontological categorization, keywords, etc.).
+Training events can be added manually or automatically harvested from a provider's website.
+If your website contains training events that you wish to include in %{site}, + see here for details on automatic registration
+ breadcrumb_index: Events + timezone_controls: + all_events_in_local_html: > + Note: all times are shown in the timezone in which each event occurs. + all_events_in_timezone_html: > + Note: all times are shown in the %{timezone} timezone. + controls_show: 'Change...' + controls_legend: 'When displaying times, use:' + local_time_select: 'the timezone in which the event occurs' + timezone_select_html: '%{timezone} timezone (detected from your browser)' + close: 'Close' materials: hints: authors: > diff --git a/config/routes.rb b/config/routes.rb index 5f9613f6f..ee89fc99d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -64,6 +64,7 @@ collection do get :count get :calendar, format: %i[js html] + get :event_time_data post :preview end member do diff --git a/config/tess.example.yml b/config/tess.example.yml index 70560649e..95e9f0303 100644 --- a/config/tess.example.yml +++ b/config/tess.example.yml @@ -182,6 +182,7 @@ default: &default # UI sticky_navbar: false # when true, allows navbar (and header_notice if enabled) to stick to the top of the window and shrink when scrolling + timezone_controls: true # Possible features to disable: # biotools, topics, operations, sponsors, fairshare, county, ardc_fields_of_research, diff --git a/test/controllers/events_controller_test.rb b/test/controllers/events_controller_test.rb index e3004fe7b..5db2fc553 100644 --- a/test/controllers/events_controller_test.rb +++ b/test/controllers/events_controller_test.rb @@ -383,6 +383,67 @@ class EventsControllerTest < ActionController::TestCase assert_response :forbidden end + test 'should allow user to edit/create events in the specified timezone on the webpage' do + sign_in users(:admin) + event = events(:training_event) # Has non-trivial timezone + + # Time zone is Melbourne + assert_equal event.timezone, "Melbourne" + + # These are UTC + assert_equal event.start.to_s, "2021-09-20 23:15:00 UTC" + assert_equal event.end.to_s, "2021-09-21 01:00:00 UTC" + + get :edit, params: { id: event } + assert_response :success + + # Time zone in the form is Melbourne + timezone_select = css_select '#event_timezone' + value = timezone_select.search('option[@selected="selected"]').first.attr('value') + assert_equal value, 'Melbourne' + + # These are Melbourne time + start_select = css_select '#event_start' + value = start_select.first.attr('value') + assert_equal value, '2021-09-21 09:15:00 +1000' + + end_select = css_select '#event_end' + value = end_select.first.attr('value') + assert_equal value, '2021-09-21 11:00:00 +1000' + + # Update this in Melbourne timezone + # Both start and end are 1 minute later than about Melbourne times + patch :update, params: { + id: event, + event: { + start: '2021-09-21 09:16:00', + end: '2021-09-21 11:01:00' + } + } + event.reload + + # These are UTC + assert_equal event.start.to_s, "2021-09-20 23:16:00 UTC" + assert_equal event.end.to_s, "2021-09-21 01:01:00 UTC" + + # Check create, set one extra minute later in Melbourne timezone + assert_difference('Event.count') do + post :create, params: { event: { description: "Create time/timezone test", + title: "Create time/timezone test", + url: 'https://www.example.com/time/timezone/test', + timezone: 'Melbourne', + # These are Melbourne time + start: '2021-09-21 09:17:00', + end: '2021-09-21 11:02:00' } } + end + event = Event.find_by(title: 'Create time/timezone test') + assert_not_nil event + + # These are UTC + assert_equal event.start.to_s, "2021-09-20 23:17:00 UTC" + assert_equal event.end.to_s, "2021-09-21 01:02:00 UTC" + end + # DESTROY TESTS test 'should destroy event owned by user' do sign_in @event.user