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

Merge pull request #1446 from sunny-b/master

Browse source 
Enable Style/DotPosition Rubocop cop
This commit is contained in:
Ana María Martínez Gómez 2017-04-07 11:21:34 +02:00 • committed by GitHub
commit fd6d0bf39b
25 changed files with 143 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/models/conference.rb
View file

@ -180,8 +180,8 @@ class Conference < ActiveRecord::Base
if registration_period &&
registration_period.start_date &&
registration_period.end_date
weeks = Date.new(registration_period.start_date.year, 12, 31).
strftime('%W').to_i
weeks = Date.new(registration_period.start_date.year, 12, 31)
.strftime('%W').to_i
result = get_registration_end_week - get_registration_start_week + 1
end
@ -277,9 +277,9 @@ class Conference < ActiveRecord::Base
# ====Returns
# * +hash+ -> user: submissions
def get_top_submitter(limit = 5)
submitter = EventUser.joins(:event).
where('event_role = ? and program_id = ?', 'submitter', Conference.find(id).program.id).
limit(limit).group(:user_id)
submitter = EventUser.joins(:event)
.where('event_role = ? and program_id = ?', 'submitter', Conference.find(id).program.id)
.limit(limit).group(:user_id)
counter = submitter.order('count_all desc').count
Conference.calculate_user_submission_hash(submitter, counter)
end
@ -461,13 +461,13 @@ class Conference < ActiveRecord::Base
# ====Returns
# * +ActiveRecord+
def self.get_active_conferences_for_dashboard
result = Conference.where('start_date > ?', Time.now).
select('id, short_title, color, start_date')
result = Conference.where('start_date > ?', Time.now)
.select('id, short_title, color, start_date')
if result.empty?
result = Conference.
select('id, short_title, color, start_date').limit(2).
order(start_date: :desc)
result = Conference
.select('id, short_title, color, start_date').limit(2)
.order(start_date: :desc)
end
result
end