ZEPPELIN-830 fix number formatting for table display

r-kamath · r-kamath · commit 7bb508eb6e14 · 2016-04-28T23:39:17.000+05:30
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js b/zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
@@ -1212,38 +1212,6 @@ angular.module('zeppelinWebApp')
   };
 
   var setTable = function(type, data, refresh) {
-    var getTableContentFormat = function(d) {
-      if (isNaN(d)) {
-        if (d.length>'%html'.length && '%html ' === d.substring(0, '%html '.length)) {
-          return 'html';
-        } else {
-          return '';
-        }
-      } else {
-        return '';
-      }
-    };
-
-    var formatTableContent = function(d) {
-      if (isNaN(d)) {
-        var f = getTableContentFormat(d);
-        if (f !== '') {
-          return d.substring(f.length+2);
-        } else {
-          return d;
-        }
-      } else {
-        var dStr = d.toString();
-        var splitted = dStr.split('.');
-        var formatted = splitted[0].replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
-        if (splitted.length>1) {
-          formatted+= '.'+splitted[1];
-        }
-        return formatted;
-      }
-    };
-
-
     var renderTable = function() {
       var height = $scope.paragraph.config.graph.height;
       angular.element('#p' + $scope.paragraph.id + '_table').css('height', height);
@@ -1263,7 +1231,20 @@ angular.module('zeppelinWebApp')
         manualRowResize: true,
         editor: false,
         fillHandle: false,
-        disableVisualSelection: true
+        disableVisualSelection: true,
+        cells: function (row, col, prop) {
+          var cellProperties = {};
+            cellProperties.renderer = function(instance, td, row, col, prop, value, cellProperties) {
+              Handsontable.NumericCell.renderer.apply(this, arguments);
+              if (!isNaN(value)) {
+                cellProperties.type = 'numeric';
+                cellProperties.format = '0,0';
+                cellProperties.editor = false;
+                td.style.textAlign="left"
+              }
+            };
+          return cellProperties;
+        }
       });
     };
 
diff --git a/zeppelin-web/src/app/notebook/paragraph/paragraph.css b/zeppelin-web/src/app/notebook/paragraph/paragraph.css
@@ -400,6 +400,7 @@
   border-top: 0px;
   padding: 4px 0px 0px 0px;
   border-left: 0px;
+  border-right: 0px;
   border-bottom: 2px solid #CCC;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -400,6 +400,7 @@`
`400`	`400`	`border-top: 0px;`
`401`	`401`	`padding: 4px 0px 0px 0px;`
`402`	`402`	`border-left: 0px;`
	`403`	`+ border-right: 0px;`
`403`	`404`	`border-bottom: 2px solid #CCC;`
`404`	`405`	`}`
`405`	`406`