@easyquery/enterprise 7.2.3-rc02 → 7.2.3-rc03

package/dist/bundles/easyquery.enterprise.js

@@ -898,24 +898,7 @@ var data_table_aggr_calculator_DataTableAggregatesCalculator = /** @class */ (fu
         for (var _i = 0, _a = this.aggregates; _i < _a.length; _i++) {
             var aggr = _a[_i];
             var columnTotals = levelTotals.columns[aggr.colId];
-            switch (aggr.funcId) {
-                case "SUM":
-                    groupTotals[aggr.colId] = columnTotals.sum;
-                    break;
-                case "AVG":
-                    groupTotals[aggr.colId] = columnTotals.sum / levelTotals.count;
-                    break;
-                case "COUNT":
-                case "CNTDST":
-                    groupTotals[aggr.colId] = levelTotals.count;
-                    break;
-                case "MIN":
-                    groupTotals[aggr.colId] = columnTotals.min;
-                    break;
-                case "MAX":
-                    groupTotals[aggr.colId] = columnTotals.max;
-                    break;
-            }
+            groupTotals[aggr.colId] = this.applyAggrFunc(aggr.funcId, columnTotals, levelTotals);
         }
         if (this.aggrSettings.hasRecordCount()) {
             groupTotals[this.aggrSettings.COUNT_FIELD_NAME] = levelTotals.count;
@@ -923,6 +906,21 @@ var data_table_aggr_calculator_DataTableAggregatesCalculator = /** @class */ (fu
         this.aggrContainer.updateAggregateData(levelIndex, groupKey, groupTotals);
         this.resetLevelTotals(levelTotals);
     };
+    DataTableAggregatesCalculator.prototype.applyAggrFunc = function (funcId, columnTotals, levelTotals) {
+        switch (funcId) {
+            case "SUM":
+                return columnTotals.sum;
+            case "AVG":
+                return columnTotals.sum / levelTotals.count;
+            case "COUNT":
+            case "CNTDST":
+                return levelTotals.count;
+            case "MIN":
+                return columnTotals.min;
+            case "MAX":
+                return columnTotals.max;
+        }
+    };
     /** Updates the totals by values in the current DataRow
      * and according to the specified aggregate
     */
@@ -3190,13 +3188,22 @@ var AggregationSettings = /** @class */ (function () {
     };
     //returns true if value1 == value2
     AggregationSettings.prototype.strictCompare = function (value1, value2) {
-        return value1 === value2;
+        if (value1 instanceof Date) {
+            return value1.getTime() === value2.getTime();
+        }
+        else
+            return value1 === value2;
     };
     //makes a case insensative comparision of two values and return true if there are equal
     AggregationSettings.prototype.caseInsensitiveCompare = function (value1, value2) {
-        var val1 = (typeof value1 === 'string') ? value1.toLowerCase() : value1;
-        var val2 = (typeof value2 === 'string') ? value2.toLowerCase() : value2;
-        return val1 === val2;
+        if (value1 instanceof Date) {
+            return value1.getTime() === value2.getTime();
+        }
+        else {
+            var val1 = (typeof value1 === 'string') ? value1.toLowerCase() : value1;
+            var val2 = (typeof value2 === 'string') ? value2.toLowerCase() : value2;
+            return val1 === val2;
+        }
     };
     return AggregationSettings;
 }());