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

Merge pull request #1306 from siddhantbajaj/Confirmed_Events

Browse source 
fixed Confirmed Scheduled Events issue
This commit is contained in:
Ana María Martínez Gómez 2017-04-18 15:37:54 +02:00 • committed by GitHub
commit be33f345a1
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