fullcalendar_engine 1.0.3 → 1.0.4

data/app/assets/javascripts/fullcalendar_engine/{events.js → events.js.erb}

@@ -1,24 +1,49 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
+
+full_calendar_options = <%= FullcalendarEngine::Configuration.to_json.html_safe %>
+app_path              = "<%= FullcalendarEngine::Configuration["mount_path"] %>"
+
+$.extend(full_calendar_options, {
+  loading: function(bool){
+    if (bool) 
+      $('#loading').show();
+    else
+      $('#loading').hide();
+  },
+  eventDrop: function(event, dayDelta, minuteDelta, allDay, revertFunc){
+    FullcalendarEngine.Events.move(event, dayDelta, minuteDelta, allDay);
+  },
+  eventResize: function(event, dayDelta, minuteDelta, revertFunc){
+    FullcalendarEngine.Events.resize(event, dayDelta, minuteDelta);
+  },
+  eventClick: function(event, jsEvent, view){
+    FullcalendarEngine.Events.showEventDetails(event);
+  },
+  select: function( startDate, endDate, allDay, jsEvent, view ) {
+    FullcalendarEngine.Form.display({ 
+      starttime: new Date(startDate.getTime()), 
+      endtime:   new Date(endDate.getTime()), 
+      allDay:    allDay 
+    })
+  }
+})
+
 if (typeof(FullcalendarEngine) === 'undefined') { FullcalendarEngine = {}; }
 
 FullcalendarEngine = {
   Form: {
     display: function(options) {
       if (typeof(options) == 'undefined') { options = {} }
+      FullcalendarEngine.Form.fetch(options)
+    },
+    render: function(options){
       $('#event_form').trigger('reset');
-
       var startTime = options['starttime'] || new Date(), endTime = options['endtime'] || new Date(startTime.getTime());
-
       if(startTime.getTime() == endTime.getTime()) { endTime.setMinutes(startTime.getMinutes() + 15); }
-
       FullcalendarEngine.setTime('#event_starttime', startTime)
       FullcalendarEngine.setTime('#event_endtime', endTime)
-
       $('#event_all_day').attr('checked', options['allDay'])
-
-      // FullcalendarEngine.Form.fetch()
-
       $('#create_event_dialog').dialog({
         title: 'New Event',
         modal: true,
@@ -26,12 +51,13 @@ FullcalendarEngine = {
         close: function(event, ui) { $('#create_event_dialog').dialog('destroy') }
       });
     },
-    fetch: function(){
+    fetch: function(options){
       $.ajax({
         type: 'get',
         dataType: 'script',
         async: true,
-        url: FullcalendarEngine.app_path() + "/events/new"
+        url: FullcalendarEngine.app_path() + "/events/new",
+        success: function(){ FullcalendarEngine.Form.render(options) }
       });
     },
     authenticity_token: function(){
@@ -79,7 +105,7 @@ FullcalendarEngine = {
       });
     },
     refetch_events_and_close_dialog: function() {
-      $('#calendar').fullCalendar( 'refetchEvents' );
+      $('.calendar').fullCalendar('refetchEvents');
       $('.dialog:visible').dialog('destroy');
     },
     showEventDetails: function(event){
@@ -169,29 +195,4 @@ $(document).ready(function(){
       alert(xhr.responseText);
     }
   })
-
-  $.extend(full_calendar_options, {
-    loading: function(bool){
-      if (bool)
-        $('#loading').show();
-      else
-        $('#loading').hide();
-    },
-    eventDrop: function(event, dayDelta, minuteDelta, allDay, revertFunc){
-      FullcalendarEngine.Events.move(event, dayDelta, minuteDelta, allDay);
-    },
-    eventResize: function(event, dayDelta, minuteDelta, revertFunc){
-      FullcalendarEngine.Events.resize(event, dayDelta, minuteDelta);
-    },
-    eventClick: function(event, jsEvent, view){
-      FullcalendarEngine.Events.showEventDetails(event);
-    },
-    select: function( startDate, endDate, allDay, jsEvent, view ) {
-      FullcalendarEngine.Form.display({ 
-        starttime: new Date(startDate.getTime()), 
-        endtime:   new Date(endDate.getTime()), 
-        allDay:    allDay 
-      })
-    }
-  })
 });

data/app/controllers/fullcalendar_engine/events_controller.rb

@@ -1,18 +1,18 @@
-require_dependency "fullcalendar_engine/application_controller"
+require_dependency 'fullcalendar_engine/application_controller'
 
 module FullcalendarEngine
   class EventsController < ApplicationController
 
-    layout FullcalendarEngine::Configuration['layout'] || "application"
+    layout FullcalendarEngine::Configuration['layout'] || 'application'
 
-    before_filter :load_event, :only => [:edit, :update, :destroy, :move, :resize]
-    before_filter :determine_event_type, :only => :create
+    before_filter :load_event, only: [:edit, :update, :destroy, :move, :resize]
+    before_filter :determine_event_type, only: :create
 
     def create
       if @event.save
-        render :nothing => true
+        render nothing: true
       else
-        render :text => @event.errors.full_messages.to_sentence, :status => 422
+        render text: @event.errors.full_messages.to_sentence, status: 422
       end
     end
 
@@ -23,84 +23,98 @@ module FullcalendarEngine
     end
 
     def get_events
-      @events = Event.where("starttime >= '#{Time.at(params['start'].to_i).to_formatted_s(:db)}' and endtime <= '#{Time.at(params['end'].to_i).to_formatted_s(:db)}'")
+      @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))
       events = []
       @events.each do |event|
