Fixed issue #11740: Decimal throwerreor with negative value

Dev: Put a try everywhere using Decimal(value), unsure we need it everywhere
LimeSurvey · Oct 15, 2016 · 33a1dd4 · Shnoulle · Oct 15, 2016 · 33a1dd4
1 parent 84c13e7
commit 33a1dd4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 14 deletions.
diff --git a/scripts/array-totalsum.js b/scripts/array-totalsum.js
@@ -40,9 +40,9 @@ function updatetotals()
     // First get number of columns (only visible and enabled inputs)
     var iColumnNum=$('#'+sTableID+' tbody tr:first-child input:enabled:visible').length;
     //Get An array of jQuery Objects
-    var $iRow = sTable.find('tr'); 
+    var $iRow = sTable.find('tr');
     //Iterate through the columns
-    for (var i = 1; i <= iColumnNum; i++) 
+    for (var i = 1; i <= iColumnNum; i++)
     {
         var sum = new Decimal(0);
         $iRow.each(function(){
@@ -60,7 +60,7 @@ function updatetotals()
 }
 function formatValue(sValue)
 {
-    
+
     sValue=Number(sValue).toString();
     var sRadix=LSvar.sLEMradix;
     sValue=sValue.replace('.',sRadix);
@@ -78,7 +78,7 @@ function normalizeValue(aValue)
     try {
         outNumber = new Decimal(aValue);
     } catch(e){}
-    
+
     if(outNumber == false)
     {
         var numReplaced = aValue.toString().replace(/,/g, ".");

diff --git a/scripts/expressions/em_javascript.js b/scripts/expressions/em_javascript.js
@@ -591,11 +591,12 @@ function LEMval(alias)
                 case 'I': //Language Question
                 case '|': //File Upload
                 case 'X': //BOILERPLATE QUESTION
-                    var numtest = new Decimal(value);
-                    if(!numtest.isNaN()){
+                    try {
+                        var numtest = new Decimal(value);
                         return parseFloat(numtest.valueOf());
-                    } else {
-                        shown = value; // what about "no answer"?
+                    }
+                    catch(e) {
+                        shown = value;
                     }
                     break;
                 case 'M': //Multiple choice checkbox
@@ -605,11 +606,12 @@ function LEMval(alias)
                     }
                     else {
                         if (attr.type == 'P' && varName.match(/comment$/)) {
-                            var numtest = new Decimal(value);
-                            if(!numtest.isNaN()){
+                            try {
+                                var numtest = new Decimal(value);
                                 shown = parseFloat(numtest.valueOf());
-                            } else {
-                                shown = value; // what about "no answer"?
+                            }
+                            catch(e) {
+                                shown = value;
                             }
                         }
                         else {
@@ -713,7 +715,13 @@ function LEMval(alias)
                 {
                     if(bNumRealValue)
                     {
-                        return parseFloat(new Decimal(value).valueOf());
+                        try {
+                            var numtest = new Decimal(value);
+                            return parseFloat(numtest.valueOf());
+                        }
+                        catch(e) {
+                            return value;
+                        }
                     }
                     else
                     {
@@ -728,7 +736,13 @@ function LEMval(alias)
 //                if (newval != parseFloat(newval)) {
 //                   return '';
 //                }
-                return parseFloat(new Decimal(newval).valueOf());
+                try {
+                    var numtest = new Decimal(value);
+                    return parseFloat(numtest.valueOf());
+                }
+                catch(e) {
+                    return value;
+                }
             }
 
             // convert content in date questions to standard format yy-mm-dd to facilitate use in EM (comparisons, min/max etc.)