Merge branch 'intersystems-ru/master'

Author: v23ent

example/index.html

@@ -14,7 +14,6 @@
     <script type="text/javascript" src="../source/js/DataController.js"></script>
     <script type="text/javascript" src="../source/js/MDXParser.js"></script>
     <script type="text/javascript" src="../source/js/PivotLocale.js"></script>
-    <script type="text/javascript" src="../source/js/ExcelExport.js"></script>
     <!-- endbuild -->
     <style>
         a {
@@ -115,6 +114,7 @@
                 // if cellDrillThrough callback returns boolean false, DrillThrough won't be performed.
                 //, cellDrillThrough: function ({Object { event: {event}, filters: {string[]} }}) {}
                 //, rowSelect: function (rs) { console.log("Rows: ", rs); }
+                //, contentRendered: function () { console.log("Rendered, wow!"); }
             }
             , pagination: 30 // Maximum rows number on one page (default: 200, turn off: 0)
             //, hideButtons: true // hides "back" and "drillThrough" buttons

package.json

@@ -1,7 +1,7 @@
 {
   "name": "LightPivotTable",
   "author": "ZitRo",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "A lightweight pivot table for MDX2JSON source for InterSystems Cache",
   "main": "test/testServer.js",
   "repository": {

readme.md

@@ -53,6 +53,7 @@ var setup = { // Object that contain settings. Properties in brackets can be mis
             , cellDrillThrough: function ({Object { event: {event}, filters: {string[]}, cellData: {object} }}) {}
             , responseHandler: function ({Object {url: {string}, status: {number}}}) {}
             , rowSelect: function ({Array}) {}
+            , contentRendered: function () {}
         } ]
         [ , pagination: 30 ] // Maximum rows number on one page (default: 200, turn off: 0)
         [ , hideButtons: true ] // hides "back" and "drillThrough" buttons

source/js/DataController.js

@@ -101,6 +101,7 @@ DataController.prototype.setData = function (data) {
     this.resetConditionalFormatting();
     this.resetRawData();
     this.modifyRawData(data);
+    this.postDataProcessing(data);
 
     if (data.info.mdxType === "drillthrough") {
         this.setDrillThroughHandler(function (params) {
@@ -167,6 +168,51 @@ DataController.prototype.resetDimensionProps = function () {
 
 };
 
+/**
+ * Try to recognise type by given value.
+ * @param {*} value
+ */
+DataController.prototype.getTypeByValue = function (value) {
+
+    if (!isNaN(value)) {
+        return { type: "number" };
+    } else if ((value + "").match(/[0-9]{2}\.[0-9]{2}\.[0-9]{2,4}/)) { // local date (unique case for RU)
+        return {
+            type: "date",
+            comparator: function (value) {
+                var arr = value.split(".");
+                return new Date(arr[2], arr[1], arr[0]); // day
+            }
+        };
+    } else if (Date.parse(value)) { // standard date recognized by JS
+        return {
+            type: "date",
+            comparator: function (value) {
+                return new Date(value);
+            }
+        }
+    } else {
+        return { type: "string" };
+    }
+
+};
+
+DataController.prototype.postDataProcessing = function (data) {
+
+    var cell, col;
+
+    if (!data || !data.rawData || !data.rawData[data.info.topHeaderRowsNumber]) return;
+    if (!data.columnProps) data.columnProps = [];
+
+    // Inserts pseudo-type to cell. If data.columnProps[col]["$FORMAT"].comparator is a function, then this function
+    // will be used to sort value of columns. @see DataController.sortByColumn.
+    for (col = data.info.leftHeaderColumnsNumber; cell = data.rawData[data.info.topHeaderRowsNumber][col]; col++) {
+        if (!data.columnProps[col]) data.columnProps[col] = {};
+        data.columnProps[col]["$FORMAT"] = this.getTypeByValue(cell.value);
+    }
+
+};
+
 DataController.prototype.resetConditionalFormatting = function () {
 
     var data, cs, c1, c2, arr, min, max,
@@ -568,7 +614,8 @@ DataController.prototype._trigger = function () {
 DataController.prototype.sortByColumn = function (columnIndex) {
 
     var data = this._dataStack[this._dataStack.length - 1].data,
-        totalsAttached = this.SUMMARY_SHOWN && this.controller.CONFIG["attachTotals"] ? 1 : 0;
+        totalsAttached = this.SUMMARY_SHOWN && this.controller.CONFIG["attachTotals"] ? 1 : 0,
+        comparator;
 
     if (this.SORT_STATE.column !== columnIndex) {
         order = this.SORT_STATE.order = 0;
@@ -599,11 +646,19 @@ DataController.prototype.sortByColumn = function (columnIndex) {
 
     order = -order;
 
-    newRawData.sort(function (a, b) {
-        if (b[xIndex].value > a[xIndex].value) return order;
-        if (b[xIndex].value < a[xIndex].value) return -order;
-        return 0;
-    });
+    if (typeof (comparator = ((data.columnProps[columnIndex] || {})["$FORMAT"] || {}).comparator) === "function") {
+        newRawData.sort(function (a, b) { // sort using comparator function
+            if (comparator(b[xIndex].value) > comparator(a[xIndex].value)) return order;
+            if (comparator(b[xIndex].value) < comparator(a[xIndex].value)) return -order;
+            return 0;
+        });
+    } else { // simple sort
+        newRawData.sort(function (a, b) {
+            if (b[xIndex].value > a[xIndex].value) return order;
+            if (b[xIndex].value < a[xIndex].value) return -order;
+            return 0;
+        });
+    }
 
     data.rawData = data._rawDataOrigin.slice(0, data.info.topHeaderRowsNumber)
         .concat(newRawData)

source/js/PivotView.js

@@ -1236,4 +1236,8 @@ PivotView.prototype.renderRawData = function (data) {
         setCaretPosition(this.elements.searchInput, this.savedSearch.value.length);
     }
 
+    if (typeof this.controller.CONFIG.triggers.contentRendered === "function") {
+        this.controller.CONFIG.triggers.contentRendered();
+    }
+
 };