From 4174b88987b8b5c4a7420020794a05af2569acca Mon Sep 17 00:00:00 2001 From: Jannik Streek Date: Sat, 29 Mar 2014 10:55:20 +0100 Subject: [PATCH] percentage result round + minor language fix --- app/assets/javascripts/app/views/poll_view.js | 2 +- config/locales/javascript/javascript.en.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/views/poll_view.js b/app/assets/javascripts/app/views/poll_view.js index ed8a09fb5..9a1df2a88 100644 --- a/app/assets/javascripts/app/views/poll_view.js +++ b/app/assets/javascripts/app/views/poll_view.js @@ -31,7 +31,7 @@ app.views.Poll = app.views.Base.extend({ for(index = 0; index < answers.length; ++index) { var percentage = 0; if(this.poll.participation_count != 0) { - percentage = answers[index].vote_count / this.poll.participation_count * 100; + percentage = Math.round(answers[index].vote_count / this.poll.participation_count * 100); } var progressBar = this.$(".poll_progress_bar[data-answerid="+answers[index].id+"]"); progressBar.parent().next().html(" - " + percentage + "%"); diff --git a/config/locales/javascript/javascript.en.yml b/config/locales/javascript/javascript.en.yml index dd00036a2..91527ffc1 100644 --- a/config/locales/javascript/javascript.en.yml +++ b/config/locales/javascript/javascript.en.yml @@ -180,4 +180,4 @@ en: one: "1 vote so far" other: "<%=count%> votes so far" show_result: "Show result" - close_result: "Close result" \ No newline at end of file + close_result: "Hide result" \ No newline at end of file