New associations and models: schedule versioning

For the schedule versioning in the admin interface (having multiple possible shcedules) we need to change some models and associations. It has also been create a rake:move_events_attributes task to migrate the data.

User Interface addapted to make use of the introduced associations and models
This commit is contained in:
Ana 2016-07-08 13:28:02 +02:00
parent e34a1904e0
commit c047ffd699
21 changed files with 165 additions and 49 deletions

View file

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

View file

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

View file

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

View file

@ -19,7 +19,7 @@
%date= event.start_time.iso8601
%start= event.start_time.strftime('%H:%M')
%duration= length_timestamp(event.event_type.length)
%room= event.room.name
%room= event.scheduled_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

View file

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

View file

@ -49,7 +49,7 @@
= f.inputs 'Enable pre-registration' do
= f.input :require_registration, label: 'Require participants to register to your event'
- message = @event.room ? "Value must be between 1 and #{@event.room.size}" : 'Check room capacity after scheduling.'
- message = @event.scheduled_room ? "Value must be between 1 and #{@event.scheduled_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 }

View file

@ -67,15 +67,15 @@
%dl#proposal-info
.col-md-12
%dt Date:
%dd= @event.start_time.strftime("%Y %B %e %H:%M") if @event.start_time
%dd= @event.scheduled_start_time.strftime("%Y %B %e %H:%M") if @event.scheduled_start_time.present?
.col-md-12
%dt Duration:
%dd= show_time(@event.event_type.length)
.col-md-12
%dt Room:
%dd
- if @event.room
= @event.room.name
- if @event.scheduled_room
= @event.scheduled_room.name
.col-md-12
%dt Conference:
%dd= @event.program.conference.title