@datarailsshared/dr_renderer 1.2.204-dragons → 1.2.206-dragons

package/package.json

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

package/src/highcharts_renderer.js

@@ -1364,9 +1364,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         resultObject = highchartsRenderer.getDataLabelsOptions(additionOptions, resultObject);
 
         lodash.forEach(col_n_keys, function(col_n_value, col_index) {
-
+            const totalValueAgg = pivotData.getAggregator([], col_n_value);
             resultObject.data.push({
-                y: pivotData.colTotals[col_n_value].sum,
+                y: totalValueAgg.value(),
                 name: lodash.unescape(col_n_value).replace('DR_Others', highchartsRenderer.getOthersName(opts)),
                 isSum: !!col_index,
                 isTotal: true,
@@ -1396,6 +1396,7 @@ 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);
                     }
+
                 });
             }
         });
@@ -5096,13 +5097,36 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         dynamicRangeOptions.pivot.calculatedValues = highchartsRenderer.objectCopyJsonMethod(dynamicRangeOptions.calculated_values || []);
     }
 
-    highchartsRenderer.addTemplateDataToFunctionOptions = function (selectedTemplate, functionOptions) {
+    highchartsRenderer.addTemplateDataToCalcModel = function (selectedTemplate, calcModelOptions) {
         highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
 
         var fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.widget_fields);
         var fieldOb;
-        var filterFields = [];
-        var valuesFields = [];
+        var selectedFields = [];
+
+        // fill selected fields
+        lodash.forEach(calcModelOptions.fields, function (valObj) {
+            fieldOb = lodash.find(fields, {id: valObj.id});
+            if (fieldOb) {
+                selectedFields.push(fieldOb);
+                lodash.remove(fields, {id: fieldOb.id});
+            }
+        });
+
+        calcModelOptions.pivot = {
+            fieldsArray: fields,
+            selectedFieldsArray: selectedFields
+        };
+    }
+
+    highchartsRenderer.addTemplateDataToFunctionOptions = function (selectedTemplate, functionOptions) {
+        highchartsRenderer.setWidgetFieldsToTemplate(selectedTemplate);
+
+        let fieldOb;
+
+        const fields = highchartsRenderer.objectCopyJsonMethod(selectedTemplate.widget_fields);
+        const filterFields = [];
+        const valuesFields = [];
 
         lodash.forEach(functionOptions.filters, function (filterObj) {
             fieldOb = lodash.find(fields, {id: filterObj.field});