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

Merge pull request #37583 from nextchamp-saqib/fix-empty-space-in-report-view

Browse source
This commit is contained in:
Suraj Shetty 2026-02-27 08:07:44 +05:30 • committed by GitHub
commit ca8fd0ea02
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 86 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -99,16 +99,6 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
});
}
setup_paging_area() {
super.setup_paging_area();
const message = __(
"For comparison, use >5, <10 or =324. For ranges, use 5:10 (for values between 5 & 10)."
);
this.$paging_area.before(
`<span class="comparison-message text-extra-muted">${message}</span>`
);
}
setup_sort_selector() {
this.sort_selector = new frappe.ui.SortSelector({
parent: this.filter_area.$filter_list_wrapper,
@ -430,6 +420,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
}
setup_inline_filter_observer() {
this.setup_inline_filter_help_icons();
this.$datatable_wrapper.on(
"keyup",
".dt-filter",
@ -439,6 +431,29 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView {
);
}
setup_inline_filter_help_icons() {
const message = __(
"For comparison, use >5, <10 or =324.\nFor ranges, use 5:10 (for values between 5 & 10)."
);
this.$datatable_wrapper.find(".dt-filter").each((_, input) => {
const $input = $(input);
if ($input.siblings(".comparison-help-icon").length) {
return;
}
const $icon = $(
`<span class="comparison-help-icon text-muted" title="${message}">${frappe.utils.icon(
"info",
"xs"
)}</span>`
);
$input.after($icon);
});
}
update_count_for_inline_filter() {
if (!this.datatable) return;

61
frappe/public/scss/desk/report.scss
View file

@ -93,6 +93,37 @@
border-radius: var(--border-radius);
}
}
.report-view {
.layout-main-section {
height: calc(100vh - var(--page-head-height));
display: flex;
flex-direction: column;
overflow: hidden;
.page-form {
flex-shrink: 0;
}
.frappe-list {
flex-grow: 1;
display: flex;
flex-direction: column;
overflow: hidden;
.result,
.no-result {
flex-grow: 1;
overflow: auto;
}
.comparison-message {
display: none;
}
}
}
}
@include media-breakpoint-up(sm) {
.report-view {
width: calc(100% - 220px);
@ -129,6 +160,36 @@
@include get_textstyle("base", "regular");
}
.report-view {
.datatable .dt-row-filter .dt-cell__content {
position: relative;
}
.datatable .dt-row-filter .dt-filter.dt-input {
padding-inline-end: 1.5rem;
}
.datatable .dt-row-filter .comparison-help-icon {
position: absolute;
top: 50%;
right: 10px;
transform: translateY(-50%);
display: inline-flex;
opacity: 0;
pointer-events: none;
transition: opacity 0.15s ease;
.icon {
stroke: currentColor;
}
}
.datatable .dt-row-filter .dt-filter.dt-input:focus + .comparison-help-icon {
opacity: 1;
pointer-events: auto;
}
}
.list-count {
margin-right: var(--margin-sm);
@include get_textstyle("base", "regular");