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

Merge pull request #26893 from barredterra/query-report-filters

Browse source
This commit is contained in:
Raffael Meyer 2024-06-28 19:37:53 +02:00 • committed by GitHub
commit 552646daf2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1330,7 +1330,14 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
raise && this.toggle_message(false);
return this.filters
.filter((f) => f.get_value())
.filter((f) => {
const filter_value = f.get_value();
if (typeof filter_value === "object") {
return filter_value.length > 0;
} else {
return filter_value;
}
})
.map((f) => {
var v = f.get_value();
// hidden fields dont have $input
@ -1473,16 +1480,23 @@ 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)
const filter_html = Object.keys(applied_filters)
.map((fieldname) => {
const docfield = frappe.query_report.get_filter(fieldname).df;
const value = applied_filters[fieldname];
return `<h6>${__(docfield.label, null, docfield.parent)}: ${frappe.format(
value,
docfield
)}</h6>`;
return `<div class="filter-row">
<b>${__(docfield.label, null, docfield.parent)}:</b> ${frappe.format(value, docfield)}
</div>`;
})
.join("");
return `<div>${filter_html}</div>
<style>
.filter-row div {
/* prevent newline + right alignment of number fields */
display: inline-block;
}
</style>`;
}
export_report() {