Bugzilla – Attachment 61318 Details for
Bug 18283
Display improvements on report results - hide code and change wording
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED OFF] Bug 18283 - Display improvements on report results - hide code and change wording
SIGNED-OFF-Bug-18283---Display-improvements-on-rep.patch (text/plain), 3.57 KB, created by
Christopher Brannon
on 2017-03-20 14:50:10 UTC
(
hide
)
Description:
[SIGNED OFF] Bug 18283 - Display improvements on report results - hide code and change wording
Filename:
MIME Type:
Creator:
Christopher Brannon
Created:
2017-03-20 14:50:10 UTC
Size:
3.57 KB
patch
obsolete
>From 5ac1672d1741530e8043ff1b6ce156aa0273c92c Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Thu, 16 Mar 2017 11:28:29 -0400 >Subject: [PATCH] [SIGNED OFF] Bug 18283 - Display improvements on report > results - hide code and change wording >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >This patch makes small display improvements to the report results page. > >-Add toggle link for SQL code >-Change results count wording >-Add 'Notes:' label report notes > >To test: >1 - Apply patch >2 - Run some reports >3 - Check that results page makes sense >4 - Hide and display code and ensure toggle works > >Followed test plan, works as expected. >Signed-off-by: Marc Véron <veron@veron.ch> > >Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org> >--- > .../intranet-tmpl/prog/en/includes/reports-toolbar.inc | 4 ++++ > .../prog/en/modules/reports/guided_reports_start.tt | 13 ++++++++++--- > 2 files changed, 14 insertions(+), 3 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >index 0ea3cea..75599fc 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/reports-toolbar.inc >@@ -55,6 +55,10 @@ > <li><a id="ods" href="/cgi-bin/koha/reports/guided_reports.pl?reports=1&phase=Export&format=ods&sql=[% sql |uri %]&reportname=[% name |uri %]">Open Document Spreadsheet</a></li> > </ul> > </div> >+ <div class="btn-group"> >+ <a class="btn btn-default btn-sm toggle_sql" id="toggle_sql_hid" href="#"><i class="fa fa-eye"></i> Show sql code</a> >+ <a class="btn btn-default btn-sm toggle_sql" id="toggle_sql_vis" href="#" style="display:none;"><i class="fa fa-eye-slash"></i> Hide sql code</a> >+ </div> > [% END %] > > [% END %] >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 ad53c08..259186a 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 >@@ -172,6 +172,12 @@ $("#delColumn").on("click",function(){ > }); > [% END %] > >+ $(".toggle_sql").click(function(){ >+ $("#sql_output").toggle(); >+ $("#toggle_sql_hid").toggle(); >+ $("#toggle_sql_vis").toggle(); >+ }); >+ > $("#table_reports").delegate(".confirmdelete", 'click', function(){ > $(this).parents('tr').attr("class","warn"); > if(confirm(_("Are you sure you want to delete this saved report?"))){ >@@ -822,9 +828,10 @@ canned reports and writing custom SQL reports.</p> > > [% IF ( execute ) %] > <h1>[% name %]</h1> >-[% IF ( notes ) %]<p>[% notes %]</p>[% END %] >-[% IF ( unlimited_total ) %]<p>Total number of rows matching the (unlimited) query is [% unlimited_total %].</p>[% END %] >-<pre id="sql_output">[% sql |html %]</pre> >+[% IF ( notes ) %]<p><span class="label">Notes:</span> [% notes %]</p>[% END %] >+[% IF ( unlimited_total ) %]<p><span class="label">Total number of results:</span> [% unlimited_total %][% IF unlimited_total > limit %] ([% limit %] shown)[% END %].</p>[% END %] >+<div id="sql_output" style="display:none;"><span class="label">Report SQL:</span><pre>[% sql |html %]</pre></div> >+</br> > > <form action="/cgi-bin/koha/reports/guided_reports.pl" method="get" id="limitselect"> > <input type="hidden" name="phase" value="Run this report"/> >-- >2.1.4
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 18283
:
61175
|
61192
|
61207
|
61249
|
61253
|
61318
|
61359
|
61360