From f68a5ea074458d3d3be61fbc524632bd2b0915ea Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Fri, 5 Oct 2012 13:18:36 -0400 Subject: [PATCH] BUG 7408 "Fire Fox English/Sumatoria" SOLVED - Grids in view mode displays the sum not properly - Problem solved, improved SUM and AVG functions in grids - It improves the visualization of the web page header, only for IE * Available from version 2.0.45 --- gulliver/js/form/core/form.js | 29 ++++++++++++++----- .../skinEngine/uxmodern/layout-pm-modern.html | 24 +++++++-------- 2 files changed, 32 insertions(+), 21 deletions(-) diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index cdf1f89cd..92975c644 100755 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -3409,7 +3409,7 @@ function putFieldNumericValue(elem, num, mask, decimalSeparator) var strAux = maskNumber.split("").reverse().join(""); cont = 0; - pos = 0; + pos = -1; for (i = 0; i <= strAux.length - 1; i++) { if (strAux.charAt(i) == "#") { @@ -3422,26 +3422,35 @@ function putFieldNumericValue(elem, num, mask, decimalSeparator) } } - var mask2 = strAux.substring(0, pos + 1); - mask2 = mask2.split("").reverse().join(""); + var mask2 = ""; + + if (pos != -1) { + mask2 = strAux.substring(0, pos + 1); + mask2 = mask2.split("").reverse().join(""); + } else { + mask1 = maskNumber; + } maskNumber = mask1 + mask2; } - var newNumber = putStringMask(n.split("").reverse().join(""), maskNumber.split("").reverse().join("")); - var newDecimal = putStringMask(d, maskDecimal); - - newNumber = newNumber.split("").reverse().join(""); + var newNumber = putStringMask(n, maskNumber, "reverse"); + var newDecimal = putStringMask(d, maskDecimal, "forward"); elem.value = newNumber + decimalSeparator + newDecimal; } -function putStringMask(str, mask) +function putStringMask(str, mask, dir) { var newStr = ""; var i1 = 0; var i2 = 0; + if (dir == "reverse") { + str = str.split("").reverse().join(""); + mask = mask.split("").reverse().join(""); + } + for (i1 = 0; i1 <= mask.length - 1; i1++) { switch (mask.charAt(i1)) { case "#": @@ -3460,6 +3469,10 @@ function putStringMask(str, mask) } } + if (dir == "reverse") { + newStr = newStr.split("").reverse().join(""); + } + return newStr; } diff --git a/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html b/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html index 665aa3e87..8b7618af7 100644 --- a/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html +++ b/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html @@ -5,15 +5,13 @@ {$_header} {literal} - + {/literal} @@ -21,18 +19,18 @@