diff --git a/client/desk/reportpage.js b/client/desk/reportpage.js index d218c6f1..69c12400 100644 --- a/client/desk/reportpage.js +++ b/client/desk/reportpage.js @@ -10,7 +10,7 @@ const Observable = require('frappejs/utils/observable'); // `getColumns` return columns module.exports = class ReportPage extends Page { - constructor({title, filterFields}) { + constructor({title, filterFields = []}) { super({title: title, hasRoute: true}); this.fullPage = true; @@ -30,6 +30,10 @@ module.exports = class ReportPage extends Page { // overrride } + getRowsForDataTable(data) { + return data; + } + makeFilters() { this.form = new Form({ parent: this.filterWrapper, @@ -79,14 +83,16 @@ module.exports = class ReportPage extends Page { method: this.method, args: filterValues }); - this.datatable.refresh(data); + + const rows = this.getRowsForDataTable(data); + this.datatable.refresh(rows); } makeDataTable() { - this.datatable = new DataTable(this.tableWrapper, { + this.datatable = new DataTable(this.tableWrapper, Object.assign({ columns: utils.convertFieldsToDatatableColumns(this.getColumns(), this.layout), data: [], layout: this.layout || 'fluid', - }); + }, this.datatableOptions || {})); } } \ No newline at end of file