@resolveio/server-lib 9.0.32 → 9.0.34

package/methods/cron-jobs.js

@@ -1,948 +1,883 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadCronJobMethods = void 0;
-var queue_method_collection_1 = require("../collections/queue-method.collection");
-var report_builder_report_collection_1 = require("../collections/report-builder-report.collection");
-var simpl_schema_1 = require("simpl-schema");
-var common_1 = require("../util/common");
-var moment = require("moment");
-var XLSX = require("xlsx");
-var Excel = require("exceljs");
-var file_collection_1 = require("../collections/file.collection");
-function loadCronJobMethods(methodManager) {
+import { QueueMethods } from '../collections/queue-method.collection';
+import { ReportBuilderReports } from '../collections/report-builder-report.collection';
+import SimpleSchema from 'simpl-schema';
+import { mergeDeep, deepCopy } from '../util/common';
+import * as moment from 'moment';
+import * as XLSX from 'xlsx';
+import * as Excel from 'exceljs';
+import { Files } from '../collections/file.collection';
+export function loadCronJobMethods(methodManager) {
     methodManager.methods({
         methodQueue: {
             function: function () {
-                var _this = this;
-                return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                    var updateCnt;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, queue_method_collection_1.QueueMethods.countDocuments()];
-                            case 1:
-                                updateCnt = _a.sent();
-                                if (updateCnt) {
-                                    methodManager.getMainServer().getQueueManager().runMethodQueue();
-                                }
-                                resolve();
-                                return [2 /*return*/];
-                        }
-                    });
-                }); });
+                return new Promise(async (resolve, reject) => {
+                    let updateCnt = await QueueMethods.countDocuments();
+                    if (updateCnt) {
+                        methodManager.getMainServer().getQueueManager().runMethodQueue();
+                    }
+                    resolve();
+                });
             }
         },
         cronEmailMergedDocsCleanUp: {
             skipQueue: true,
             function: function () {
-                var _this = this;
-                return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                    var files;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, file_collection_1.Files.find({ $and: [{ type: 'Email Merged Docs' }, { createdAt: { $lte: moment().subtract(1, 'day').toDate() } }] })];
-                            case 1:
-                                files = _a.sent();
-                                if (files.length) {
-                                    this.callMethodInternal('deleteFiles');
-                                    file_collection_1.Files.deleteMany({ _id: { $in: files.map(function (a) { return a._id; }) } });
-                                }
-                                resolve();
-                                return [2 /*return*/];
-                        }
-                    });
-                }); });
+                return new Promise(async (resolve, reject) => {
+                    let files = await Files.find({ $and: [{ type: 'Email Merged Docs' }, { createdAt: { $lte: moment().subtract(1, 'day').toDate() } }] });
+                    if (files.length) {
+                        this.callMethodInternal('deleteFiles');
+                        Files.deleteMany({ _id: { $in: files.map(a => a._id) } });
+                    }
+                    resolve();
+                });
             }
         },
         reportbuilderCronJob: {
             skipQueue: true,
-            check: new simpl_schema_1.default({
+            check: new SimpleSchema({
                 data: {
                     type: Object,
                     blackbox: true
                 }
             }),
             function: function (data) {
-                var _this = this;
-                return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                    var report, fieldsObj_1, count_1, sortObj_1, rootOptions_1, filters_1;
-                    var _this = this;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, report_builder_report_collection_1.ReportBuilderReports.findById(data['id_report'])];
-                            case 1:
-                                report = _a.sent();
-                                report.fields_selected.forEach(function (field) {
-                                    var _a, _b;
-                                    var dotPath = field.fieldPath.replace(/\.\$/g, '');
-                                    var fieldData = dotPath.split('.');
-                                    field.fieldPathObj = null;
-                                    for (var i = fieldData.length - 1; i >= 0; i--) {
-                                        if (!field.fieldPathObj) {
-                                            field.fieldPathObj = (_a = {}, _a[fieldData[i]] = 1, _a);
+                return new Promise(async (resolve, reject) => {
+                    let report = await ReportBuilderReports.findById(data['id_report']);
+                    report.fields_selected.forEach((field) => {
+                        let dotPath = field.fieldPath.replace(/\.\$/g, '');
+                        let fieldData = dotPath.split('.');
+                        field.fieldPathObj = null;
+                        for (let i = fieldData.length - 1; i >= 0; i--) {
+                            if (!field.fieldPathObj) {
+                                field.fieldPathObj = { [fieldData[i]]: 1 };
+                            }
+                            else {
+                                field.fieldPathObj = { [fieldData[i]]: field.fieldPathObj };
+                            }
+                        }
+                    });
+                    if ((report.fields_selected && report.fields_selected.length) || (report.groups_row && report.groups_row.length)) {
+                        let fieldsObj = {};
+                        let count = 0;
+                        report.fields_selected.forEach((field) => {
+                            if (field.collection_name === report.collection_root) {
+                                fieldsObj = mergeDeep(fieldsObj, field.fieldPathObj);
+                            }
+                            let sortIndex = report.fields_sort.findIndex(a => a.field === field['id']);
+                            if (sortIndex >= 0) {
+                                report.fields_sort[sortIndex].field = ('f_' + count);
+                            }
+                            field['id'] = 'f_' + count;
+                            count += 1;
+                        });
+                        let sortObj = {};
+                        if (report.fields_sort.length) {
+                            report.fields_sort.forEach(sortField => {
+                                if (sortField.field.startsWith('gr_')) {
+                                    sortObj['_id.' + sortField.field] = (sortField.order === 'asc' ? 1 : -1);
+                                }
+                                else {
+                                    sortObj[sortField.field] = (sortField.order === 'asc' ? 1 : -1);
+                                }
+                            });
+                        }
+                        else {
+                            sortObj = null;
+                        }
+                        let rootOptions = {
+                            limit: 0,
+                            skip: 0,
+                            fields: fieldsObj,
+                            sort: sortObj
+                        };
+                        let filters = [];
+                        report.fields_filter.forEach(filterAnd => {
+                            let ors = [];
+                            filterAnd.ors.filter(a => !a.field.includes('.$.')).forEach(filter => {
+                                if (filter.condition && filter.field && ((filter.value !== null && (!Array.isArray(filter.value) || filter.value.length)) || filter.condition === 'null' || filter.condition === 'nnull')) {
+                                    if (filter.condition === 'bw') {
+                                        if (filter.fieldType === 'Date' && filter.is_rolling) {
+                                            let startDate = null;
+                                            let endDate = null;
+                                            if (filter.rolling_interval === 'Q1') {
+                                                startDate = moment().startOf('year').toDate();
+                                                endDate = moment().startOf('year').quarter(2).subtract(1, 'days').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Q2') {
+                                                startDate = moment().startOf('year').quarter(2).toDate();
+                                                endDate = moment().startOf('year').quarter(3).subtract(1, 'days').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Q3') {
+                                                startDate = moment().startOf('year').quarter(3).toDate();
+                                                endDate = moment().startOf('year').quarter(4).subtract(1, 'days').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Q4') {
+                                                startDate = moment().startOf('year').quarter(4).toDate();
+                                                endDate = moment().endOf('year').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Today') {
+                                                startDate = moment().startOf('day').toDate();
+                                                endDate = moment().endOf('day').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Yesterday') {
+                                                startDate = moment().subtract(1, 'days').startOf('day').toDate();
+                                                endDate = moment().subtract(1, 'days').endOf('day').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Week') {
+                                                startDate = moment().startOf('isoWeek').toDate();
+                                                endDate = moment().endOf('day').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Last Week') {
+                                                endDate = moment().startOf('isoWeek').subtract(1, 'days').toDate();
+                                                startDate = moment(endDate).startOf('isoWeek').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Month') {
+                                                startDate = moment().startOf('month').toDate();
+                                                endDate = moment().endOf('day').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Last Month') {
+                                                endDate = moment().startOf('month').subtract(1, 'days').endOf('day').toDate();
+                                                startDate = moment(endDate).startOf('month').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Last 30 Days') {
+                                                endDate = moment().endOf('day').toDate();
+                                                startDate = moment().subtract(30, 'days').startOf('day').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Quarter') {
+                                                startDate = moment().startOf('year').quarter(moment().quarter()).toDate();
+                                                endDate = moment().endOf('day').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Last Quarter') {
+                                                endDate = moment().startOf('year').quarter(moment().quarter()).subtract(1, 'days').endOf('day').toDate();
+                                                startDate = moment(endDate).startOf('quarter').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Year') {
+                                                startDate = moment().startOf('year').toDate();
+                                                endDate = moment().endOf('day').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'Last Year') {
+                                                endDate = moment().startOf('year').subtract(1, 'days').endOf('day').toDate();
+                                                startDate = moment(endDate).startOf('year').toDate();
+                                            }
+                                            else if (filter.rolling_interval === 'All') {
+                                                startDate = new Date(2017, 0, 1, 0, 0, 0, 0);
+                                                endDate = moment().endOf('day').toDate();
+                                            }
+                                            ors.push({ $and: [{ [filter.field]: { '$gte': startDate } }, { [filter.field]: { '$lte': endDate } }] });
                                         }
                                         else {
-                                            field.fieldPathObj = (_b = {}, _b[fieldData[i]] = field.fieldPathObj, _b);
+                                            ors.push({ $and: [{ [filter.field]: { '$gte': filter.value } }, { [filter.field]: { '$lte': filter.highValue } }] });
                                         }
                                     }
-                                });
-                                if ((report.fields_selected && report.fields_selected.length) || (report.groups_row && report.groups_row.length)) {
-                                    fieldsObj_1 = {};
-                                    count_1 = 0;
-                                    report.fields_selected.forEach(function (field) {
-                                        if (field.collection_name === report.collection_root) {
-                                            fieldsObj_1 = common_1.mergeDeep(fieldsObj_1, field.fieldPathObj);
-                                        }
-                                        var sortIndex = report.fields_sort.findIndex(function (a) { return a.field === field['id']; });
-                                        if (sortIndex >= 0) {
-                                            report.fields_sort[sortIndex].field = ('f_' + count_1);
+                                    else if (filter.condition === 'nnull') {
+                                        let and = [];
+                                        and.push({ [filter.field]: { '$exists': true } });
+                                        and.push({ [filter.field]: { '$ne': null } });
+                                        if (filter.fieldType === 'String') {
+                                            and.push({ [filter.field]: { '$ne': '' } });
                                         }
-                                        field['id'] = 'f_' + count_1;
-                                        count_1 += 1;
-                                    });
-                                    sortObj_1 = {};
-                                    if (report.fields_sort.length) {
-                                        report.fields_sort.forEach(function (sortField) {
-                                            if (sortField.field.startsWith('gr_')) {
-                                                sortObj_1['_id.' + sortField.field] = (sortField.order === 'asc' ? 1 : -1);
+                                        ors.push({ $and: and });
+                                    }
+                                    else if (filter.condition === 'null') {
+                                        ors.push({ [filter.field]: { '$eq': null } });
+                                    }
+                                    else {
+                                        if (Array.isArray(filter.value)) {
+                                            if (filter.condition === 'ne') {
+                                                let and = [];
+                                                filter.value.forEach(filt => {
+                                                    and.push({ [filter.field]: { ['$' + filter.condition]: (Array.isArray(filt) ? filt[0] : filt) } });
+                                                });
+                                                if (and.length > 1) {
+                                                    ors.push({ $and: and });
+                                                }
+                                                else {
+                                                    ors.push(and[0]);
+                                                }
                                             }
                                             else {
-                                                sortObj_1[sortField.field] = (sortField.order === 'asc' ? 1 : -1);
+                                                let or = [];
+                                                filter.value.forEach(filt => {
+                                                    or.push({ [filter.field]: { ['$' + filter.condition]: (Array.isArray(filt) ? filt[0] : filt) } });
+                                                });
+                                                if (or.length > 1) {
+                                                    ors.push({ $or: or });
+                                                }
+                                                else {
+                                                    ors.push(or[0]);
+                                                }
                                             }
-                                        });
-                                    }
-                                    else {
-                                        sortObj_1 = null;
+                                        }
+                                        else {
+                                            ors.push({ [filter.field]: { ['$' + filter.condition]: filter.value } });
+                                        }
                                     }
-                                    rootOptions_1 = {
-                                        limit: 0,
-                                        skip: 0,
-                                        fields: fieldsObj_1,
-                                        sort: sortObj_1
-                                    };
-                                    filters_1 = [];
-                                    report.fields_filter.forEach(function (filterAnd) {
-                                        var ors = [];
-                                        filterAnd.ors.filter(function (a) { return !a.field.includes('.$.'); }).forEach(function (filter) {
-                                            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-                                            if (filter.condition && filter.field && ((filter.value !== null && (!Array.isArray(filter.value) || filter.value.length)) || filter.condition === 'null' || filter.condition === 'nnull')) {
-                                                if (filter.condition === 'bw') {
-                                                    if (filter.fieldType === 'Date' && filter.is_rolling) {
-                                                        var startDate = null;
-                                                        var endDate = null;
-                                                        if (filter.rolling_interval === 'Q1') {
-                                                            startDate = moment().startOf('year').toDate();
-                                                            endDate = moment().startOf('year').quarter(2).subtract(1, 'days').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Q2') {
-                                                            startDate = moment().startOf('year').quarter(2).toDate();
-                                                            endDate = moment().startOf('year').quarter(3).subtract(1, 'days').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Q3') {
-                                                            startDate = moment().startOf('year').quarter(3).toDate();
-                                                            endDate = moment().startOf('year').quarter(4).subtract(1, 'days').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Q4') {
-                                                            startDate = moment().startOf('year').quarter(4).toDate();
-                                                            endDate = moment().endOf('year').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Today') {
-                                                            startDate = moment().startOf('day').toDate();
-                                                            endDate = moment().endOf('day').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Yesterday') {
-                                                            startDate = moment().subtract(1, 'days').startOf('day').toDate();
-                                                            endDate = moment().subtract(1, 'days').endOf('day').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Week') {
-                                                            startDate = moment().startOf('isoWeek').toDate();
-                                                            endDate = moment().endOf('day').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Last Week') {
-                                                            endDate = moment().startOf('isoWeek').subtract(1, 'days').toDate();
-                                                            startDate = moment(endDate).startOf('isoWeek').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Month') {
-                                                            startDate = moment().startOf('month').toDate();
-                                                            endDate = moment().endOf('day').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Last Month') {
-                                                            endDate = moment().startOf('month').subtract(1, 'days').endOf('day').toDate();
-                                                            startDate = moment(endDate).startOf('month').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Last 30 Days') {
-                                                            endDate = moment().endOf('day').toDate();
-                                                            startDate = moment().subtract(30, 'days').startOf('day').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Quarter') {
-                                                            startDate = moment().startOf('year').quarter(moment().quarter()).toDate();
-                                                            endDate = moment().endOf('day').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Last Quarter') {
-                                                            endDate = moment().startOf('year').quarter(moment().quarter()).subtract(1, 'days').endOf('day').toDate();
-                                                            startDate = moment(endDate).startOf('quarter').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Year') {
-                                                            startDate = moment().startOf('year').toDate();
-                                                            endDate = moment().endOf('day').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'Last Year') {
-                                                            endDate = moment().startOf('year').subtract(1, 'days').endOf('day').toDate();
-                                                            startDate = moment(endDate).startOf('year').toDate();
-                                                        }
-                                                        else if (filter.rolling_interval === 'All') {
-                                                            startDate = new Date(2017, 0, 1, 0, 0, 0, 0);
-                                                            endDate = moment().endOf('day').toDate();
-                                                        }
-                                                        ors.push({ $and: [(_a = {}, _a[filter.field] = { '$gte': startDate }, _a), (_b = {}, _b[filter.field] = { '$lte': endDate }, _b)] });
+                                }
+                            });
+                            if (ors.length) {
+                                filters.push({ $or: ors });
+                            }
+                        });
+                        this.callMethodInternal('reportBuilderBuildTree', report.collection_root, (errCollTree, collectionTree) => {
+                            if (collectionTree) {
+                                collectionTree.layers = [collectionTree];
+                                let treeLeaves = [];
+                                let allLeaves = [];
+                                getTreeLeaves(collectionTree.children, treeLeaves);
+                                getTreeLeaves(collectionTree.children, allLeaves, true);
+                                let filterArrayFields = [];
+                                let filterArrays = [];
+                                report.fields_filter.forEach(filterAnd => {
+                                    let ors = [];
+                                    filterAnd.ors.filter(a => a.field.includes('.$.')).forEach(filter => {
+                                        filterArrayFields.push(allLeaves.filter(a => a.fieldPath === filter.field)[0]);
+                                        if (filter.condition && filter.field && filter.value !== null) {
+                                            if (filter.condition === 'bw') {
+                                                if (filter.fieldType === 'Date' && filter.is_rolling) {
+                                                    let startDate = null;
+                                                    let endDate = null;
+                                                    if (filter.rolling_interval === 'Q1') {
+                                                        startDate = moment().startOf('year').toDate();
+                                                        endDate = moment().startOf('year').quarter(2).subtract(1, 'days').toDate();
                                                     }
-                                                    else {
-                                                        ors.push({ $and: [(_c = {}, _c[filter.field] = { '$gte': filter.value }, _c), (_d = {}, _d[filter.field] = { '$lte': filter.highValue }, _d)] });
+                                                    else if (filter.rolling_interval === 'Q2') {
+                                                        startDate = moment().startOf('year').quarter(2).toDate();
+                                                        endDate = moment().startOf('year').quarter(3).subtract(1, 'days').toDate();
                                                     }
-                                                }
-                                                else if (filter.condition === 'nnull') {
-                                                    var and = [];
-                                                    and.push((_e = {}, _e[filter.field] = { '$exists': true }, _e));
-                                                    and.push((_f = {}, _f[filter.field] = { '$ne': null }, _f));
-                                                    if (filter.fieldType === 'String') {
-                                                        and.push((_g = {}, _g[filter.field] = { '$ne': '' }, _g));
+                                                    else if (filter.rolling_interval === 'Q3') {
+                                                        startDate = moment().startOf('year').quarter(3).toDate();
+                                                        endDate = moment().startOf('year').quarter(4).subtract(1, 'days').toDate();
                                                     }
-                                                    ors.push({ $and: and });
-                                                }
-                                                else if (filter.condition === 'null') {
-                                                    ors.push((_h = {}, _h[filter.field] = { '$eq': null }, _h));
+                                                    else if (filter.rolling_interval === 'Q4') {
+                                                        startDate = moment().startOf('year').quarter(4).toDate();
+                                                        endDate = moment().endOf('year').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Today') {
+                                                        startDate = moment().startOf('day').toDate();
+                                                        endDate = moment().endOf('day').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Yesterday') {
+                                                        startDate = moment().subtract(1, 'days').startOf('day').toDate();
+                                                        endDate = moment().subtract(1, 'days').endOf('day').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Week') {
+                                                        startDate = moment().startOf('isoWeek').toDate();
+                                                        endDate = moment().endOf('day').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Last Week') {
+                                                        endDate = moment().startOf('isoWeek').subtract(1, 'days').toDate();
+                                                        startDate = moment(endDate).startOf('isoWeek').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Month') {
+                                                        startDate = moment().startOf('month').toDate();
+                                                        endDate = moment().endOf('day').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Last Month') {
+                                                        endDate = moment().startOf('month').subtract(1, 'days').endOf('day').toDate();
+                                                        startDate = moment(endDate).startOf('month').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Last 30 Days') {
+                                                        endDate = moment().endOf('day').toDate();
+                                                        startDate = moment().subtract(30, 'days').startOf('day').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Quarter') {
+                                                        startDate = moment().startOf('year').quarter(moment().quarter()).toDate();
+                                                        endDate = moment().endOf('day').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Last Quarter') {
+                                                        endDate = moment().startOf('year').quarter(moment().quarter()).subtract(1, 'days').endOf('day').toDate();
+                                                        startDate = moment(endDate).startOf('quarter').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Year') {
+                                                        startDate = moment().startOf('year').toDate();
+                                                        endDate = moment().endOf('day').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'Last Year') {
+                                                        endDate = moment().startOf('year').subtract(1, 'days').endOf('day').toDate();
+                                                        startDate = moment(endDate).startOf('year').toDate();
+                                                    }
+                                                    else if (filter.rolling_interval === 'All') {
+                                                        startDate = new Date(2017, 0, 1, 0, 0, 0, 0);
+                                                        endDate = moment().endOf('day').toDate();
+                                                    }
+                                                    ors.push({ $and: [{ [filter.field]: { '$gte': startDate } }, { [filter.field]: { '$lte': endDate } }] });
                                                 }
                                                 else {
-                                                    if (Array.isArray(filter.value)) {
-                                                        if (filter.condition === 'ne') {
-                                                            var and_1 = [];
-                                                            filter.value.forEach(function (filt) {
-                                                                var _a, _b;
-                                                                and_1.push((_a = {}, _a[filter.field] = (_b = {}, _b['$' + filter.condition] = (Array.isArray(filt) ? filt[0] : filt), _b), _a));
-                                                            });
-                                                            if (and_1.length > 1) {
-                                                                ors.push({ $and: and_1 });
-                                                            }
-                                                            else {
-                                                                ors.push(and_1[0]);
-                                                            }
+                                                    filterArrays.push({ $and: [{ [filter.field]: { '$gte': filter.value } }, { [filter.field]: { '$lte': filter.highValue } }] });
+                                                }
+                                            }
+                                            else if (filter.condition === 'nnull') {
+                                                let and = [];
+                                                and.push({ [filter.field.replace(/\.\$/g, '')]: { '$exists': true } });
+                                                and.push({ [filter.field.replace(/\.\$/g, '')]: { '$ne': null } });
+                                                if (filter.fieldType === 'String') {
+                                                    and.push({ [filter.field.replace(/\.\$/g, '')]: { '$ne': '' } });
+                                                }
+                                                ors.push({ $and: and });
+                                            }
+                                            else if (filter.condition === 'null') {
+                                                ors.push({ [filter.field.replace(/\.\$/g, '')]: { '$eq': null } });
+                                            }
+                                            else {
+                                                if (Array.isArray(filter.value)) {
+                                                    if (filter.condition === 'ne') {
+                                                        let and = [];
+                                                        filter.value.forEach(filt => {
+                                                            and.push({ [filter.field.replace(/\.\$/g, '')]: { ['$' + filter.condition]: (Array.isArray(filt) ? filt[0] : filt) } });
+                                                        });
+                                                        if (and.length > 1) {
+                                                            ors.push({ $and: and });
                                                         }
                                                         else {
-                                                            var or_1 = [];
-                                                            filter.value.forEach(function (filt) {
-                                                                var _a, _b;
-                                                                or_1.push((_a = {}, _a[filter.field] = (_b = {}, _b['$' + filter.condition] = (Array.isArray(filt) ? filt[0] : filt), _b), _a));
-                                                            });
-                                                            if (or_1.length > 1) {
-                                                                ors.push({ $or: or_1 });
-                                                            }
-                                                            else {
-                                                                ors.push(or_1[0]);
-                                                            }
+                                                            ors.push(and[0]);
                                                         }
                                                     }
                                                     else {
-                                                        ors.push((_j = {}, _j[filter.field] = (_k = {}, _k['$' + filter.condition] = filter.value, _k), _j));
+                                                        let or = [];
+                                                        filter.value.forEach(filt => {
+                                                            or.push({ [filter.field.replace(/\.\$/g, '')]: { ['$' + filter.condition]: (Array.isArray(filt) ? filt[0] : filt) } });
+                                                        });
+                                                        if (or.length > 1) {
+                                                            ors.push({ $or: or });
+                                                        }
+                                                        else {
+                                                            ors.push(or[0]);
+                                                        }
                                                     }
                                                 }
+                                                else {
+                                                    ors.push({ [filter.field.replace(/\.\$/g, '')]: { ['$' + filter.condition]: filter.value } });
+                                                }
                                             }
-                                        });
-                                        if (ors.length) {
-                                            filters_1.push({ $or: ors });
                                         }
                                     });
-                                    this.callMethodInternal('reportBuilderBuildTree', report.collection_root, function (errCollTree, collectionTree) {
-                                        if (collectionTree) {
-                                            collectionTree.layers = [collectionTree];
-                                            var treeLeaves = [];
-                                            var allLeaves_1 = [];
-                                            getTreeLeaves(collectionTree.children, treeLeaves);
-                                            getTreeLeaves(collectionTree.children, allLeaves_1, true);
-                                            var filterArrayFields_1 = [];
-                                            var filterArrays_1 = [];
-                                            report.fields_filter.forEach(function (filterAnd) {
-                                                var ors = [];
-                                                filterAnd.ors.filter(function (a) { return a.field.includes('.$.'); }).forEach(function (filter) {
-                                                    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-                                                    filterArrayFields_1.push(allLeaves_1.filter(function (a) { return a.fieldPath === filter.field; })[0]);
-                                                    if (filter.condition && filter.field && filter.value !== null) {
-                                                        if (filter.condition === 'bw') {
-                                                            if (filter.fieldType === 'Date' && filter.is_rolling) {
-                                                                var startDate = null;
-                                                                var endDate = null;
-                                                                if (filter.rolling_interval === 'Q1') {
-                                                                    startDate = moment().startOf('year').toDate();
-                                                                    endDate = moment().startOf('year').quarter(2).subtract(1, 'days').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Q2') {
-                                                                    startDate = moment().startOf('year').quarter(2).toDate();
-                                                                    endDate = moment().startOf('year').quarter(3).subtract(1, 'days').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Q3') {
-                                                                    startDate = moment().startOf('year').quarter(3).toDate();
-                                                                    endDate = moment().startOf('year').quarter(4).subtract(1, 'days').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Q4') {
-                                                                    startDate = moment().startOf('year').quarter(4).toDate();
-                                                                    endDate = moment().endOf('year').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Today') {
-                                                                    startDate = moment().startOf('day').toDate();
-                                                                    endDate = moment().endOf('day').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Yesterday') {
-                                                                    startDate = moment().subtract(1, 'days').startOf('day').toDate();
-                                                                    endDate = moment().subtract(1, 'days').endOf('day').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Week') {
-                                                                    startDate = moment().startOf('isoWeek').toDate();
-                                                                    endDate = moment().endOf('day').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Last Week') {
-                                                                    endDate = moment().startOf('isoWeek').subtract(1, 'days').toDate();
-                                                                    startDate = moment(endDate).startOf('isoWeek').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Month') {
-                                                                    startDate = moment().startOf('month').toDate();
-                                                                    endDate = moment().endOf('day').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Last Month') {
-                                                                    endDate = moment().startOf('month').subtract(1, 'days').endOf('day').toDate();
-                                                                    startDate = moment(endDate).startOf('month').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Last 30 Days') {
-                                                                    endDate = moment().endOf('day').toDate();
-                                                                    startDate = moment().subtract(30, 'days').startOf('day').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Quarter') {
-                                                                    startDate = moment().startOf('year').quarter(moment().quarter()).toDate();
-                                                                    endDate = moment().endOf('day').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Last Quarter') {
-                                                                    endDate = moment().startOf('year').quarter(moment().quarter()).subtract(1, 'days').endOf('day').toDate();
-                                                                    startDate = moment(endDate).startOf('quarter').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Year') {
-                                                                    startDate = moment().startOf('year').toDate();
-                                                                    endDate = moment().endOf('day').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'Last Year') {
-                                                                    endDate = moment().startOf('year').subtract(1, 'days').endOf('day').toDate();
-                                                                    startDate = moment(endDate).startOf('year').toDate();
-                                                                }
-                                                                else if (filter.rolling_interval === 'All') {
-                                                                    startDate = new Date(2017, 0, 1, 0, 0, 0, 0);
-                                                                    endDate = moment().endOf('day').toDate();
-                                                                }
-                                                                ors.push({ $and: [(_a = {}, _a[filter.field] = { '$gte': startDate }, _a), (_b = {}, _b[filter.field] = { '$lte': endDate }, _b)] });
-                                                            }
-                                                            else {
-                                                                filterArrays_1.push({ $and: [(_c = {}, _c[filter.field] = { '$gte': filter.value }, _c), (_d = {}, _d[filter.field] = { '$lte': filter.highValue }, _d)] });
-                                                            }
+                                    if (ors.length) {
+                                        filterArrays.push({ $or: ors });
+                                    }
+                                });
+                                this.callMethodInternal('reportBuilderGetResults', report.type, report.collection_root, rootOptions, filters, filterArrays, filterArrayFields, report.fields_selected, report.fields_custom, report.groups_row, report.fields_total, report.fields_link, report.id_date_field || null, report.date_interval || null, report.group_type, (err, res) => {
+                                    if (res && res[0]) {
+                                        let results = res[0].results;
+                                        let reportTotals = res[0].totals;
+                                        if (report.type === 'List') {
+                                            report.fields_selected.filter(a => a.show).forEach(field => {
+                                                if ((field.fieldType === 'Number' || field.leafValueType === 'Count') && field.leafFormatType === 'Number') {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = result[field.id].toLocaleString();
+                                                    });
+                                                }
+                                                else if ((field.fieldType === 'Number' || field.leafValueType === 'Count') && field.leafFormatType === 'String') {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = result[field.id].toLocaleString('en-US', { style: 'currency', currency: 'USD' });
+                                                    });
+                                                }
+                                                else if ((field.fieldType === 'Number' || field.leafValueType === 'Count') && field.leafFormatType === 'Currency') {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = result[field.id].toLocaleString('en-US', { style: 'currency', currency: 'USD' });
+                                                    });
+                                                }
+                                                else if (field.fieldType === 'Boolean' && (!field.leafFormatType || field.leafFormatType === 'Boolean')) {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = result[field.id] === true ? 'True' : 'False';
+                                                    });
+                                                }
+                                                else if (field.fieldType === 'Boolean' && field.leafFormatType === 'String') {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = result[field.id] === true ? 'Yes' : 'No';
+                                                    });
+                                                }
+                                                else if (field.fieldType === 'Boolean' && field.leafFormatType === 'Boolean_Number') {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = result[field.id] === true ? 1 : 0;
+                                                    });
+                                                }
+                                                else if (field.fieldType === 'Date' && (field.leafFormatType === 'Date')) {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = moment(result[field.id]).format('L');
+                                                    });
+                                                }
+                                                else if (field.fieldType === 'Date' && field.leafFormatType === 'Time') {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = moment(result[field.id]).format('LT');
+                                                    });
+                                                }
+                                                else if (field.fieldType === 'Date' && field.leafFormatType === 'DateTime') {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = moment(result[field.id]).format('MM/DD/YYYY h:mm A');
+                                                    });
+                                                }
+                                                else if (field.fieldType === 'Date' && field.leafFormatType === 'Date_long') {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = moment(result[field.id]).format('LL');
+                                                    });
+                                                }
+                                                else if (field.fieldType === 'Date' && field.leafFormatType === 'DateTime_long') {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = moment(result[field.id]).format('LLL');
+                                                    });
+                                                }
+                                                else if (field.fieldType === 'Date' && field.leafFormatType === 'Timestamp') {
+                                                    results.filter(a => a[field.id] !== null && a[field.id] !== undefined).forEach(result => {
+                                                        result[field.id] = moment(result[field.id]).toDate().getTime();
+                                                    });
+                                                }
+                                            });
+                                            let lines = [];
+                                            let tmpHeaders = {};
+                                            report.groups_row.forEach(group => {
+                                                tmpHeaders[group.id] = group.columnName;
+                                            });
+                                            report.fields_selected.filter(a => a.show).forEach(header => {
+                                                tmpHeaders[header.columnName] = header.columnName;
+                                            });
+                                            let wb = XLSX.utils.book_new();
+                                            results.forEach(result => {
+                                                let tmp = {};
+                                                report.groups_row.forEach(group => {
+                                                    if (Array.isArray(result._id[group.id])) {
+                                                        tmp[group.columnName] = result._id[group.id].join(',');
+                                                    }
+                                                    else {
+                                                        if (group.treeItem.fieldType === 'Number') {
+                                                            tmp[group.columnName] = result._id[group.id] ? (typeof (result._id[group.id]) === 'string' ? parseFloat(result._id[group.id].replace(/,/g, '').replace(/\$/g, '')) : result._id[group.id]) : '';
                                                         }
-                                                        else if (filter.condition === 'nnull') {
-                                                            var and = [];
-                                                            and.push((_e = {}, _e[filter.field.replace(/\.\$/g, '')] = { '$exists': true }, _e));
-                                                            and.push((_f = {}, _f[filter.field.replace(/\.\$/g, '')] = { '$ne': null }, _f));
-                                                            if (filter.fieldType === 'String') {
-                                                                and.push((_g = {}, _g[filter.field.replace(/\.\$/g, '')] = { '$ne': '' }, _g));
-                                                            }
-                                                            ors.push({ $and: and });
+                                                        else {
+                                                            tmp[group.columnName] = result._id[group.id] || '';
                                                         }
-                                                        else if (filter.condition === 'null') {
-                                                            ors.push((_h = {}, _h[filter.field.replace(/\.\$/g, '')] = { '$eq': null }, _h));
+                                                    }
+                                                });
+                                                report.fields_selected.filter(a => a.show).forEach(header => {
+                                                    if (Array.isArray(result[header.id])) {
+                                                        tmp[header.columnName] = result[header.id].join(',');
+                                                    }
+                                                    else {
+                                                        if (header.fieldType === 'Number' || header.leafValueType === 'Count') {
+                                                            tmp[header.columnName] = result[header.id] ? (typeof (result[header.id]) === 'string' ? parseFloat(result[header.id].replace(/,/g, '').replace(/\$/g, '')) : result[header.id]) : '';
                                                         }
                                                         else {
-                                                            if (Array.isArray(filter.value)) {
-                                                                if (filter.condition === 'ne') {
-                                                                    var and_2 = [];
-                                                                    filter.value.forEach(function (filt) {
-                                                                        var _a, _b;
-                                                                        and_2.push((_a = {}, _a[filter.field.replace(/\.\$/g, '')] = (_b = {}, _b['$' + filter.condition] = (Array.isArray(filt) ? filt[0] : filt), _b), _a));
-                                                                    });
-                                                                    if (and_2.length > 1) {
-                                                                        ors.push({ $and: and_2 });
-                                                                    }
-                                                                    else {
-                                                                        ors.push(and_2[0]);
-                                                                    }
-                                                                }
-                                                                else {
-                                                                    var or_2 = [];
-                                                                    filter.value.forEach(function (filt) {
-                                                                        var _a, _b;
-                                                                        or_2.push((_a = {}, _a[filter.field.replace(/\.\$/g, '')] = (_b = {}, _b['$' + filter.condition] = (Array.isArray(filt) ? filt[0] : filt), _b), _a));
-                                                                    });
-                                                                    if (or_2.length > 1) {
-                                                                        ors.push({ $or: or_2 });
-                                                                    }
-                                                                    else {
-                                                                        ors.push(or_2[0]);
-                                                                    }
-                                                                }
-                                                            }
-                                                            else {
-                                                                ors.push((_j = {}, _j[filter.field.replace(/\.\$/g, '')] = (_k = {}, _k['$' + filter.condition] = filter.value, _k), _j));
-                                                            }
+                                                            tmp[header.columnName] = result[header.id] || '';
+                                                        }
+                                                    }
+                                                });
+                                                lines.push(tmp);
+                                            });
+                                            let ws = XLSX.utils.json_to_sheet(lines);
+                                            XLSX.utils.book_append_sheet(wb, ws, 'RB Data');
+                                            let wbout = XLSX.write(wb, { bookType: 'xlsx', type: 'base64' });
+                                            data['emails'].forEach(email => {
+                                                this.sendEmail(email, this.serverConfig['CLIENT_NAME'] + ' Scheduled Report - ' + report.report_name, '', `
+												<b>` + this.serverConfig['CLIENT_NAME'] + ` Automated Report</b><br>
+												<b>Report Name: </b>` + report.report_name + `<br>
+												<b>Prepared By: </b>` + data['user'] + `<br><br>
+												Attached are the results of this automated report.<br><br>
+												ResolveIO<br><br>`, [
+                                                    {
+                                                        filename: report.report_name + '-' + moment().format('MM-DD-YYYY-hh-mm-A') + '.xlsx',
+                                                        content: wbout,
+                                                        encoding: 'base64'
+                                                    }
+                                                ], this.serverConfig['MAIL_FROM_REPORTS']);
+                                            });
+                                        }
+                                        else if (report.type === 'Group') {
+                                            report.fields_selected.filter(a => a.show).forEach(field => {
+                                                results.forEach(result => {
+                                                    modifyDataTypeField(report, result, field, 1);
+                                                });
+                                            });
+                                            let wb = new Excel.Workbook();
+                                            let ws = wb.addWorksheet('RB_1', { views: [{ showGridLines: false }] });
+                                            wb.properties.date1904 = false;
+                                            wb.calcProperties.fullCalcOnLoad = true;
+                                            let currentRow = 1;
+                                            let row = ws.getRow(currentRow);
+                                            row.getCell(2).font = {
+                                                name: 'Arial',
+                                                bold: true,
+                                                size: 14
+                                            };
+                                            row.getCell(4).font = {
+                                                name: 'Arial',
+                                                size: 14
+                                            };
+                                            row.getCell(2).value = 'Report Name:';
+                                            row.getCell(4).value = report.report_name;
+                                            currentRow += 1;
+                                            row = ws.getRow(currentRow);
+                                            row.getCell(2).font = {
+                                                name: 'Arial',
+                                                bold: true,
+                                                size: 14
+                                            };
+                                            row.getCell(4).font = {
+                                                name: 'Arial',
+                                                size: 14
+                                            };
+                                            row.getCell(2).value = 'Run Date:';
+                                            row.getCell(4).value = moment().format('LLL');
+                                            currentRow += 2;
+                                            let copy = deepCopy(results);
+                                            let widths = [];
+                                            copy.forEach(res => {
+                                                currentRow = tabGroupExcelRecursive(report, ws, currentRow, 1, res);
+                                                tabGroupExcelWidthRecursive(report, 1, res, widths);
+                                            });
+                                            for (let i = 1; i < ws.columns.length; i++) {
+                                                ws.columns[i].width = widths[i - 1];
+                                            }
+                                            let now = new Date();
+                                            wb.xlsx.writeBuffer().then(buffer => {
+                                                data['emails'].forEach(email => {
+                                                    this.sendEmail(email, this.serverConfig['CLIENT_NAME'] + ' Scheduled Report - ' + report.report_name, '', `
+													<b>` + this.serverConfig['CLIENT_NAME'] + ` Automated Report</b><br>
+													<b>Report Name: </b>` + report.report_name + `<br>
+													<b>Prepared By: </b>` + data['user'] + `<br><br>
+													Attached are the results of this automated report.<br><br>
+													Have a great day!<br><br>
+													ResolveIO<br><br>`, [
+                                                        {
+                                                            filename: 'Group_Report_' + report.report_name + '_' + now.getFullYear() + '_' + (now.getMonth() + 1) + '_' + now.getDate() + '.xlsx',
+                                                            content: buffer
                                                         }
+                                                    ], this.serverConfig['MAIL_FROM_REPORTS']);
+                                                });
+                                            }).catch(err => console.log('Error writing excel export', err));
+                                        }
+                                        else if (report.type === 'Dated') {
+                                            let lines = [];
+                                            let tmpHeaders = {};
+                                            report.groups_row.forEach(group => {
+                                                tmpHeaders[group.id] = group.columnName;
+                                            });
+                                            tmpHeaders[''] = '';
+                                            let datedUniqueDates = [];
+                                            let datedUniqueGroups = [];
+                                            if (report.date_interval === 'Quarterly') {
+                                                results.forEach(dataPt => {
+                                                    if (dataPt._id.month < 4) {
+                                                        dataPt._id.quarter = 1;
+                                                    }
+                                                    else if (dataPt._id.month < 7) {
+                                                        dataPt._id.quarter = 2;
                                                     }
+                                                    else if (dataPt._id.month < 10) {
+                                                        dataPt._id.quarter = 3;
+                                                    }
+                                                    else {
+                                                        dataPt._id.quarter = 4;
+                                                    }
+                                                    delete dataPt._id.month;
                                                 });
-                                                if (ors.length) {
-                                                    filterArrays_1.push({ $or: ors });
+                                                for (let i = results.length - 1; i >= 1; i--) {
+                                                    let dataPt = results[i];
+                                                    if (results.filter(a => JSON.stringify(a._id) === JSON.stringify(dataPt._id)).length > 1) {
+                                                        let tmpData = results.filter(a => JSON.stringify(a._id) === JSON.stringify(dataPt._id))[0];
+                                                        Object.keys(tmpData).filter(a => a !== '_id').forEach(key => {
+                                                            tmpData[key] += dataPt[key];
+                                                        });
+                                                        results.splice(i, 1);
+                                                    }
+                                                }
+                                            }
+                                            let tmpResults = deepCopy(results);
+                                            tmpResults.forEach(result => {
+                                                delete result._id.day;
+                                                delete result._id.week;
+                                                delete result._id.month;
+                                                delete result._id.quarter;
+                                                delete result._id.year;
+                                                let tmp = {};
+                                                Object.keys(result._id).forEach(key => {
+                                                    tmp[key] = result._id[key];
+                                                });
+                                                if (!datedUniqueGroups.filter(a => JSON.stringify(a) === JSON.stringify(tmp)).length) {
+                                                    datedUniqueGroups.push(tmp);
                                                 }
                                             });
-                                            _this.callMethodInternal('reportBuilderGetResults', report.type, report.collection_root, rootOptions_1, filters_1, filterArrays_1, filterArrayFields_1, report.fields_selected, report.fields_custom, report.groups_row, report.fields_total, report.fields_link, report.id_date_field || null, report.date_interval || null, report.group_type, function (err, res) {
-                                                if (res && res[0]) {
-                                                    var results_1 = res[0].results;
-                                                    var reportTotals = res[0].totals;
-                                                    if (report.type === 'List') {
-                                                        report.fields_selected.filter(function (a) { return a.show; }).forEach(function (field) {
-                                                            if ((field.fieldType === 'Number' || field.leafValueType === 'Count') && field.leafFormatType === 'Number') {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = result[field.id].toLocaleString();
-                                                                });
-                                                            }
-                                                            else if ((field.fieldType === 'Number' || field.leafValueType === 'Count') && field.leafFormatType === 'String') {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = result[field.id].toLocaleString('en-US', { style: 'currency', currency: 'USD' });
-                                                                });
-                                                            }
-                                                            else if ((field.fieldType === 'Number' || field.leafValueType === 'Count') && field.leafFormatType === 'Currency') {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = result[field.id].toLocaleString('en-US', { style: 'currency', currency: 'USD' });
-                                                                });
-                                                            }
-                                                            else if (field.fieldType === 'Boolean' && (!field.leafFormatType || field.leafFormatType === 'Boolean')) {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = result[field.id] === true ? 'True' : 'False';
-                                                                });
-                                                            }
-                                                            else if (field.fieldType === 'Boolean' && field.leafFormatType === 'String') {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = result[field.id] === true ? 'Yes' : 'No';
-                                                                });
-                                                            }
-                                                            else if (field.fieldType === 'Boolean' && field.leafFormatType === 'Boolean_Number') {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = result[field.id] === true ? 1 : 0;
-                                                                });
-                                                            }
-                                                            else if (field.fieldType === 'Date' && (field.leafFormatType === 'Date')) {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = moment(result[field.id]).format('L');
-                                                                });
-                                                            }
-                                                            else if (field.fieldType === 'Date' && field.leafFormatType === 'Time') {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = moment(result[field.id]).format('LT');
-                                                                });
-                                                            }
-                                                            else if (field.fieldType === 'Date' && field.leafFormatType === 'DateTime') {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = moment(result[field.id]).format('MM/DD/YYYY h:mm A');
-                                                                });
-                                                            }
-                                                            else if (field.fieldType === 'Date' && field.leafFormatType === 'Date_long') {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = moment(result[field.id]).format('LL');
-                                                                });
-                                                            }
-                                                            else if (field.fieldType === 'Date' && field.leafFormatType === 'DateTime_long') {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = moment(result[field.id]).format('LLL');
-                                                                });
-                                                            }
-                                                            else if (field.fieldType === 'Date' && field.leafFormatType === 'Timestamp') {
-                                                                results_1.filter(function (a) { return a[field.id] !== null && a[field.id] !== undefined; }).forEach(function (result) {
-                                                                    result[field.id] = moment(result[field.id]).toDate().getTime();
-                                                                });
+                                            tmpResults = deepCopy(results);
+                                            tmpResults.forEach(result => {
+                                                Object.keys(result._id).filter(a => a !== 'day' && a !== 'week' && a !== 'month' && a !== 'quarter' && a !== 'year').forEach(key => {
+                                                    delete result._id[key];
+                                                });
+                                                let tmp = {};
+                                                Object.keys(result._id).forEach(key => {
+                                                    tmp[key] = result._id[key];
+                                                });
+                                                if (!datedUniqueDates.filter(a => JSON.stringify(a) === JSON.stringify(tmp)).length) {
+                                                    datedUniqueDates.push(tmp);
+                                                }
+                                            });
+                                            datedUniqueDates.forEach(result => {
+                                                if (!result.year) {
+                                                    result.dateString = 'No Date';
+                                                }
+                                                else {
+                                                    if (report.date_interval === 'Daily') {
+                                                        result.date = new Date(result.year, result.month - 1, result.day, 0, 0, 0, 0);
+                                                        result.dateString = moment(result.date).format('MMM DD YYYY');
+                                                    }
+                                                    else if (report.date_interval === 'Weekly') {
+                                                        result.date = moment().day('Monday').isoWeekYear(result.year).isoWeek(result.week).toDate();
+                                                        result.dateLast = moment().day('Sunday').isoWeekYear(result.year).isoWeek(result.week).toDate();
+                                                        result.dateString = 'Week #' + result.week + ' ' + result.year + '(' + moment(result.date).format('MM/DD/YY') + ' - ' + moment(result.dateLast).format('MM/DD/YY') + ')';
+                                                    }
+                                                    else if (report.date_interval === 'Monthly') {
+                                                        result.date = new Date(result.year, result.month - 1, 1, 0, 0, 0, 0);
+                                                        result.dateString = moment(result.date).format('MMM YYYY');
+                                                    }
+                                                    else if (report.date_interval === 'Quarterly') {
+                                                        result.date = moment().quarter(result.quarter).year(result.year).toDate();
+                                                        result.dateString = 'Q' + result.quarter + ' ' + result.year;
+                                                    }
+                                                    else if (report.date_interval === 'Yearly') {
+                                                        result.date = new Date(result.year);
+                                                        result.dateString = result.year.toString();
+                                                    }
+                                                }
+                                            });
+                                            datedUniqueDates = datedUniqueDates.filter(a => !a.date).concat(datedUniqueDates.filter(a => a.date).sort((a, b) => a.date.getTime() - b.date.getTime()));
+                                            let reportTotalGroups = [];
+                                            let reportTotalDates = [];
+                                            let datedData = [];
+                                            datedUniqueDates.forEach(date => {
+                                                let tmpData = [];
+                                                let tmpTotalDated = {};
+                                                let tmpTotalCnt = {};
+                                                let tmpTotalType = {};
+                                                datedUniqueGroups.forEach(group => {
+                                                    let result = results.filter(a => {
+                                                        let res = true;
+                                                        Object.keys(date).filter(a => a !== 'date' && a !== 'dateLast' && a !== 'dateString').forEach(key => {
+                                                            if (a._id[key] !== date[key]) {
+                                                                res = false;
                                                             }
                                                         });
-                                                        var lines_1 = [];
-                                                        var tmpHeaders_1 = {};
-                                                        report.groups_row.forEach(function (group) {
-                                                            tmpHeaders_1[group.id] = group.columnName;
-                                                        });
-                                                        report.fields_selected.filter(function (a) { return a.show; }).forEach(function (header) {
-                                                            tmpHeaders_1[header.columnName] = header.columnName;
+                                                        Object.keys(group).forEach(key => {
+                                                            if (a._id[key] !== group[key]) {
+                                                                res = false;
+                                                            }
                                                         });
-                                                        var wb = XLSX.utils.book_new();
-                                                        results_1.forEach(function (result) {
-                                                            var tmp = {};
-                                                            report.groups_row.forEach(function (group) {
-                                                                if (Array.isArray(result._id[group.id])) {
-                                                                    tmp[group.columnName] = result._id[group.id].join(',');
+                                                        return res;
+                                                    })[0];
+                                                    if (result) {
+                                                        tmpData.push(result);
+                                                        Object.keys(result._id).filter(a => a).forEach(key => {
+                                                            if (report.fields_total.filter(a => a.fields.includes(key)).length) {
+                                                                if (!tmpTotalDated[key]) {
+                                                                    tmpTotalDated[key] = result._id[key];
                                                                 }
                                                                 else {
-                                                                    if (group.treeItem.fieldType === 'Number') {
-                                                                        tmp[group.columnName] = result._id[group.id] ? (typeof (result._id[group.id]) === 'string' ? parseFloat(result._id[group.id].replace(/,/g, '').replace(/\$/g, '')) : result._id[group.id]) : '';
-                                                                    }
-                                                                    else {
-                                                                        tmp[group.columnName] = result._id[group.id] || '';
-                                                                    }
+                                                                    tmpTotalDated[key] += result._id[key];
                                                                 }
-                                                            });
-                                                            report.fields_selected.filter(function (a) { return a.show; }).forEach(function (header) {
-                                                                if (Array.isArray(result[header.id])) {
-                                                                    tmp[header.columnName] = result[header.id].join(',');
+                                                                if (!tmpTotalCnt[key]) {
+                                                                    tmpTotalCnt[key] = 1;
                                                                 }
                                                                 else {
-                                                                    if (header.fieldType === 'Number' || header.leafValueType === 'Count') {
-                                                                        tmp[header.columnName] = result[header.id] ? (typeof (result[header.id]) === 'string' ? parseFloat(result[header.id].replace(/,/g, '').replace(/\$/g, '')) : result[header.id]) : '';
-                                                                    }
-                                                                    else {
-                                                                        tmp[header.columnName] = result[header.id] || '';
-                                                                    }
-                                                                }
-                                                            });
-                                                            lines_1.push(tmp);
-                                                        });
-                                                        var ws = XLSX.utils.json_to_sheet(lines_1);
-                                                        XLSX.utils.book_append_sheet(wb, ws, 'RB Data');
-                                                        var wbout_1 = XLSX.write(wb, { bookType: 'xlsx', type: 'base64' });
-                                                        data['emails'].forEach(function (email) {
-                                                            _this.sendEmail(email, _this.serverConfig['CLIENT_NAME'] + ' Scheduled Report - ' + report.report_name, '', "\n\t\t\t\t\t\t\t\t\t\t\t\t<b>" + _this.serverConfig['CLIENT_NAME'] + " Automated Report</b><br>\n\t\t\t\t\t\t\t\t\t\t\t\t<b>Report Name: </b>" + report.report_name + "<br>\n\t\t\t\t\t\t\t\t\t\t\t\t<b>Prepared By: </b>" + data['user'] + "<br><br>\n\t\t\t\t\t\t\t\t\t\t\t\tAttached are the results of this automated report.<br><br>\n\t\t\t\t\t\t\t\t\t\t\t\tResolveIO<br><br>", [
-                                                                {
-                                                                    filename: report.report_name + '-' + moment().format('MM-DD-YYYY-hh-mm-A') + '.xlsx',
-                                                                    content: wbout_1,
-                                                                    encoding: 'base64'
+                                                                    tmpTotalCnt[key] += 1;
                                                                 }
-                                                            ], _this.serverConfig['MAIL_FROM_REPORTS']);
-                                                        });
-                                                    }
-                                                    else if (report.type === 'Group') {
-                                                        report.fields_selected.filter(function (a) { return a.show; }).forEach(function (field) {
-                                                            results_1.forEach(function (result) {
-                                                                modifyDataTypeField(report, result, field, 1);
-                                                            });
-                                                        });
-                                                        var wb = new Excel.Workbook();
-                                                        var ws_1 = wb.addWorksheet('RB_1', { views: [{ showGridLines: false }] });
-                                                        wb.properties.date1904 = false;
-                                                        wb.calcProperties.fullCalcOnLoad = true;
-                                                        var currentRow_1 = 1;
-                                                        var row = ws_1.getRow(currentRow_1);
-                                                        row.getCell(2).font = {
-                                                            name: 'Arial',
-                                                            bold: true,
-                                                            size: 14
-                                                        };
-                                                        row.getCell(4).font = {
-                                                            name: 'Arial',
-                                                            size: 14
-                                                        };
-                                                        row.getCell(2).value = 'Report Name:';
-                                                        row.getCell(4).value = report.report_name;
-                                                        currentRow_1 += 1;
-                                                        row = ws_1.getRow(currentRow_1);
-                                                        row.getCell(2).font = {
-                                                            name: 'Arial',
-                                                            bold: true,
-                                                            size: 14
-                                                        };
-                                                        row.getCell(4).font = {
-                                                            name: 'Arial',
-                                                            size: 14
-                                                        };
-                                                        row.getCell(2).value = 'Run Date:';
-                                                        row.getCell(4).value = moment().format('LLL');
-                                                        currentRow_1 += 2;
-                                                        var copy = common_1.deepCopy(results_1);
-                                                        var widths_1 = [];
-                                                        copy.forEach(function (res) {
-                                                            currentRow_1 = tabGroupExcelRecursive(report, ws_1, currentRow_1, 1, res);
-                                                            tabGroupExcelWidthRecursive(report, 1, res, widths_1);
-                                                        });
-                                                        for (var i = 1; i < ws_1.columns.length; i++) {
-                                                            ws_1.columns[i].width = widths_1[i - 1];
-                                                        }
-                                                        var now_1 = new Date();
-                                                        wb.xlsx.writeBuffer().then(function (buffer) {
-                                                            data['emails'].forEach(function (email) {
-                                                                _this.sendEmail(email, _this.serverConfig['CLIENT_NAME'] + ' Scheduled Report - ' + report.report_name, '', "\n\t\t\t\t\t\t\t\t\t\t\t\t\t<b>" + _this.serverConfig['CLIENT_NAME'] + " Automated Report</b><br>\n\t\t\t\t\t\t\t\t\t\t\t\t\t<b>Report Name: </b>" + report.report_name + "<br>\n\t\t\t\t\t\t\t\t\t\t\t\t\t<b>Prepared By: </b>" + data['user'] + "<br><br>\n\t\t\t\t\t\t\t\t\t\t\t\t\tAttached are the results of this automated report.<br><br>\n\t\t\t\t\t\t\t\t\t\t\t\t\tHave a great day!<br><br>\n\t\t\t\t\t\t\t\t\t\t\t\t\tResolveIO<br><br>", [
-                                                                    {
-                                                                        filename: 'Group_Report_' + report.report_name + '_' + now_1.getFullYear() + '_' + (now_1.getMonth() + 1) + '_' + now_1.getDate() + '.xlsx',
-                                                                        content: buffer
-                                                                    }
-                                                                ], _this.serverConfig['MAIL_FROM_REPORTS']);
-                                                            });
-                                                        }).catch(function (err) { return console.log('Error writing excel export', err); });
-                                                    }
-                                                    else if (report.type === 'Dated') {
-                                                        var lines_2 = [];
-                                                        var tmpHeaders_2 = {};
-                                                        report.groups_row.forEach(function (group) {
-                                                            tmpHeaders_2[group.id] = group.columnName;
+                                                                tmpTotalType[key] = report.fields_total.filter(a => a.fields.includes(key))[0].type;
+                                                            }
                                                         });
-                                                        tmpHeaders_2[''] = '';
-                                                        var datedUniqueDates_1 = [];
-                                                        var datedUniqueGroups_1 = [];
-                                                        if (report.date_interval === 'Quarterly') {
-                                                            results_1.forEach(function (dataPt) {
-                                                                if (dataPt._id.month < 4) {
-                                                                    dataPt._id.quarter = 1;
+                                                        Object.keys(result).filter(a => a && a !== '_id').forEach(key => {
+                                                            if (report.fields_total.filter(a => a.fields.includes(key)).length) {
+                                                                if (!tmpTotalDated[key]) {
+                                                                    tmpTotalDated[key] = result[key];
                                                                 }
-                                                                else if (dataPt._id.month < 7) {
-                                                                    dataPt._id.quarter = 2;
+                                                                else {
+                                                                    tmpTotalDated[key] += result[key];
                                                                 }
-                                                                else if (dataPt._id.month < 10) {
-                                                                    dataPt._id.quarter = 3;
+                                                                if (!tmpTotalCnt[key]) {
+                                                                    tmpTotalCnt[key] = 1;
                                                                 }
                                                                 else {
-                                                                    dataPt._id.quarter = 4;
-                                                                }
-                                                                delete dataPt._id.month;
-                                                            });
-                                                            var _loop_1 = function (i) {
-                                                                var dataPt = results_1[i];
-                                                                if (results_1.filter(function (a) { return JSON.stringify(a._id) === JSON.stringify(dataPt._id); }).length > 1) {
-                                                                    var tmpData_1 = results_1.filter(function (a) { return JSON.stringify(a._id) === JSON.stringify(dataPt._id); })[0];
-                                                                    Object.keys(tmpData_1).filter(function (a) { return a !== '_id'; }).forEach(function (key) {
-                                                                        tmpData_1[key] += dataPt[key];
-                                                                    });
-                                                                    results_1.splice(i, 1);
+                                                                    tmpTotalCnt[key] += 1;
                                                                 }
-                                                            };
-                                                            for (var i = results_1.length - 1; i >= 1; i--) {
-                                                                _loop_1(i);
-                                                            }
-                                                        }
-                                                        var tmpResults = common_1.deepCopy(results_1);
-                                                        tmpResults.forEach(function (result) {
-                                                            delete result._id.day;
-                                                            delete result._id.week;
-                                                            delete result._id.month;
-                                                            delete result._id.quarter;
-                                                            delete result._id.year;
-                                                            var tmp = {};
-                                                            Object.keys(result._id).forEach(function (key) {
-                                                                tmp[key] = result._id[key];
-                                                            });
-                                                            if (!datedUniqueGroups_1.filter(function (a) { return JSON.stringify(a) === JSON.stringify(tmp); }).length) {
-                                                                datedUniqueGroups_1.push(tmp);
+                                                                tmpTotalType[key] = report.fields_total.filter(a => a.fields.includes(key))[0].type;
                                                             }
                                                         });
-                                                        tmpResults = common_1.deepCopy(results_1);
-                                                        tmpResults.forEach(function (result) {
-                                                            Object.keys(result._id).filter(function (a) { return a !== 'day' && a !== 'week' && a !== 'month' && a !== 'quarter' && a !== 'year'; }).forEach(function (key) {
-                                                                delete result._id[key];
-                                                            });
-                                                            var tmp = {};
-                                                            Object.keys(result._id).forEach(function (key) {
-                                                                tmp[key] = result._id[key];
-                                                            });
-                                                            if (!datedUniqueDates_1.filter(function (a) { return JSON.stringify(a) === JSON.stringify(tmp); }).length) {
-                                                                datedUniqueDates_1.push(tmp);
+                                                    }
+                                                    else {
+                                                        tmpData.push(null);
+                                                    }
+                                                });
+                                                Object.keys(tmpTotalType).forEach(totalKey => {
+                                                    if (tmpTotalType[totalKey] === 'avg') {
+                                                        tmpTotalDated[totalKey] = tmpTotalDated[totalKey] / tmpTotalCnt[totalKey];
+                                                    }
+                                                    tmpTotalDated[totalKey] = Math.round(tmpTotalDated[totalKey] * 100) / 100;
+                                                });
+                                                reportTotalDates.push(tmpTotalDated);
+                                                datedData.push(tmpData);
+                                            });
+                                            datedUniqueGroups.forEach(group => {
+                                                let tmpTotalGroup = {};
+                                                let filteredData = results.filter(a => {
+                                                    let res = (!Object.keys(group).length || group._id === null) ? false : true;
+                                                    Object.keys(group).filter(a => a !== 'date' && a !== 'dateLast' && a !== 'dateString' && a !== 'day' && a !== 'week' && a !== 'month' && a !== 'quarter' && a !== 'year').forEach(key => {
+                                                        if (a._id[key] !== group[key]) {
+                                                            res = false;
+                                                        }
+                                                    });
+                                                    return res;
+                                                });
+                                                report.fields_total.forEach(total => {
+                                                    total.fields.forEach(field => {
+                                                        if (filteredData.length) {
+                                                            tmpTotalGroup[field] = filteredData.filter(a => a && a[field]).map(a => a[field]).reduce((a, b) => a + b, 0);
+                                                            if (total.type === 'avg') {
+                                                                tmpTotalGroup[field] = Math.round(tmpTotalGroup[field] / filteredData.length * 100) / 100;
                                                             }
-                                                        });
-                                                        datedUniqueDates_1.forEach(function (result) {
-                                                            if (!result.year) {
-                                                                result.dateString = 'No Date';
+                                                        }
+                                                        else {
+                                                            tmpTotalGroup[field] = 0;
+                                                        }
+                                                    });
+                                                });
+                                                reportTotalGroups.push(tmpTotalGroup);
+                                            });
+                                            datedUniqueDates.forEach(date => {
+                                                tmpHeaders[date.dateString] = date.dateString;
+                                            });
+                                            tmpHeaders['Totals'] = 'Totals';
+                                            lines.push(tmpHeaders);
+                                            for (let i = 0; i <= datedUniqueGroups.length - 1; i++) {
+                                                let group = datedUniqueGroups[i];
+                                                for (let j = 0; j <= report.fields_selected.filter(a => a.show).length - 1; j++) {
+                                                    let field = report.fields_selected.filter(a => a.show)[j];
+                                                    let tmp = {};
+                                                    for (let k = 0; k <= report.groups_row.length - 1; k++) {
+                                                        let groupRow = report.groups_row[k];
+                                                        if (j === 0) {
+                                                            tmp[group[groupRow.id]] = group[groupRow.id];
+                                                        }
+                                                        else {
+                                                            tmp[group[groupRow.id]] = '';
+                                                        }
+                                                    }
+                                                    tmp[field.columnName] = field.columnName;
+                                                    for (let k = 0; k <= datedData.length - 1; k++) {
+                                                        let result = datedData[k];
+                                                        if (result[i]) {
+                                                            if (allLeaves.filter(a => a.id === field.id)[0] && allLeaves.filter(a => a.id === field.id)[0].fieldType === 'Number') {
+                                                                tmp[i + ' ' + j + ' ' + k] = result[i][field.id] ? (typeof (result[i][field.id]) === 'string' ? parseInt(result[i][field.id].replace(/,/g, '')) : result[i][field.id]) : '';
                                                             }
                                                             else {
-                                                                if (report.date_interval === 'Daily') {
-                                                                    result.date = new Date(result.year, result.month - 1, result.day, 0, 0, 0, 0);
-                                                                    result.dateString = moment(result.date).format('MMM DD YYYY');
-                                                                }
-                                                                else if (report.date_interval === 'Weekly') {
-                                                                    result.date = moment().day('Monday').isoWeekYear(result.year).isoWeek(result.week).toDate();
-                                                                    result.dateLast = moment().day('Sunday').isoWeekYear(result.year).isoWeek(result.week).toDate();
-                                                                    result.dateString = 'Week #' + result.week + ' ' + result.year + '(' + moment(result.date).format('MM/DD/YY') + ' - ' + moment(result.dateLast).format('MM/DD/YY') + ')';
-                                                                }
-                                                                else if (report.date_interval === 'Monthly') {
-                                                                    result.date = new Date(result.year, result.month - 1, 1, 0, 0, 0, 0);
-                                                                    result.dateString = moment(result.date).format('MMM YYYY');
-                                                                }
-                                                                else if (report.date_interval === 'Quarterly') {
-                                                                    result.date = moment().quarter(result.quarter).year(result.year).toDate();
-                                                                    result.dateString = 'Q' + result.quarter + ' ' + result.year;
-                                                                }
-                                                                else if (report.date_interval === 'Yearly') {
-                                                                    result.date = new Date(result.year);
-                                                                    result.dateString = result.year.toString();
-                                                                }
+                                                                tmp[i + ' ' + j + ' ' + k] = result[i][field.id] ? (typeof (result[i][field.id]) === 'string' ? result[i][field.id].replace(/,/g, '') : result[i][field.id]) : '';
                                                             }
-                                                        });
-                                                        datedUniqueDates_1 = datedUniqueDates_1.filter(function (a) { return !a.date; }).concat(datedUniqueDates_1.filter(function (a) { return a.date; }).sort(function (a, b) { return a.date.getTime() - b.date.getTime(); }));
-                                                        var reportTotalGroups_1 = [];
-                                                        var reportTotalDates_1 = [];
-                                                        var datedData_1 = [];
-                                                        datedUniqueDates_1.forEach(function (date) {
-                                                            var tmpData = [];
-                                                            var tmpTotalDated = {};
-                                                            var tmpTotalCnt = {};
-                                                            var tmpTotalType = {};
-                                                            datedUniqueGroups_1.forEach(function (group) {
-                                                                var result = results_1.filter(function (a) {
-                                                                    var res = true;
-                                                                    Object.keys(date).filter(function (a) { return a !== 'date' && a !== 'dateLast' && a !== 'dateString'; }).forEach(function (key) {
-                                                                        if (a._id[key] !== date[key]) {
-                                                                            res = false;
-                                                                        }
-                                                                    });
-                                                                    Object.keys(group).forEach(function (key) {
-                                                                        if (a._id[key] !== group[key]) {
-                                                                            res = false;
-                                                                        }
-                                                                    });
-                                                                    return res;
-                                                                })[0];
-                                                                if (result) {
-                                                                    tmpData.push(result);
-                                                                    Object.keys(result._id).filter(function (a) { return a; }).forEach(function (key) {
-                                                                        if (report.fields_total.filter(function (a) { return a.fields.includes(key); }).length) {
-                                                                            if (!tmpTotalDated[key]) {
-                                                                                tmpTotalDated[key] = result._id[key];
-                                                                            }
-                                                                            else {
-                                                                                tmpTotalDated[key] += result._id[key];
-                                                                            }
-                                                                            if (!tmpTotalCnt[key]) {
-                                                                                tmpTotalCnt[key] = 1;
-                                                                            }
-                                                                            else {
-                                                                                tmpTotalCnt[key] += 1;
-                                                                            }
-                                                                            tmpTotalType[key] = report.fields_total.filter(function (a) { return a.fields.includes(key); })[0].type;
-                                                                        }
-                                                                    });
-                                                                    Object.keys(result).filter(function (a) { return a && a !== '_id'; }).forEach(function (key) {
-                                                                        if (report.fields_total.filter(function (a) { return a.fields.includes(key); }).length) {
-                                                                            if (!tmpTotalDated[key]) {
-                                                                                tmpTotalDated[key] = result[key];
-                                                                            }
-                                                                            else {
-                                                                                tmpTotalDated[key] += result[key];
-                                                                            }
-                                                                            if (!tmpTotalCnt[key]) {
-                                                                                tmpTotalCnt[key] = 1;
-                                                                            }
-                                                                            else {
-                                                                                tmpTotalCnt[key] += 1;
-                                                                            }
-                                                                            tmpTotalType[key] = report.fields_total.filter(function (a) { return a.fields.includes(key); })[0].type;
-                                                                        }
-                                                                    });
-                                                                }
-                                                                else {
-                                                                    tmpData.push(null);
-                                                                }
-                                                            });
-                                                            Object.keys(tmpTotalType).forEach(function (totalKey) {
-                                                                if (tmpTotalType[totalKey] === 'avg') {
-                                                                    tmpTotalDated[totalKey] = tmpTotalDated[totalKey] / tmpTotalCnt[totalKey];
-                                                                }
-                                                                tmpTotalDated[totalKey] = Math.round(tmpTotalDated[totalKey] * 100) / 100;
-                                                            });
-                                                            reportTotalDates_1.push(tmpTotalDated);
-                                                            datedData_1.push(tmpData);
-                                                        });
-                                                        datedUniqueGroups_1.forEach(function (group) {
-                                                            var tmpTotalGroup = {};
-                                                            var filteredData = results_1.filter(function (a) {
-                                                                var res = (!Object.keys(group).length || group._id === null) ? false : true;
-                                                                Object.keys(group).filter(function (a) { return a !== 'date' && a !== 'dateLast' && a !== 'dateString' && a !== 'day' && a !== 'week' && a !== 'month' && a !== 'quarter' && a !== 'year'; }).forEach(function (key) {
-                                                                    if (a._id[key] !== group[key]) {
-                                                                        res = false;
-                                                                    }
-                                                                });
-                                                                return res;
-                                                            });
-                                                            report.fields_total.forEach(function (total) {
-                                                                total.fields.forEach(function (field) {
-                                                                    if (filteredData.length) {
-                                                                        tmpTotalGroup[field] = filteredData.filter(function (a) { return a && a[field]; }).map(function (a) { return a[field]; }).reduce(function (a, b) { return a + b; }, 0);
-                                                                        if (total.type === 'avg') {
-                                                                            tmpTotalGroup[field] = Math.round(tmpTotalGroup[field] / filteredData.length * 100) / 100;
-                                                                        }
-                                                                    }
-                                                                    else {
-                                                                        tmpTotalGroup[field] = 0;
-                                                                    }
-                                                                });
-                                                            });
-                                                            reportTotalGroups_1.push(tmpTotalGroup);
-                                                        });
-                                                        datedUniqueDates_1.forEach(function (date) {
-                                                            tmpHeaders_2[date.dateString] = date.dateString;
-                                                        });
-                                                        tmpHeaders_2['Totals'] = 'Totals';
-                                                        lines_2.push(tmpHeaders_2);
-                                                        for (var i = 0; i <= datedUniqueGroups_1.length - 1; i++) {
-                                                            var group = datedUniqueGroups_1[i];
-                                                            var _loop_2 = function (j) {
-                                                                var field = report.fields_selected.filter(function (a) { return a.show; })[j];
-                                                                var tmp = {};
-                                                                for (var k = 0; k <= report.groups_row.length - 1; k++) {
-                                                                    var groupRow = report.groups_row[k];
-                                                                    if (j === 0) {
-                                                                        tmp[group[groupRow.id]] = group[groupRow.id];
-                                                                    }
-                                                                    else {
-                                                                        tmp[group[groupRow.id]] = '';
-                                                                    }
-                                                                }
-                                                                tmp[field.columnName] = field.columnName;
-                                                                for (var k = 0; k <= datedData_1.length - 1; k++) {
-                                                                    var result = datedData_1[k];
-                                                                    if (result[i]) {
-                                                                        if (allLeaves_1.filter(function (a) { return a.id === field.id; })[0] && allLeaves_1.filter(function (a) { return a.id === field.id; })[0].fieldType === 'Number') {
-                                                                            tmp[i + ' ' + j + ' ' + k] = result[i][field.id] ? (typeof (result[i][field.id]) === 'string' ? parseInt(result[i][field.id].replace(/,/g, '')) : result[i][field.id]) : '';
-                                                                        }
-                                                                        else {
-                                                                            tmp[i + ' ' + j + ' ' + k] = result[i][field.id] ? (typeof (result[i][field.id]) === 'string' ? result[i][field.id].replace(/,/g, '') : result[i][field.id]) : '';
-                                                                        }
-                                                                    }
-                                                                    else {
-                                                                        tmp[i + ' ' + j + ' ' + k] = '';
-                                                                    }
-                                                                }
-                                                                for (var k = 0; k <= report.fields_total.length - 1; k++) {
-                                                                    var total = report.fields_total[k];
-                                                                    if (total.fields.includes(field.id)) {
-                                                                        tmp['total' + i + ' ' + j + ' ' + k] = reportTotalGroups_1[i][field.id] ? (typeof (reportTotalGroups_1[i][field.id]) === 'string' ? parseInt(reportTotalGroups_1[i][field.id].replace(/,/g, '')) : reportTotalGroups_1[i][field.id]) : '';
-                                                                    }
-                                                                    else {
-                                                                        tmp['total' + i + ' ' + j + ' ' + k] = '';
-                                                                    }
-                                                                }
-                                                                lines_2.push(tmp);
-                                                            };
-                                                            for (var j = 0; j <= report.fields_selected.filter(function (a) { return a.show; }).length - 1; j++) {
-                                                                _loop_2(j);
+                                                        }
+                                                        else {
+                                                            tmp[i + ' ' + j + ' ' + k] = '';
+                                                        }
+                                                    }
+                                                    for (let k = 0; k <= report.fields_total.length - 1; k++) {
+                                                        let total = report.fields_total[k];
+                                                        if (total.fields.includes(field.id)) {
+                                                            tmp['total' + i + ' ' + j + ' ' + k] = reportTotalGroups[i][field.id] ? (typeof (reportTotalGroups[i][field.id]) === 'string' ? parseInt(reportTotalGroups[i][field.id].replace(/,/g, '')) : reportTotalGroups[i][field.id]) : '';
+                                                        }
+                                                        else {
+                                                            tmp['total' + i + ' ' + j + ' ' + k] = '';
+                                                        }
+                                                    }
+                                                    lines.push(tmp);
+                                                }
+                                            }
+                                            if (reportTotals) {
+                                                for (let j = 0; j <= report.fields_selected.filter(a => a.show).length - 1; j++) {
+                                                    let field = report.fields_selected.filter(a => a.show)[j];
+                                                    let tmp = {};
+                                                    for (let k = 0; k <= report.groups_row.length - 1; k++) {
+                                                        let groupRow = report.groups_row[k];
+                                                        for (let l = 0; l <= report.fields_total.length - 1; l++) {
+                                                            let total = report.fields_total[l];
+                                                            if (j === 0) {
+                                                                tmp[total.type + k] = total.type + ' TOTALS';
+                                                            }
+                                                            else {
+                                                                tmp[total.type + k] = '';
                                                             }
                                                         }
-                                                        if (reportTotals) {
-                                                            for (var j = 0; j <= report.fields_selected.filter(function (a) { return a.show; }).length - 1; j++) {
-                                                                var field = report.fields_selected.filter(function (a) { return a.show; })[j];
-                                                                var tmp = {};
-                                                                for (var k = 0; k <= report.groups_row.length - 1; k++) {
-                                                                    var groupRow = report.groups_row[k];
-                                                                    for (var l = 0; l <= report.fields_total.length - 1; l++) {
-                                                                        var total = report.fields_total[l];
-                                                                        if (j === 0) {
-                                                                            tmp[total.type + k] = total.type + ' TOTALS';
-                                                                        }
-                                                                        else {
-                                                                            tmp[total.type + k] = '';
-                                                                        }
-                                                                    }
-                                                                }
-                                                                tmp[field.columnName] = field.columnName;
-                                                                for (var k = 0; k <= datedData_1.length - 1; k++) {
-                                                                    var result = datedData_1[k];
-                                                                    for (var l = 0; l <= report.fields_total.length - 1; l++) {
-                                                                        var total = report.fields_total[l];
-                                                                        if (total.fields.includes(field.id)) {
-                                                                            tmp['total' + j + ' ' + k + ' ' + l] = reportTotalDates_1[k][field.id];
-                                                                        }
-                                                                        else {
-                                                                            tmp['total' + j + ' ' + k + ' ' + l] = '';
-                                                                        }
-                                                                    }
-                                                                }
-                                                                for (var k = 0; k <= report.groups_row.length - 1; k++) {
-                                                                    var groupRow = report.groups_row[k];
-                                                                    for (var l = 0; l <= report.fields_total.length - 1; l++) {
-                                                                        var total = report.fields_total[l];
-                                                                        if (total.fields.includes(groupRow.id)) {
-                                                                            tmp['totalreportTotals' + j + ' ' + k + ' ' + l] = reportTotals[total.id + groupRow.id];
-                                                                        }
-                                                                    }
-                                                                }
-                                                                for (var l = 0; l <= report.fields_total.length - 1; l++) {
-                                                                    var total = report.fields_total[l];
-                                                                    if (total.fields.includes(field.id)) {
-                                                                        tmp['totalreportTotals' + j + ' ' + l] = reportTotals[total.id + '_' + field.id];
-                                                                    }
-                                                                }
-                                                                lines_2.push(tmp);
+                                                    }
+                                                    tmp[field.columnName] = field.columnName;
+                                                    for (let k = 0; k <= datedData.length - 1; k++) {
+                                                        let result = datedData[k];
+                                                        for (let l = 0; l <= report.fields_total.length - 1; l++) {
+                                                            let total = report.fields_total[l];
+                                                            if (total.fields.includes(field.id)) {
+                                                                tmp['total' + j + ' ' + k + ' ' + l] = reportTotalDates[k][field.id];
+                                                            }
+                                                            else {
+                                                                tmp['total' + j + ' ' + k + ' ' + l] = '';
                                                             }
                                                         }
-                                                        var newCSV_1 = '';
-                                                        lines_2.forEach(function (row, index) {
-                                                            Object.keys(row).forEach(function (key, keyIndex) {
-                                                                if (row[key] && typeof (row[key]) === 'string') {
-                                                                    row[key] = row[key].replace(new RegExp(/,/g), '');
-                                                                }
-                                                                newCSV_1 += row[key];
-                                                                if (keyIndex < Object.keys(row).length - 1) {
-                                                                    newCSV_1 += ',';
-                                                                }
-                                                            });
-                                                            if (index < lines_2.length - 1) {
-                                                                newCSV_1 += '\r\n';
+                                                    }
+                                                    for (let k = 0; k <= report.groups_row.length - 1; k++) {
+                                                        let groupRow = report.groups_row[k];
+                                                        for (let l = 0; l <= report.fields_total.length - 1; l++) {
+                                                            let total = report.fields_total[l];
+                                                            if (total.fields.includes(groupRow.id)) {
+                                                                tmp['totalreportTotals' + j + ' ' + k + ' ' + l] = reportTotals[total.id + groupRow.id];
                                                             }
-                                                        });
-                                                        data['emails'].forEach(function (email) {
-                                                            _this.sendEmail(email, _this.serverConfig['CLIENT_NAME'] + ' Scheduled Report - ' + report.report_name, '', "\n\t\t\t\t\t\t\t\t\t\t\t\t<b>" + _this.serverConfig['CLIENT_NAME'] + " Automated Report</b><br>\n\t\t\t\t\t\t\t\t\t\t\t\t<b>Report Name: </b>" + report.report_name + "<br>\n\t\t\t\t\t\t\t\t\t\t\t\t<b>Prepared By: </b>" + data['user'] + "<br><br>\n\t\t\t\t\t\t\t\t\t\t\t\tAttached are the results of this automated report.<br><br>\n\t\t\t\t\t\t\t\t\t\t\t\tHave a great day!<br><br>\n\t\t\t\t\t\t\t\t\t\t\t\tResolveIO<br><br>", [
-                                                                {
-                                                                    filename: report.report_name + '-' + moment().format('MM-DD-YYYY-hh-mm-A') + '.csv',
-                                                                    content: newCSV_1
-                                                                }
-                                                            ], _this.serverConfig['MAIL_FROM_REPORTS']);
-                                                        });
-                                                        resolve();
+                                                        }
                                                     }
+                                                    for (let l = 0; l <= report.fields_total.length - 1; l++) {
+                                                        let total = report.fields_total[l];
+                                                        if (total.fields.includes(field.id)) {
+                                                            tmp['totalreportTotals' + j + ' ' + l] = reportTotals[total.id + '_' + field.id];
+                                                        }
+                                                    }
+                                                    lines.push(tmp);
                                                 }
-                                                else {
-                                                    console.log(res);
-                                                    _this.callMethodInternal('insertErrorLog', 'Report Builder Cron Job - Report Builder Get Results', [
-                                                        err
-                                                    ]);
-                                                    reject(err);
+                                            }
+                                            let newCSV = '';
+                                            lines.forEach((row, index) => {
+                                                Object.keys(row).forEach((key, keyIndex) => {
+                                                    if (row[key] && typeof (row[key]) === 'string') {
+                                                        row[key] = row[key].replace(new RegExp(/,/g), '');
+                                                    }
+                                                    newCSV += row[key];
+                                                    if (keyIndex < Object.keys(row).length - 1) {
+                                                        newCSV += ',';
+                                                    }
+                                                });
+                                                if (index < lines.length - 1) {
+                                                    newCSV += '\r\n';
                                                 }
                                             });
+                                            data['emails'].forEach(email => {
+                                                this.sendEmail(email, this.serverConfig['CLIENT_NAME'] + ' Scheduled Report - ' + report.report_name, '', `
+												<b>` + this.serverConfig['CLIENT_NAME'] + ` Automated Report</b><br>
+												<b>Report Name: </b>` + report.report_name + `<br>
+												<b>Prepared By: </b>` + data['user'] + `<br><br>
+												Attached are the results of this automated report.<br><br>
+												Have a great day!<br><br>
+												ResolveIO<br><br>`, [
+                                                    {
+                                                        filename: report.report_name + '-' + moment().format('MM-DD-YYYY-hh-mm-A') + '.csv',
+                                                        content: newCSV
+                                                    }
+                                                ], this.serverConfig['MAIL_FROM_REPORTS']);
+                                            });
+                                            resolve();
                                         }
-                                    });
-                                }
-                                return [2 /*return*/];
-                        }
-                    });
-                }); });
+                                    }
+                                    else {
+                                        console.log(res);
+                                        this.callMethodInternal('insertErrorLog', 'Report Builder Cron Job - Report Builder Get Results', [
+                                            err
+                                        ]);
+                                        reject(err);
+                                    }
+                                });
+                            }
+                        });
+                    }
+                });
             }
         }
     });
 }
