details: https://code.openbravo.com/erp/devel/pi/rev/28afef865651
changeset: 22842:28afef865651
user: Guillermo Gil <guillermo.gil <at> openbravo.com>
date: Tue Apr 08 10:48:24 2014 +0200
summary: Fixed issue 26132: wrong visualization value of quantity fields with
very small numbers
Created function to show always decimal notation instead scientific notation
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js
| 76 +++++++++-
1 files changed, 73 insertions(+), 3 deletions(-)
diffs (113 lines):
diff -r 9cbac5131256 -r 28afef865651
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js
Tue Apr 08 09:23:12 2014 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/utilities/ob-utilities-number.js
Tue Apr 08 10:48:24 2014 +0200
@@ -52,7 +52,7 @@
OB.Utilities.Number.OBMaskedToOBPlain = function (number, decSeparator,
groupSeparator) {
number = number.toString();
var plainNumber = number,
- decimalNotation = (number.indexOf('E') !== -1);
+ decimalNotation = (number.indexOf('E') === -1 && number.indexOf('e') ===
-1);
// Remove group separators
if (groupSeparator) {
@@ -60,6 +60,11 @@
plainNumber = plainNumber.replace(groupRegExp, '');
}
+ //Check if the number is not on decimal notation
+ if (!decimalNotation) {
+ plainNumber = OB.Utilities.Number.ScientificToDecimal(number,
decSeparator);
+ }
+
// Catch sign
var numberSign = '';
if (plainNumber.substring(0, 1) === '+') {
@@ -70,8 +75,8 @@
plainNumber = plainNumber.substring(1, number.length);
}
- // Remove ending decimal '0' if the number is not expressed in decimal
notation
- if (plainNumber.indexOf(decSeparator) !== -1 && !decimalNotation) {
+ // Remove ending decimal '0'
+ if (plainNumber.indexOf(decSeparator) !== -1) {
while (plainNumber.substring(plainNumber.length - 1, plainNumber.length)
=== '0') {
plainNumber = plainNumber.substring(0, plainNumber.length - 1);
}
@@ -166,6 +171,11 @@
decNumber = '0.' + decNumber;
decNumber = OB.Utilities.Number.roundJSNumber(decNumber, decMask.length);
decNumber = decNumber.toString();
+
+ // Check if the number is on Scientific notation
+ if (decNumber.indexOf('e') !== -1 || decNumber.indexOf('E') !== -1) {
+ decNumber = OB.Utilities.Number.ScientificToDecimal(decNumber,
decSeparator);
+ }
if (decNumber.substring(0, 1) === '1') {
intNumber = parseFloat(intNumber);
intNumber = intNumber + 1;
@@ -392,4 +402,64 @@
multiplier = this.getGroupingMultiplier(groupingMode);
return groupValue + ' - ' + (groupValue + multiplier);
}
+};
+
+//** {{{ OB.Utilities.Number.ScientificToDecimal }}} **
+//
+// Convert a number from Scientific notation to decimal notation
+//
+// Parameters:
+// * {{{number}}}: the number on scientific notation
+// * {{{decSeparator}}}: the decimal separator of the OB number
+// Return:
+// * The OB number on decimal notation
+OB.Utilities.Number.ScientificToDecimal = function (number, decSeparator) {
+
+ number = number.toString();
+ var coeficient, exponent, numberOfZeros, zeros = '',
+ i, split, index;
+
+ // Look for 'e' or 'E'
+ if (number.indexOf('e') !== -1) {
+ index = number.indexOf('e');
+ } else if (number.indexOf('E') !== -1) {
+ index = number.indexOf('E');
+ } else { // Number is not expressed in scientific notation
+ return number;
+ }
+
+ // Set the number before and after e
+ coeficient = number.substring(0, index);
+ exponent = number.substring(index + 1, number.length);
+
+ //Remove the decimal separator
+ if (coeficient.indexOf(decSeparator) !== -1) {
+ split = coeficient.split(decSeparator);
+ coeficient = split[0] + split[1];
+ }
+
+ if (exponent.indexOf('-') !== -1) { // Case the number is smaller than 1
+ numberOfZeros = exponent.substring(1, exponent.length);
+
+ //Create the string of zeros
+ for (i = 1; i < numberOfZeros; i++) {
+ zeros = zeros + '0';
+ }
+ //Create the final number
+ number = '0.' + zeros + coeficient;
+ } else if (exponent.indexOf('+') !== -1) { // Case the number is bigger than
1
+ numberOfZeros = exponent.substring(1, exponent.length);
+ if (split) {
+ numberOfZeros = numberOfZeros - split[1].length;
+ }
+
+ //Create the string of zeros
+ for (i = 0; i < numberOfZeros; i++) {
+ zeros = zeros + '0';
+ }
+ //Create the final number
+ number = coeficient + zeros;
+ }
+
+ return number;
};
\ No newline at end of file
------------------------------------------------------------------------------
Put Bad Developers to Shame
Dominate Development with Jenkins Continuous Integration
Continuously Automate Build, Test & Deployment
Start a new project now. Try Jenkins in the cloud.
http://p.sf.net/sfu/13600_Cloudbees
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
