lib/calendrier/helpers/event_helper.rb in calendrier-0.9.1 vs lib/calendrier/helpers/event_helper.rb in calendrier-0.9.3

- old
+ new

@@ -18,14 +18,14 @@ end protected def sorted_events_do(events_by_date, cell_begin_time, cell_end_time, &block) - begin + begin unless events_by_date[cell_begin_time.year.to_s][cell_begin_time.month.to_s][cell_begin_time.day.to_s].nil? - events_by_date[cell_begin_time.year.to_s][cell_begin_time.month.to_s][cell_begin_time.day.to_s].each do |event| - yield event if display_event?(event, cell_begin_time, cell_end_time) # && block_given? + events_by_date[cell_begin_time.year.to_s][cell_begin_time.month.to_s][cell_begin_time.day.to_s].each_with_index do |event, idx| + yield event, idx if display_event?(event, cell_begin_time, cell_end_time) && block_given? end end rescue NoMethodError end end @@ -40,14 +40,14 @@ end if event.respond_to?(:begin_time) && event.respond_to?(:end_time) event_begin_time = event.begin_time event_end_time = event.end_time - end + end if event_begin_time.to_i <= cell_begin_time.to_i if event_end_time.to_i <= cell_end_time.to_i - if event_end_time.to_i > cell_begin_time.to_i + if event_end_time.to_i > cell_begin_time.to_i ok = true end else ok = true end