From e98219157fa8e6d4d7cc66fe06e831197aef73b8 Mon Sep 17 00:00:00 2001 From: Manjunath Davanam Date: Fri, 28 Sep 2018 18:26:31 +0530 Subject: [PATCH 1/2] Issue #SB-7779 fix: rounding issue fix --- .../renderer/endpageApp.js | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/player/public/coreplugins/org.sunbird.player.endpage-1.1/renderer/endpageApp.js b/player/public/coreplugins/org.sunbird.player.endpage-1.1/renderer/endpageApp.js index 76d42dbef..00a1d39ae 100644 --- a/player/public/coreplugins/org.sunbird.player.endpage-1.1/renderer/endpageApp.js +++ b/player/public/coreplugins/org.sunbird.player.endpage-1.1/renderer/endpageApp.js @@ -38,7 +38,7 @@ endPage.controller("endPageController", function($scope, $rootScope, $state,$ele maxScore = maxScore + 0; } }); - $scope.score = (totalScore + "/" + maxScore); + $scope.score = ($scope.convert(totalScore) + "/" + $scope.convert(maxScore)); } else { $scope.score = undefined; } @@ -189,4 +189,24 @@ endPage.controller("endPageController", function($scope, $rootScope, $state,$ele org.ekstep.service.content.clearTelemetryEvents(); $scope.safeApply(); }); + $scope.precision = function(a) { + if (!isFinite(a)) return 0; + var e = 1, + p = 0; + while (Math.round(a * e) / e !== a) { + e *= 10; + p++; + } + return p; + }; + + $scope.convert = function(totalScore) { + if ((!isNaN(totalScore) && totalScore.toString().indexOf('.') != -1)) { + var precisionLen = $scope.precision(totalScore); + return precisionLen > 1 ? totalScore.toFixed(2) : totalScore; + } else { + return totalScore + } + }; + }); \ No newline at end of file From 488e1f3b7d71bc2769ff353a3069396b7e5fada8 Mon Sep 17 00:00:00 2001 From: Manjunath Davanam Date: Tue, 9 Oct 2018 18:17:16 +0530 Subject: [PATCH 2/2] Issue #SB-7779 fix: rounding issue fix --- .../renderer/endpageApp.js | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/player/public/coreplugins/org.sunbird.player.endpage-1.1/renderer/endpageApp.js b/player/public/coreplugins/org.sunbird.player.endpage-1.1/renderer/endpageApp.js index 00a1d39ae..54afce2b7 100644 --- a/player/public/coreplugins/org.sunbird.player.endpage-1.1/renderer/endpageApp.js +++ b/player/public/coreplugins/org.sunbird.player.endpage-1.1/renderer/endpageApp.js @@ -189,24 +189,11 @@ endPage.controller("endPageController", function($scope, $rootScope, $state,$ele org.ekstep.service.content.clearTelemetryEvents(); $scope.safeApply(); }); - $scope.precision = function(a) { - if (!isFinite(a)) return 0; - var e = 1, - p = 0; - while (Math.round(a * e) / e !== a) { - e *= 10; - p++; - } - return p; - }; - $scope.convert = function(totalScore) { - if ((!isNaN(totalScore) && totalScore.toString().indexOf('.') != -1)) { - var precisionLen = $scope.precision(totalScore); - return precisionLen > 1 ? totalScore.toFixed(2) : totalScore; - } else { - return totalScore - } + $scope.convert = function(num) { + num = num.toString(); //If it's not already a String + num = num.slice(0, (num.indexOf(".")) + 3); //With 3 exposing the hundredths place + return Number(num); //If you need it back as a Number }; }); \ No newline at end of file