-exports.loadCronJobMethods = loadCronJobMethods;
-function getTreeLeaves(items, resArray, allowLookups) {
-    if (allowLookups === void 0) { allowLookups = false; }
-    items.forEach(function (item) {
+function getTreeLeaves(items, resArray, allowLookups = false) {
+    items.forEach(item => {
         if (item.isLeaf) {
             resArray.push(item);
         }
@@ -956,13 +891,13 @@ function getTreeLeaves(items, resArray, allowLookups) {
 function modifyDataTypeField(report, result, field, index) {
     if (index < report.groups_row.length) {
         result = result['gr_' + (index + 1)];
-        result.forEach(function (tDataRes, tIndex) {
+        result.forEach((tDataRes, tIndex) => {
             modifyDataTypeField(report, tDataRes, field, index + 1);
         });
     }
     else {
         if (Array.isArray(result[field.id])) {
-            result[field.id].forEach(function (arr, arrIndex) {
+            result[field.id].forEach((arr, arrIndex) => {
                 if ((field.fieldType === 'Number' || field.leafValueType === 'Count') && field.leafFormatType === 'Number') {
                     result[field.id].splice(arrIndex, 1, arr.toLocaleString());
                 }
@@ -1042,7 +977,7 @@ function modifyDataTypeField(report, result, field, index) {
     }
 }
 function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
-    var row = ws.getRow(currentRow);
+    let row = ws.getRow(currentRow);
     if (level < report.groups_row.length) {
         row.getCell(2).fill = {
             fgColor: { argb: report.groups_row[level - 1].fill_color ? report.groups_row[level - 1].fill_color.replace('#', '') : 'ffffff' },
@@ -1056,17 +991,17 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
             size: 14
         };
         row.getCell(2).value = report.groups_row[level - 1].columnName + ': ' + result._id['gr_' + level];
-        ws.mergeCells(row.getCell(2).$col$row + ':' + row.getCell(report.fields_selected.filter(function (a) { return a.show; }).length + 1).$col$row);
+        ws.mergeCells(row.getCell(2).$col$row + ':' + row.getCell(report.fields_selected.filter(a => a.show).length + 1).$col$row);
         row.getCell(2).border = {
             top: { style: 'thick' },
             left: { style: 'thick' },
             right: { style: 'thick' }
         };
         if (report.fields_total.length) {
-            report.fields_total.forEach(function (total) {
+            report.fields_total.forEach(total => {
                 currentRow += 1;
                 row = ws.getRow(currentRow);
-                report.fields_selected.filter(function (a) { return a.show; }).forEach(function (field, fieldIndex) {
+                report.fields_selected.filter(a => a.show).forEach((field, fieldIndex) => {
                     if (total.fields.includes(field.id)) {
                         row.getCell(fieldIndex + 2).value = field.columnName;
                         row.getCell(fieldIndex + 2).font = {
@@ -1086,7 +1021,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
                             left: { style: 'thick' }
                         };
                     }
-                    else if (fieldIndex === report.fields_selected.filter(function (a) { return a.show; }).length - 1) {
+                    else if (fieldIndex === report.fields_selected.filter(a => a.show).length - 1) {
                         row.getCell(fieldIndex + 2).border = {
                             right: { style: 'thick' }
                         };
@@ -1095,10 +1030,10 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
             });
         }
         // Totals
-        report.fields_total.forEach(function (total) {
+        report.fields_total.forEach(total => {
             currentRow += 1;
             row = ws.getRow(currentRow);
-            report.fields_selected.filter(function (a) { return a.show; }).forEach(function (field, fieldIndex) {
+            report.fields_selected.filter(a => a.show).forEach((field, fieldIndex) => {
                 if (total.fields.includes(field.id)) {
                     row.getCell(fieldIndex + 2).value = result[total.id + '_' + field.id];
                     row.getCell(fieldIndex + 2).font = {
@@ -1120,7 +1055,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
                         bottom: { style: 'thick' }
                     };
                 }
-                else if (fieldIndex === report.fields_selected.filter(function (a) { return a.show; }).length - 1) {
+                else if (fieldIndex === report.fields_selected.filter(a => a.show).length - 1) {
                     row.getCell(fieldIndex + 2).border = {
                         top: { style: 'thin' },
                         bottom: { style: 'thick' },
@@ -1137,7 +1072,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
         });
         currentRow += 1;
         result = result['gr_' + (level + 1)];
-        result.forEach(function (tDataRes, tIndex) {
+        result.forEach((tDataRes, tIndex) => {
             currentRow = tabGroupExcelRecursive(report, ws, currentRow, level + 1, tDataRes);
         });
     }
@@ -1154,7 +1089,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
             size: 12
         };
         row.getCell(2).value = report.groups_row[level - 1].columnName + ': ' + result._id['gr_' + level];
-        ws.mergeCells(row.getCell(2).$col$row + ':' + row.getCell(report.fields_selected.filter(function (a) { return a.show; }).length + 1).$col$row);
+        ws.mergeCells(row.getCell(2).$col$row + ':' + row.getCell(report.fields_selected.filter(a => a.show).length + 1).$col$row);
         row.getCell(2).border = {
             top: { style: 'thick' },
             left: { style: 'thick' },
@@ -1163,7 +1098,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
         currentRow += 1;
         row = ws.getRow(currentRow);
         // Headers
-        report.fields_selected.filter(function (a) { return a.show; }).forEach(function (field, fieldIndex) {
+        report.fields_selected.filter(a => a.show).forEach((field, fieldIndex) => {
             row.getCell(fieldIndex + 2).value = field.columnName;
             row.getCell(fieldIndex + 2).font = {
                 name: 'Arial',
@@ -1181,17 +1116,17 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
                     left: { style: 'thick' }
                 };
             }
-            else if (fieldIndex === report.fields_selected.filter(function (a) { return a.show; }).length - 1) {
+            else if (fieldIndex === report.fields_selected.filter(a => a.show).length - 1) {
                 row.getCell(fieldIndex + 2).border = {
                     right: { style: 'thick' }
                 };
             }
         });
         // Data
-        result['f_0'].forEach(function (res, resIndex) {
+        result['f_0'].forEach((res, resIndex) => {
             currentRow += 1;
             row = ws.getRow(currentRow);
-            report.fields_selected.filter(function (a) { return a.show; }).forEach(function (field, fieldIndex) {
+            report.fields_selected.filter(a => a.show).forEach((field, fieldIndex) => {
                 if (field.fieldType === 'Number' && typeof (result[field.id][resIndex] === 'string') && result[field.id][resIndex]) {
                     row.getCell(fieldIndex + 2).value = parseFloat(result[field.id][resIndex].replace(new RegExp(/\,/g), '').replace(new RegExp(/\$/g), ''));
                 }
@@ -1213,7 +1148,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
                         left: { style: 'thick' }
                     };
                 }
-                else if (fieldIndex === report.fields_selected.filter(function (a) { return a.show; }).length - 1) {
+                else if (fieldIndex === report.fields_selected.filter(a => a.show).length - 1) {
                     row.getCell(fieldIndex + 2).border = {
                         right: { style: 'thick' }
                     };
@@ -1221,10 +1156,10 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
             });
         });
         // Totals
-        report.fields_total.forEach(function (total) {
+        report.fields_total.forEach(total => {
             currentRow += 1;
             row = ws.getRow(currentRow);
-            report.fields_selected.filter(function (a) { return a.show; }).forEach(function (field, fieldIndex) {
+            report.fields_selected.filter(a => a.show).forEach((field, fieldIndex) => {
                 if (total.fields.includes(field.id)) {
                     row.getCell(fieldIndex + 2).value = result[total.id + '_' + field.id];
                     row.getCell(fieldIndex + 2).font = {
@@ -1246,7 +1181,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
                         bottom: { style: 'thick' }
                     };
                 }
-                else if (fieldIndex === report.fields_selected.filter(function (a) { return a.show; }).length - 1) {
+                else if (fieldIndex === report.fields_selected.filter(a => a.show).length - 1) {
                     row.getCell(fieldIndex + 2).border = {
                         top: { style: 'thin' },
                         bottom: { style: 'thick' },
@@ -1267,15 +1202,15 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result) {
 function tabGroupExcelWidthRecursive(report, level, result, cols) {
     if (level < report.groups_row.length) {
         result = result['gr_' + (level + 1)];
-        result.forEach(function (tDataRes, tIndex) {
+        result.forEach((tDataRes, tIndex) => {
             cols = tabGroupExcelWidthRecursive(report, level + 1, tDataRes, cols);
         });
     }
     else {
-        report.fields_selected.filter(function (a) { return a.show; }).forEach(function (field, fieldIndex) {
+        report.fields_selected.filter(a => a.show).forEach((field, fieldIndex) => {
             if (Array.isArray(result[field.id])) {
-                result[field.id].forEach(function (res) {
-                    var length = 10;
+                result[field.id].forEach(res => {
+                    let length = 10;
                     if (res) {
                         length = res.length + 3;
                     }
@@ -1288,7 +1223,7 @@ function tabGroupExcelWidthRecursive(report, level, result, cols) {
                 });
             }
             else {
-                var res = result[field.id];
+                let res = result[field.id];
                 if (res) {
                     length = res.length + 3;
                 }