-        events << {:id => event.id, :title => event.title, :description => event.description || "Some cool description here...", :start => "#{event.starttime.iso8601}", :end => "#{event.endtime.iso8601}", :allDay => event.all_day, :recurring => (event.event_series_id)? true: false}
+        events << { id: event.id,
+                    title: event.title,
+                    description: event.description || '', 
+                    start: event.starttime.iso8601,
+                    end: event.endtime.iso8601,
+                    allDay: event.all_day,
+                    recurring: (event.event_series_id) ? true : false }
       end
-      render :json => events.to_json
+      render json: events.to_json
     end
 
     def move
       if @event
-        @event.starttime = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@event.starttime))
-        @event.endtime = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@event.endtime))
-        @event.all_day = params[:all_day]
+        @event.starttime = make_time_from_minute_and_day_delta(@event.starttime)
+        @event.endtime   = make_time_from_minute_and_day_delta(@event.endtime)
+        @event.all_day   = params[:all_day]
         @event.save
       end
-      render :nothing => true
+      render nothing: true
     end
 
     def resize
       if @event
-        @event.endtime = (params[:minute_delta].to_i).minutes.from_now((params[:day_delta].to_i).days.from_now(@event.endtime))
+        @event.endtime = make_time_from_minute_and_day_delta(@event.endtime)
         @event.save
       end    
-      render :nothing => true
+      render nothing: true
     end
 
     def edit
-      render :json => { :form => render_to_string(:partial => 'edit_form') } 
+      render json: { form: render_to_string(partial: 'edit_form') } 
     end
 
     def update
       case params[:event][:commit_button]
-      when "Update All Occurrence"
-        @events = @event.event_series.events #.find(:all, :conditions => ["starttime > '#{@event.starttime.to_formatted_s(:db)}' "])
+      when 'Update All Occurrence'
+        @events = @event.event_series.events
         @event.update_events(@events, event_params)
-      when "Update All Following Occurrence"
-        @events = @event.event_series.events.find(:all, :conditions => ["starttime > '#{@event.starttime.to_formatted_s(:db)}' "])
+      when 'Update All Following Occurrence'
+        @events = @event.event_series.events.where('starttime > :start_time', 
+                                                   start_time: @event.starttime.to_formatted_s(:db)).to_a
         @event.update_events(@events, event_params)
       else
         @event.attributes = event_params
         @event.save
       end
-      render :nothing => true
+      render nothing: true
     end
 
     def destroy
       case params[:delete_all]
-      when "true"
+      when 'true'
         @event.event_series.destroy
-      when "future"
-        @events = @event.event_series.events.find(:all, :conditions => ["starttime > '#{@event.starttime.to_formatted_s(:db)}' "])
-        @event.event_series.events.delete(@events)  
+      when 'future'
+        @events = @event.event_series.events.where('starttime > :start_time',
+                                                   start_time: @event.starttime.to_formatted_s(:db)).to_a
+        @event.event_series.events.delete(@events)
       else
         @event.destroy
       end
-      render :nothing => true
+      render nothing: true
     end
 
     private
 
-      def load_event
-        @event = Event.where(:id => params[:id]).first
-        unless @event
-          render :json => {:message => "Event Not Found.."}, :status => 404 and return
-        end
+    def load_event
+      @event = Event.where(:id => params[:id]).first
+      unless @event
+        render json: { message: "Event Not Found.."}, status: 404 and return
       end
+    end
 
-      def event_params
-        params.require(:event).permit('title', 'description', 'starttime(1i)', 'starttime(2i)', 'starttime(3i)', 'starttime(4i)', 'starttime(5i)', 'endtime(1i)', 'endtime(2i)', 'endtime(3i)', 'endtime(4i)', 'endtime(5i)', 'all_day', 'period', 'frequency', 'commit_button')
-      end
+    def event_params
+      params.require(:event).permit('title', 'description', 'starttime', 'endtime', 'all_day', 'period', 'frequency', 'commit_button')
+    end
 
