event_calendar_engine 0.1.9 → 0.1.10

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

data/app/controllers/events_controller.rb

@@ -10,8 +10,8 @@ class EventsController < EventCalendar::ApplicationController
         {
           :id => event.id,
           :title => event.name,
-          :start => event.start_on,
-          :end => event.end_on,
+          :start => event.start_on.in_time_zone(event.timezone),
+          :end => event.end_on.in_time_zone(event.timezone),
           :url => event_path(event),
           :details => render_to_string(:partial => 'events/details', :object => event)
         }
@@ -32,8 +32,8 @@ class EventsController < EventCalendar::ApplicationController
       end_min = params[:event].delete :"end_time(5i)"
       start_date = Date.parse(params[:event][:start_date])
       end_date = Date.parse(params[:event][:end_date])
-      params[:event][:start_on] = Time.local(start_date.year, start_date.month, start_date.day, start_hour, start_min)
-      params[:event][:end_on] = Time.local(end_date.year, end_date.month, end_date.day, end_hour, end_min)
+      params[:event][:start_on] = Time.local(nil, start_min, start_hour, start_date.day, start_date.month, start_date.year, nil, nil, nil, params[:event][:timezone])
+      params[:event][:end_on] = Time.local(nil, end_min, end_hour, end_date.day, end_date.month, end_date.year, nil, nil, nil, params[:event][:timezone])
       params[:event][:start_time] = params[:event][:start_on]
       params[:event][:end_time] = params[:event][:end_on]
     end

data/app/helpers/event_calendar/application_helper.rb

@@ -1,6 +1,5 @@
 module EventCalendar::ApplicationHelper
   def div_for_record(record, options={}, &block)
-    options.merge!({:class => "span-10 #{options[:class]}"})
     div_for(record, options){ yield }
   end
   def tag_for_record(tag, record, *args, &block)

data/app/models/event_instance_methods.rb

@@ -2,46 +2,48 @@ module EventInstanceMethods
   attr_accessor :start_time, :end_time, :start_date, :end_date
   
   def start_time
-    @start_time ||= start_on
+    @start_time ||= start_on.present? ? start_on.in_time_zone(timezone) : start_on
   end
   
   def end_time
-    @end_time ||= end_on
+    @end_time ||= end_on.present? ? end_on.in_time_zone(timezone) : end_on
   end
   
   def start_date
-    @start_date ||= start_on.present? ? start_on.to_date : start_on
+    @start_date ||= start_on.present? ? start_on.in_time_zone(timezone).to_date : start_on
   end
   
   def end_date
-    @end_date ||= end_on.present? ? end_on.to_date : end_on
+    @end_date ||= end_on.present? ? end_on.in_time_zone(timezone).to_date : end_on
   end
 
   def start_year
-    start_on.year
+    start_on.present? ? start_on.in_time_zone(timezone).year : start_on
   end
 
   def start_month
-    start_on.strftime("%B")
+    start_on.present? ? start_on.in_time_zone(timezone).strftime("%B") : start_on
   end
   
   def start_day
-    start_on.day
+    start_on.present? ? start_on.in_time_zone(timezone).day : start_on
   end
   
   def end_year
-    end_on.year
+    end_on.present? ? end_on.in_time_zone(timezone).year : end_on
   end
   
   def end_month
-    end_on.strftime("%B")
+    end_on.present? ? end_on.in_time_zone(timezone).strftime("%B") : end_on
   end
   
   def end_day
-    end_on.day
+    end_on.present? ? end_on.in_time_zone(timezone).day : end_on
   end
   
   def one_day?
-    start_day == end_day
+    start_day == end_day &&
+    start_month == end_month &&
+    start_year == end_year
   end
 end

data/app/views/events/_calendar.html.erb

@@ -1,10 +1,10 @@
 <p><em>mouse over an event to preview; click on an event for full details</em></p>
 
-<div id="event_quick_description" class="span-12" style="display:none"></div>
+<div id="calendar" class="calendars"></div>
 
 <div style="clear:both"></div>
 
-<div id="calendar" class="calendars"></div>
+<div id="event_quick_description" class="span-12" style="display:none"></div>
 
 <% content_for :javascript do %>
 <script type="text/javascript">

data/app/views/events/_current_event.html.erb

@@ -1,6 +1,10 @@
 <%- if current_event_counter == 0; then current_event_counter += 1; end -%>
 <div class="span-2<%= current_event_counter % 8 == 0 ? ' last' : '' %>">
   <p><strong><%= link_to current_event.name, event_path(current_event) %></strong></p>
-  <p><em><%= current_event.start_on.strftime("%a, %b %d") %></em></p>
-  <p><em><%= current_event.end_on.strftime("%a, %b %d") %></em></p>
+  <%- if current_event.one_day? -%>
+  <%= render :partial => 'events/times', :object => times_with_zones(current_event) %>
+  <%- else -%>
+  <p><em><%= current_event.start_on.in_time_zone(current_event.timezone).strftime("%a, %b %d") %></em></p>
+  <p><em><%= current_event.end_on.in_time_zone(current_event.timezone).strftime("%a, %b %d") %></em></p>
+  <%- end -%>
 </div>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: event_calendar_engine
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Jason LaPier