From d54d1dd3e8b5b8d2b8f1119523f07d046ee85c02 Mon Sep 17 00:00:00 2001 From: yqbk Date: Thu, 12 May 2016 18:22:17 +0200 Subject: [PATCH 1/6] Score given in percentage --- app/assets/javascripts/editor.js.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb index c69551bb..b40b93ec 100644 --- a/app/assets/javascripts/editor.js.erb +++ b/app/assets/javascripts/editor.js.erb @@ -706,7 +706,8 @@ $(function() { var renderScore = function() { var score = $('#score').data('score'); var maxium_score = $('#score').data('maximum-score'); - $('.score').html((score || '?') + ' / ' + maxium_score); + var percentage_score = score / maxium_score * 100 + $('.score').html((percentage_score || 0) + ' % '); renderProgressBar(score, maxium_score); }; From d05ceac7a346bff9f7864a6491efbff6a5e3cab1 Mon Sep 17 00:00:00 2001 From: yqbk Date: Thu, 12 May 2016 18:30:50 +0200 Subject: [PATCH 2/6] check if score is valid --- app/assets/javascripts/editor.js.erb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb index b40b93ec..1d84361b 100644 --- a/app/assets/javascripts/editor.js.erb +++ b/app/assets/javascripts/editor.js.erb @@ -706,8 +706,13 @@ $(function() { var renderScore = function() { var score = $('#score').data('score'); var maxium_score = $('#score').data('maximum-score'); - var percentage_score = score / maxium_score * 100 - $('.score').html((percentage_score || 0) + ' % '); + if (score >= 0 && score <= maxium_score && maxium_score >0 ) { + var percentage_score = score / maxium_score * 100 + $('.score').html(percentage_score + '%'); + } + else { + $('.score').html( 0 + ' % '); + } renderProgressBar(score, maxium_score); }; From e5b3d33228599f6bf902a260b05eeed5d4404794 Mon Sep 17 00:00:00 2001 From: yqbk Date: Thu, 12 May 2016 18:34:16 +0200 Subject: [PATCH 3/6] delete spaces --- app/assets/javascripts/editor.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb index 1d84361b..0bb22853 100644 --- a/app/assets/javascripts/editor.js.erb +++ b/app/assets/javascripts/editor.js.erb @@ -711,7 +711,7 @@ $(function() { $('.score').html(percentage_score + '%'); } else { - $('.score').html( 0 + ' % '); + $('.score').html( 0 + '%'); } renderProgressBar(score, maxium_score); }; From f2e2c232e48b42e5c3e7c70299c1e41466ddfc35 Mon Sep 17 00:00:00 2001 From: yqbk Date: Tue, 14 Jun 2016 17:01:50 +0200 Subject: [PATCH 4/6] round result to fixed 2 digits --- app/assets/javascripts/editor.js.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb index 0bb22853..10123521 100644 --- a/app/assets/javascripts/editor.js.erb +++ b/app/assets/javascripts/editor.js.erb @@ -707,7 +707,8 @@ $(function() { var score = $('#score').data('score'); var maxium_score = $('#score').data('maximum-score'); if (score >= 0 && score <= maxium_score && maxium_score >0 ) { - var percentage_score = score / maxium_score * 100 + var rounded_number = (score / maxium_score ).toFixed(2); + var percentage_score = rounded_number * 100 $('.score').html(percentage_score + '%'); } else { From d5b78c29da39c15df6a61e7de1da83cf2b3f1e63 Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Tue, 14 Jun 2016 17:19:52 +0200 Subject: [PATCH 5/6] Fixed rounding issue caused by JavaScript and the conversion to String. --- app/assets/javascripts/editor.js.erb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb index 10123521..50217b1f 100644 --- a/app/assets/javascripts/editor.js.erb +++ b/app/assets/javascripts/editor.js.erb @@ -707,8 +707,7 @@ $(function() { var score = $('#score').data('score'); var maxium_score = $('#score').data('maximum-score'); if (score >= 0 && score <= maxium_score && maxium_score >0 ) { - var rounded_number = (score / maxium_score ).toFixed(2); - var percentage_score = rounded_number * 100 + var percentage_score = (score / maxium_score * 100 ).toFixed(2); $('.score').html(percentage_score + '%'); } else { From 894f8abda233fd00dd0efe6bcb2b2cd704592f63 Mon Sep 17 00:00:00 2001 From: yqbk Date: Wed, 15 Jun 2016 12:03:34 +0200 Subject: [PATCH 6/6] round result to fixed 0 digits in percentage output --- app/assets/javascripts/editor.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb index 50217b1f..f000a23a 100644 --- a/app/assets/javascripts/editor.js.erb +++ b/app/assets/javascripts/editor.js.erb @@ -707,7 +707,7 @@ $(function() { var score = $('#score').data('score'); var maxium_score = $('#score').data('maximum-score'); if (score >= 0 && score <= maxium_score && maxium_score >0 ) { - var percentage_score = (score / maxium_score * 100 ).toFixed(2); + var percentage_score = (score / maxium_score * 100 ).toFixed(0); $('.score').html(percentage_score + '%'); } else {