From 1c5f77def21ec7a2ac6f3950f2a5439b3f186161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Tue, 15 Sep 2015 14:11:12 +0200 Subject: [PATCH] makes percentage votes to sum 100 --- app/helpers/application_helper.rb | 8 ++++++-- app/views/debates/_votes.html.erb | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 54eadb947..59a604810 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,8 +1,12 @@ module ApplicationHelper - def percentage(vote, debate) + def votes_percentage(vote, debate) return "0%" if debate.total_votes == 0 - debate.send(vote).percent_of(debate.total_votes).to_s + "%" + if vote == 'likes' + debate.likes.percent_of(debate.total_votes).to_s + "%" + elsif vote == 'dislikes' + (100 - debate.likes.percent_of(debate.total_votes)).to_s + "%" + end end def home_page? diff --git a/app/views/debates/_votes.html.erb b/app/views/debates/_votes.html.erb index 89a03752f..970bcc8a5 100644 --- a/app/views/debates/_votes.html.erb +++ b/app/views/debates/_votes.html.erb @@ -4,7 +4,7 @@ <%= link_to vote_debate_path(debate, value: 'yes'), class: "like #{voted_classes[:in_favor]}", title: t('votes.agree'), method: "post", remote: true do %> - <%= percentage('likes', debate) %> + <%= votes_percentage('likes', debate) %> <% end %> @@ -13,7 +13,7 @@
<%= link_to vote_debate_path(debate, value: 'no'), class: "unlike #{voted_classes[:against]}", title: t('votes.disagree'), method: "post", remote: true do %> - <%= percentage('dislikes', debate) %> + <%= votes_percentage('dislikes', debate) %> <% end %>