@datarailsshared/dr_renderer 1.2.209 → 1.2.210-dragons

package/package.json

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

package/src/dr_pivottable.js

@@ -2421,8 +2421,14 @@ let initDRPivotTable = function($, window, document) {
             if (colAttrs.length > 0 && colKeys.length > 0) {
                 colHeaders = processKeys(colKeys, "pvtColLabel", 'cols', colAttrs);
             }
-            var tableClasses = useNewUx && opts.chartOptions.table_options.use_new_table_design ? 'pvtTable newPvtTable' : 'pvtTable';
-            result = createElement("table", tableClasses , null, {
+            var tableClasses = ['pvtTable'];
+            if (opts.chartOptions.table_options.use_new_table_design) {
+                tableClasses.push('newPvtTable');
+            }
+            if (!pivotData.aggregator().uniq) {
+                tableClasses.push('numbers-to-right');
+            }
+            result = createElement("table", tableClasses.join(' ') , null, {
                 style: "display: none;"
             });
 

package/src/highcharts_renderer.js

@@ -87,6 +87,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         EXCEL_VIEWER: 'excel_viewer',
     };
 
+    highchartsRenderer.VIRTUAL_FIELDS = {
+        WATERFALL_VARIANCE: 'DR_WATERFALL_VARIANCE',
+    };
+
     highchartsRenderer.highcharts_theme = {
         "colors": highchartsRenderer.defaults_colors,
         "chart": {
@@ -1344,7 +1348,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const chart_series = [];
         const row_n_keys = pivotData.getRowKeys();
         const col_n_keys = pivotData.getColKeys();
-        const hasBreakdownValues = lodash.get(opts, 'breakdown_options.values.breakdown.length');
 
         let resultObject = {
             data: [],
@@ -1376,9 +1379,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (col_index !== col_n_keys.length - 1) {
                 lodash.forEach(row_n_keys, function (row_n_value) {
                     const agg = pivotData.getAggregator(row_n_value, col_n_value);
-                    let val = hasBreakdownValues
-                        ? agg.value()
-                        : nextTotalColumnValue - totalColumnValue;
+                    let val = agg.value();
 
                     val = $.isNumeric(val) ? parseFloat(val) : 0;
                     if (val) {
@@ -1398,12 +1399,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         tmoobj.colKeys = [lodash.unescape(col_n_keys[col_index - 1]), lodash.unescape(col_n_value)];
                         resultObject.data.push(tmoobj);
                     }
+
                 });
             }
         });
 
         chart_series.push(resultObject);
-
         opts.chart_series = [];
         if (!lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
             chart_series.forEach(series => {
@@ -4954,12 +4955,28 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         });
 
+        // add virtual fields to rows if required
+        let rows = widgetOptions.rows;
+        if (!lodash.get(widgetOptions, 'rows.length') && widgetOptions.options.breakdown_options) {
+            rows = [
+                {
+                    id: -1,
+                    name: highchartsRenderer.VIRTUAL_FIELDS.WATERFALL_VARIANCE,
+                    type: 'Text',
+                },
+            ];
+        }
+
         // fill rows fields
-        lodash.forEach(widgetOptions.rows, function (valObj) {
-            fieldOb = lodash.find(fields, {id: valObj.id});
-            if (fieldOb) {
-                legendFields.push(fieldOb);
-                lodash.remove(fields, {id: fieldOb.id});
+        lodash.forEach(rows, function (valObj) {
+            if (lodash.includes(highchartsRenderer.VIRTUAL_FIELDS, valObj.name)) {
+                legendFields.push(valObj);
+            } else {
+                fieldOb = lodash.find(fields, {id: valObj.id});
+                if (fieldOb) {
+                    legendFields.push(fieldOb);
+                    lodash.remove(fields, {id: fieldOb.id});
+                }
             }
         });
 
@@ -7927,7 +7944,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.createDateFromString = function (dateString, format) {
-        if ((format && !highchartsRenderer.isDateFormat(dateString, format)) || !highchartsRenderer.isDate(dateString)) {
+        if (!(format && highchartsRenderer.isDateFormat(dateString, format) || highchartsRenderer.isDate(dateString))) {
             return null;
         }
         const utcDate = format 
@@ -8081,6 +8098,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 filter.is_excluded = false;
             } else {
                 filter = highchartsRenderer.createDrillDownFilterObject(widget, widget.cols[0], colKey[0]);
+                filters.push(filter);
             }
             filter.values = [];
             for (let i = 0; i < colKey.length; i++) {

package/src/novix_renderer.js

@@ -28,8 +28,6 @@ let initNovixRenderer = function($, window, document, Handsontable){
     const delim = " , ";
     const subtotal = "subtotalDatarailsPlaceholder";
     const replaceValue = "SubTotals";
-    const useNewUx = document.ReportHippo && document.ReportHippo && document.ReportHippo.user &&
-      document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.use_new_ux;
 
     $.pivotUtilities.novix_renderers = {
 
@@ -889,9 +887,14 @@ let initNovixRenderer = function($, window, document, Handsontable){
 
             // inject the widgetId to the class name so we can separate the tables by it
             // look for the search side on line 653 "opts.$el.find(".widget-id-" + opts.widgetId);"
-            return `<div class='novixPivot widget-id-${opts.widgetId} ${
-              useNewUx && opts.chartOptions.table_options.use_new_table_design ? 'handsontable-new' : ''
-            }' style='overflow:auto'></div>`;
+            var tableClasses = ['novixPivot', `widget-id-${opts.widgetId}`];
+            if (opts.chartOptions.table_options.use_new_table_design) {
+                tableClasses.push('handsontable-new');
+            }
+            if (!pvtData.aggregator().uniq) {
+                tableClasses.push('numbers-to-right');
+            }
+            return `<div class='${tableClasses.join(' ')}' style='overflow:auto'></div>`;
         }
 
     };

package/src/pivot.css

@@ -29,9 +29,6 @@ table.pvtTable tbody tr th > i {
     font-size: 10px;
 }
 
-table.pvtTable .pvtColLabel {text-align: center;}
-table.pvtTable .pvtTotalLabel {text-align: right;}
-
 table.pvtTable tbody tr td {
     color: #3D3D3D;
     padding: 5px;
@@ -263,11 +260,6 @@ table.pvtTable.newPvtTable tbody tr td.rowTotal {
   background-color: #dfe6ec !important;
   border-color: #ffffff !important;
 }
-table.pvtTable.newPvtTable .pvtColLabel,
-table.pvtTable.newPvtTable .pvtTotalLabel,
-table.pvtTable.newPvtTable .pvtTotalLabel.rowTotal {
-  text-align: left;
-}
 
 table.pvtTable.newPvtTable tbody tr th .fa {
   padding: 2px;
@@ -408,3 +400,27 @@ table.pvtTable.newPvtTable tbody tr td:hover:after {
   top: 4px;
   font-size: 12px;
 }
+
+
+/* Table cells alignment */
+table.pvtTable .pvtColLabel {text-align: center;}
+table.pvtTable .pvtTotalLabel {text-align: right;}
+
+table.pvtTable.newPvtTable .pvtColLabel,
+table.pvtTable.newPvtTable .pvtTotalLabel,
+table.pvtTable.newPvtTable .pvtTotalLabel.rowTotal {
+    text-align: left;
+}
+
+table.pvtTable thead tr th.pvtColLabel,
+table.pvtTable thead tr th.pvtTotalLabel  {
+    text-align: center !important;
+}
+
+table.pvtTable.numbers-to-right tbody tr td.pvtVal,
+table.pvtTable.numbers-to-right tbody tr td.rowTotal.rowTotal,
+table.pvtTable.numbers-to-right tbody tr td.pvtGrandTotal  {
+    text-align: right !important;
+    padding-right: 9px;
+    line-height: 15px;
+}