-      def determine_event_type
-        if params[:event][:period] == "Does not repeat"
-          @event = Event.new(event_params)
-        else
-          @event = EventSeries.new(event_params)
-        end
+    def determine_event_type
+      if params[:event][:period] == "Does not repeat"
+        @event = Event.new(event_params)
+      else
+        @event = EventSeries.new(event_params)
       end
+    end
 
+    def make_time_from_minute_and_day_delta(event_time)
+      params[:minute_delta].to_i.minutes.from_now((params[:day_delta].to_i).days.from_now(event_time))
+    end
   end
 end

data/app/views/fullcalendar_engine/events/_edit_form.html.erb

@@ -24,7 +24,6 @@
   <%=f.check_box :all_day %>
 </p>
 
-<%=f.hidden_field :id, :value => @event.id%>
 <%=f.hidden_field :commit_button, :value => ""%>
 <p>
   <%if @event.event_series -%>

data/app/views/fullcalendar_engine/events/_form.html.erb

@@ -1,4 +1,4 @@
-<%= form_for @event ||= FullcalendarEngine::Event.new, :html => { :id => 'event_form' } do |f| %>
+<%= form_for @event ||= FullcalendarEngine::Event.new, :html => { id: 'event_form' } do |f| %>
 <p>
   <%=f.label :title %>
   <br/>
@@ -25,14 +25,13 @@
 </p>
 <p>
   <%=f.label :period, "Repeats" %>
-  <%=f.select :period, FullcalendarEngine::Event::REPEATS.values,{}, :onchange => "FullcalendarEngine.Events.showPeriodAndFrequency(this.value);" %>
+  <%=f.select :period, FullcalendarEngine::Event::REPEATS.values, {}, onchange: "FullcalendarEngine.Events.showPeriodAndFrequency(this.value);" %>
 </p>
 <p id = "frequency" style = "display:none;">
   <%=f.label :frequency, "Repeat every" %>
   <%=f.select :frequency, (1..30).to_a %> <span id = "period"></span>
 </p>
-<%=f.hidden_field :id, :value => @event.id %>
 <p>
-  <%=f.submit 'Create' %> <span id = "creating_events" class="spinner" style = "display:none;">Creating, Please wait...</span>
+  <%=f.submit %> <span id = "creating_events" class="spinner" style = "display:none;">Creating, Please wait...</span>
 </p>
 <%end %>

data/app/views/fullcalendar_engine/events/index.html.erb

@@ -1,14 +1,8 @@
 <p>
-  <%= link_to 'Create Event', 'javascript:void()', :id => 'new_event' %>
+  <%= link_to 'Create Event', 'javascript:void()', id: 'new_event' %>
 </p>
-
-<%= content_tag :script do %>
-  full_calendar_options = <%= FullcalendarEngine::Configuration.to_json.html_safe %>
-  app_path              = "<%= FullcalendarEngine::Configuration["mount_path"] %>"
-<% end %>
-
 <div>
-  <div id='calendar'></div>
+  <div class='calendar'></div>
 </div>
 <div id="event_desc_dialog" class="dialog" style="display:none;"></div>
 <div id="create_event_dialog" class="dialog" style ="display:none;">
@@ -17,7 +11,7 @@
 
 <script>
   $(document).ready(function(){
-    $('#calendar').fullCalendar(full_calendar_options);
+    $('.calendar').fullCalendar(full_calendar_options);
     // page is now ready, initialize the calendar...
     $('#new_event').click(function(event) {
       FullcalendarEngine.Form.display()

data/lib/fullcalendar_engine/version.rb

@@ -1,3 +1,3 @@
 module FullcalendarEngine
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullcalendar_engine
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -55,11 +55,11 @@ files:
 - app/assets/stylesheets/fullcalendar_engine/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 - app/assets/stylesheets/fullcalendar_engine/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
 - app/assets/stylesheets/fullcalendar_engine/images/ui-bg_diagonals-thick_20_666666_40x40.png
-- app/assets/javascripts/fullcalendar_engine/events.js
 - app/assets/javascripts/fullcalendar_engine/jquery-ui-1.10.3.custom.min.js
 - app/assets/javascripts/fullcalendar_engine/fullcalendar.js
 - app/assets/javascripts/fullcalendar_engine/application.js
 - app/assets/javascripts/fullcalendar_engine/gcal.js
+- app/assets/javascripts/fullcalendar_engine/events.js.erb
 - app/models/fullcalendar_engine/event_series.rb
 - app/models/fullcalendar_engine/event.rb
 - app/controllers/fullcalendar_engine/events_controller.rb