From 14468afef0b6ad16bb92a95ab6322cfbf6707ffc Mon Sep 17 00:00:00 2001 From: Aditya Kapoor Date: Wed, 25 Jun 2014 23:19:01 +0530 Subject: [PATCH] Fix Query for the fetching of the events on calendar --- .../fullcalendar_engine/events_controller.rb | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/fullcalendar_engine/events_controller.rb b/app/controllers/fullcalendar_engine/events_controller.rb index c32e043..897adc7 100644 --- a/app/controllers/fullcalendar_engine/events_controller.rb +++ b/app/controllers/fullcalendar_engine/events_controller.rb @@ -23,10 +23,15 @@ def new end def get_events - @events = Event.where('starttime >= :start_time and - endtime <= :end_time', - start_time: Time.at(params['start'].to_i).to_formatted_s(:db), - end_time: Time.at(params['end'].to_i).to_formatted_s(:db)) + start_time = Time.at(params[:start].to_i).to_formatted_s(:db) + end_time = Time.at(params[:end].to_i).to_formatted_s(:db) + + @events = Event.where(' + (starttime >= :start_time and endtime <= :end_time) or + (starttime >= :start_time and endtime > :end_time and starttime <= :end_time) or + (starttime <= :start_time and endtime >= :start_time and endtime <= :end_time) or + (starttime <= :start_time and endtime > :end_time)', + start_time: start_time, end_time: end_time) events = [] @events.each do |event| events << { id: event.id,