fixed filters increment on refresh, docs provided

Author: nikitaeverywhere

example/index.html

@@ -109,6 +109,7 @@
             , enableHeadersScrolling: true // enable scrolling both for table and headers
             //, loadingMessageHTML: "LOADING DATA..." // HTML displaying during data load
             //, conditionalFormattingOn: true // enable conditional formatting rules
+            //, defaultFilterSpecs: ["[Date].[H1].[month].&[]"] ] // default filters array
             //, drillDownTarget: "<dashboard name>" // undocumented, deepSee only
         };
 

export/LightPivotTable-DeepSeePortlet.xml

@@ -11,7 +11,7 @@
 
 <Class name="DeepSee.LightPivotTable">
 <Super>%DeepSee.Component.Portlet.abstractPortlet</Super>
-<TimeChanged>63565,62684.158342</TimeChanged>
+<TimeChanged>63565,64700.290542</TimeChanged>
 <TimeCreated>63515,61322.546099</TimeCreated>
 
 <Parameter name="INCLUDEFILES">
@@ -88,11 +88,11 @@
         // prevents refreshing twice at start
         if (!this._INITIALIZED) { this._INITIALIZED = true; return; }
 
-        this.LightPivotTable.clearFilters();
+        this.LightPivotTable.CONFIG["defaultFilterSpecs"] = [];
 
         // updateFilters
         for (var i in controller.filters) {
-            this.LightPivotTable.setFilter(controller.filters[i].spec);
+            this.LightPivotTable.CONFIG["defaultFilterSpecs"].push(controller.filters[i].spec);
         }
 
         this.LightPivotTable.refresh();
@@ -108,13 +108,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="onRefreshContents">
-<Language>javascript</Language>
-<ClientMethod>1</ClientMethod>
-<Implementation><![CDATA[    console.log("onRefreshContents", this);
-]]></Implementation>
-</Method>
-
 <Method name="InitLPT">
 <Language>javascript</Language>
 <ClientMethod>1</ClientMethod>
@@ -125,7 +118,6 @@
 
     if (!container) {
         console.error("Light pivot table: Unable to get widget with ID=" + this.id);
-        setTimeout(function () { self.onCreate.call(self); }, 1);
         return;
     }
 
@@ -146,11 +138,11 @@
         defaultFilters = [],
         exportToExcel = !!parseInt(container.getAttribute("export-csv"));
 
-        // !ultra-bydlocode (get the widget object)
+    // !ultra-bydlocode (get the widget object)
     while (widget["parent"]) {
         widget = widget["parent"];
     }
-        // !ultra-bydlocode (possible you will have better suggestions to get widget key)
+    // !ultra-bydlocode (possible you will have better suggestions to get widget key)
     widgetKey = parseInt(_.parent.parent.onwindowgrab.match(/[0-9]+/)[0]);
 
     if (exportToExcel) {
@@ -247,114 +239,6 @@
     // filtering frequent size updates as an expensive operation
     this._SIZE_ADJUST_TIMEOUT = 0;
     this._FIRST_TIME_SIZE_UPDATE = true;
-    /*var container = document.getElementById(this.id),
-        basicContainer = container,
-        self = this;
-
-    if (!container) {
-        console.error("Light pivot table: Unable to get widget with ID=" + this.id);
-        setTimeout(function () { self.onCreate.call(self); }, 1);
-        return;
-    }
-
-    for (i in container.childNodes) {
-        if (container.childNodes[i].className === "lpt-container") {
-            container = container.childNodes[i];
-            break;
-        }
-    }
-
-    var controller,
-        source,
-        setup,
-        _ = this,
-        widget = this, // It's lie. It changes later.
-        widgetKey,
-        i, info = {},
-        exportToExcel = !!parseInt(container.getAttribute("export-csv"));
-
-    if (exportToExcel) {
-        var widgetHead = document.getElementById(basicContainer.getAttribute("id").replace(/\/./, "/header"));
-        if (widgetHead) {
-            var f,
-                widgetTr = (f = function (el) {var r; if (el.tagName === "TR") return el; for (var i in el.childNodes) { r = f(el.childNodes[i]); if (r) return r; } return null; })(widgetHead);
-            if (widgetTr) {
-                var td = document.createElement("TD");
-                td.selfW = _;
-                td.setAttribute("style", "padding-right:6px;vertical-align:bottom;");
-                td.innerHTML = "<div class=\"zendiv\" onclick=\"this.parentNode.selfW.exportCSV.call(this.parentNode.selfW)\"><img class=\"imageLink\" src=\"deepsee/ds2_action_44.png\" title=\"Export to CSV format\"></div>";
-                widgetTr.appendChild(td);
-            }
-        }
-    }
-
-    var post = function (url, data, callback) {
-
-        var xhr = new XMLHttpRequest();
-        xhr.open("POST", url);
-        xhr.onreadystatechange = function () {
-            if (xhr.readyState === 4 && xhr.status === 200) {
-                callback((function () {
-                    try {
-                        return JSON.parse(xhr.responseText) || {}
-                    } catch (e) {
-                        return {
-                            error: "<h1>Unable to parse server response</h1><p>" + xhr.responseText
-                                + "</p>"
-                            };
-                    }
-                })());
-            } else if (xhr.readyState === 4 && xhr.status !== 200) {
-                callback({ error: xhr.responseText
-                    || "Error while trying to retrieve data from server." });
-            }
-        };
-        xhr.send(JSON.stringify(data));
-
-    };
-
-    setTimeout(function() { // onCreate fired when scripts are ready, but this.parent is missed.
-
-        controller = _.getConnectedController();
-
-        // !ultra-bydlocode (get the widget object)
-        while (widget["parent"]) {
-            widget = widget["parent"];
-        }
-        // !ultra-bydlocode (possible you will have better suggestions to get widget key)
-        widgetKey = parseInt(_.parent.parent.onwindowgrab.match(/[0-9]+/)[0]);
-
-        post((source = location.origin + container.getAttribute("data-source")) + "/Widgets", {
-            Dashboard: widget["dashboardName"]
-            }, function (data) {
-                if (data.error) {
-                    container.innerHTML = "<br/><br/><h3>Unable to get data from server.</h3><p>Check if data source is configured and accessible: " + source + "/Widgets" + "</p>"
-                } else {
-                    for (i in data.children) {
-                        if (data.children[i].key === widgetKey) {
-                            info = data.children[i];
-                            break;
-                        }
-                    }
-                    //console.log(info);
-                    setup = {
-                        container: container,
-                        dataSource: {
-                            pivot: info["dataSource"],
-                            MDX2JSONSource: source,
-                            basicMDX: info["mdx"]
-                        }
-                    }
-                    if (controller && controller["data"] && controller["data"]["rowCaptions"] && typeof controller["data"]["rowCaptions"][0] === "string") setup.caption = controller["data"]["rowCaptions"][0];
-                    if (controller && controller["data"] && !setup.caption) setup.caption = controller["data"]["defaultCaption"] || "";
-                    if (info["drillDownDataSource"]) setup["drillDownTarget"] = info["drillDownDataSource"];
-                    setup["showSummary"] = !!parseInt(container.getAttribute("show-summary"));
-
-                    _.LightPivotTable = new LightPivotTable(setup);
-                }
-        });
-
-    }, 0);*/
 ]]></Implementation>
 </Method>
 

readme.md

@@ -64,15 +64,17 @@ var setup = { // Object that contain settings. Any setting may be missed.
     },
     lp = new LightPivotTable(setup);
 
-console.log(lp.CONTROLS); // object with functions that can be triggered to control pivot table
+console.log(lp.CONTROLS); // object with functions that can be triggered to control pivot table:
 /* Available controls:
  * lp.CONTROLS.drillThrough() - Perform drillThrough for current location.
  * lp.CONTROLS.customDrillThrough(["filterSpec1", ...]) - Perform drillThrough with filters.
  * lp.CONTROLS.back() - Back to the parent level.
  */
 
 lp.setFilter("[DateOfSale].[Actual].[YearSold].&[2009]");
-lp.refresh();
+
+lp.refresh(); // refresh pivot contents
+lp.updateSizes(); // recalculate pivot sizes
 ```
 
 #### Caché DeepSee

source/js/DataSource.js

@@ -28,7 +28,7 @@ var DataSource = function (config, globalConfig, lpt) {
 
     this.FILTERS = [];
 
-    this.BASIC_FILTERS = [];
+    this._PIVOT_DEFAULT_FILTERS = [];
 
 };
 
@@ -130,6 +130,7 @@ DataSource.prototype.getCurrentData = function (callback) {
         var data = ready.pivotData;
 
         _.GLOBAL_CONFIG["pivotProperties"] = ready.pivotData;
+        _._PIVOT_DEFAULT_FILTERS = [];
 
         if (data["rowAxisOptions"]) {
             if (data["rowAxisOptions"]["drilldownSpec"]) {
@@ -150,7 +151,7 @@ DataSource.prototype.getCurrentData = function (callback) {
         if (data["filters"] && data["filters"].length > 0) {
             for (var i in data["filters"]) {
                 if (data["filters"][i]["spec"]) {
-                    _.BASIC_FILTERS.push(data["filters"][i]["spec"]);
+                    _._PIVOT_DEFAULT_FILTERS.push(data["filters"][i]["spec"]);
                 }
             }
         }
@@ -211,7 +212,7 @@ DataSource.prototype.getCurrentData = function (callback) {
 
     var requestData = function () {
 
-        var filters = _.BASIC_FILTERS.concat(_.FILTERS);
+        var filters = _._PIVOT_DEFAULT_FILTERS.concat(_.FILTERS);
 
         for (var i in filters) {
             mdx = mdxParser.applyFilter(mdx, filters[i]);

source/js/LightPivotTable.js

@@ -50,6 +50,7 @@ LightPivotTable.prototype.refresh = function () {
     var _  = this,
         i;
 
+    this.clearFilters();
     if (this.CONFIG["defaultFilterSpecs"] instanceof Array) {
         for (i in this.CONFIG["defaultFilterSpecs"]) {
             this.setFilter(this.CONFIG["defaultFilterSpecs"][i]);