flexmonster 2.9.16 → 2.9.17

package/toolbar/flexmonster.toolbar.js

@@ -1,6 +1,6 @@
 /** 
  * Flexmonster Pivot Table & Charts [https://www.flexmonster.com/]
- * January 2022 (v. 2.9.16)
+ * January 2022 (v. 2.9.17)
  * Copyright (c) 2022 Flexmonster. All rights reserved.
  *
  * Flexmonster Pivot Table & Charts commercial licenses may be obtained at
@@ -25,45 +25,45 @@ FlexmonsterToolbar.prototype.getTabs = function () {
         icon: this.icons.connect,
         kibana: false,
         menu: [{
-            title: Labels.connect_local_csv,
-            id: "fm-tab-connect-local-csv",
-            handler: this.connectLocalCSVHandler,
-            mobile: false,
-            icon: this.icons.connect_csv
-        },
-        {
-            title: Labels.connect_local_json,
-            id: "fm-tab-connect-local-json",
-            handler: this.connectLocalJSONHandler,
-            mobile: false,
-            icon: this.icons.connect_json
-        },
-        {
-            title: this.osUtils.isMobile ? Labels.connect_remote_csv_mobile : Labels.connect_remote_csv,
-            id: "fm-tab-connect-remote-csv",
-            handler: this.connectRemoteCSV,
-            icon: this.icons.connect_csv_remote
-        },
-        {
-            title: this.osUtils.isMobile ? Labels.connect_remote_json_mobile : Labels.connect_remote_json,
-            id: "fm-tab-connect-remote-json",
-            handler: this.connectRemoteJSON,
-            icon: this.icons.connect_json_remote
-        },
-        {
-            title: this.osUtils.isMobile ? Labels.connect_olap_mobile : Labels.connect_olap,
-            id: "fm-tab-connect-olap",
-            handler: this.connectOLAP,
-            flat: false,
-            icon: this.icons.connect_olap
-        },
-        {
-            title: this.osUtils.isMobile ? Labels.connect_elastic_mobile : Labels.connect_elastic,
-            id: "fm-tab-connect-elastic",
-            handler: this.connectElastic,
-            flat: false,
-            icon: this.icons.connect_elastic
-        }
+                title: Labels.connect_local_csv,
+                id: "fm-tab-connect-local-csv",
+                handler: this.connectLocalCSVHandler,
+                mobile: false,
+                icon: this.icons.connect_csv
+            },
+            {
+                title: Labels.connect_local_json,
+                id: "fm-tab-connect-local-json",
+                handler: this.connectLocalJSONHandler,
+                mobile: false,
+                icon: this.icons.connect_json
+            },
+            {
+                title: this.osUtils.isMobile ? Labels.connect_remote_csv_mobile : Labels.connect_remote_csv,
+                id: "fm-tab-connect-remote-csv",
+                handler: this.connectRemoteCSV,
+                icon: this.icons.connect_csv_remote
+            },
+            {
+                title: this.osUtils.isMobile ? Labels.connect_remote_json_mobile : Labels.connect_remote_json,
+                id: "fm-tab-connect-remote-json",
+                handler: this.connectRemoteJSON,
+                icon: this.icons.connect_json_remote
+            },
+            {
+                title: this.osUtils.isMobile ? Labels.connect_olap_mobile : Labels.connect_olap,
+                id: "fm-tab-connect-olap",
+                handler: this.connectOLAP,
+                flat: false,
+                icon: this.icons.connect_olap
+            },
+            {
+                title: this.osUtils.isMobile ? Labels.connect_elastic_mobile : Labels.connect_elastic,
+                id: "fm-tab-connect-elastic",
+                handler: this.connectElastic,
+                flat: false,
+                icon: this.icons.connect_elastic
+            }
         ]
     });
 
@@ -74,18 +74,18 @@ FlexmonsterToolbar.prototype.getTabs = function () {
         icon: this.icons.open,
         kibana: false,
         menu: [{
-            title: Labels.local_report,
-            id: "fm-tab-open-local-report",
-            handler: this.openLocalReport,
-            mobile: false,
-            icon: this.icons.open_local
-        },
-        {
-            title: this.osUtils.isMobile ? Labels.remote_report_mobile : Labels.remote_report,
-            id: "fm-tab-open-remote-report",
-            handler: this.openRemoteReport,
-            icon: this.icons.open_remote
-        }
+                title: Labels.local_report,
+                id: "fm-tab-open-local-report",
+                handler: this.openLocalReport,
+                mobile: false,
+                icon: this.icons.open_local
+            },
+            {
+                title: this.osUtils.isMobile ? Labels.remote_report_mobile : Labels.remote_report,
+                id: "fm-tab-open-remote-report",
+                handler: this.openRemoteReport,
+                icon: this.icons.open_remote
+            }
         ]
     });
 
@@ -106,46 +106,46 @@ FlexmonsterToolbar.prototype.getTabs = function () {
         mobile: false,
         icon: this.icons.export,
         menu: [{
-            title: Labels.export_print,
-            id: "fm-tab-export-print",
-            handler: this.printHandler,
-            icon: this.icons.export_print
-        },
-        {
-            title: Labels.export_html,
-            id: "fm-tab-export-html",
-            handler: this.exportHandler,
-            args: "html",
-            icon: this.icons.export_html
-        },
-        {
-            title: Labels.export_csv,
-            id: "fm-tab-export-csv",
-            handler: this.exportHandler,
-            args: "csv",
-            icon: this.icons.export_csv
-        },
-        {
-            title: Labels.export_excel,
-            id: "fm-tab-export-excel",
-            handler: this.exportHandler,
-            args: "excel",
-            icon: this.icons.export_excel
-        },
-        {
-            title: Labels.export_image,
-            id: "fm-tab-export-image",
-            handler: this.exportHandler,
-            args: "image",
-            icon: this.icons.export_image
-        },
-        {
-            title: Labels.export_pdf,
-            id: "fm-tab-export-pdf",
-            handler: this.exportHandler,
-            args: "pdf",
-            icon: this.icons.export_pdf
-        },
+                title: Labels.export_print,
+                id: "fm-tab-export-print",
+                handler: this.printHandler,
+                icon: this.icons.export_print
+            },
+            {
+                title: Labels.export_html,
+                id: "fm-tab-export-html",
+                handler: this.exportHandler,
+                args: "html",
+                icon: this.icons.export_html
+            },
+            {
+                title: Labels.export_csv,
+                id: "fm-tab-export-csv",
+                handler: this.exportHandler,
+                args: "csv",
+                icon: this.icons.export_csv
+            },
+            {
+                title: Labels.export_excel,
+                id: "fm-tab-export-excel",
+                handler: this.exportHandler,
+                args: "excel",
+                icon: this.icons.export_excel
+            },
+            {
+                title: Labels.export_image,
+                id: "fm-tab-export-image",
+                handler: this.exportHandler,
+                args: "image",
+                icon: this.icons.export_image
+            },
+            {
+                title: Labels.export_pdf,
+                id: "fm-tab-export-pdf",
+                handler: this.exportHandler,
+                args: "pdf",
+                icon: this.icons.export_pdf
+            },
         ]
     });
     // Share tab
@@ -176,63 +176,63 @@ FlexmonsterToolbar.prototype.getTabs = function () {
         onShowHandler: this.checkChartMultipleMeasures,
         icon: this.icons.charts,
         menu: [{
-            title: Labels.charts_column,
-            id: "fm-tab-charts-column",
-            handler: this.chartsHandler,
-            args: "column",
-            icon: this.icons.charts
-        },
-        {
-            title: Labels.charts_bar_horizontal,
-            id: "fm-tab-charts-bar-horizontal",
-            handler: this.chartsHandler,
-            args: "bar_h",
-            icon: this.icons.charts_bar
-        },
-        {
-            title: Labels.charts_line,
-            id: "fm-tab-charts-line",
-            handler: this.chartsHandler,
-            args: "line",
-            icon: this.icons.charts_line
-        },
-        {
-            title: Labels.charts_scatter,
-            id: "fm-tab-charts-scatter",
-            handler: this.chartsHandler,
-            args: "scatter",
-            icon: this.icons.charts_scatter
-        },
-        {
-            title: Labels.charts_pie,
-            id: "fm-tab-charts-pie",
-            handler: this.chartsHandler,
-            args: "pie",
-            icon: this.icons.charts_pie
-        },
-        {
-            title: Labels.charts_stacked_column,
-            id: "fm-tab-charts-stacked-column",
-            handler: this.chartsHandler,
-            args: "stacked_column",
-            flat: false,
-            icon: this.icons.charts_stacked_column
-        },
-        {
-            title: Labels.charts_column_line,
-            id: "fm-tab-charts-column-line",
-            handler: this.chartsHandler,
-            args: "column_line",
-            icon: this.icons.charts_column_line
-        },
-        {
-            title: Labels.charts_multiple,
-            id: "fm-tab-charts-multiple",
-            handler: this.chartsMultipleHandler,
-            flat: false,
-            mobile: false,
-            type: "checkbox"
-        }
+                title: Labels.charts_column,
+                id: "fm-tab-charts-column",
+                handler: this.chartsHandler,
+                args: "column",
+                icon: this.icons.charts
+            },
+            {
+                title: Labels.charts_bar_horizontal,
+                id: "fm-tab-charts-bar-horizontal",
+                handler: this.chartsHandler,
+                args: "bar_h",
+                icon: this.icons.charts_bar
+            },
+            {
+                title: Labels.charts_line,
+                id: "fm-tab-charts-line",
+                handler: this.chartsHandler,
+                args: "line",
+                icon: this.icons.charts_line
+            },
+            {
+                title: Labels.charts_scatter,
+                id: "fm-tab-charts-scatter",
+                handler: this.chartsHandler,
+                args: "scatter",
+                icon: this.icons.charts_scatter
+            },
+            {
+                title: Labels.charts_pie,
+                id: "fm-tab-charts-pie",
+                handler: this.chartsHandler,
+                args: "pie",
+                icon: this.icons.charts_pie
+            },
+            {
+                title: Labels.charts_stacked_column,
+                id: "fm-tab-charts-stacked-column",
+                handler: this.chartsHandler,
+                args: "stacked_column",
+                flat: false,
+                icon: this.icons.charts_stacked_column
+            },
+            {
+                title: Labels.charts_column_line,
+                id: "fm-tab-charts-column-line",
+                handler: this.chartsHandler,
+                args: "column_line",
+                icon: this.icons.charts_column_line
+            },
+            {
+                title: Labels.charts_multiple,
+                id: "fm-tab-charts-multiple",
+                handler: this.chartsMultipleHandler,
+                flat: false,
+                mobile: false,
+                type: "checkbox"
+            }
         ]
     });
     tabs.push({
@@ -246,17 +246,17 @@ FlexmonsterToolbar.prototype.getTabs = function () {
         icon: this.icons.format,
         rightGroup: true,
         menu: [{
-            title: this.osUtils.isMobile ? Labels.format_cells_mobile : Labels.format_cells,
-            id: "fm-tab-format-cells",
-            handler: this.formatCellsHandler,
-            icon: this.icons.format_number
-        },
-        {
-            title: this.osUtils.isMobile ? Labels.conditional_formatting_mobile : Labels.conditional_formatting,
-            id: "fm-tab-format-conditional",
-            handler: this.conditionalFormattingHandler,
-            icon: this.icons.format_conditional
-        }
+                title: this.osUtils.isMobile ? Labels.format_cells_mobile : Labels.format_cells,
+                id: "fm-tab-format-cells",
+                handler: this.formatCellsHandler,
+                icon: this.icons.format_number
+            },
+            {
+                title: this.osUtils.isMobile ? Labels.conditional_formatting_mobile : Labels.conditional_formatting,
+                id: "fm-tab-format-conditional",
+                handler: this.conditionalFormattingHandler,
+                icon: this.icons.format_conditional
+            }
         ]
     });
 
@@ -388,7 +388,7 @@ FlexmonsterToolbar.prototype.init = function () {
         _this.updateLabels(_this.Labels);
 
         _this.pivot.on("numberformatting", function (data) {
-            _this.formatCellsHandler(data.measureName);
+            _this.formatCellsHandler(data.measureName, data.aggregation);
         });
         _this.pivot.on("conditionalformatting", function (data) {
             _this.conditionalFormattingHandler(data.measureName);
@@ -428,8 +428,8 @@ FlexmonsterToolbar.prototype.init = function () {
             for (var i = 0; i < children.length; i++) {
                 var classList = children[i].classList;
                 if (!(classList.contains("fm-popup") ||
-                    classList.contains("fm-modal-overlay") ||
-                    classList.contains("fm-popup-modal-overlay"))) {
+                        classList.contains("fm-modal-overlay") ||
+                        classList.contains("fm-popup-modal-overlay"))) {
                     elementsToDelete.push(children[i]);
                 }
             }
@@ -754,8 +754,8 @@ FlexmonsterToolbar.prototype.disableMultipleValues = function (type, multiple, n
     }
 }
 // Format tab
-FlexmonsterToolbar.prototype.formatCellsHandler = function (measureName) {
-    this.showFormatCellsDialog(measureName);
+FlexmonsterToolbar.prototype.formatCellsHandler = function (measureName, aggregation) {
+    this.showFormatCellsDialog(measureName, aggregation);
 }
 FlexmonsterToolbar.prototype.conditionalFormattingHandler = function (measureName) {
     this.showConditionalFormattingDialog(measureName);
@@ -773,7 +773,7 @@ FlexmonsterToolbar.prototype.printHandler = function () {
     this.pivot.print();
 }
 FlexmonsterToolbar.prototype.exportHandler = function (type) {
-    (type == "pdf") ? this.showExportPdfDialog() : this.pivot.exportTo(type);
+    (type == "pdf") ? this.showExportPdfDialog(): this.pivot.exportTo(type);
 }
 // Share tab
 FlexmonsterToolbar.prototype.shareReportHandler = function () {
@@ -802,15 +802,15 @@ FlexmonsterToolbar.prototype.showConnectToRemoteCSVDialog = function () {
     dialog.content.classList.add("fm-popup-w500");
     dialog.setTitle(Labels.open_remote_csv);
     dialog.setToolbar([{
-        id: "fm-btn-open",
-        label: Labels.open,
-        handler: applyHandler,
-        isPositive: true
-    },
-    {
-        id: "fm-btn-cancel",
-        label: Labels.cancel
-    }
+            id: "fm-btn-open",
+            label: Labels.open,
+            handler: applyHandler,
+            isPositive: true
+        },
+        {
+            id: "fm-btn-cancel",
+            label: Labels.cancel
+        }
     ]);
 
     var content = document.createElement("div");
@@ -841,15 +841,15 @@ FlexmonsterToolbar.prototype.showConnectToRemoteJsonDialog = function () {
     dialog.content.classList.add("fm-popup-w500");
     dialog.setTitle(Labels.open_remote_json);
     dialog.setToolbar([{
-        id: "fm-btn-open",
-        label: Labels.open,
-        handler: applyHandler,
-        isPositive: true
-    },
-    {
-        id: "fm-btn-cancel",
-        label: Labels.cancel
-    }
+            id: "fm-btn-open",
+            label: Labels.open,
+            handler: applyHandler,
+            isPositive: true
+        },
+        {
+            id: "fm-btn-cancel",
+            label: Labels.cancel
+        }
     ]);
 
     var content = document.createElement("div");
@@ -902,16 +902,16 @@ FlexmonsterToolbar.prototype.showConnectToElasticDialog = function () {
     dialog.content.classList.add("fm-popup-w570");
     dialog.setTitle(Labels.connect_elastic_title);
     dialog.setToolbar([{
-        id: "fm-btn-open",
-        label: Labels.ok,
-        handler: okHandler,
-        disabled: true,
-        isPositive: true
-    },
-    {
-        id: "fm-btn-cancel",
-        label: Labels.cancel
-    }
+            id: "fm-btn-open",
+            label: Labels.ok,
+            handler: okHandler,
+            disabled: true,
+            isPositive: true
+        },
+        {
+            id: "fm-btn-cancel",
+            label: Labels.cancel
+        }
     ]);
 
     var content = document.createElement("div");
@@ -1024,16 +1024,16 @@ FlexmonsterToolbar.prototype.showConnectToOLAPDialog = function () {
     dialog.content.classList.add("fm-popup-w570");
     dialog.setTitle(this.osUtils.isMobile ? Labels.connect_olap_mobile : Labels.olap_connection_tool);
     dialog.setToolbar([{
-        id: "fm-btn-open",
-        label: Labels.ok,
-        handler: okHandler,
-        disabled: true,
-        isPositive: true
-    },
-    {
-        id: "fm-btn-cancel",
-        label: Labels.cancel
-    }
+            id: "fm-btn-open",
+            label: Labels.ok,
+            handler: okHandler,
+            disabled: true,
+            isPositive: true
+        },
+        {
+            id: "fm-btn-cancel",
+            label: Labels.cancel
+        }
     ]);
 
     var content = document.createElement("div");
@@ -1132,15 +1132,15 @@ FlexmonsterToolbar.prototype.showOpenRemoteReportDialog = function () {
     dialog.content.classList.add("fm-popup-w500");
     dialog.setTitle(Labels.open_remote_report);
     dialog.setToolbar([{
-        id: "fm-btn-open",
-        label: Labels.open,
-        handler: applyHandler,
-        isPositive: true
-    },
-    {
-        id: "fm-btn-cancel",
-        label: Labels.cancel
-    }
+            id: "fm-btn-open",
+            label: Labels.open,
+            handler: applyHandler,
+            isPositive: true
+        },
+        {
+            id: "fm-btn-cancel",
+            label: Labels.cancel
+        }
     ]);
     var content = document.createElement("div");
     var textInput = document.createElement("input");
@@ -1158,164 +1158,164 @@ FlexmonsterToolbar.prototype.showOpenRemoteReportDialog = function () {
 // Format cells
 FlexmonsterToolbar.prototype.defaults.numberFormatting = {
     textAligns: [{
-        label: "align_left",
-        value: "left"
-    },
-    {
-        label: "align_right",
-        value: "right"
-    },
-    {
-        label: "align_center",
-        value: "center"
-    },
+            label: "align_left",
+            value: "left"
+        },
+        {
+            label: "align_right",
+            value: "right"
+        },
+        {
+            label: "align_center",
+            value: "center"
+        },
     ],
     thousandsSeparators: [{
-        label: "none",
-        value: ""
-    },
-    {
-        label: "space",
-        value: " "
-    },
-    {
-        label: ",",
-        value: ","
-    },
-    {
-        label: ".",
-        value: "."
-    },
+            label: "none",
+            value: ""
+        },
+        {
+            label: "space",
+            value: " "
+        },
+        {
+            label: ",",
+            value: ","
+        },
+        {
+            label: ".",
+            value: "."
+        },
     ],
     decimalSeparators: [{
-        label: ",",
-        value: ","
-    },
-    {
-        label: ".",
-        value: "."
-    },
+            label: ",",
+            value: ","
+        },
+        {
+            label: ".",
+            value: "."
+        },
     ],
     decimalPlaces: [{
-        label: "none",
-        value: -1
-    },
-    {
-        label: "0",
-        value: 0
-    },
-    {
-        label: "1",
-        value: 1
-    },
-    {
-        label: "2",
-        value: 2
-    },
-    {
-        label: "3",
-        value: 3
-    },
-    {
-        label: "4",
-        value: 4
-    },
-    {
-        label: "5",
-        value: 5
-    },
-    {
-        label: "6",
-        value: 6
-    },
-    {
-        label: "7",
-        value: 7
-    },
-    {
-        label: "8",
-        value: 8
-    },
-    {
-        label: "9",
-        value: 9
-    },
+            label: "none",
+            value: -1
+        },
+        {
+            label: "0",
+            value: 0
+        },
+        {
+            label: "1",
+            value: 1
+        },
+        {
+            label: "2",
+            value: 2
+        },
+        {
+            label: "3",
+            value: 3
+        },
+        {
+            label: "4",
+            value: 4
+        },
+        {
+            label: "5",
+            value: 5
+        },
+        {
+            label: "6",
+            value: 6
+        },
+        {
+            label: "7",
+            value: 7
+        },
+        {
+            label: "8",
+            value: 8
+        },
+        {
+            label: "9",
+            value: 9
+        },
     ],
     positiveCurrencyFormats: [{
-        label: "$1",
-        value: "$1"
-    },
-    {
-        label: "1$",
-        value: "1$"
-    },
+            label: "$1",
+            value: "$1"
+        },
+        {
+            label: "1$",
+            value: "1$"
+        },
     ],
     negativeCurrencyFormats: [{
-        label: "-$1",
-        value: "-$1"
-    },
-    {
-        label: "-1$",
-        value: "-1$"
-    },
-    {
-        label: "$-1",
-        value: "$-1"
-    },
-    {
-        label: "$1-",
-        value: "$1-"
-    },
-    {
-        label: "1-$",
-        value: "1-$"
-    },
-    {
-        label: "1$-",
-        value: "1$-"
-    },
-    {
-        label: "($1)",
-        value: "($1)"
-    },
-    {
-        label: "(1$)",
-        value: "(1$)"
-    },
+            label: "-$1",
+            value: "-$1"
+        },
+        {
+            label: "-1$",
+            value: "-1$"
+        },
+        {
+            label: "$-1",
+            value: "$-1"
+        },
+        {
+            label: "$1-",
+            value: "$1-"
+        },
+        {
+            label: "1-$",
+            value: "1-$"
+        },
+        {
+            label: "1$-",
+            value: "1$-"
+        },
+        {
+            label: "($1)",
+            value: "($1)"
+        },
+        {
+            label: "(1$)",
+            value: "(1$)"
+        },
     ],
     negativeNumberFormats: [{
-        label: "-1",
-        value: "-1"
-    },
-    {
-        label: "- 1",
-        value: "- 1"
-    },
-    {
-        label: "1-",
-        value: "1-"
-    },
-    {
-        label: "1 -",
-        value: "1 -"
-    },
-    {
-        label: "(1)",
-        value: "(1)"
-    },
+            label: "-1",
+            value: "-1"
+        },
+        {
+            label: "- 1",
+            value: "- 1"
+        },
+        {
+            label: "1-",
+            value: "1-"
+        },
+        {
+            label: "1 -",
+            value: "1 -"
+        },
+        {
+            label: "(1)",
+            value: "(1)"
+        },
     ],
     isPercent: [{
-        label: "true_value",
-        value: true
-    },
-    {
-        label: "false_value",
-        value: false
-    },
+            label: "true_value",
+            value: true
+        },
+        {
+            label: "false_value",
+            value: false
+        },
     ]
 }
-FlexmonsterToolbar.prototype.ConfirmationPopUp = function () { }
-FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName) {
+FlexmonsterToolbar.prototype.ConfirmationPopUp = function () {}
+FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName, measureAggregation) {
     var self = this;
     var Labels = this.Labels;
     var currentFormatVO = undefined;
@@ -1410,16 +1410,16 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName) {
     ConfirmationPopUp.prototype.initializePopUp = function () {
         this.dialog.setTitle(Labels.confirm_title);
         confirmPopUp.dialog.setToolbar([{
-            id: "fm-btn-apply",
-            label: Labels.ok,
-            handler: switchToMeasure,
-            isPositive: true
-        },
-        {
-            id: "fm-btn-cancel",
-            label: Labels.cancel,
-            handler: restoreEditedMeasure
-        }
+                id: "fm-btn-apply",
+                label: Labels.ok,
+                handler: switchToMeasure,
+                isPositive: true
+            },
+            {
+                id: "fm-btn-cancel",
+                label: Labels.cancel,
+                handler: restoreEditedMeasure
+            }
         ], false, this.removePopUp);
         var content = document.createElement("div");
         var contentLabel = document.createElement("label");
@@ -1461,8 +1461,8 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName) {
         var formatObject = {};
         formatObject = filterFormatting(formatObject);
         if ((formatObject.hasOwnProperty("textAlign") || formatObject.hasOwnProperty("thousandsSeparator") || formatObject.hasOwnProperty("decimalSeparator") ||
-            formatObject.hasOwnProperty("decimalPlaces") || formatObject.hasOwnProperty("currencySymbol") || formatObject.hasOwnProperty("positiveCurrencyFormat") ||
-            formatObject.hasOwnProperty("negativeCurrencyFormat") || formatObject.hasOwnProperty("nullValue") || formatObject.hasOwnProperty("isPercent")) &&
+                formatObject.hasOwnProperty("decimalPlaces") || formatObject.hasOwnProperty("currencySymbol") || formatObject.hasOwnProperty("positiveCurrencyFormat") ||
+                formatObject.hasOwnProperty("negativeCurrencyFormat") || formatObject.hasOwnProperty("nullValue") || formatObject.hasOwnProperty("isPercent")) &&
             (currentMeasureNames && currentMeasureNames.length > 0)) {
             confirmPopUp.createPopUp();
             confirmPopUp.initializePopUp();
@@ -1518,7 +1518,10 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName) {
     var switchToMeasure = function () {
         validateForm();
         currentMeasureNames = valuesDropDown.getValue();
-        var formatVO = self.pivot.getFormat(currentMeasureNames ? currentMeasureNames[0] : null);
+        var currentMeasure = currentMeasureNames ? getMeasureFromUniqueName(currentMeasureNames[0]) : null;
+        var formatVO = currentMeasure ?
+            self.pivot.getFormat(currentMeasure[0], currentMeasure[1]) :
+            self.pivot.getFormat(null);
         currentFormatVO = formatVO;
 
         applyStringDataMode(isStringDataMode());
@@ -1567,9 +1570,11 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName) {
         }
         filterFormatting(formatVO);
         currentFormatVO = undefined;
-        var measures = valuesDropDown.getValue();
-        for (var i = 0; i < measures.length; i++) {
-            self.pivot.setFormat(formatVO, (measures[i] == "" ? null : measures[i]));
+        var measuresList = valuesDropDown.getValue();
+        var measure = null;
+        for (var i = 0; i < measuresList.length; i++) {
+            measure = getMeasureFromUniqueName(measuresList[i]);
+            self.pivot.setFormat(formatVO, (measure[0] == "" ? null : measure[0]), measure[1]);
         }
         // if (valuesDropDown.getValue() === "" && currentReport.hasOwnProperty("formats")) {
         //     var reportMeasures = currentReport.slice.measures;
@@ -1582,21 +1587,42 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName) {
         self.pivot.refresh();
     }
 
+    var MEASURE_UNIQUENAME_DELIMETER = "_@@_@@_@@_";
+    //generates uniqueName based on measure's uniqueName and aggregation
+    var getMeasureUniqueName = function (uniqueName, aggregation) {
+        return uniqueName + MEASURE_UNIQUENAME_DELIMETER + aggregation;
+    }
+
+    //generates measure tuple (uniqueName and aggregation) based on getMeasureUniqueName result
+    var getMeasureFromUniqueName = function (uniqueName) {
+        return uniqueName.split(MEASURE_UNIQUENAME_DELIMETER, 2);
+    }
+
+    var getDropDownLabel = function (measure) {
+        var aggregationLabelIndex = measure.availableAggregations.indexOf(measure.aggregation);
+        var aggregation = aggregationLabelIndex === -1 || measure.aggregation === "none" || measure.calculated ?
+            null :
+            measure.availableAggregationsCaptions[aggregationLabelIndex];
+        return aggregation === null ?
+            measure.name :
+            measure.name + " (" + aggregation + ")";
+    }
+
     var dialog = this.popupManager.createPopup();
     var confirmPopUp = new ConfirmationPopUp();
 
     dialog.content.classList.add("fm-popup-format-cells");
     dialog.setTitle(this.osUtils.isMobile ? Labels.format : Labels.format_cells);
     dialog.setToolbar([{
-        id: "fm-btn-apply",
-        label: Labels.apply,
-        handler: applyHandler,
-        isPositive: true
-    },
-    {
-        id: "fm-btn-cancel",
-        label: Labels.cancel
-    }
+            id: "fm-btn-apply",
+            label: Labels.apply,
+            handler: applyHandler,
+            isPositive: true
+        },
+        {
+            id: "fm-btn-cancel",
+            label: Labels.cancel
+        }
     ], true);
 
     var content = document.createElement("div");
@@ -1608,21 +1634,23 @@ FlexmonsterToolbar.prototype.showFormatCellsDialog = function (measureName) {
         value: "",
         label: Labels.default_value
     }];
-    var _uniqueNames = [];
+    var _uniqueNames = {};
     var _measures = self.pivot.getMeasures();
     for (var i = 0; i < _measures.length; i++) {
-        if (_uniqueNames.indexOf(_measures[i].uniqueName) == -1) {
-            _uniqueNames.push(_measures[i].uniqueName);
+        if (!_uniqueNames[_measures[i].uniqueName] ||
+            (_uniqueNames[_measures[i].uniqueName] && !_uniqueNames[_measures[i].uniqueName][_measures[i].aggregation])) {
+            if (!_uniqueNames[_measures[i].uniqueName]) _uniqueNames[_measures[i].uniqueName] = {};
+            _uniqueNames[_measures[i].uniqueName][_measures[i].aggregation] = true;
             measuresDataProvider.push({
-                value: _measures[i].uniqueName,
-                label: _measures[i].name
+                value: getMeasureUniqueName(_measures[i].uniqueName, _measures[i].aggregation),
+                label: getDropDownLabel(_measures[i])
             });
         }
     }
 
     var valuesDropDown = this.createSelect(measuresDataProvider, Labels.choose_value, true);
     valuesDropDown.onchange = valuesDropDownChangeHandler;
-    if (measureName) valuesDropDown.setValue([measureName]);
+    if (measureName && measureAggregation) valuesDropDown.setValue([getMeasureUniqueName(measureName, measureAggregation)]);
 
     var valuesRow = this.createInputRow(Labels.choose_value, valuesDropDown);
     valuesRow.querySelector("label").classList.add("fm-uc");
@@ -1726,25 +1754,39 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
     var self = this;
     var Labels = this.Labels;
     var conditions = this.pivot.getAllConditions();
+    var dataType = this.pivot.getReport().dataSource.type;
+    var isMSAS = dataType === "microsoft analysis services" || dataType === "mondrian";
 
     var _allMeasures = self.pivot.getAllMeasures();
     var _measures = self.pivot.getMeasures();
     var _conditionsMeasuresMap = {};
     var _uniqueNames = [];
+    var _measureWithAggregations = {};
     var measures = [];
 
-    for (var i = 0; i < conditions.length; i++) {// creating a map where the key is measure's uniqueName for which the condition is defined
+    var MEASURE_UNIQUENAME_DELIMETER = "_@@_@@_@@_";
+    //generates uniqueName based on measure's uniqueName and aggregation
+    var getMeasureUniqueName = function (measure) {
+        return measure.uniqueName + MEASURE_UNIQUENAME_DELIMETER + measure.aggregation;
+    }
+
+    for (var i = 0; i < conditions.length; i++) { // creating a map where the key is measure's uniqueName for which the condition is defined
         _conditionsMeasuresMap[conditions[i].measure] = 1;
     }
-    for (var i = 0; i < _allMeasures.length; i++) {// adding all the measures for which the condition is defined to the dropdown the list
-        if (_conditionsMeasuresMap[_allMeasures[i].uniqueName] === 1) {
+    for (var i = 0; i < _allMeasures.length; i++) { // adding all the measures for which the condition is defined to the dropdown the list
+        var uniqueName = isMSAS ? _allMeasures[i].uniqueName : getMeasureUniqueName(_allMeasures[i]);
+        if (_conditionsMeasuresMap[_allMeasures[i].uniqueName] === 1 && _measureWithAggregations[uniqueName] === undefined) {
+            _measureWithAggregations[uniqueName] = 1;
             _uniqueNames.push(_allMeasures[i].uniqueName);
             measures.push(_allMeasures[i]);
         }
     }
-    for (var i = 0; i < _measures.length; i++) {// adding all the measures from the slice.measures list to the dropdown the list
-        if (_uniqueNames.indexOf(_measures[i].uniqueName) === -1 && _measures[i].type === "number") {
-            _uniqueNames.push(_measures[i].uniqueName);
+    for (var i = 0; i < _measures.length; i++) { // adding all the measures from the slice.measures list to the dropdown the list
+        var uniqueName = isMSAS ? _measures[i].uniqueName : getMeasureUniqueName(_measures[i]);
+        if (((_measures[i].type === "number" || _measures[i].type === "float" || _measures[i].type === "long") && _measureWithAggregations[uniqueName] === undefined)
+            || (_measures[i].type === undefined && _measureWithAggregations[uniqueName] === undefined)) {
+            //_uniqueNames.push(_measures[i].uniqueName);
+            _measureWithAggregations[uniqueName] = 1;
             measures.push(_measures[i]);
         }
     }
@@ -1753,11 +1795,12 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
     _measures = undefined;
     _conditionsMeasuresMap = undefined;
     _uniqueNames = undefined;
+    _measureWithAggregations = undefined;
 
     var applyHandler = function () {
         self.pivot.removeAllConditions();
         for (var i = 0; i < conditions.length; i++) {
-            var formula = composeFormula(conditions[i].sign, conditions[i].value1, conditions[i].value2);
+            var formula = composeFormula(conditions[i].sign, conditions[i].value1, conditions[i].value2, [conditions[i].measure, conditions[i].aggregation]);
             if (formula == null) return;
             conditions[i].formula = formula;
             self.pivot.addCondition(conditions[i]);
@@ -1777,7 +1820,7 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
             }
         };
         conditions.unshift(condition);
-        var item = self.createConditionalFormattingItem(condition, conditions);
+        var item = self.createConditionalFormattingItem(condition, conditions, isMSAS);
         content.insertBefore(item, content.firstChild);
         item.focus();
         content.scrollTop = 0;
@@ -1786,25 +1829,27 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
         }
         self.popupManager.centerPopup(dialog.content);
     };
-    var composeFormula = function (sign, value1, value2) {
+
+    var composeFormula = function (sign, value1, value2, measureWithAggregation) {
         var formula = '';
         var firstValueEmpty = (value1 == null || value1.length == 0);
         var secondValueEmpty = (value2 == null || value2.length == 0);
         var isBetween = (sign === '><');
         var isEmpty = (sign === 'isNaN');
+        var value = "#value";
         if ((firstValueEmpty && !isEmpty) || (isBetween && secondValueEmpty)) {
             return formula;
         }
         if (isBetween && !secondValueEmpty) {
-            formula = "AND(#value > " + value1 + ", #value < " + value2 + ")";
+            formula = "AND(" + value + " > " + value1 + ", " + value + " < " + value2 + ")";
         } else if (isEmpty) {
-            formula = "isNaN(#value)";
+            formula = "isNaN(" + value + ")";
         } else {
             var isString = isNaN(parseFloat(value1));
             if (isString) {
                 value1 = "'" + value1 + "'";
             }
-            formula = "#value " + sign + " " + value1;
+            formula = value + " " + sign + " " + value1;
         }
         return formula;
     };
@@ -1828,11 +1873,22 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
         }
         return output;
     };
+    var filterNumbers = function (numbersList) {
+        if (!numbersList) return numbersList;
+        var filteredNumbers = [];
+        for (var i = 0; i < numbersList.length; i++) {
+            if (!isNaN(Number(numbersList[i]))) {
+                filteredNumbers.push(numbersList[i]);
+            }
+        }
+        return filteredNumbers;
+    }
     var parseFormula = function (formula) {
         var parseNumber = /\W\d+\.*\d*/g;
         var parseSign = /<=|>=|<|>|=|=|!=|isNaN/g;
