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: selected_schedule_room and selected_schedule_time
This commit is contained in:
Ana 2016-08-01 21:25:12 +02:00
parent 47e316cddd
commit f65778b4fe
13 changed files with 32 additions and 35 deletions

View file

@ -106,18 +106,18 @@
%td
= @event.language
- if !@event.scheduled_room.nil?
- if !@event.selected_schedule_room.nil?
%tr
%td
%b Room
%td
= @event.scheduled_room.name
- if !@event.scheduled_start_time.nil?
= @event.selected_schedule_room.name
- if !@event.selected_schedule_time.nil?
%tr
%td
%b Scheduled time
%td
= @event.scheduled_start_time
= @event.selected_schedule_time
%tr
%td
%b Submitter

View file

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

View file

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