@datarailsshared/dr_renderer 1.5.116 → 1.5.120

package/package.json

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

package/src/dr_pivottable.js

@@ -3,20 +3,136 @@ const { DELIMER } = require('./dr-renderer-helpers');
 const { TooMuchDataError } = require('./errors');
 
 let initDRPivotTable = function($, window, document) {
-    var hasProp = {}.hasOwnProperty;
-    var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
+    var bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
+        hasProp = {}.hasOwnProperty;
 
     var DRPivotData, processKey, SubtotalRenderer, getFormattedNumber, NovixRenderer;
     const newTableColors = ['rgb(127, 196, 255)', 'rgb(200, 243,243)', 'rgb(247, 161, 173)', 'rgb(255, 237, 178)', 'rgb(221, 239, 255)',
         'rgb(171, 216, 255)', 'rgb(174, 231, 220)', 'rgb(227, 255, 236)', 'rgb(162, 215, 227)', 'rgb(223, 239, 236)'];
 
-    // const numberOfRows = 500; // change to activate the handsontable when num of rows bigger then this.
+    /*
+    Utilities (from pivottable@2.23.0)
+     */
+    var addSeparators, aggregatorTemplates, locales, numberFormat, usFmtInt;
+    addSeparators = function(nStr, thousandsSep, decimalSep) {
+        var rgx, x, x1, x2;
+        nStr += '';
+        x = nStr.split('.');
+        x1 = x[0];
+        x2 = x.length > 1 ? decimalSep + x[1] : '';
+        rgx = /(\d+)(\d{3})/;
+        while (rgx.test(x1)) {
+            x1 = x1.replace(rgx, '$1' + thousandsSep + '$2');
+        }
+        return x1 + x2;
+    };
 
-    DRPivotData = (function(superClass) {
-        extend(DRPivotData, superClass);
+    numberFormat = function(opts) {
+        var defaults;
+        defaults = {
+            digitsAfterDecimal: 2,
+            scaler: 1,
+            thousandsSep: ",",
+            decimalSep: ".",
+            prefix: "",
+            suffix: ""
+        };
+        opts = $.extend({}, defaults, opts);
+        return function(x) {
+            var result;
+            if (isNaN(x) || !isFinite(x)) {
+                return "";
+            }
+            result = addSeparators((opts.scaler * x).toFixed(opts.digitsAfterDecimal), opts.thousandsSep, opts.decimalSep);
+            return "" + opts.prefix + result + opts.suffix;
+        };
+    };
+    usFmtInt = numberFormat({
+        digitsAfterDecimal: 0
+    });
+    aggregatorTemplates = {
+        count: function(formatter) {
+            if (formatter == null) {
+                formatter = usFmtInt;
+            }
+            return function() {
+                return function(data, rowKey, colKey) {
+                    return {
+                        count: 0,
+                        push: function() {
+                            return this.count++;
+                        },
+                        value: function() {
+                            return this.count;
+                        },
+                        format: formatter
+                    };
+                };
+            };
+        },
+    };
+    locales = {
+        en: {
+            localeStrings: {
+                selectAll: "Select All",
+                selectNone: "Select None",
+                tooMany: "(too many to list)",
+                filterResults: "Filter values",
+                apply: "Apply",
+                cancel: "Cancel",
+                totals: "Totals",
+                vs: "vs",
+                by: "by"
+            }
+        }
+    };
+
+    DRPivotData = (function() {
 
         function DRPivotData(input, opts) {
-            DRPivotData.__super__.constructor.call(this, input, opts);
+            if (opts == null) {
+                opts = {};
+            }
+            this.getAggregator = bind(this.getAggregator, this);
+            this.getRowKeys = bind(this.getRowKeys, this);
+            this.getColKeys = bind(this.getColKeys, this);
+            this.getRowKeysByCols = bind(this.getRowKeysByCols, this);
+            this.input = input;
+            this.aggregator = opts.aggregator != null ? opts.aggregator : aggregatorTemplates.count()();
+            this.aggregatorName = opts.aggregatorName != null ? opts.aggregatorName : "Count";
+            this.colAttrs = opts.cols != null ? opts.cols : [];
+            this.rowAttrs = opts.rows != null ? opts.rows : [];
+            this.derivedAttributes = opts.derivedAttributes != null ? opts.derivedAttributes : {};
+            this.filter = opts.filter != null ? opts.filter : (function() {
+                return true;
+            });
+            this.isSmartQueriesEnabled = _.some(input, item => item.Scenario === DR_SCENARIO.SQ_Actuals);
+
+            this.tree = {};
+
+            // some chart types don't have row/col keys (for example, KPI_WIDGET)
+            this.rowKeys = opts.keysObject ? opts.keysObject.row_keys : [];
+            this.colKeys = opts.keysObject ? opts.keysObject.col_keys : [];
+            this.rowKeysByCols = opts.keysObject ? opts.keysObject.row_keys_by_cols : [];
+
+            this.rowTotals = {};
+            this.colTotals = {};
+            this.allTotal = this.aggregator(this, [], []);
+            this.dateValuesDictionary = opts.dateValuesDictionary;
+            this.colFormats = opts.colFormats || [];
+            this.rowFormats = opts.rowFormats || [];
+            this.isFormattingAxisLabels = opts.rendererOptions && opts.rendererOptions.isFormattingAxisLabels;
+            this.getFormattedColKeys = (keys) => opts.getFormattedColKeys(this, keys);
+            this.getFormattedRowKeys = (keys) => opts.getFormattedRowKeys(this, keys);
+            this.isDrillDownDisabled = opts.isDrillDownDisabled;
+
+            this.forEachRecord(this.input, this.derivedAttributes, (function(_this) {
+                return function(record) {
+                    if (_this.filter(record)) {
+                        return _this.processRecord(record, _this.isSmartQueriesEnabled);
+                    }
+                };
+            })(this));
         }
 
         DRPivotData.prototype.forEachRecord = function(input, derivedAttributes, f) {
@@ -193,11 +309,28 @@ let initDRPivotTable = function($, window, document) {
             };
         };
 
+        DRPivotData.prototype.getColKeys = function() {
+            return this.colKeys;
+        };
+
+        DRPivotData.prototype.getRowKeys = function() {
+            return this.rowKeys;
+        };
+
+        DRPivotData.prototype.getRowKeysByCols = function() {
+            return this.rowKeysByCols;
+        };
+
         return DRPivotData;
 
-    })($.pivotUtilities.PivotData);
+    })();
 
-    $.pivotUtilities.DRPivotData = DRPivotData;
+    $.pivotUtilities = {
+        aggregatorTemplates: aggregatorTemplates,
+        locales: locales,
+        numberFormat: numberFormat,
+        DRPivotData: DRPivotData
+    };
 
     getFormattedNumber = function(val, aggregator, opts, format_argument) {
         if (!aggregator) {

package/src/index.js

@@ -1,6 +1,5 @@
 const getPublishedItemsRenderer = require('./published_items_renderer');
 const getHighchartsRenderer = require('./highcharts_renderer');
-const initPivotTable = require('./pivottable');
 const initDRPivotTable = require('./dr_pivottable');
 const initNovixRenderer = require('./novix_renderer');
 const DataFormatter = require('./dataformatter');
@@ -12,7 +11,6 @@ let dr_render_factory = {};
 
 dr_render_factory.init = function($, window, document, Handsontable){
     window.DataFormatter = DataFormatter;
-    initPivotTable($, window, document);
     initDRPivotTable($, window, document);
     if(Handsontable){
         initNovixRenderer($, window, document, Handsontable);

package/src/options/builders.js

@@ -404,6 +404,10 @@ const withTooltipPie = () => createSuboption('tooltips', 'Tooltip', [
 const withTooltipGauge = () => createSuboption('tooltips', 'Tooltip', [
     GAUGE_SHOW_TOGGLE,
     ...createTooltipStyleGroup(),
+    createDivider(),
+    createCheckbox('show_segment_name', 'Segment name', true),
+    createCheckbox('show_percentage_in_value', 'Value % out of Goal', true),
+    createCheckbox('show_percentage_in_segments', 'Segment % out Goal', true),
 ]);
 
 // ============================================================================
@@ -495,7 +499,7 @@ const withTableOptionsTranspose = (config = {}) => {
         createCheckbox('show_subtotals_for_columns', 'Subtotals for columns', false),
         createCheckbox('show_subtotals_for_rows', 'Subtotals for rows', false),
         createCheckbox('show_subtotals_in_brackets', 'Subtotals in brackets', false),
-        createCheckbox('transpose_table', 'Transpose', true),
+        createCheckbox('transpose_table', 'Transpose', false),
         createCheckbox('start_collapsed_rows', 'Start collapsed rows <small>(old table only)</small>', false),
         createCheckbox('start_collapsed_columns', 'Start collapsed columns <small>(old table only)</small>', false),
         createCheckbox('colorize_headers', 'Colorize headers', true),
@@ -503,7 +507,6 @@ const withTableOptionsTranspose = (config = {}) => {
         createCheckbox('use_handsOnTable', 'Use big data table', false),
         createCheckbox('use_new_table_design', 'Use new table design', true),
         createCheckbox('hide_nulls_in_headers', 'Null values appear as blank', true),
-        createCheckbox('show_all', 'Show All', false),
         createCheckbox('freeze_panes', 'Freeze panes <small>(old table only)</small>', false),
         createCheckbox('eliminate_calc_totals', 'Eliminate grand totals for calculated values', false),
         createCheckbox('show_more_than_thousand_rows', 'Show data in dashboard if more than 1000 rows', false, {
@@ -529,36 +532,36 @@ const withTableOptionsGauge = () => createSuboption('table_options', 'Table', [
 const withTableDesignOptions = () => createSuboption('table_design_options', 'Table design', [
     createDivider('Columns'),
     createSelect('columns_font_style', 'Font style', SUBOPTIONS_FONTS, LABEL_DEFAULT_SETTINGS.FONT_FAMILY),
-    createSelect('columns_font_size', 'Font size', SUBOPTIONS_FONT_SIZE_VALUES, LABEL_DEFAULT_SETTINGS.FONT_SIZE),
-    createSelect('columns_text_alignment', 'Text alignment', [
+    createSelect('columns_font_size', 'Font size', SUBOPTIONS_FONT_SIZE_VALUES, '10'),
+    createSelect('columns_align_text', 'Alignment', [
         { label: 'Left', value: 'left' },
         { label: 'Center', value: 'center' },
         { label: 'Right', value: 'right' },
     ], 'left'),
     createDivider('Rows'),
     createSelect('rows_font_style', 'Font style', SUBOPTIONS_FONTS, LABEL_DEFAULT_SETTINGS.FONT_FAMILY),
-    createSelect('rows_font_size', 'Font size', SUBOPTIONS_FONT_SIZE_VALUES, LABEL_DEFAULT_SETTINGS.FONT_SIZE),
-    createSelect('rows_text_alignment', 'Text alignment', [
+    createSelect('rows_font_size', 'Font size', SUBOPTIONS_FONT_SIZE_VALUES, '10'),
+    createSelect('rows_align_text', 'Alignment', [
         { label: 'Left', value: 'left' },
         { label: 'Center', value: 'center' },
         { label: 'Right', value: 'right' },
     ], 'left'),
     createDivider('Values'),
     createSelect('values_font_style', 'Font style', SUBOPTIONS_FONTS, LABEL_DEFAULT_SETTINGS.FONT_FAMILY),
-    createSelect('values_font_size', 'Font size', SUBOPTIONS_FONT_SIZE_VALUES, LABEL_DEFAULT_SETTINGS.FONT_SIZE),
-    createSelect('values_text_alignment', 'Text alignment', [
+    createSelect('values_font_size', 'Font size', SUBOPTIONS_FONT_SIZE_VALUES, '10'),
+    createSelect('values_align_text', 'Alignment', [
         { label: 'Left', value: 'left' },
         { label: 'Center', value: 'center' },
         { label: 'Right', value: 'right' },
-    ], 'right'),
-    createDivider('Subtotals'),
-    createSelect('subtotals_font_style', 'Font style', SUBOPTIONS_FONTS, LABEL_DEFAULT_SETTINGS.FONT_FAMILY),
-    createSelect('subtotals_font_size', 'Font size', SUBOPTIONS_FONT_SIZE_VALUES, LABEL_DEFAULT_SETTINGS.FONT_SIZE),
-    createSelect('subtotals_text_alignment', 'Text alignment', [
+    ], 'left'),
+    createDivider('Totals'),
+    createSelect('totals_font_style', 'Font style', SUBOPTIONS_FONTS, LABEL_DEFAULT_SETTINGS.FONT_FAMILY),
+    createSelect('totals_font_size', 'Font size', SUBOPTIONS_FONT_SIZE_VALUES, '10'),
+    createSelect('totals_align_text', 'Alignment', [
         { label: 'Left', value: 'left' },
         { label: 'Center', value: 'center' },
         { label: 'Right', value: 'right' },
-    ], 'right'),
+    ], 'left'),
 ]);
 
 // ============================================================================
@@ -666,12 +669,17 @@ const withName = () => createSuboption('name', 'Name', [
  * Creates a negative number format suboption.
  * @returns {SuboptionDefinition}
  */
-const withNegativeNumberFormat = () => createSuboption('negative_number_format', 'Negative format', [
-    createRadio('format', 'Format', [
-        { label: '-1234', value: '' },
-        { label: '(1234)', value: 'brackets' },
-    ], ''),
-]);
+const withNegativeNumberFormat = () => ({
+    ...createSuboption('negative_numbers', 'Negative num', [
+        createRadio('value', 'Show like', [
+            { label: '-1234', value: 'minus' },
+            { label: '-1234[red]', value: 'red_minus' },
+            { label: '(1234)', value: 'absolute' },
+            { label: '(1234)[red]', value: 'red_absolute' },
+        ], 'minus'),
+    ]),
+    is_hidden: true,
+});
 
 /**
  * Creates a value suboption for KPI widgets.
@@ -806,10 +814,13 @@ const withTotalValueLabelDonut = () => createSuboption('total_value_label', 'Tot
  * @returns {SuboptionDefinition}
  */
 const withGaugeGoal = () => ({
-    ...createSuboption('goal', 'Gauge goal', [
+    category_class: DEFAULT_CATEGORY_CLASS,
+    category_label: 'Gauge goal',
+    category_type: 'goal',
+    elements: [
         createInput('title', 'Goal title', 'Goal'),
         createInput('value', 'Goal value', 1000000),
-    ]),
+    ],
     is_hidden: true,
 });
 
@@ -839,9 +850,9 @@ const withGaugeSegments = (config = {}) => ({
     category_type: 'segments',
     is_hidden: true,
     default_value: config.defaultSegments || [
-        { from: 0, to: 50, color: 'red', title: 'Title 1' },
-        { from: 51, to: 80, color: 'blue', title: 'Title 2' },
-        { from: 81, to: 100, color: 'green', title: 'Title 3' },
+        { from: 0, to: 50, color: '#BF1D30', title: 'Low' },
+        { from: 50, to: 90, color: '#FFA310', title: 'Medium' },
+        { from: 90, to: 100, color: '#037C5A', title: 'High' },
     ],
 });