-        var numbers = formula.match(parseNumber);
         var strings = parseStrings(formula);
+        var numbers = formula.match(parseNumber);
+        numbers = filterNumbers(numbers);
         var signs = formula.match(parseSign);
         if (numbers == null && strings == null) return {};
         return {
@@ -1845,15 +1901,15 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
     dialog.content.classList.add("fm-popup-conditional");
     dialog.setTitle(this.osUtils.isMobile ? Labels.conditional : Labels.conditional_formatting);
     dialog.setToolbar([{
-        id: "fm-btn-apply",
-        label: Labels.apply,
-        handler: applyHandler,
-        isPositive: true
-    },
-    {
-        id: "fm-btn-cancel",
-        label: Labels.cancel
-    }
+            id: "fm-btn-apply",
+            label: Labels.apply,
+            handler: applyHandler,
+            isPositive: true
+        },
+        {
+            id: "fm-btn-cancel",
+            label: Labels.cancel
+        }
     ], true);
 
     var addConditionBtn = document.createElement("button");
@@ -1909,7 +1965,7 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
         conditions[i].value2 = formula.value2;
         conditions[i].sign = formula.sign;
         conditions[i].measures = measures;
-        content.appendChild(self.createConditionalFormattingItem(conditions[i], conditions));
+        content.appendChild(self.createConditionalFormattingItem(conditions[i], conditions, isMSAS));
     }
     if (conditions.length > 0) {
         placeholder.style.display = "none";
@@ -1921,56 +1977,90 @@ FlexmonsterToolbar.prototype.showConditionalFormattingDialog = function (measure
 FlexmonsterToolbar.prototype.defaults.fontSizes = ["8px", "9px", "10px", "11px", "12px", "13px", "14px"];
 FlexmonsterToolbar.prototype.defaults.fonts = ['Arial', 'Lucida Sans Unicode', 'Verdana', 'Courier New', 'Palatino Linotype', 'Tahoma', 'Impact', 'Trebuchet MS', 'Georgia', 'Times New Roman'];
 FlexmonsterToolbar.prototype.defaults.conditions = [{
-    label: "less_than",
-    value: '<'
-},
-{
-    label: "less_than_or_equal",
-    value: '<='
-},
-{
-    label: "greater_than",
-    value: '>'
-},
-{
-    label: "greater_than_or_equal",
-    value: '>='
-},
-{
-    label: "equal_to",
-    value: '='
-},
-{
-    label: "not_equal_to",
-    value: '!='
-},
-{
-    label: "between",
-    value: '><'
-},
-{
-    label: "is_empty",
-    value: 'isNaN'
-}
+        label: "less_than",
+        value: '<'
+    },
+    {
+        label: "less_than_or_equal",
+        value: '<='
+    },
+    {
+        label: "greater_than",
+        value: '>'
+    },
+    {
+        label: "greater_than_or_equal",
+        value: '>='
+    },
+    {
+        label: "equal_to",
+        value: '='
+    },
+    {
+        label: "not_equal_to",
+        value: '!='
+    },
+    {
+        label: "between",
+        value: '><'
+    },
+    {
+        label: "is_empty",
+        value: 'isNaN'
+    }
 ];
-FlexmonsterToolbar.prototype.createConditionalFormattingItem = function (data, allConditions) {
+FlexmonsterToolbar.prototype.createConditionalFormattingItem = function (data, allConditions, isMSAS) {
     var self = this;
     var Labels = this.Labels;
+    var _isMSAS = isMSAS;
+
+    var MEASURE_UNIQUENAME_DELIMETER = "_@@_@@_@@_";
+    //generates uniqueName based on measure's uniqueName and aggregation
+    var getMeasureUniqueName = function (uniqueName, aggregation) {
+        return _isMSAS || aggregation === "none" || aggregation === ""  ? uniqueName : uniqueName + MEASURE_UNIQUENAME_DELIMETER + aggregation;
+    }
+    //generates measure tuple (uniqueName and aggregation) based on getMeasureUniqueName result
+    var getMeasureFromUniqueName = function (uniqueName) {
+        return uniqueName.split(MEASURE_UNIQUENAME_DELIMETER, 2);
+    }
 
-    function fillValuesDropDown(measures, selectedMeasure) {
+    var getDropDownLabel = function (measure) {
+        var aggregationLabelIndex = measure.availableAggregations.indexOf(measure.aggregation);
+        var aggregation = aggregationLabelIndex === -1 || measure.aggregation === "none" || measure.calculated ?
+            null :
+            measure.availableAggregationsCaptions[aggregationLabelIndex];
+        return aggregation === null || _isMSAS ?
+            measure.name :
+            measure.name + " (" + aggregation + ")";
+    }
+
+    function fillValuesDropDown(measures, selectedMeasure, selectedMeasureAggregation) {
         var options = self.pivot.getOptions() || {};
+        var currentMeasure = measures.filter(function (measure) {
+            return measure.uniqueName === selectedMeasure
+        }).pop();
         var isFlatTable = (options.grid && options.grid.type == "flat");
         var dataProvider = [{
             label: Labels.all_values,
             value: ""
         }];
+        if (selectedMeasure && selectedMeasureAggregation === "" && (currentMeasure && !currentMeasure.calculated) && !isMSAS) {
+            var measureItemList = measures.filter(function(item) {
+                return item.uniqueName === selectedMeasure;
+            });
+            var selectedMeasureLabel = measureItemList.length > 0 ? measureItemList[0].name + " (" + Labels.all + ")" : selectedMeasure + " (" + Labels.all + ")";
+            dataProvider.push({
+                label: selectedMeasureLabel,
+                value: selectedMeasure
+            });
+        }
         for (var i = 0; i < measures.length; i++) {
             if (isFlatTable && measures[i].type == 7) { // count measure
                 continue;
             }
             dataProvider.push({
-                label: measures[i].name,
-                value: measures[i].uniqueName
+                label: getDropDownLabel(measures[i]),
+                value: getMeasureUniqueName(measures[i].uniqueName, measures[i].aggregation)
             })
             // backward compatibility with 2.1
             if (selectedMeasure == "[Measures].[" + measures[i].uniqueName + "]") {
@@ -1978,7 +2068,9 @@ FlexmonsterToolbar.prototype.createConditionalFormattingItem = function (data, a
             }
         }
         valuesDropDown.setDataProvider(dataProvider);
-        valuesDropDown.setValue(selectedMeasure ? selectedMeasure : dataProvider[0].value);
+        valuesDropDown.setValue(selectedMeasure && selectedMeasureAggregation !== undefined 
+            ? getMeasureUniqueName(selectedMeasure, selectedMeasureAggregation) 
+            : (selectedMeasure ? selectedMeasure : dataProvider[0].value));
     };
 
     function applyLabels(dataProvider) {
@@ -1990,7 +2082,9 @@ FlexmonsterToolbar.prototype.createConditionalFormattingItem = function (data, a
         });
     }
     var onValueChanged = function () {
-        data.measure = valuesDropDown.getValue();
+        var measureWithAggregation = getMeasureFromUniqueName(valuesDropDown.getValue());
+        data.measure = measureWithAggregation[0];
+        data.aggregation = measureWithAggregation[1];
     };
     var onFontFamilyChanged = function () {
         if (data.format != null) {
@@ -2099,7 +2193,7 @@ FlexmonsterToolbar.prototype.createConditionalFormattingItem = function (data, a
     var valuesDropDown = this.createSelect();
     valuesDropDown.classList.add("fm-values");
     if (data.measures && data.measures.length > 0) {
-        fillValuesDropDown(data.measures, data.measure);
+        fillValuesDropDown(data.measures, data.measure, data.aggregation);
     } else {
         valuesDropDown.setEnabled(false);
     }
@@ -2224,15 +2318,15 @@ FlexmonsterToolbar.prototype.showOptionsDialog = function () {
     dialog.content.classList.add("fm-popup-options");
     dialog.setTitle(this.osUtils.isMobile ? Labels.options : Labels.layout_options);
     dialog.setToolbar([{
-        id: "fm-btn-apply",
-        label: Labels.apply,
-        handler: applyHandler,
-        isPositive: true
-    },
-    {
-        id: "fm-btn-cancel",
-        label: Labels.cancel
-    }
+            id: "fm-btn-apply",
+            label: Labels.apply,
+            handler: applyHandler,
+            isPositive: true
+        },
+        {
+            id: "fm-btn-cancel",
+            label: Labels.cancel
+        }
     ], true);
 
     var content = document.createElement("div");
@@ -2348,15 +2442,15 @@ FlexmonsterToolbar.prototype.showExportPdfDialog = function () {
     var dialog = this.popupManager.createPopup();
     dialog.setTitle(Labels.choose_page_orientation);
     dialog.setToolbar([{
-        id: "fm-btn-apply",
-        label: Labels.apply,
-        handler: applyHandler,
-        isPositive: true
-    },
-    {
-        id: "fm-btn-cancel",
-        label: Labels.cancel
-    }
+            id: "fm-btn-apply",
+            label: Labels.apply,
+            handler: applyHandler,
+            isPositive: true
+        },
+        {
+            id: "fm-btn-cancel",
+            label: Labels.cancel
+        }
     ]);
 
     var content = document.createElement("div");
@@ -2531,7 +2625,7 @@ FlexmonsterToolbar.prototype.makeSelectableByKeyboard = function (element) {
         if (document.activeElement !== element) {
             return;
         }
-        if (e.which == 13 /*enter*/ || e.which == 32 /*space*/) {
+        if (e.which == 13 /*enter*/ || e.which == 32 /*space*/ ) {
             element.click();
             var el = element.querySelector("input");
             if (el) {
@@ -3068,7 +3162,7 @@ FlexmonsterToolbar.prototype.createTabMenu = function (dataProvider, parentTab)
             setActiveItemAt(e.keyCode == 40 ? _activeItemIndex + 1 : _activeItemIndex - 1);
             e.preventDefault();
         }
-        if (e.keyCode == 13 /*enter*/ || e.keyCode == 32 /*space*/) {
+        if (e.keyCode == 13 /*enter*/ || e.keyCode == 32 /*space*/ ) {
             if (_isOpen) {
                 if (_activeItemIndex >= 0) {
                     var data = dataProvider[_activeItemIndex];
@@ -3083,7 +3177,7 @@ FlexmonsterToolbar.prototype.createTabMenu = function (dataProvider, parentTab)
                 e.preventDefault();
             }
         }
-        if (_isOpen && e.keyCode == 27 /*esc*/) {
+        if (_isOpen && e.keyCode == 27 /*esc*/ ) {
             hide();
             e.stopImmediatePropagation();
         }