diff --git a/app/models/conference.rb b/app/models/conference.rb index e2020ab3..76615367 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -707,7 +707,7 @@ class Conference < ActiveRecord::Base # ====Returns # * +Fixnum+ -> Progress in Percent def calculate_setup_progress(result) - (result.values.count(true) / result.values.count.to_f * 100).round(0).to_s + (100 * result.values.count(true) / result.values.count).to_s end ## diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb index b1f6f419..581a3b5f 100755 --- a/spec/models/conference_spec.rb +++ b/spec/models/conference_spec.rb @@ -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