gunghogeoduck/osem-fcy
1
0
Fork 0
mirror of https://github.com/openSUSE/osem.git synced 2026-08-16 05:04:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #635 from bgeuken/refactor_calculate_progress

Browse source 
Refactor calculate progress
This commit is contained in:
Henne Vogelsang 2015-04-20 17:21:15 +02:00
commit 6cc8c1e5c2
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/conference.rb
View file

@ -705,9 +705,9 @@ class Conference < ActiveRecord::Base
# Returns the progress of the set up conference list in percent
#
# ====Returns
# * +Fixnum+ -> Progress in Percent
# * +String+ -> Progress in Percent
def calculate_setup_progress(result)
(result.select { |_k, v| v }.length / result.length.to_f * 100).round(0).to_s
(100 * result.values.count(true) / result.values.count).to_s
end
##

6
spec/models/conference_spec.rb
View file

@ -994,7 +994,7 @@ describe Conference do
subject.splashpage = create(:splashpage, public: false)
@result_false['registration'] = true
@result_false['process'] = 13.to_s
@result_false['process'] = 12.to_s
expect(subject.get_status).to eq(@result_false)
end
@ -1033,7 +1033,7 @@ describe Conference do
@result_false['cfp'] = true
@result_false['registration'] = true
@result_false['venue'] = true
@result_false['process'] = 38.to_s
@result_false['process'] = 37.to_s
expect(subject.get_status).to eq(@result_false)
end
@ -1076,7 +1076,7 @@ describe Conference do
@result_false['venue'] = true
@result_false['rooms'] = true
@result_false['tracks'] = true
@result_false['process'] = 63.to_s
@result_false['process'] = 62.to_s
expect(subject.get_status).to eq(@result_false)
end