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

Merge pull request #28331 from ljain112/fix-report-print

Browse source
This commit is contained in:
Suraj Shetty 2024-11-05 10:53:06 +05:30 • committed by GitHub
commit 3da56632d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -1481,10 +1481,14 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
get_filters_html_for_print() {
const applied_filters = this.get_filter_values();
return Object.keys(applied_filters)
.filter((fieldname) => !frappe.utils.is_empty(applied_filters[fieldname]))
.map((fieldname) => {
const docfield = frappe.query_report.get_filter(fieldname).df;
const value = applied_filters[fieldname];
if (frappe.utils.is_empty(value) || docfield.hidden_due_to_dependency) {
return null;
}
return `<div class="filter-row">
<b>${__(docfield.label, null, docfield.parent)}:</b> ${frappe.format(value, docfield)}
</div>`;
@ -1532,14 +1536,16 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
let filters = this.get_filter_values(true);
let boolean_labels = { 1: __("Yes"), 0: __("No") };
let applied_filters = Object.fromEntries(
Object.entries(filters).map(([key, value]) => [
frappe.query_report.get_filter(key).df.label,
frappe.query_report.get_filter(key).df.fieldtype == "Check"
? boolean_labels[value]
: value,
])
);
let applied_filters = {};
for (const [key, value] of Object.entries(filters)) {
const df = frappe.query_report.get_filter(key).df;
if (!df.hidden_due_to_dependency) {
applied_filters[df.label] =
df.fieldtype === "Check" ? boolean_labels[value] : value;
}
}
if (this.prepared_report_name) {
filters.prepared_report_name = this.prepared_report_name;
}