Bugzilla – Attachment 92992 Details for
Bug 23626
Add a system preference to limit the number of rows of data used when charting or exporting report results
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23626: Move message to relavent chart control
Bug-23626-Move-message-to-relavent-chart-control.patch (text/plain), 3.14 KB, created by
Kyle M Hall (khall)
on 2019-09-20 10:54:16 UTC
(
hide
)
Description:
Bug 23626: Move message to relavent chart control
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2019-09-20 10:54:16 UTC
Size:
3.14 KB
patch
obsolete
>From f2c1d90db04a08a635468c90df27933a7414d9f4 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatersolutions.com> >Date: Fri, 20 Sep 2019 06:50:05 -0400 >Subject: [PATCH] Bug 23626: Move message to relavent chart control > >As it stands, this limit message makes it sounds like the chart data is limited where it clearly is not. >Instead, we should show the limit on the 'use all data' checkbox. > >As it stands, you could actual have more results data in the chart than the system preference allows >by only using the displayed results! I think this is a benefit and not a problem, since we are not >refetching those data to generate the chart. > >Instead, we need just move the 'warning' to make it clear when the syspref limit will be used and relevant. > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc | 7 ++++++- > .../prog/en/modules/reports/guided_reports_start.tt | 1 - > 2 files changed, 6 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc >index cb1f6d3b55..d092b6954e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc >@@ -1,3 +1,4 @@ >+[% USE Koha %] > <div class="modal" id="chartModal" tabindex="-1" role="dialog" aria-labelledby="chartModalLabel"> > <div class="modal-dialog modal-wide" role="document"> > <div class="modal-content"> >@@ -34,7 +35,11 @@ > </li> > > <li> >- <label for="include-all">Include all rows (ignore pagination):</label> >+ [% IF Koha.Preference("ReportsMaxRowsInChart") %] >+ <label for="include-all">Include first [% Koha.Preference("ReportsMaxRowsInChart") %] rows of full report (ignore pagination):</label> >+ [% ELSE %] >+ <label for="include-all">Include all rows (ignore pagination):</label> >+ [% END %] > <input id="include-all" name="chart-include-all" type="checkbox" /> > </li> > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >index bea40abcf6..de0409868a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt >@@ -719,7 +719,6 @@ canned reports and writing custom SQL reports.</p> > <h1>[% name | html %]</h1> > [% IF ( notes ) %]<p><span class="label">Notes:</span> [% notes | html %]</p>[% END %] > [% IF ( unlimited_total ) %]<p><span class="label">Total number of results:</span> [% unlimited_total | html %][% IF unlimited_total > limit %] ([% limit | html %] shown)[% END %].</p>[% END %] >-[% IF ( allresults.size == max_rows_in_chart ) %]Data in chart have been limited to [% max_rows_in_chart | html %] rows.[% END %] > > <div id="sql_output" style="display:none;"> > <span class="label">Report SQL:</span> >-- >2.20.1 (Apple Git-117)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23626
:
92845
|
92904
|
92905
|
92908
|
92909
|
92910
|
92919
|
92920
|
92921
|
92992
|
92994
|
93126
|
93137
|
93204
|
93406
|
93589
|
93720
|
93723
|
93729
|
93914
|
93915
|
93916
|
93981