Implement track scheduling
Add track association to schedule Show schedules in admin sidebar to track organizers Allow track organizers to manage the schedules of their tracks Don't allow self-organized track events to be dragged or unscheduled in a conference schedule Make scheduled events of self-organized tracks appear semitransparent in conference schedules Make the rooms of confirmed self_organized tracks appear semitransparent and don't allow events to be scheduled to it in the conference schedules during the dates of its track Create admin/SchedulesController#new action Add a button in admin/Schedules#index to create schedules for tracks Add self_organized scope to Track Modify Schedules#show to handle track schedules and show a unified schedule Allow track organizers to create new schedules for their tracks Correctly identify scheduled and unscheduled events in Schedules#events Fix Event#room and Event#time for when the event is scheduled in a track schedule Modify Program#selected_event_schedules to include the event_schedules of selected track schedules Modify Track#revoke_role_and_cleanup to destroy the track's schedules and revert its events' state to new Add tabs for conference and track schedules in admin/Schedules#index Add button to Create/Show a tracks schedule in Tracks#index and #show Fix concurrent_events in application_helper because of changes in Program#selected_event_schedules Do not take into account cfp_active in Event#valid_track Modify EventsController#get_tracks accordingly Enforce cfp_active of track to be enabled for proposals in ProposalsController#create and #update Add support for multiple schedules per track Add selected_schedule_id to Track Load EventSchedules of selected track schedules for conference schedules in admin/SchedulesController#show Modify SchedulesController#show to take into account only the selected track schedules Create Event#selected_schedule_id and use it in Event#scheduled? and Event#time Validate that an EventSchedule for an event of a self-organized track belongs to one of the track's schedules Add 'Manage' button in Tracks#index, #show that sends you to the admin side of things Add admin/TracksController#update_selected_schedule to update the selected_schedule_id of tracks
This commit is contained in:
parent
af7efdb6fe
commit
7eea930269
37 changed files with 443 additions and 118 deletions
|
|
@ -97,10 +97,10 @@ describe Event do
|
|||
end
|
||||
end
|
||||
|
||||
describe '#acceptable_track' do
|
||||
describe '#valid_track' do
|
||||
context 'is valid' do
|
||||
it 'when the track belong to the same program, is confirmed and is included in the cfp' do
|
||||
track = create(:track, state: 'confirmed', cfp_active: true, program: conference.program)
|
||||
it 'when the track belongs to the same program and is confirmed' do
|
||||
track = create(:track, state: 'confirmed', program: conference.program)
|
||||
event = build(:event, program: conference.program, track: track)
|
||||
expect(event.valid?).to eq true
|
||||
end
|
||||
|
|
@ -108,26 +108,19 @@ describe Event do
|
|||
|
||||
context 'is invalid' do
|
||||
it 'when the track doesn\'t have the same program' do
|
||||
track = create(:track, state: 'confirmed', cfp_active: true)
|
||||
track = create(:track, state: 'confirmed')
|
||||
event = build(:event, program: conference.program, track: track)
|
||||
expect(event.valid?).to eq false
|
||||
expect(event.errors[:track]).to eq ['is invalid']
|
||||
end
|
||||
|
||||
it 'when the track is unconfirmed' do
|
||||
track = create(:track, cfp_active: true, program: conference.program)
|
||||
track = create(:track, program: conference.program)
|
||||
allow(track).to receive(:confirmed?).and_return(false)
|
||||
event = build(:event, program: conference.program, track: track)
|
||||
expect(event.valid?).to eq false
|
||||
expect(event.errors[:track]).to eq ['is invalid']
|
||||
end
|
||||
|
||||
it 'when the track isn\'t included in the cfp' do
|
||||
track = create(:track, state: 'confirmed', cfp_active: false, program: conference.program)
|
||||
event = build(:event, program: conference.program, track: track)
|
||||
expect(event.valid?).to eq false
|
||||
expect(event.errors[:track]).to eq ['is invalid']
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
@ -382,4 +375,30 @@ describe Event do
|
|||
expect(other_event.week).to eq 48
|
||||
end
|
||||
end
|
||||
|
||||
describe '#selected_schedule_id' do
|
||||
before :each do
|
||||
conference.program.selected_schedule = create(:schedule, program: conference.program)
|
||||
end
|
||||
|
||||
context 'returns the program\'s selected_schedule_id' do
|
||||
it 'when it doesn\'t have a track' do
|
||||
create(:event_schedule, event: event, schedule: conference.program.selected_schedule)
|
||||
expect(event.send(:selected_schedule_id)).to eq conference.program.selected_schedule_id
|
||||
end
|
||||
|
||||
it 'when it belongs to a regular track' do
|
||||
event.track = create(:track, program: conference.program)
|
||||
expect(event.send(:selected_schedule_id)).to eq conference.program.selected_schedule_id
|
||||
end
|
||||
end
|
||||
|
||||
context 'returns the track\'s selected_schedule_id' do
|
||||
it 'when it belongs to a self-organized track' do
|
||||
event.track = create(:track, :self_organized, program: conference.program, state: 'confirmed')
|
||||
event.track.selected_schedule = create(:schedule, program: conference.program, track: event.track)
|
||||
expect(event.send(:selected_schedule_id)).to eq event.track.selected_schedule_id
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue