npm - @webtypen/webframez-core - Versions diffs - 0.3.2 → 0.3.4 - Mend

@webtypen/webframez-core 0.3.2 → 0.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/Datatable/Datatable.js +25 -1
package/package.json +1 -1
package/src/Datatable/Datatable.ts +27 -1

package/dist/Datatable/Datatable.js CHANGED Viewed

@@ -192,11 +192,17 @@ class Datatable {
                 },
             })
                 .toArray();
+            const sumsAfter = [];
             const statsGroup = { $group: { _id: null, count: { $sum: 1 } } };
             if (req.body.sums && Object.keys(req.body.sums).length > 0) {
                 for (let key in req.body.sums) {
                     if (req.body.sums[key] && req.body.sums[key].mapping) {
-                        statsGroup.$group["sum_" + req.body.sums[key].mapping] = { $sum: "$" + req.body.sums[key].mapping };
+                        if (req.body.sums[key].afterOnRow) {
+                            statsGroup.$group["sum_" + req.body.sums[key].mapping] = { $sum: "$" + req.body.sums[key].mapping };
+                        }
+                        else {
+                            sumsAfter.push(req.body.sums[key]);
+                        }
                     }
                 }
             }
@@ -229,6 +235,21 @@ class Datatable {
                     }
                 }
             }
+            if (sumsAfter && sumsAfter.length > 0) {
+                for (let i in results) {
+                    for (let sum of sumsAfter) {
+                        if (!sums[req.body.sums[sum.mapping].mapping]) {
+                            sums[req.body.sums[sum.mapping].mapping] = Object.assign({}, req.body.sums[sum.mapping]);
+                        }
+                        sums[req.body.sums[sum.mapping].mapping] +=
+                            results[i][sum.mapping] !== null &&
+                                results[i][sum.mapping] !== undefined &&
+                                !isNaN(parseFloat(results[i][sum.mapping]))
+                                ? parseFloat(results[i][sum.mapping])
+                                : 0;
+                    }
+                }
+            }
             const data = {
                 page: page,
                 max_entries: stats && stats[0] && stats[0].count ? stats[0].count : 0,
@@ -253,6 +274,9 @@ class Datatable {
                         delete entry.skipStats;
                         aggregation.push(entry);
                     }
+                    else {
+                        aggregation.push(entry);
+                    }
                 }
             }
             const connection = yield DBConnection_1.DBConnection.getConnection();

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
     "name": "@webtypen/webframez-core",
-    "version": "0.3.2",
+    "version": "0.3.4",
     "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
     "homepage": "https://webtypen.de/",
     "license": "MIT",

package/src/Datatable/Datatable.ts CHANGED Viewed

@@ -192,11 +192,16 @@ export class Datatable {
             })
             .toArray();
+        const sumsAfter: any = [];
         const statsGroup: any = { $group: { _id: null, count: { $sum: 1 } } };
         if (req.body.sums && Object.keys(req.body.sums).length > 0) {
             for (let key in req.body.sums) {
                 if (req.body.sums[key] && req.body.sums[key].mapping) {
-                    statsGroup.$group["sum_" + req.body.sums[key].mapping] = { $sum: "$" + req.body.sums[key].mapping };
+                    if (req.body.sums[key].afterOnRow) {
+                        statsGroup.$group["sum_" + req.body.sums[key].mapping] = { $sum: "$" + req.body.sums[key].mapping };
+                    } else {
+                        sumsAfter.push(req.body.sums[key]);
+                    }
                 }
             }
         }
@@ -238,6 +243,25 @@ export class Datatable {
             }
         }
+        if (sumsAfter && sumsAfter.length > 0) {
+            for (let i in results) {
+                for (let sum of sumsAfter) {
+                    if (!sums[req.body.sums[sum.mapping].mapping]) {
+                        sums[req.body.sums[sum.mapping].mapping] = {
+                            ...req.body.sums[sum.mapping],
+                        };
+                    }
+                    sums[req.body.sums[sum.mapping].mapping] +=
+                        results[i][sum.mapping] !== null &&
+                        results[i][sum.mapping] !== undefined &&
+                        !isNaN(parseFloat(results[i][sum.mapping]))
+                            ? parseFloat(results[i][sum.mapping])
+                            : 0;
+                }
+            }
+        }
         const data = {
             page: page,
             max_entries: stats && stats[0] && stats[0].count ? stats[0].count : 0,
@@ -262,6 +286,8 @@ export class Datatable {
                 if (entry.skipStats) {
                     delete entry.skipStats;
                     aggregation.push(entry);
+                } else {
+                    aggregation.push(entry);
                 }
             }
         }