gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Confirmed Scheduled Events issue

Browse source 
Fixed issues with scheduled_event_distribution method in conference.rb
and added test in conference_spec.rb to confirm issue is fixed.
Fixes #1302
This commit is contained in:
Siddhant Bajaj 2017-04-18 18:30:42 +05:30
parent 7741d43d17
commit cd9f329939
2 changed files with 26 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/models/conference.rb
View file

@ -311,9 +311,10 @@ class Conference < ActiveRecord::Base
# ====Returns
# * +hash+ -> hash
def scheduled_event_distribution
confirmed_events = program.events.where(state: 'confirmed')
scheduled_value = { 'value' => confirmed_events.where.not(start_time: nil).count, 'color' => 'green' }
unscheduled_value = { 'value' => confirmed_events.where(start_time: nil).count, 'color' => 'red' }
confirmed_scheduled_events = program.events.confirmed.scheduled(program.selected_schedule.try(:id))
confirmed_unscheduled_events = program.events.confirmed - confirmed_scheduled_events
scheduled_value = { 'value' => confirmed_scheduled_events.count, 'color' => 'green' }
unscheduled_value = { 'value' => confirmed_unscheduled_events.count, 'color' => 'red' }
{ 'Scheduled' => scheduled_value, 'Unscheduled' => unscheduled_value }
end