fix: exclude negative sign from digit group separation (#598)

dhis2 · Sep 14, 2020 · d7ec310 · d7ec310
1 parent 857b3f0
commit d7ec310
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/src/__demo__/PivotTable.stories.js b/src/__demo__/PivotTable.stories.js
@@ -115,6 +115,19 @@ storiesOf('PivotTable', module).add('simple', () => {
     )
 })
 
+storiesOf('PivotTable', module).add('simple - comma DGS', () => {
+    const visualization = {
+        ...simpleVisualization,
+        ...visualizationReset,
+        digitGroupSeparator: 'COMMA',
+    }
+    return (
+        <div style={{ width: 800, height: 600 }}>
+            <PivotTable data={simpleData} visualization={visualization} />
+        </div>
+    )
+})
+
 storiesOf('PivotTable', module).add(
     'simple - title / subtitle / filter',
     () => {

diff --git a/src/__demo__/data/simple.data.json b/src/__demo__/data/simple.data.json
@@ -78,7 +78,7 @@
             "fbfJHSPpUQD",
             "201907",
             "ImspTQPwCqd",
-            "22356.0",
+            "461.0",
             "",
             "",
             "",
@@ -89,7 +89,7 @@
             "testing-extraneous-data",
             "201907",
             "ImspTQPwCqd",
-            "22356.0",
+            "1234.0",
             "",
             "",
             "",
@@ -100,7 +100,7 @@
             "fbfJHSPpUQD",
             "201905",
             "ImspTQPwCqd",
-            "29461.0",
+            "-461.0",
             "",
             "",
             "",
@@ -111,7 +111,7 @@
             "fbfJHSPpUQD",
             "201904",
             "ImspTQPwCqd",
-            "18576.0",
+            "-1234.0",
             "",
             "",
             "",

diff --git a/src/modules/pivotTable/renderValue.js b/src/modules/pivotTable/renderValue.js
@@ -9,13 +9,18 @@ const trimTrailingZeros = stringValue => stringValue.replace(/\.?0+$/, '')
 const defaultDecimalSeparator = '.'
 
 const separateDigitGroups = (stringValue, decimalSeparator) => {
-    const [integer, remainder] = stringValue.split('.')
+    const isNegative = stringValue[0] === '-'
+    const [integer, remainder] = stringValue.replace(/^-/, '').split('.')
 
     const groups = []
     for (let i = integer.length; i > 0; i -= 3) {
         groups.unshift(integer.substring(i - 3, i))
     }
 
+    if (isNegative) {
+        groups[0] = '-' + groups[0]
+    }
+
     if (remainder) {
         const trimmedRemainder = trimTrailingZeros(remainder)
         if (trimmedRemainder.length) {