From 39c4261859fd246d5fbe67d88b110e95503e779b Mon Sep 17 00:00:00 2001 From: Ana Date: Fri, 1 Jul 2016 11:41:16 +0200 Subject: [PATCH] All events takes you to the current day --- app/controllers/conference_controller.rb | 3 +++ app/models/conference.rb | 6 ++++++ app/views/conference/events.html.haml | 5 +++++ 3 files changed, 14 insertions(+) diff --git a/app/controllers/conference_controller.rb b/app/controllers/conference_controller.rb index 134fc745..7068061e 100644 --- a/app/controllers/conference_controller.rb +++ b/app/controllers/conference_controller.rb @@ -31,6 +31,9 @@ class ConferenceController < ApplicationController @scheduled_events = @conference.program.events.scheduled @unscheduled_events = @conference.program.events.unscheduled + + day = @conference.current_conference_day + @tag = day.strftime('%Y-%m-%d') if day end private diff --git a/app/models/conference.rb b/app/models/conference.rb index 149504d5..d3fd5590 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -609,6 +609,12 @@ class Conference < ActiveRecord::Base next_color(start_index[collection]) end + # Returns the current day if it is a day of the schedule or nil otherwise + def current_conference_day + day = Time.find_zone(timezone).today + day if (start_date..end_date).cover? day + end + private # Returns a different html colour for every i and consecutive colors are diff --git a/app/views/conference/events.html.haml b/app/views/conference/events.html.haml index 939e4254..d011390d 100644 --- a/app/views/conference/events.html.haml +++ b/app/views/conference/events.html.haml @@ -58,3 +58,8 @@ $('.program-selector').on('click', function(e) { $('.li-dropdown-program').removeClass('active'); }); + + // Go to current date and time + $(document).ready(function(){ + document.getElementById("#{ @tag }").scrollIntoView(); + });