From a03d604861acee8827df55f0b19aaed43a27a02d Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Mon, 19 Dec 2016 18:29:33 +0100 Subject: [PATCH] fix points rounding in results view, clear results view on new scoring attempt. --- app/assets/javascripts/editor/editor.js.erb | 4 ++-- app/assets/javascripts/editor/evaluation.js.erb | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb index 8b3db444..50e14514 100644 --- a/app/assets/javascripts/editor/editor.js.erb +++ b/app/assets/javascripts/editor/editor.js.erb @@ -351,7 +351,7 @@ configureEditors: function () { }, isBrowserSupported: function () { - // websockets is used for run, score and test + // websockets are used for run, score and test return Modernizr.websockets; }, @@ -361,7 +361,7 @@ configureEditors: function () { panel.find('.panel-title .number').text(index + 1); panel.find('.row .col-sm-9').eq(0).find('.number').eq(0).text(result.passed); panel.find('.row .col-sm-9').eq(0).find('.number').eq(1).text(result.count); - panel.find('.row .col-sm-9').eq(1).find('.number').eq(0).text((result.score * result.weight).toFixed(2)); + panel.find('.row .col-sm-9').eq(1).find('.number').eq(0).text(parseFloat((result.score * result.weight).toFixed(2))); panel.find('.row .col-sm-9').eq(1).find('.number').eq(1).text(result.weight); panel.find('.row .col-sm-9').eq(2).text(result.message); if (result.error_messages) panel.find('.row .col-sm-9').eq(3).text(result.error_messages.join(', ')); diff --git a/app/assets/javascripts/editor/evaluation.js.erb b/app/assets/javascripts/editor/evaluation.js.erb index f7b51f30..e4182413 100644 --- a/app/assets/javascripts/editor/evaluation.js.erb +++ b/app/assets/javascripts/editor/evaluation.js.erb @@ -6,6 +6,7 @@ CodeOceanEditorEvaluation = { */ scoreCode: function (event) { event.preventDefault(); + this.clearScoringOutput(); this.createSubmission('#assess', null, function (response) { this.showSpinner($('#assess')); $('#score_div').removeClass('hidden'); @@ -139,6 +140,14 @@ CodeOceanEditorEvaluation = { $('#output pre').remove(); }, + clearScoringOutput: function() { + $('#results ul').first().html(''); + $('.test-count .number').html(0); + $('#score').data('score', 0); + this.renderScore(); + this.clearOutput(); + }, + printOutput: function (output, colorize, index) { var element = this.findOrCreateOutputElement(index); if (!colorize) {