@resolveio/server-lib 20.12.62 → 20.12.64

package/methods/cron-jobs.js

@@ -87,7 +87,6 @@ exports.loadCronJobMethods = loadCronJobMethods;
 var Excel = require("exceljs");
 var moment = require("moment-timezone");
 var simpl_schema_1 = require("simpl-schema");
-var XLSX = require("xlsx");
 var cron_job_collection_1 = require("../collections/cron-job.collection");
 var file_collection_1 = require("../collections/file.collection");
 var report_builder_report_collection_1 = require("../collections/report-builder-report.collection");
@@ -270,6 +269,401 @@ function resolveFieldRefToLeafId(fieldRef, report) {
     }
     return fieldRef;
 }
+function buildCollectionKeysFromReport(report) {
+    var keys = [];
+    if (report === null || report === void 0 ? void 0 : report.collection_root) {
+        keys.push(report.collection_root);
+    }
+    ((report === null || report === void 0 ? void 0 : report.collection_joins) || []).forEach(function (join) {
+        if (!join) {
+            return;
+        }
+        var alias = (join.alias || '').trim();
+        if (alias && !keys.includes(alias)) {
+            keys.push(alias);
+        }
+        else if (join.collection && !keys.includes(join.collection)) {
+            keys.push(join.collection);
+        }
+    });
+    return keys.length ? keys : ['root'];
+}
+function buildLayoutColumnsFromFields(report, fields) {
+    if (fields === void 0) { fields = []; }
+    var keys = buildCollectionKeysFromReport(report);
+    return (fields || []).map(function (field, index) {
+        var header = field.columnName || field.fieldName || "Column ".concat(index + 1);
+        var isCustom = (((field === null || field === void 0 ? void 0 : field.id) || (field === null || field === void 0 ? void 0 : field.fieldPath) || '') + '').startsWith('c_') || (field === null || field === void 0 ? void 0 : field.fieldPathName) === 'Custom Field';
+        var mappings = keys.map(function (key) {
+            var matchesKey = key === report.collection_root
+                ? (field.collection_name === report.collection_root || isCustom)
+                : (key === (field.lookup_as || '').trim()) || key === field.collection_name;
+            if (matchesKey) {
+                return {
+                    collection: key,
+                    mode: 'variable',
+                    fieldPath: field.fieldPath || '',
+                    fieldId: field.id || "f_layout_".concat(index),
+                    text: '',
+                    leafValueType: field.leafValueType || 'Value',
+                    leafFormatType: field.leafFormatType || ''
+                };
+            }
+            return {
+                collection: key,
+                mode: 'text',
+                fieldPath: '',
+                fieldId: '',
+                text: '',
+                leafValueType: 'Value',
+                leafFormatType: ''
+            };
+        });
+        return {
+            id: field.id ? "layout_".concat(field.id) : "layout_".concat(index),
+            header: header,
+            mappings: mappings
+        };
+    });
+}
+function ensureLayoutHasCustomField(report, layout, customId, columnName, leafValueType) {
+    if (layout === void 0) { layout = []; }
+    if (!layout || !customId) {
+        return;
+    }
+    var hasCustomField = (layout || []).some(function (col) { return ((col === null || col === void 0 ? void 0 : col.mappings) || []).some(function (m) {
+        return (m === null || m === void 0 ? void 0 : m.mode) === 'variable' && (m.fieldId === customId || m.fieldPath === customId);
+    }); });
+    if (hasCustomField) {
+        return;
+    }
+    var keys = buildCollectionKeysFromReport(report);
+    var rootKey = (report === null || report === void 0 ? void 0 : report.collection_root) || '';
+    var header = columnName || customId;
+    var mappings = keys.map(function (key) {
+        if (key === rootKey) {
+            return {
+                collection: key,
+                mode: 'variable',
+                fieldPath: customId,
+                fieldId: customId,
+                text: '',
+                leafValueType: leafValueType || 'Value',
+                leafFormatType: 'Number'
+            };
+        }
+        return {
+            collection: key,
+            mode: 'text',
+            fieldPath: '',
+            fieldId: '',
+            text: '',
+            leafValueType: 'Value',
+            leafFormatType: ''
+        };
+    });
+    layout.push({
+        id: "layout_".concat(customId),
+        header: header,
+        mappings: mappings
+    });
+}
+function ensureLayoutIncludesCustomFields(report, layout) {
+    if (layout === void 0) { layout = []; }
+    var fieldsCustom = (report === null || report === void 0 ? void 0 : report.fields_custom) || [];
+    if (!fieldsCustom.length) {
+        return layout;
+    }
+    fieldsCustom.forEach(function (custom) {
+        ensureLayoutHasCustomField(report, layout, custom === null || custom === void 0 ? void 0 : custom.id, custom === null || custom === void 0 ? void 0 : custom.columnName, custom === null || custom === void 0 ? void 0 : custom.leafValueType);
+    });
+    return layout;
+}
+function getLayoutColumnsFromReport(report) {
+    var layout = [];
+    if ((report === null || report === void 0 ? void 0 : report.fields_layout) && report.fields_layout.length) {
+        layout = (0, common_1.deepCopy)(report.fields_layout);
+    }
+    else {
+        layout = buildLayoutColumnsFromFields(report, (report === null || report === void 0 ? void 0 : report.fields_selected) || []);
+    }
+    return ensureLayoutIncludesCustomFields(report, layout);
+}
+function syncSelectedFieldsFromLayout(report, layoutColumns) {
+    if (layoutColumns === void 0) { layoutColumns = []; }
+    var fields = [];
+    var sourceFields = (0, common_1.deepCopy)((report === null || report === void 0 ? void 0 : report.fields_selected) || []);
+    var byId = new Map();
+    var byPath = new Map();
+    sourceFields.forEach(function (f) {
+        if (f === null || f === void 0 ? void 0 : f.id) {
+            byId.set(f.id, f);
+        }
+        if (f === null || f === void 0 ? void 0 : f.fieldPath) {
+            byPath.set(f.fieldPath, f);
+        }
+    });
+    layoutColumns.forEach(function (col, colIndex) {
+        (col.mappings || []).forEach(function (map, mapIndex) {
+            if (map.mode === 'variable' && map.fieldPath) {
+                var baseField = byId.get(map.fieldId) || byPath.get(map.fieldPath);
+                if (!baseField) {
+                    return;
+                }
+                var clone = (0, common_1.deepCopy)(baseField);
+                clone.columnName = col.header || baseField.columnName || baseField.fieldPathName || 'Column';
+                clone.show = (typeof map.show === 'boolean')
+                    ? map.show
+                    : (typeof baseField.show === 'boolean' ? baseField.show : true);
+                clone.leafValueType = map.leafValueType || clone.leafValueType;
+                clone.leafFormatType = map.leafFormatType || clone.leafFormatType;
+                clone.id = map.fieldId || clone.id || "f_layout_".concat(colIndex, "_").concat(mapIndex);
+                clone.layoutCollection = map.collection;
+                clone.layoutColumnIndex = colIndex;
+                if (!map.fieldId) {
+                    map.fieldId = clone.id;
+                }
+                fields.push(clone);
+            }
+        });
+    });
+    return fields;
+}
+function materializeLayoutRow(report, layoutColumns, selectedFields, row) {
+    var materialized = { _id: row === null || row === void 0 ? void 0 : row._id };
+    var hasDataForCollection = function (collection) {
+        if (!collection) {
+            return false;
+        }
+        return (selectedFields || []).some(function (f) {
+            return f.layoutCollection === collection &&
+                row &&
+                Object.prototype.hasOwnProperty.call(row, f.id) &&
+                row[f.id] !== undefined &&
+                row[f.id] !== null &&
+                row[f.id] !== '';
+        });
+    };
+    (layoutColumns || []).forEach(function (col, colIndex) {
+        var values = [];
+        (col.mappings || []).forEach(function (map) {
+            if (map.mode === 'text' && map.text) {
+                if (hasDataForCollection(map.collection)) {
+                    values.push({ collection: map.collection, value: map.text });
+                }
+            }
+            else if (map.mode === 'variable' && map.fieldId && row && Object.prototype.hasOwnProperty.call(row, map.fieldId)) {
+                values.push({ collection: map.collection, value: row[map.fieldId] });
+            }
+        });
+        materialized[colIndex] = values;
+    });
+    return materialized;
+}
+function getLayoutCellExportValue(report, layoutRow, colIndex) {
+    if (!layoutRow || layoutRow[colIndex] === undefined || layoutRow[colIndex] === null) {
+        return '';
+    }
+    var cellValues = Array.isArray(layoutRow[colIndex]) ? layoutRow[colIndex] : [layoutRow[colIndex]];
+    var filtered = cellValues.filter(function (v) { return v !== undefined && v !== null && v.value !== undefined && v.value !== null && v.value !== ''; });
+    if (!filtered.length) {
+        return '';
+    }
+    var rootCollection = report === null || report === void 0 ? void 0 : report.collection_root;
+    var preferred = filtered.find(function (v) { return v.collection === rootCollection; }) || filtered[0];
+    var value = preferred === null || preferred === void 0 ? void 0 : preferred.value;
+    if (value === undefined || value === null) {
+        return '';
+    }
+    if (Array.isArray(value)) {
+        return value;
+    }
+    return typeof value === 'string' ? value.trim().replace(/\t/g, '').replace(/\n/g, '') : value;
+}
+function getPrimaryFieldForLayoutColumn(col, selectedFields) {
+    if (!(col === null || col === void 0 ? void 0 : col.mappings)) {
+        return null;
+    }
+    var target = col.mappings.find(function (m) { return m.mode === 'variable' && m.fieldId; });
+    if (!target) {
+        return null;
+    }
+    return (selectedFields || []).find(function (f) { return f.id === target.fieldId; }) || null;
+}
+var STRING_DATE_FORMATS = [
+    moment.ISO_8601,
+    'MM/DD/YYYY',
+    'M/D/YYYY',
+    'MM/DD/YYYY h:mm A',
+    'M/D/YYYY h:mm A',
+    'MM/DD/YYYY hh:mm A',
+    'M/D/YYYY hh:mm A',
+    'MM/DD/YYYY h:mm:ss A',
+    'M/D/YYYY h:mm:ss A',
+    'MM/DD/YYYY hh:mm:ss A',
+    'M/D/YYYY hh:mm:ss A',
+    'MM/DD/YYYY H:mm',
+    'M/D/YYYY H:mm',
+    'MM/DD/YYYY HH:mm',
+    'M/D/YYYY HH:mm',
+    'MM/DD/YYYY H:mm:ss',
+    'M/D/YYYY H:mm:ss',
+    'MM/DD/YYYY HH:mm:ss',
+    'M/D/YYYY HH:mm:ss'
+];
+function parseMoment(value) {
+    if (value === null || value === undefined) {
+        return null;
+    }
+    if (moment.isMoment(value)) {
+        return value;
+    }
+    if (value instanceof Date || typeof value === 'number') {
+        var m_1 = moment(value);
+        return m_1.isValid() ? m_1 : null;
+    }
+    if (typeof value === 'string' || value instanceof String) {
+        var str = "".concat(value).trim();
+        if (!str) {
+            return null;
+        }
+        var m_2 = moment(str, STRING_DATE_FORMATS, true);
+        if (m_2.isValid()) {
+            return m_2;
+        }
+        var loose = moment(str, STRING_DATE_FORMATS, false);
+        if (loose.isValid()) {
+            return loose;
+        }
+        var jsDateStr = str.replace(/\s*\([^)]*\)\s*$/, '');
+        var jsDate = moment(jsDateStr, 'ddd MMM DD YYYY HH:mm:ss [GMT]ZZ', true);
+        if (jsDate.isValid()) {
+            return jsDate;
+        }
+        if (/[T:\\/\\-]/.test(str) || /GMT|UTC/i.test(str)) {
+            var fallback = moment(str);
+            return fallback.isValid() ? fallback : null;
+        }
+        return null;
+    }
+    var m = moment(value);
+    return m.isValid() ? m : null;
+}
+function parseExcelNumber(value) {
+    if (typeof value === 'number') {
+        return Number.isFinite(value) ? value : null;
+    }
+    if (typeof value !== 'string') {
+        return null;
+    }
+    var s = value.trim();
+    if (!s) {
+        return null;
+    }
+    var negative = false;
+    var parenMatch = s.match(/^\((.*)\)$/);
+    if (parenMatch) {
+        negative = true;
+        s = parenMatch[1].trim();
+    }
+    s = s
+        .replace(/[\t\n\r]/g, '')
+        .replace(/\$/g, '')
+        .replace(/,/g, '');
+    s = s.trim();
+    if (!s) {
+        return null;
+    }
+    var num = Number(s);
+    if (!Number.isFinite(num)) {
+        return null;
+    }
+    return negative ? -num : num;
+}
+function isExcelNumericField(field) {
+    return !!field && (field.fieldType === 'Number' ||
+        field.leafValueType === 'Count' ||
+        field.leafValueType === 'Sum' ||
+        field.leafValueType === 'Average');
+}
+function writeExcelCell(cell, value, fieldMeta) {
+    if (value === null || value === undefined) {
+        cell.value = '';
+        return;
+    }
+    if ((fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.fieldType) === 'Date') {
+        var rawValue = Array.isArray(value) ? value.find(function (v) { return v !== null && v !== undefined && v !== ''; }) : value;
+        var m = parseMoment(rawValue);
+        if (m) {
+            var timezone = process.env.TZ_CLIENT;
+            var local = timezone ? moment.tz(m.toDate(), timezone) : m.clone().local();
+            var leafFormatType = fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.leafFormatType;
+            var excelSerial = (Date.UTC(local.year(), local.month(), local.date(), local.hour(), local.minute(), local.second(), local.millisecond()) - Date.UTC(1899, 11, 30)) / 86400000;
+            if (leafFormatType === 'Date' || leafFormatType === 'Date_long') {
+                cell.value = Math.floor(excelSerial);
+            }
+            else if (leafFormatType === 'Time' || leafFormatType === 'DateTime' || leafFormatType === 'DateTime_long') {
+                cell.value = excelSerial;
+            }
+            else {
+                cell.value = local.toDate();
+            }
+            switch (leafFormatType) {
+                case 'Time':
+                    cell.numFmt = 'h:mm AM/PM';
+                    break;
+                case 'DateTime':
+                case 'DateTime_long':
+                    cell.numFmt = 'mm/dd/yyyy h:mm AM/PM';
+                    break;
+                case 'Date':
+                    cell.numFmt = 'mm/dd/yyyy';
+                    break;
+                case 'Date_long':
+                default:
+                    cell.numFmt = 'mm/dd/yyyy';
+                    break;
+            }
+            return;
+        }
+    }
+    if (Array.isArray(value)) {
+        cell.value = value.join(', ');
+        return;
+    }
+    if (isExcelNumericField(fieldMeta)) {
+        var parsed = parseExcelNumber(value);
+        if (parsed !== null) {
+            cell.value = parsed;
+            if ((fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.leafFormatType) === 'Currency') {
+                cell.numFmt = '"$"#,##0.00;[Red]-"$"#,##0.00';
+            }
+            else if ((fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.leafFormatType) === 'Number' || (fieldMeta === null || fieldMeta === void 0 ? void 0 : fieldMeta.leafValueType) === 'Count') {
+                cell.numFmt = '#,##0';
+            }
+            return;
+        }
+    }
+    if (typeof value === 'string') {
+        cell.value = value.replace(/\t/g, '').replace(/\n/g, '');
+    }
+    else {
+        cell.value = value;
+    }
+}
+function getMaxRows(row) {
+    var keys = Object.keys(row || {});
+    var maxArray = [];
+    for (var i = 0; i < keys.length; i++) {
+        if (Array.isArray(row[keys[i]]) && row[keys[i]].length > maxArray.length) {
+            maxArray = row[keys[i]];
+        }
+        else if (maxArray.length === 0) {
+            maxArray = [row[keys[i]]];
+        }
+    }
+    return maxArray;
+}
 function applyClientGroupSortToData(results, report, sorts) {
     if (sorts === void 0) { sorts = []; }
     if (!Array.isArray(results) || !results.length) {
@@ -451,7 +845,7 @@ function loadCronJobMethods(methodManager) {
             }),
             function: function (data) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var report, fieldsObj_1, count_1, idRemap_1, groupIds_1, userSorts, userSortByField_1, groupSorts, nonGroupSorts, effectiveSorts, sortObj_1, totalsForQuery, rootOptions, filters_1, filterArrayFields_1, filterArrays_1, res, results_1, reportTotals, customFields, exportFields_1, lines_1, tmpHeaders_1, wb, ws, wbout, _a, _b, email, e_2_1, wb, ws_1, currentRow_1, row, copy, widths_1, i, now, buffer, _c, _d, email, e_3_1, err_1, datedUniqueDates_1, datedUniqueGroups_1, datedData_1, reportTotalGroups_1, reportTotalDates_1, _loop_1, i, tmpResults, wb, ws, currentRow, currentCol_1, row_1, _loop_2, i, i, total, j, field, buffer, _e, _f, email, e_4_1, err_2, err_3;
+                    var report, layoutColumns_1, selectedFields, fieldsObj_1, selectedFieldsForQuery_1, groupIds_1, userSorts, userSortByField_1, groupSorts, nonGroupSorts, effectiveSorts, sortObj_1, totalsForQuery, rootOptions, filters_1, filterArrayFields_1, filterArrays_1, res, results_1, reportTotals, customFields, exportFields_1, wb, ws_1, currentRow_1, row_1, useLayout_1, headers_1, exportResults, buffer, _a, _b, email, e_2_1, err_1, wb, ws_2, currentRow_2, row, copy, widths_1, i, now, buffer, _c, _d, email, e_3_1, err_2, datedUniqueDates_1, datedUniqueGroups_1, datedData_1, reportTotalGroups_1, reportTotalDates_1, _loop_1, i, tmpResults, wb, ws, currentRow, currentCol_1, row_2, _loop_2, i, i, total, j, field, buffer, _e, _f, email, e_4_1, err_3, err_4;
                     var e_2, _g, e_3, _h, e_4, _j;
                     return __generator(this, function (_k) {
                         switch (_k.label) {
@@ -460,9 +854,32 @@ function loadCronJobMethods(methodManager) {
                                 report = _k.sent();
                                 _k.label = 2;
                             case 2:
-                                _k.trys.push([2, 39, , 40]);
+                                _k.trys.push([2, 43, , 44]);
+                                layoutColumns_1 = getLayoutColumnsFromReport(report);
+                                selectedFields = syncSelectedFieldsFromLayout(report, layoutColumns_1);
+                                report.fields_selected = selectedFields;
+                                report.fields_layout = layoutColumns_1;
+                                (report.fields_selected || []).forEach(function (field, index) {
+                                    if (!(field === null || field === void 0 ? void 0 : field.id)) {
+                                        field.id = "f_".concat(index);
+                                    }
+                                });
+                                (report.fields_custom || []).forEach(function (custom) {
+                                    if (!custom) {
+                                        return;
+                                    }
+                                    if (!custom.selFieldId && custom.id) {
+                                        var match = (report.fields_selected || []).find(function (field) { return field.fieldPath === custom.id; });
+                                        if (match === null || match === void 0 ? void 0 : match.id) {
+                                            custom.selFieldId = match.id;
+                                        }
+                                    }
+                                });
                                 report.fields_selected.forEach(function (field) {
                                     var _a, _b;
+                                    if (!(field === null || field === void 0 ? void 0 : field.fieldPath)) {
+                                        return;
+                                    }
                                     var dotPath = field.fieldPath.replace(/\.\$/g, '');
                                     var fieldData = dotPath.split('.');
                                     field.fieldPathObj = null;
@@ -475,26 +892,14 @@ function loadCronJobMethods(methodManager) {
                                         }
                                     }
                                 });
-                                if (!((report.fields_selected && report.fields_selected.length) || (report.groups_row && report.groups_row.length))) return [3 /*break*/, 38];
+                                if (!((report.fields_selected && report.fields_selected.length) || (report.groups_row && report.groups_row.length))) return [3 /*break*/, 42];
                                 fieldsObj_1 = {};
-                                count_1 = 0;
-                                idRemap_1 = {};
+                                selectedFieldsForQuery_1 = (report.fields_selected || []).filter(function (field) { return !(((field === null || field === void 0 ? void 0 : field.fieldPath) || '').startsWith('c_')); });
                                 report.fields_sort = report.fields_sort || [];
-                                report.fields_selected.forEach(function (field) {
-                                    if (field.collection_name === report.collection_root) {
+                                selectedFieldsForQuery_1.forEach(function (field) {
+                                    if (field.collection_name === report.collection_root && field.fieldPathObj) {
                                         fieldsObj_1 = (0, common_1.mergeDeep)(fieldsObj_1, field.fieldPathObj);
                                     }
-                                    var oldId = field['id'];
-                                    var newId = 'f_' + count_1;
-                                    if (oldId) {
-                                        idRemap_1[oldId] = newId;
-                                    }
-                                    var sortIndex = report.fields_sort.findIndex(function (a) { return a.field === oldId; });
-                                    if (sortIndex >= 0) {
-                                        report.fields_sort[sortIndex].field = newId;
-                                    }
-                                    field['id'] = newId;
-                                    count_1 += 1;
                                 });
                                 groupIds_1 = (report.groups_row || []).map(function (g) { return g.id; }).filter(Boolean);
                                 userSorts = (report.fields_sort || []).filter(function (s) { return !!s.field; });
@@ -513,9 +918,6 @@ function loadCronJobMethods(methodManager) {
                                         if (!targetField) {
                                             return;
                                         }
-                                        if (!targetField.startsWith('gr_') && !targetField.startsWith('layout_col_')) {
-                                            targetField = idRemap_1[targetField] || targetField;
-                                        }
                                         if (targetField.startsWith('layout_col_')) {
                                             var resolved = resolveFieldRefToLeafId(targetField, report);
                                             targetField = resolved || targetField;
@@ -537,7 +939,7 @@ function loadCronJobMethods(methodManager) {
                                         if (ref.startsWith('layout_col_')) {
                                             return resolveFieldRefToLeafId(ref, report);
                                         }
-                                        return idRemap_1[ref] || ref;
+                                        return ref;
                                     })
                                         .filter(function (f) { return !!f; });
                                     return __assign(__assign({}, total), { fields: mappedFields });
@@ -552,6 +954,13 @@ function loadCronJobMethods(methodManager) {
                                 filters_1 = [];
                                 filterArrayFields_1 = [];
                                 filterArrays_1 = [];
+                                selectedFieldsForQuery_1
+                                    .filter(function (f) { return (f.fieldPath || '').includes('.$.'); })
+                                    .forEach(function (sel) {
+                                    if (!filterArrayFields_1.some(function (f) { return (f === null || f === void 0 ? void 0 : f.fieldPath) === sel.fieldPath; })) {
+                                        filterArrayFields_1.push(sel);
+                                    }
+                                });
                                 (report.fields_filter || []).forEach(function (filterAnd) {
                                     var ors = [];
                                     var hasArrayTarget = false;
@@ -569,7 +978,7 @@ function loadCronJobMethods(methodManager) {
                                             }
                                             if (isArrayTarget) {
                                                 hasArrayTarget = true;
-                                                var leaf_1 = (report.fields_selected || []).find(function (a) { return a.fieldPath === path; });
+                                                var leaf_1 = selectedFieldsForQuery_1.find(function (a) { return a.fieldPath === path; });
                                                 if (leaf_1 && !filterArrayFields_1.some(function (f) { return (f === null || f === void 0 ? void 0 : f.fieldPath) === leaf_1.fieldPath; })) {
                                                     filterArrayFields_1.push(leaf_1);
                                                 }
@@ -586,10 +995,10 @@ function loadCronJobMethods(methodManager) {
                                         }
                                     }
                                 });
-                                return [4 /*yield*/, this.callMethod('reportBuilderGetResults', report.type, report.collection_root, rootOptions, filters_1, filterArrays_1, filterArrayFields_1, report.fields_selected, report.fields_custom, report.groups_row, totalsForQuery, report.fields_link, report.id_date_field || null, report.date_interval || null, report.group_type)];
+                                return [4 /*yield*/, this.callMethod('reportBuilderGetResults', report.type, report.collection_root, rootOptions, filters_1, filterArrays_1, filterArrayFields_1, selectedFieldsForQuery_1, report.fields_custom, report.groups_row, totalsForQuery, report.fields_link, report.id_date_field || null, report.date_interval || null, report.group_type)];
                             case 3:
                                 res = _k.sent();
-                                if (!(res && res[0])) return [3 /*break*/, 38];
+                                if (!(res && res[0])) return [3 /*break*/, 42];
                                 results_1 = res[0].results;
                                 reportTotals = res[0].totals;
                                 if (report.type === 'Group') {
@@ -597,7 +1006,7 @@ function loadCronJobMethods(methodManager) {
                                 }
                                 customFields = (report.fields_custom || []).map(function (cust) { return (__assign(__assign({}, cust), { id: cust.selFieldId, fieldType: 'Number', leafValueType: cust.leafValueType || 'Value', leafFormatType: 'Number', columnName: cust.columnName || cust.id, show: true })); });
                                 exportFields_1 = report.fields_selected.filter(function (a) { return a.show; }).concat(customFields);
-                                if (!(report.type === 'List')) return [3 /*break*/, 12];
+                                if (!(report.type === 'List')) return [3 /*break*/, 16];
                                 exportFields_1.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) {
@@ -660,94 +1069,141 @@ function loadCronJobMethods(methodManager) {
                                         });
                                     }
                                 });
-                                lines_1 = [];
-                                tmpHeaders_1 = {};
+                                wb = new Excel.Workbook();
+                                ws_1 = wb.addWorksheet('RB_1', { views: [{ showGridLines: true }] });
+                                wb.properties.date1904 = false;
+                                wb.calcProperties.fullCalcOnLoad = true;
+                                currentRow_1 = 1;
+                                row_1 = ws_1.getRow(currentRow_1);
+                                row_1.getCell(2).font = {
+                                    name: 'Arial',
+                                    bold: true,
+                                    size: 14
+                                };
+                                row_1.getCell(4).font = {
+                                    name: 'Arial',
+                                    size: 14
+                                };
+                                row_1.getCell(2).value = 'Report Name:';
+                                row_1.getCell(4).value = report.report_name;
+                                currentRow_1 += 1;
+                                row_1 = ws_1.getRow(currentRow_1);
+                                row_1.getCell(2).font = {
+                                    name: 'Arial',
+                                    bold: true,
+                                    size: 14
+                                };
+                                row_1.getCell(4).font = {
+                                    name: 'Arial',
+                                    size: 14
+                                };
+                                row_1.getCell(2).value = 'Run Date:';
+                                row_1.getCell(4).value = moment().format('LLL');
+                                currentRow_1 += 2;
+                                row_1 = ws_1.getRow(currentRow_1);
+                                useLayout_1 = (layoutColumns_1 && layoutColumns_1.length > 0);
+                                headers_1 = [];
                                 report.groups_row.forEach(function (group) {
-                                    tmpHeaders_1[group.id] = group.columnName;
+                                    headers_1.push(group.columnName);
                                 });
-                                exportFields_1.forEach(function (header) {
-                                    tmpHeaders_1[header.columnName] = header.columnName;
+                                if (useLayout_1) {
+                                    layoutColumns_1.forEach(function (col, idx) {
+                                        headers_1.push(col.header || "Column ".concat(idx + 1));
+                                    });
+                                }
+                                else {
+                                    exportFields_1.forEach(function (field) {
+                                        headers_1.push(field.columnName);
+                                    });
+                                }
+                                headers_1.forEach(function (header, headerIdx) {
+                                    row_1.getCell(headerIdx + 1).value = header;
                                 });
-                                wb = XLSX.utils.book_new();
-                                results_1.forEach(function (result) {
-                                    var tmp = {};
+                                currentRow_1 += 1;
+                                row_1 = ws_1.getRow(currentRow_1);
+                                exportResults = (0, common_1.deepCopy)(results_1 || []);
+                                exportResults.forEach(function (result) {
+                                    var currentCol = 1;
                                     report.groups_row.forEach(function (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 {
-                                                tmp[group.columnName] = result._id[group.id] || '';
-                                            }
-                                        }
+                                        var _a, _b;
+                                        writeExcelCell(row_1.getCell(currentCol), (_b = (_a = result === null || result === void 0 ? void 0 : result._id) === null || _a === void 0 ? void 0 : _a[group.id]) !== null && _b !== void 0 ? _b : '', group.treeItem);
+                                        currentCol += 1;
                                     });
-                                    exportFields_1.forEach(function (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 {
-                                                tmp[header.columnName] = result[header.id] || '';
-                                            }
-                                        }
-                                    });
-                                    lines_1.push(tmp);
+                                    if (useLayout_1) {
+                                        var layoutRow_1 = materializeLayoutRow(report, layoutColumns_1, report.fields_selected, result);
+                                        layoutColumns_1.forEach(function (col, colIdx) {
+                                            var cellValue = getLayoutCellExportValue(report, layoutRow_1, colIdx);
+                                            var primaryFieldMeta = getPrimaryFieldForLayoutColumn(col, report.fields_selected);
+                                            writeExcelCell(row_1.getCell(currentCol), cellValue === undefined ? '' : cellValue, primaryFieldMeta);
+                                            currentCol += 1;
+                                        });
+                                    }
+                                    else {
+                                        exportFields_1.forEach(function (field) {
+                                            var _a;
+                                            writeExcelCell(row_1.getCell(currentCol), (_a = result[field.id]) !== null && _a !== void 0 ? _a : '', field);
+                                            currentCol += 1;
+                                        });
+                                    }
+                                    currentRow_1 += 1;
+                                    row_1 = ws_1.getRow(currentRow_1);
                                 });
-                                ws = XLSX.utils.json_to_sheet(lines_1);
-                                XLSX.utils.book_append_sheet(wb, ws, 'RB Data');
-                                wbout = XLSX.write(wb, { bookType: 'xlsx', type: 'base64' });
                                 _k.label = 4;
                             case 4:
-                                _k.trys.push([4, 9, 10, 11]);
-                                _a = __values(data['emails']), _b = _a.next();
-                                _k.label = 5;
+                                _k.trys.push([4, 14, , 15]);
+                                return [4 /*yield*/, wb.xlsx.writeBuffer()];
                             case 5:
-                                if (!!_b.done) return [3 /*break*/, 8];
+                                buffer = _k.sent();
+                                _k.label = 6;
+                            case 6:
+                                _k.trys.push([6, 11, 12, 13]);
+                                _a = __values(data['emails']), _b = _a.next();
+                                _k.label = 7;
+                            case 7:
+                                if (!!_b.done) return [3 /*break*/, 10];
                                 email = _b.value;
-                                return [4 /*yield*/, this.sendEmail(email, this.serverConfig['CLIENT_NAME'] + ' Scheduled Report - ' + report.report_name, '', "\n\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<b>Report Name: </b>" + report.report_name + "<br>\n\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\tAttached are the results of this automated report.<br><br>\n\t\t\t\t\t\t\t\t\t\tResolveIO<br><br>", [
+                                return [4 /*yield*/, this.sendEmail(email, this.serverConfig['CLIENT_NAME'] + ' Scheduled Report - ' + report.report_name, '', "\n\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<b>Report Name: </b>" + report.report_name + "<br>\n\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\tAttached are the results of this automated report.<br><br>\n\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,
-                                            encoding: 'base64'
+                                            content: buffer
                                         }
                                     ], this.serverConfig['MAIL_FROM_REPORTS'], '')];
-                            case 6:
+                            case 8:
                                 _k.sent();
-                                _k.label = 7;
-                            case 7:
-                                _b = _a.next();
-                                return [3 /*break*/, 5];
-                            case 8: return [3 /*break*/, 11];
+                                _k.label = 9;
                             case 9:
+                                _b = _a.next();
+                                return [3 /*break*/, 7];
+                            case 10: return [3 /*break*/, 13];
+                            case 11:
                                 e_2_1 = _k.sent();
                                 e_2 = { error: e_2_1 };
-                                return [3 /*break*/, 11];
-                            case 10:
+                                return [3 /*break*/, 13];
+                            case 12:
                                 try {
                                     if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                                 }
                                 finally { if (e_2) throw e_2.error; }
                                 return [7 /*endfinally*/];
-                            case 11: return [3 /*break*/, 38];
-                            case 12:
-                                if (!(report.type === 'Group')) return [3 /*break*/, 25];
+                            case 13: return [3 /*break*/, 15];
+                            case 14:
+                                err_1 = _k.sent();
+                                console.log('Error writing excel export', err_1);
+                                return [3 /*break*/, 15];
+                            case 15: return [3 /*break*/, 42];
+                            case 16:
+                                if (!(report.type === 'Group')) return [3 /*break*/, 29];
                                 exportFields_1.forEach(function (field) {
                                     results_1.forEach(function (result) {
                                         modifyDataTypeField(report, result, field, 1);
                                     });
                                 });
                                 wb = new Excel.Workbook();
-                                ws_1 = wb.addWorksheet('RB_1', { views: [{ showGridLines: false }] });
+                                ws_2 = wb.addWorksheet('RB_1', { views: [{ showGridLines: false }] });
                                 wb.properties.date1904 = false;
                                 wb.calcProperties.fullCalcOnLoad = true;
-                                currentRow_1 = 1;
-                                row = ws_1.getRow(currentRow_1);
+                                currentRow_2 = 1;
+                                row = ws_2.getRow(currentRow_2);
                                 row.getCell(2).font = {
                                     name: 'Arial',
                                     bold: true,
@@ -759,8 +1215,8 @@ function loadCronJobMethods(methodManager) {
                                 };
                                 row.getCell(2).value = 'Report Name:';
                                 row.getCell(4).value = report.report_name;
-                                currentRow_1 += 1;
-                                row = ws_1.getRow(currentRow_1);
+                                currentRow_2 += 1;
+                                row = ws_2.getRow(currentRow_2);
                                 row.getCell(2).font = {
                                     name: 'Arial',
                                     bold: true,
@@ -772,30 +1228,30 @@ function loadCronJobMethods(methodManager) {
                                 };
                                 row.getCell(2).value = 'Run Date:';
                                 row.getCell(4).value = moment().format('LLL');
-                                currentRow_1 += 2;
+                                currentRow_2 += 2;
                                 copy = (0, common_1.deepCopy)(results_1);
                                 widths_1 = [];
                                 copy.forEach(function (res) {
-                                    currentRow_1 = tabGroupExcelRecursive(report, ws_1, currentRow_1, 1, res, exportFields_1);
+                                    currentRow_2 = tabGroupExcelRecursive(report, ws_2, currentRow_2, 1, res, exportFields_1);
                                     tabGroupExcelWidthRecursive(report, 1, res, widths_1, exportFields_1);
                                 });
-                                for (i = 1; i < ws_1.columns.length; i++) {
-                                    ws_1.columns[i].width = widths_1[i - 1];
+                                for (i = 1; i < ws_2.columns.length; i++) {
+                                    ws_2.columns[i].width = widths_1[i - 1];
                                 }
                                 now = new Date();
-                                _k.label = 13;
-                            case 13:
-                                _k.trys.push([13, 23, , 24]);
+                                _k.label = 17;
+                            case 17:
+                                _k.trys.push([17, 27, , 28]);
                                 return [4 /*yield*/, wb.xlsx.writeBuffer()];
-                            case 14:
+                            case 18:
                                 buffer = _k.sent();
-                                _k.label = 15;
-                            case 15:
-                                _k.trys.push([15, 20, 21, 22]);
+                                _k.label = 19;
+                            case 19:
+                                _k.trys.push([19, 24, 25, 26]);
                                 _c = __values(data['emails']), _d = _c.next();
-                                _k.label = 16;
-                            case 16:
-                                if (!!_d.done) return [3 /*break*/, 19];
+                                _k.label = 20;
+                            case 20:
+                                if (!!_d.done) return [3 /*break*/, 23];
                                 email = _d.value;
                                 return [4 /*yield*/, this.sendEmail(email, this.serverConfig['CLIENT_NAME'] + ' Scheduled Report - ' + report.report_name, '', "\n\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<b>Report Name: </b>" + report.report_name + "<br>\n\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\tAttached are the results of this automated report.<br><br>\n\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\tResolveIO<br><br>", [
                                         {
@@ -803,33 +1259,33 @@ function loadCronJobMethods(methodManager) {
                                             content: buffer
                                         }
                                     ], this.serverConfig['MAIL_FROM_REPORTS'], '')];
-                            case 17:
+                            case 21:
                                 _k.sent();
-                                _k.label = 18;
-                            case 18:
+                                _k.label = 22;
+                            case 22:
                                 _d = _c.next();
-                                return [3 /*break*/, 16];
-                            case 19: return [3 /*break*/, 22];
-                            case 20:
+                                return [3 /*break*/, 20];
+                            case 23: return [3 /*break*/, 26];
+                            case 24:
                                 e_3_1 = _k.sent();
                                 e_3 = { error: e_3_1 };
-                                return [3 /*break*/, 22];
-                            case 21:
+                                return [3 /*break*/, 26];
+                            case 25:
                                 try {
                                     if (_d && !_d.done && (_h = _c.return)) _h.call(_c);
                                 }
                                 finally { if (e_3) throw e_3.error; }
                                 return [7 /*endfinally*/];
-                            case 22: return [3 /*break*/, 24];
-                            case 23:
-                                err_1 = _k.sent();
-                                console.log('Error writing excel export', err_1);
-                                return [3 /*break*/, 24];
-                            case 24:
+                            case 26: return [3 /*break*/, 28];
+                            case 27:
+                                err_2 = _k.sent();
+                                console.log('Error writing excel export', err_2);
+                                return [3 /*break*/, 28];
+                            case 28:
                                 ;
-                                return [3 /*break*/, 38];
-                            case 25:
-                                if (!(report.type === 'Dated')) return [3 /*break*/, 38];
+                                return [3 /*break*/, 42];
+                            case 29:
+                                if (!(report.type === 'Dated')) return [3 /*break*/, 42];
                                 datedUniqueDates_1 = [];
                                 datedUniqueGroups_1 = [];
                                 datedData_1 = [];
@@ -1089,36 +1545,36 @@ function loadCronJobMethods(methodManager) {
                                 wb.calcProperties.fullCalcOnLoad = true;
                                 currentRow = 1;
                                 currentCol_1 = 1;
-                                row_1 = ws.getRow(currentRow);
-                                row_1.getCell(2).font = {
+                                row_2 = ws.getRow(currentRow);
+                                row_2.getCell(2).font = {
                                     name: 'Arial',
                                     bold: true,
                                     size: 14
                                 };
-                                row_1.getCell(4).font = {
+                                row_2.getCell(4).font = {
                                     name: 'Arial',
                                     size: 14
                                 };
-                                row_1.getCell(2).value = 'Report Name:';
-                                row_1.getCell(4).value = report.report_name;
+                                row_2.getCell(2).value = 'Report Name:';
+                                row_2.getCell(4).value = report.report_name;
                                 currentRow += 1;
-                                row_1 = ws.getRow(currentRow);
-                                row_1.getCell(2).font = {
+                                row_2 = ws.getRow(currentRow);
+                                row_2.getCell(2).font = {
                                     name: 'Arial',
                                     bold: true,
                                     size: 14
                                 };
-                                row_1.getCell(4).font = {
+                                row_2.getCell(4).font = {
                                     name: 'Arial',
                                     size: 14
                                 };
-                                row_1.getCell(2).value = 'Run Date:';
-                                row_1.getCell(4).value = moment().format('LLL');
+                                row_2.getCell(2).value = 'Run Date:';
+                                row_2.getCell(4).value = moment().format('LLL');
                                 currentRow += 2;
-                                row_1 = ws.getRow(currentRow);
+                                row_2 = ws.getRow(currentRow);
                                 // Add group column headers
                                 report.groups_row.forEach(function (group) {
-                                    row_1.getCell(currentCol_1).value = group.columnName;
+                                    row_2.getCell(currentCol_1).value = group.columnName;
                                     currentCol_1++;
                                 });
                                 // Add field headers
@@ -1126,46 +1582,46 @@ function loadCronJobMethods(methodManager) {
                                 // Add the date interval headers
                                 report.fields_selected.filter(function (a) { return a.show; }).forEach(function () {
                                     datedUniqueDates_1.forEach(function (date) {
-                                        row_1.getCell(currentCol_1).value = date.dateString;
+                                        row_2.getCell(currentCol_1).value = date.dateString;
                                         currentCol_1++;
                                     });
                                 });
                                 // Add totals headers
                                 report.fields_total.forEach(function (total) {
-                                    row_1.getCell(currentCol_1).value = 'Totals - ' + (0, common_1.toTitleCase)(total.type);
+                                    row_2.getCell(currentCol_1).value = 'Totals - ' + (0, common_1.toTitleCase)(total.type);
                                     currentCol_1++;
                                 });
                                 currentCol_1 = 1;
                                 currentRow += 1;
-                                row_1 = ws.getRow(currentRow);
+                                row_2 = ws.getRow(currentRow);
                                 _loop_2 = function (i) {
                                     var group = datedUniqueGroups_1[i];
                                     var _loop_3 = function (j) {
                                         var field = report.fields_selected.filter(function (a) { return a.show; })[j];
                                         currentCol_1 = 1;
-                                        row_1 = ws.getRow(currentRow);
+                                        row_2 = ws.getRow(currentRow);
                                         // Populate group data
                                         report.groups_row.forEach(function (groupRow) {
-                                            row_1.getCell(currentCol_1).value = (j === 0) ? group[groupRow.id] : '';
+                                            row_2.getCell(currentCol_1).value = (j === 0) ? group[groupRow.id] : '';
                                             currentCol_1++;
                                         });
                                         // Populate field data
-                                        row_1.getCell(currentCol_1).value = field.columnName;
+                                        row_2.getCell(currentCol_1).value = field.columnName;
                                         currentCol_1++;
                                         // Populate date interval data for each field
                                         for (var k = 0; k < datedUniqueDates_1.length; k++) {
                                             var result = datedData_1[k];
                                             if (result[i]) {
-                                                row_1.getCell(currentCol_1).value = result[i][field.id] ? result[i][field.id] : '';
+                                                row_2.getCell(currentCol_1).value = result[i][field.id] ? result[i][field.id] : '';
                                             }
                                             else {
-                                                row_1.getCell(currentCol_1).value = '';
+                                                row_2.getCell(currentCol_1).value = '';
                                             }
                                             currentCol_1++;
                                         }
                                         // Add totals for each field in the report
                                         for (var k = 0; k < report.fields_total.length; k++) {
-                                            row_1.getCell(currentCol_1).value = reportTotalGroups_1[i][field.id] ? reportTotalGroups_1[i][field.id] : '';
+                                            row_2.getCell(currentCol_1).value = reportTotalGroups_1[i][field.id] ? reportTotalGroups_1[i][field.id] : '';
                                             currentCol_1++;
                                         }
                                         currentRow++; // Move to the next row for the next field
@@ -1182,9 +1638,9 @@ function loadCronJobMethods(methodManager) {
                                 if (reportTotals) {
                                     for (i = 0; i < report.fields_total.length; i++) {
                                         total = report.fields_total[i];
-                                        row_1 = ws.getRow(currentRow);
+                                        row_2 = ws.getRow(currentRow);
                                         currentCol_1 = 1;
-                                        row_1.getCell(currentCol_1).value = (0, common_1.toTitleCase)(total.type) + ' Totals';
+                                        row_2.getCell(currentCol_1).value = (0, common_1.toTitleCase)(total.type) + ' Totals';
                                         currentCol_1 += report.groups_row.length; // Skip group columns
                                         // Skip the date columns for the totals row
                                         report.fields_selected.filter(function (a) { return a.show; }).forEach(function () {
@@ -1196,25 +1652,25 @@ function loadCronJobMethods(methodManager) {
                                         // Set totals in the correct fields
                                         for (j = 0; j < report.fields_selected.filter(function (a) { return a.show; }).length; j++) {
                                             field = report.fields_selected.filter(function (a) { return a.show; })[j];
-                                            row_1.getCell(currentCol_1).value = reportTotals[total.id + '_' + field.id] || '';
+                                            row_2.getCell(currentCol_1).value = reportTotals[total.id + '_' + field.id] || '';
                                             currentCol_1++;
                                         }
                                         currentRow++; // Move to the next row for the next total
                                     }
                                 }
-                                _k.label = 26;
-                            case 26:
-                                _k.trys.push([26, 36, , 37]);
+                                _k.label = 30;
+                            case 30:
+                                _k.trys.push([30, 40, , 41]);
                                 return [4 /*yield*/, wb.xlsx.writeBuffer()];
-                            case 27:
+                            case 31:
                                 buffer = _k.sent();
-                                _k.label = 28;
-                            case 28:
-                                _k.trys.push([28, 33, 34, 35]);
+                                _k.label = 32;
+                            case 32:
+                                _k.trys.push([32, 37, 38, 39]);
                                 _e = __values(data['emails']), _f = _e.next();
-                                _k.label = 29;
-                            case 29:
-                                if (!!_f.done) return [3 /*break*/, 32];
+                                _k.label = 33;
+                            case 33:
+                                if (!!_f.done) return [3 /*break*/, 36];
                                 email = _f.value;
                                 return [4 /*yield*/, this.sendEmail(email, this.serverConfig['CLIENT_NAME'] + ' Scheduled Report - ' + report.report_name, '', "\n\t\t\t\t\t\t\t\t\t\t\t<b>".concat(this.serverConfig['CLIENT_NAME'], " Automated Report</b><br>\n\t\t\t\t\t\t\t\t\t\t\t<b>Report Name: </b>").concat(report.report_name, "<br>\n\t\t\t\t\t\t\t\t\t\t\t<b>Prepared By: </b>").concat(data['user'], "<br><br>\n\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\tResolveIO<br><br>"), [
                                         {
@@ -1222,35 +1678,35 @@ function loadCronJobMethods(methodManager) {
                                             content: buffer
                                         }
                                     ], this.serverConfig['MAIL_FROM_REPORTS'], '')];
-                            case 30:
+                            case 34:
                                 _k.sent();
-                                _k.label = 31;
-                            case 31:
+                                _k.label = 35;
+                            case 35:
                                 _f = _e.next();
-                                return [3 /*break*/, 29];
-                            case 32: return [3 /*break*/, 35];
-                            case 33:
+                                return [3 /*break*/, 33];
+                            case 36: return [3 /*break*/, 39];
+                            case 37:
                                 e_4_1 = _k.sent();
                                 e_4 = { error: e_4_1 };
-                                return [3 /*break*/, 35];
-                            case 34:
+                                return [3 /*break*/, 39];
+                            case 38:
                                 try {
                                     if (_f && !_f.done && (_j = _e.return)) _j.call(_e);
                                 }
                                 finally { if (e_4) throw e_4.error; }
                                 return [7 /*endfinally*/];
-                            case 35: return [3 /*break*/, 37];
-                            case 36:
-                                err_2 = _k.sent();
-                                console.log('Error writing excel export', err_2);
-                                return [3 /*break*/, 37];
-                            case 37: return [2 /*return*/, true];
-                            case 38: return [3 /*break*/, 40];
-                            case 39:
+                            case 39: return [3 /*break*/, 41];
+                            case 40:
                                 err_3 = _k.sent();
-                                err_3.message = "Error in Report Builder Cron Job - Report Builder Build Tree: ".concat(err_3.message);
-                                throw err_3;
-                            case 40: return [2 /*return*/, true];
+                                console.log('Error writing excel export', err_3);
+                                return [3 /*break*/, 41];
+                            case 41: return [2 /*return*/, true];
+                            case 42: return [3 /*break*/, 44];
+                            case 43:
+                                err_4 = _k.sent();
+                                err_4.message = "Error in Report Builder Cron Job - Report Builder Build Tree: ".concat(err_4.message);
+                                throw err_4;
+                            case 44: return [2 /*return*/, true];
                         }
                     });
                 });
@@ -1329,6 +1785,7 @@ function modifyDataTypeField(report, result, field, index) {
 }
 function tabGroupExcelRecursive(report, ws, currentRow, level, result, fields) {
     var row = ws.getRow(currentRow);
+    var fieldCount = fields.length;
     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' },
@@ -1343,7 +1800,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result, fields) {
         };
         var currentGroup = report.groups_row[level - 1];
         row.getCell(2).value = currentGroup.columnName + ': ' + (result._id[currentGroup.id] || '');
-        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(fieldCount + 1).$col$row);
         row.getCell(2).border = {
             top: { style: 'thick' },
             left: { style: 'thick' },
@@ -1373,7 +1830,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result, fields) {
                             left: { style: 'thick' }
                         };
                     }
-                    else if (fieldIndex === report.fields_selected.filter(function (a) { return a.show; }).length - 1) {
+                    else if (fieldIndex === fieldCount - 1) {
                         row.getCell(fieldIndex + 2).border = {
                             right: { style: 'thick' }
                         };
@@ -1407,7 +1864,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result, fields) {
                         bottom: { style: 'thick' }
                     };
                 }
-                else if (fieldIndex === report.fields_selected.filter(function (a) { return a.show; }).length - 1) {
+                else if (fieldIndex === fieldCount - 1) {
                     row.getCell(fieldIndex + 2).border = {
                         top: { style: 'thin' },
                         bottom: { style: 'thick' },
@@ -1447,7 +1904,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result, fields) {
         };
         var finalGroup = report.groups_row[level - 1];
         row.getCell(2).value = finalGroup.columnName + ': ' + (result._id[finalGroup.id] || '');
-        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(fieldCount + 1).$col$row);
         row.getCell(2).border = {
             top: { style: 'thick' },
             left: { style: 'thick' },
@@ -1474,22 +1931,29 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result, fields) {
                     left: { style: 'thick' }
                 };
             }
-            else if (fieldIndex === report.fields_selected.filter(function (a) { return a.show; }).length - 1) {
+            else if (fieldIndex === fieldCount - 1) {
                 row.getCell(fieldIndex + 2).border = {
                     right: { style: 'thick' }
                 };
             }
         });
         // Data
-        result['f_0'].forEach(function (res, resIndex) {
+        getMaxRows(result).forEach(function (res, resIndex) {
             currentRow += 1;
             row = ws.getRow(currentRow);
             fields.forEach(function (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), ''));
+                var value = null;
+                if (Array.isArray(result[field.id])) {
+                    value = result[field.id][resIndex] !== undefined ? result[field.id][resIndex] : result[field.id][result[field.id].length - 1];
+                }
+                else {
+                    value = result[field.id];
+                }
+                if (field.fieldType === 'Number' && typeof (value) === 'string' && value) {
+                    row.getCell(fieldIndex + 2).value = parseFloat(value.replace(new RegExp(/\,/g), '').replace(new RegExp(/\$/g), ''));
                 }
                 else {
-                    row.getCell(fieldIndex + 2).value = result[field.id][resIndex];
+                    row.getCell(fieldIndex + 2).value = value;
                 }
                 if (field.leafFormatType === 'Currency') {
                     row.getCell(fieldIndex + 2).numFmt = '"$"#,##0.00';
@@ -1506,7 +1970,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result, fields) {
                         left: { style: 'thick' }
                     };
                 }
-                else if (fieldIndex === report.fields_selected.filter(function (a) { return a.show; }).length - 1) {
+                else if (fieldIndex === fieldCount - 1) {
                     row.getCell(fieldIndex + 2).border = {
                         right: { style: 'thick' }
                     };
@@ -1539,7 +2003,7 @@ function tabGroupExcelRecursive(report, ws, currentRow, level, result, fields) {
                         bottom: { style: 'thick' }
                     };
                 }
-                else if (fieldIndex === report.fields_selected.filter(function (a) { return a.show; }).length - 1) {
+                else if (fieldIndex === fieldCount - 1) {
                     row.getCell(fieldIndex + 2).border = {
                         top: { style: 'thin' },
                         bottom: { style: 'thick' },
@@ -1587,14 +2051,16 @@ function tabGroupExcelWidthRecursive(report, level, result, cols, fields) {
             }
             else {
                 var res = result[field.id];
-                if (res) {
-                    length = res.length + 3;
+                var length_1 = 10;
+                if (res !== null && res !== undefined) {
+                    var resStr = (typeof res === 'string') ? res : "".concat(res);
+                    length_1 = resStr.length + 3;
                 }
                 if (!cols[fieldIndex]) {
                     cols[fieldIndex] = Math.max(10, field.columnName.length);
                 }
-                if (length > cols[fieldIndex]) {
-                    cols[fieldIndex] = length;
+                if (length_1 > cols[fieldIndex]) {
+                    cols[fieldIndex] = length_1;
                 }
             }
         });