vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge pull request #7079 from netchampfaris/fix-report-datatable

Browse source 
fix: Report fixes
This commit is contained in:
Suraj Shetty 2019-03-14 20:26:58 +05:30 • committed by GitHub
commit 90c3d43347
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frappe/public/js/frappe/views/reports/report_view.js
View file

@ -135,6 +135,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
render(force) {
if (this.data.length === 0) return;
this.render_count();
this.setup_columns();
if (this.chart) {
this.refresh_charts();
@ -224,7 +225,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
getEditor: this.get_editing_object.bind(this),
checkboxColumn: true,
inlineFilters: true,
cellHeight: 37,
cellHeight: 35,
events: {
onRemoveColumn: (column) => {
this.remove_column_from_datatable(column);
@ -1042,13 +1043,18 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
{
label: __('Print'),
action: () => {
this.report_data = this.data.slice();
// prepare rows in their current state, sorted and filtered
const rows_in_order = this.datatable.datamanager.rowViewOrder.map(index => {
if (this.datatable.bodyRenderer.visibleRowIndices.includes(index)) {
return this.data[index];
}
}).filter(Boolean);
if (this.add_totals_row) {
const total_data = this.get_columns_totals(this.data);
total_data['name'] = __('Totals').bold();
this.report_data.push(total_data);
rows_in_order.push(total_data);
}
frappe.ui.get_print_settings(false, (print_settings) => {
@ -1058,7 +1064,7 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
subtitle: this.get_filters_html_for_print(),
print_settings: print_settings,
columns: this.columns,
data: this.report_data
data: rows_in_order
});
});
}

4
frappe/public/less/frappe-datatable.less
View file

@ -61,6 +61,10 @@ table td.dt-cell {
}
}
.dt-row {
height: 35px;
}
.dt-row.dt-row-totalRow {
font-weight: bold;
}