From 1862534b2ceb4fbca0f1a61945b56de4ba6cc7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Geuken?= Date: Sat, 16 May 2015 15:19:03 +0200 Subject: [PATCH] Avoid float conversion when calculating progress --- app/helpers/application_helper.rb | 8 +++----- app/models/event.rb | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ef409eb1..8fb9c7ae 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -19,13 +19,11 @@ module ApplicationHelper end def event_progress_color(progress) - progress = progress.to_i - - case progress + case progress.to_i when 100 then 'progress-bar-success' - when 86 then 'progress-bar-info' + when 85 then 'progress-bar-info' when 71 then 'progress-bar-warning' - when 14, 29, 43, 57 then 'progress-bar-danger' + when 14, 28, 42, 57 then 'progress-bar-danger' end end diff --git a/app/models/event.rb b/app/models/event.rb index c9756f91..dc7185de 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -211,7 +211,7 @@ class Event < ActiveRecord::Base def calculate_progress result = self.progress_status true_items = result.select { |_key, value| value }.length - (true_items / result.length.to_f * 100).round(0).to_s + (100 * true_items / result.length).to_s end private