Event model improvements

- Drop selected_event_schedule function
- Rename scheduled_room and scheduled_start_time to room and time as if there is no selected_schedule, the event is not scheduled.

app/views/admin/events/_proposal.html.haml

@@ -106,18 +106,18 @@
           %td
             = @event.language
 
-      - unless @event.scheduled_room.nil?
+      - unless @event.room.nil?
         %tr
           %td
             %b Room
           %td
-            = @event.scheduled_room.name
-      - unless @event.scheduled_start_time.nil?
+            = @event.room.name
+      - unless @event.time.nil?
         %tr
           %td
             %b Scheduled time
           %td
-            = @event.scheduled_start_time
+            = @event.time
       %tr
         %td
           %b Submitter

app/views/admin/events/registrations.html.haml

@@ -11,7 +11,7 @@
         for
         = @event.title
 
-    - if @event.scheduled_room && (@event_registrations.length > @event.scheduled_room.size)
+    - if @event.room && (@event_registrations.length > @event.room.size)
       %b Attention:
       You have more registrations than the capacity of the room!
 

app/views/admin/tracks/show.html.haml

@@ -27,4 +27,4 @@
             %td
               = event.state
             %td
-              = event.scheduled_start_time
+              = event.time

app/views/conference_registrations/_registration_info.html.haml

@@ -11,7 +11,7 @@
         .text-muted
           = registered_text(event)
           - if event.scheduled?
-            (Scheduled on: #{event.scheduled_start_time.to_date})
+            (Scheduled on: #{event.time.to_date})
       %br
 
 

app/views/proposal/_proposal_form.html.haml

@@ -49,7 +49,7 @@
 
     = f.inputs 'Enable pre-registration' do
       = f.input :require_registration, label: 'Require participants to register to your event'
-      - message = @event.scheduled_room ? "Value must be between 1 and #{@event.scheduled_room.size}" : 'Check room capacity after scheduling.'
+      - message = @event.room ? "Value must be between 1 and #{@event.room.size}" : 'Check room capacity after scheduling.'
       = f.input :max_attendees, hint: 'The maximum number of participants. ' + message
 
     - if current_user.has_any_role? :admin, { name: :organizer, resource: @conference }, { name: :cfp, resource: @conference }

app/views/proposal/show.html.haml

@@ -75,8 +75,8 @@
           .col-md-12
             %dt Room:
             %dd
-              - if @event.scheduled_room
-                = @event.scheduled_room.name
+              - if @event.room
+                = @event.room.name
           .col-md-12
             %dt Conference:
             %dd= @event.program.conference.title

app/views/schedules/show.xml.haml

@@ -16,10 +16,10 @@
           %room{ name: room.name }
             - events_in_rooms[room].each do |event|
               %event{ guid: event.guid, id: event.id }
-                %date= event.scheduled_start_time.iso8601
-                %start= event.scheduled_start_time.strftime('%H:%M')
+                %date= event.time.iso8601
+                %start= event.time.strftime('%H:%M')
                 %duration= length_timestamp(event.event_type.length)
-                %room= event.scheduled_room.name
+                %room= event.room.name
                 %type= event.event_type.name
                 %language= ISO_639.find_by_english_name(event.language).third if event.language
                 %slug= "#{event.id} #{event.title}".parameterize