From a25e66cc00f3260f8ecbe8a9ea01c32d5050538e Mon Sep 17 00:00:00 2001 From: deepeshgarg007 Date: Fri, 31 May 2019 16:26:53 +0530 Subject: [PATCH] fix: Query report print fix --- .../public/js/frappe/views/reports/query_report.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 4172974cfe..b84b88347d 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -347,6 +347,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { this.render_datatable(); } else { + this.data = []; this.toggle_nothing_to_show(true); } @@ -922,12 +923,21 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } get_data_for_print() { - const indices = this.datatable.datamanager.getFilteredRowIndices(); - let rows = indices.map(i => this.data[i]); + if (!this.data.length) { + return []; + } + + const rows = this.datatable.datamanager.rowViewOrder.map(index => { + if (this.datatable.bodyRenderer.visibleRowIndices.includes(index)) { + return this.data[index]; + } + }).filter(Boolean); + let totalRow = this.datatable.bodyRenderer.getTotalRow().reduce((row, cell) => { row[cell.column.id] = cell.content; return row; }, {}); + rows.push(totalRow); return rows; }