|
|
|
@ -24,10 +24,10 @@ module ActivitiesHelper
|
|
|
|
|
events.sort {|x, y| y.event_datetime <=> x.event_datetime}.each do |event|
|
|
|
|
|
if group_events = events_by_group.delete(event.event_group)
|
|
|
|
|
group_events.sort {|x, y| y.event_datetime <=> x.event_datetime}.each_with_index do |e, i|
|
|
|
|
|
sorted_events << [e, i > 0]
|
|
|
|
|
sorted_events << [e, i > 0] unless e.event_description.nil?
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
sorted_events
|
|
|
|
|
sorted_events
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|