Small refactoring of get_status & self.get_event_state_line_colors

This commit is contained in:
Björn Geuken 2015-05-19 20:18:28 +02:00
parent 12fa985fff
commit c972731e20

View file

@ -306,18 +306,21 @@ class Conference < ActiveRecord::Base
# ====Returns # ====Returns
# * +hash+ -> true -> filled / false -> missing # * +hash+ -> true -> filled / false -> missing
def get_status def get_status
result = {} result = {
result['registration'] = registration_date_set? registration: registration_date_set?,
result['cfp'] = cfp_set? cfp: cfp_set?,
result['venue'] = venue_set? venue: venue_set?,
result['rooms'] = rooms_set? rooms: rooms_set?,
result['tracks'] = tracks_set? tracks: tracks_set?,
result['event_types'] = event_types_set? event_types: event_types_set?,
result['difficulty_levels'] = difficulty_levels_set? difficulty_levels: difficulty_levels_set?,
result['splashpage'] = splashpage && splashpage.public? splashpage: splashpage && splashpage.public?
result['process'] = calculate_setup_progress(result) }
result['short_title'] = short_title
result result.update(
process: calculate_setup_progress(result),
short_title: short_title
).with_indifferent_access
end end
## ##
@ -487,11 +490,11 @@ class Conference < ActiveRecord::Base
# ====Returns # ====Returns
# * +List+ # * +List+
def self.get_event_state_line_colors def self.get_event_state_line_colors
result = [] [
result.push(short_title: 'Submitted', color: 'blue') { short_title: 'Submitted', color: 'blue' },
result.push(short_title: 'Confirmed', color: 'green') { short_title: 'Confirmed', color: 'green' },
result.push(short_title: 'Unconfirmed', color: 'orange') { short_title: 'Unconfirmed', color: 'orange' }
result ]
end end
## ##