@datarailsshared/dr_renderer 1.2.430 → 1.2.431

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.430",
+  "version": "1.2.431",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/dataformatter.js

@@ -1026,9 +1026,49 @@ var DataFormatterImpl = function () {
 
             return result;
         }
+    }, {
+        key: 'formatValue',
+        value: function formatValue(data_type, number_format, value, override_values_format) {
+            if (!number_format) {
+                number_format = 'General';
+            }
+
+            if (Number.isNaN(value)) {
+                return { value: "#Error" };
+            }
+
+            if (data_type === 'n' && value != null) {
+                if (override_values_format) {
+                    number_format = override_values_format;
+                }
+
+                if (number_format.indexOf('[kilo]') >= 0) {
+                    value = value / 1000;
+                    number_format = number_format.replace('[kilo]', '');
+                } else if (number_format.indexOf('[mega]') >= 0) {
+                    value = value / 1000000;
+                    number_format = number_format.replace('[mega]', '');
+                } else if (number_format.indexOf('[kilomega]') >= 0) {
+                    number_format = number_format.replace('[kilomega]', '');
+                }
+
+                return this.format(value, 'Number', number_format);
+            } else if (data_type === 'd') {
+                number_format = number_format.split(';')[0];
+                let d;
+                if (value instanceof Date || typeof value === 'string') {
+                    d = new Date(value);
+                } else {
+                    d = new Date(value * 1000);
+                }
+                return this.format(d.toString(), 'DateTime', number_format);
+            } else {
+                return value;
+            }
+        }
     }]);
 
     return DataFormatterImpl;
 }();
 
-module.exports = new DataFormatterImpl();
+module.exports = new DataFormatterImpl();

package/src/highcharts_renderer.js

@@ -3742,52 +3742,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
 
     highchartsRenderer.formatValue = function (data_type, number_format, value, widget_values_format) {
-        if (!number_format)
-            number_format = 'General';
-        if (Number.isNaN(value)) {
-            return {value: "#Error"};
-        }
-        if (data_type == 'n' && value != null) {
-
-            if (widget_values_format)
-                number_format = widget_values_format;
-            var sumbol = '';
-
-            if (number_format.indexOf('[kilo]') >= 0) {
-                sumbol = 'k';
-                value = value / 1000;
-                number_format = number_format.replace('[kilo]', '');
-            } else if (number_format.indexOf('[mega]') >= 0) {
-                sumbol = 'M';
-                value = value / 1000000;
-                number_format = number_format.replace('[mega]', '');
-            } else if (number_format.indexOf('[kilomega]') >= 0) {
-                var sumbol = '';
-                /*if(Math.abs(value) > 999){
-                     sumbol = 'k';
-                     value = value / 1000;
-                     }
-                     if(Math.abs(value) > 999){
-                     sumbol = 'M';
-                     value = value / 1000;
-                     }*/
-
-                number_format = number_format.replace('[kilomega]', '');
-            }
-
-            return DataFormatter.format(value, "Number", number_format);
-        } else if (data_type == 'd') {
-            number_format = number_format.split(';')[0];
-            var d;
-            if (value instanceof Date || typeof value === 'string') {
-                d = new Date(value);
-            } else {
-                d = new Date(value * 1000);
-            }
-            return DataFormatter.format(d.toString(), "DateTime", number_format);
-        } else {
-            return value;
-        }
+        return DataFormatter.formatValue(data_type, number_format, value, widget_values_format);
     };
 
     highchartsRenderer.getCalculatedValueFormat = function(calculatedFormats, rowKey, colKey) {