Merge pull request #492 from valor-software/feature/handsontable-fixes

Numeric format fix
valor-software · Dec 15, 2017 · 1d12711 · 1d12711
2 parents e8cb386 + 05ebc23
commit 1d12711
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="2.0.1"></a>
+## [2.0.1](https://github.com/valor-software/ng2-handsontable/compare/2.0.0...v2.0.1) (2017-12-15)
+
+
+### Bug Fixes
+
+* **demo:** Update numeric formats ([8a7b278](https://github.com/valor-software/ng2-handsontable/commit/8a7b278))
+
+
+
 <a name="2.0.0"></a>
 # [2.0.0](https://github.com/valor-software/ng2-handsontable/compare/v1.0.4...v2.0.0) (2017-12-12)
 

diff --git a/demo/src/components/handsontable/advanced-demo.ts b/demo/src/components/handsontable/advanced-demo.ts
@@ -18,17 +18,17 @@ export class AdvancedDemoComponent {
     this.colHeaders = ['Country', 'Level', 'Units', 'As Of', '1Y Chg', '5Y Ago', '10Y Ago', '25Y Ago'];
     this.columns = [
       {data: 0, type: 'text'},
-      {data: 1, type: 'numeric', format: '0,0.00[0000]'},
+      {data: 1, type: 'numeric', numericFormat: { pattern: '0,0.00[0000]' }},
       {data: 2, type: 'text'},
-      {data: 3, type: 'numeric', format: '0'},
-      {data: 4, type: 'numeric', format: '0.00%', renderer:
+      {data: 3, type: 'numeric', numericFormat: { pattern: '0' }},
+      {data: 4, type: 'numeric', numericFormat: { pattern: '0.00%' }, renderer:
         function percentRenderer(instance, td, row, col, prop, value, cellProperties) {
           Handsontable.renderers.NumericRenderer.apply(this, arguments);
           td.style.color = (value < 0) ? 'red' : 'green';
         }
       },
-      {data: 5, type: 'numeric', format: '0,0.00[0000]'},
-      {data: 6, type: 'numeric', format: '0,0.00[0000]'}
+      {data: 5, type: 'numeric', numericFormat: { pattern: '0,0.00[0000]' }},
+      {data: 6, type: 'numeric', numericFormat: { pattern: '0,0.00[0000]' }}
     ];
     this.options = {
       height: 396,

diff --git a/demo/src/components/handsontable/basic-demo.ts b/demo/src/components/handsontable/basic-demo.ts
@@ -37,7 +37,7 @@ export class BasicDemoComponent {
     {
       data: 'price',
       type: 'numeric',
-      format: '$ 0,0.00'
+      numericFormat: { pattern: '$0,0.00', culture: 'en-US' }
     },
     {
       data: 'isActive',

diff --git a/demo/src/components/handsontable/finance-demo.ts b/demo/src/components/handsontable/finance-demo.ts
@@ -16,11 +16,11 @@ export class FinanceDemoComponent {
     this.data = getFinanceData();
     this.colHeaders = ['Price', 'Date', '1D Chg', 'YTD Chg', 'Vol BTC'];
     this.columns = [
-      {type: 'numeric', format: '$0,0.00'},
+      {type: 'numeric', numericFormat: { pattern: '$0,0.00', culture: 'en-US' }},
       {type: 'date', dateFormat: 'DD/MM/YYYY', correctFormat: true},
-      {type: 'numeric', format: '0.00%'},
-      {type: 'numeric', format: '0.00%'},
-      {type: 'numeric', format: '0.00'}
+      {type: 'numeric', numericFormat: { pattern: '0.00%' }},
+      {type: 'numeric', numericFormat: { pattern: '0.00%' }},
+      {type: 'numeric', numericFormat: { pattern: '0.00' }}
     ];
     this.options = {
       height: 396,

diff --git a/demo/src/components/handsontable/personal-demo.ts b/demo/src/components/handsontable/personal-demo.ts
@@ -81,7 +81,7 @@ export class PersonalDemoComponent {
         const a42 = Array.apply(0, Array(42)).map((x, y) => y + 1);
         if (a42.indexOf(row) !== -1 && col >= 1) {
           cellProperties.type = 'numeric';
-          cellProperties.format = '$0,0.00';
+          cellProperties.numericFormat = { pattern: '$0,0.00', culture: 'en-US' };
         }
 
         return cellProperties;

diff --git a/demo/src/components/handsontable/science-demo.ts b/demo/src/components/handsontable/science-demo.ts
@@ -60,10 +60,10 @@ export class ScienceDemoComponent {
       columnSorting: true,
       columns: [
         {data: 0, renderer: 'html'},
-        {data: 1, type: 'numeric', format: '0[.]000000000000000'},
-        {data: 2, type: 'numeric', format: '0[.]000000000000000', renderer: heatmapRenderer},
-        {data: 3, type: 'numeric', format: '0[.]000000000000000'},
-        {data: 4, type: 'numeric', format: '0[.]000000000000000', renderer: heatmapRenderer}
+        {data: 1, type: 'numeric', numericFormat: { pattern: '0[.]000000000000000' }},
+        {data: 2, type: 'numeric', numericFormat: { pattern: '0[.]000000000000000' }, renderer: heatmapRenderer},
+        {data: 3, type: 'numeric', numericFormat: { pattern: '0[.]000000000000000' }},
+        {data: 4, type: 'numeric', numericFormat: { pattern: '0[.]000000000000000' }, renderer: heatmapRenderer}
       ],
       afterLoadData: updateHeatmap,
       beforeChangeRender: updateHeatmap,

diff --git a/demo/src/components/handsontable/sport-demo.ts b/demo/src/components/handsontable/sport-demo.ts
@@ -26,11 +26,11 @@ export class SportDemoComponent {
         {data: 0, type: 'numeric'},
         {data: 1, type: 'text'},
         {data: 2, renderer: 'html', width: 200},
-        {data: 3, type: 'numeric', format: '$0,0.00'},
-        {data: 4, type: 'numeric', format: '0.00%'},
-        {data: 5, type: 'numeric', format: '0.00%'},
-        {data: 6, type: 'numeric', format: '$0,0.00'},
-        {data: 7, type: 'numeric', format: '$0,0.00'}
+        {data: 3, type: 'numeric', numericFormat: { pattern: '$0,0.00', culture: 'en-US' }},
+        {data: 4, type: 'numeric', numericFormat: { pattern: '0.00%' }},
+        {data: 5, type: 'numeric', numericFormat: { pattern: '0.00%' }},
+        {data: 6, type: 'numeric', numericFormat: { pattern: '$0,0.00', culture: 'en-US' }},
+        {data: 7, type: 'numeric', numericFormat: { pattern: '$0,0.00', culture: 'en-US' }}
       ],
       cells: (row, col, prop) => {
         const cellProperties: any = {};

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng2-handsontable-base",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Angular4 Handsontable components",
   "private": true,
   "scripts": {