From de2a483e3493e6cf60a5436cbb73cf40c7f817b4 Mon Sep 17 00:00:00 2001
From: Albert Backenhof <EXT_BPD@qlik.com>
Date: Fri, 17 May 2019 09:43:45 +0200
Subject: [PATCH] Fixed number formatting bugs

-Using whitespace as thousand separator created bad
 format.
-Percentage values always had two decimals.
-Percentage values weren't multiplied by 100.

Issue: QLIK-95907
---
 src/data-table/data-cell.jsx | 54 ++++++++++++++++++------------------
 src/masking.js               |  6 ++++
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/src/data-table/data-cell.jsx b/src/data-table/data-cell.jsx
index 316eb2d..7b54dd4 100644
--- a/src/data-table/data-cell.jsx
+++ b/src/data-table/data-cell.jsx
@@ -129,14 +129,14 @@ DataCell.propTypes = {
 export default DataCell;
 
 function formatMeasurementValue (measurement, styling) {
+  if (isNaN(measurement.value)) {
+    return styling.symbolForNulls;
+  }
+
   const isColumnPercentageBased = (/%/).test(measurement.format);
   let formattedMeasurementValue = '';
   if (isColumnPercentageBased) {
-    if (isNaN(measurement.value)) {
-      formattedMeasurementValue = styling.symbolForNulls;
-    } else {
-      formattedMeasurementValue = ApplyPreMask('0,00%', measurement.value);
-    }
+    formattedMeasurementValue = ApplyPreMask(measurement.format, measurement.value * 100);
   } else {
     let magnitudeDivider;
     switch (measurement.magnitude.toLowerCase()) {
@@ -148,29 +148,29 @@ function formatMeasurementValue (measurement, styling) {
         break;
       default:
         magnitudeDivider = 1;
+        break;
     }
-    const formattingStringWithoutMagnitude = measurement.format.replace(/k|K|m|M/gi, '');
-    if (isNaN(measurement.value)) {
-      formattedMeasurementValue = styling.symbolForNulls;
-    } else {
-      let preFormatValue = measurement.value;
-      if (isColumnPercentageBased) {
-        preFormatValue *= 100;
-      }
-      switch (formattingStringWithoutMagnitude) {
-        case '#.##0':
-          formattedMeasurementValue = addSeparators((preFormatValue / magnitudeDivider), '.', ',', 0);
-          break;
-        case '#,##0':
-          formattedMeasurementValue = addSeparators((preFormatValue / magnitudeDivider), ',', '.', 0);
-          break;
-        default:
-          formattedMeasurementValue = ApplyPreMask(
-            formattingStringWithoutMagnitude,
-            (preFormatValue / magnitudeDivider)
-          );
-          break;
-      }
+    const formattingStringWithoutMagnitude = measurement.format.replace(/k|K|m|M|/gi, '');
+    switch (formattingStringWithoutMagnitude) {
+      case '#.##0':
+        formattedMeasurementValue
+          = addSeparators((measurement.value / magnitudeDivider), '.', ',', 0);
+        break;
+      case '#,##0':
+        formattedMeasurementValue
+          = addSeparators((measurement.value / magnitudeDivider), ',', '.', 0);
+        break;
+      case '# ##0':
+      case '# ##0':
+        formattedMeasurementValue
+          = addSeparators((measurement.value / magnitudeDivider), ' ', '.', 0);
+        break;
+      default:
+        formattedMeasurementValue = ApplyPreMask(
+          formattingStringWithoutMagnitude,
+          (measurement.value / magnitudeDivider)
+        );
+        break;
     }
   }
   return formattedMeasurementValue;
diff --git a/src/masking.js b/src/masking.js
index 5cda4af..e4cadba 100644
--- a/src/masking.js
+++ b/src/masking.js
@@ -12,6 +12,9 @@ export function ApplyPreMask (mask, value) { // aqui
           return (addSeparators(value, '.', ',', 0));
         case '+#,##0':
           return (addSeparators(value, ',', '.', 0));
+        case '# ##0':
+        case '# ##0':
+          return (addSeparators(value, ' ', '.', 0));
         default:
           return (applyMask(mask.substring(0, mask.indexOf(';')), value));
       }
@@ -29,6 +32,9 @@ export function ApplyPreMask (mask, value) { // aqui
           return (`(${addSeparators(vMyValue, '.', ',', 0)})`);
         case '-#,##0':
           return (`(${addSeparators(vMyValue, ',', '.', 0)})`);
+        case '# ##0':
+        case '# ##0':
+          return (`(${addSeparators(vMyValue, ' ', '.', 0)})`);
         default:
           return (`(${applyMask(vMyMask, vMyValue)})`);
       }