From cc8591e73ad15399ac6f4ae1e2066f37c2eccc82 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 15 Jun 2021 11:55:24 +0530 Subject: [PATCH 1/5] fix: Report View single vertical scrollbar --- frappe/public/scss/desk/report.scss | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss index ea09bd8046..3e26081d62 100644 --- a/frappe/public/scss/desk/report.scss +++ b/frappe/public/scss/desk/report.scss @@ -89,9 +89,19 @@ } .report-view { - .dt-row:last-child:not(.dt-row-filter) { - .dt-cell { - border-bottom: 1px solid var(--border-color); + margin-bottom: calc(var(--page-bottom-margin) * -1); + + .result { + min-height: calc(100vh - 320px) !important; + + .dt-row:last-child:not(.dt-row-filter) { + .dt-cell { + border-bottom: 1px solid var(--border-color); + } + } + + .dt-scrollable { + height: 30vw; } } } From 3709992dc1d7c9517e0efa2717c281069bd095d8 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 12 Jul 2021 21:27:38 +0530 Subject: [PATCH 2/5] fix: query_report & report_view single vertical scrollbar --- .../js/frappe/views/reports/query_report.js | 3 ++ .../js/frappe/views/reports/report_view.js | 2 ++ frappe/public/scss/desk/report.scss | 28 +++++++++++++++---- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 208d5b2f67..2027311bfe 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -518,6 +518,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } else { this.page.show_form(); } + + this.page.body[0].style.setProperty('--report-filter-height', this.page.page_form.css('height')); + this.page.body.parent().css('margin-bottom', 'unset'); } set_filters(filters) { diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 6a324f6034..2547dd6407 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -49,6 +49,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { this.setup_columns(); super.setup_new_doc_event(); this.page.main.addClass('report-view'); + this.page.body[0].style.setProperty('--report-filter-height', this.page.page_form.css('height')); + this.page.body.parent().css('margin-bottom', 'unset'); } toggle_side_bar() { diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss index 3e26081d62..b849f42b36 100644 --- a/frappe/public/scss/desk/report.scss +++ b/frappe/public/scss/desk/report.scss @@ -84,28 +84,44 @@ margin-bottom: 10px; } +.layout-main-section .frappe-card { + --report-filter-height: 0px; +} + .report-wrapper { overflow: auto; + + .datatable { + height: calc(100vh - var(--report-filter-height) - 205px); + + .dt-scrollable { + height: calc(100vh - var(--report-filter-height) - 275px); + } + } } .report-view { - margin-bottom: calc(var(--page-bottom-margin) * -1); - .result { - min-height: calc(100vh - 320px) !important; - .dt-row:last-child:not(.dt-row-filter) { .dt-cell { border-bottom: 1px solid var(--border-color); } } - .dt-scrollable { - height: 30vw; + .datatable { + height: calc(100vh - var(--report-filter-height) - 225px); + + .dt-scrollable { + height: calc(100vh - var(--report-filter-height) - 295px); + } } } } +// .frappe-card { +// height: calc(100vh - 165px); +// } + .group-by-button { margin: 5px; max-width: 125px; From 0967316c77f45772c099f781047b170b8c4f709c Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 12 Jul 2021 21:44:21 +0530 Subject: [PATCH 3/5] chore: remove commented code --- frappe/public/scss/desk/report.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss index b849f42b36..061fdef776 100644 --- a/frappe/public/scss/desk/report.scss +++ b/frappe/public/scss/desk/report.scss @@ -118,9 +118,6 @@ } } -// .frappe-card { -// height: calc(100vh - 165px); -// } .group-by-button { margin: 5px; From 792319444970d67d7414fb7ab14dfe44409e6a77 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 13 Jul 2021 10:29:53 +0530 Subject: [PATCH 4/5] fix: min-height for report view --- frappe/public/scss/desk/report.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss index 061fdef776..564b813ab2 100644 --- a/frappe/public/scss/desk/report.scss +++ b/frappe/public/scss/desk/report.scss @@ -102,6 +102,7 @@ .report-view { .result { + min-height: calc(100vh - 320px); .dt-row:last-child:not(.dt-row-filter) { .dt-cell { border-bottom: 1px solid var(--border-color); From f5c77f547ffd3db384feff6dc6cc554a8ec6347b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 13 Jul 2021 10:41:25 +0530 Subject: [PATCH 5/5] fix: minor fix --- frappe/public/scss/desk/report.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss index 564b813ab2..e2aae431aa 100644 --- a/frappe/public/scss/desk/report.scss +++ b/frappe/public/scss/desk/report.scss @@ -102,7 +102,7 @@ .report-view { .result { - min-height: calc(100vh - 320px); + min-height: 50vh !important; .dt-row:last-child:not(.dt-row-filter) { .dt-cell { border-bottom: 1px solid var(--border-color); @@ -119,7 +119,6 @@ } } - .group-by-button { margin: 5px; max-width: 125px;