Bugzilla – Attachment 53322 Details for
Bug 16531
Circ overdues report is showing an empty table if no overdues
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 16531: Circ overdue report is showing an empty table if no overdues
SIGNED-OFF-Bug-16531-Circ-overdue-report-is-showin.patch (text/plain), 6.76 KB, created by
Owen Leonard
on 2016-07-12 16:51:15 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 16531: Circ overdue report is showing an empty table if no overdues
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2016-07-12 16:51:15 UTC
Size:
6.76 KB
patch
obsolete
>From 73ff599d5a6768b205e5aa6e24e6d8040415579c Mon Sep 17 00:00:00 2001 >From: Aleisha <aleishaamohia@hotmail.com> >Date: Tue, 17 May 2016 04:46:31 +0000 >Subject: [PATCH] [SIGNED-OFF] Bug 16531: Circ overdue report is showing an > empty table if no overdues >Content-Type: text/plain; charset="utf-8" > >EDIT: Comment 2 >EDIT2: using noreport variable (Comment 5) > >To test: >1) Ensure you have no items overdue >2) Go to Circ -> Circulation reports -> Overdues >3) Notice empty table, '0 items overdue' heading >4) Ensure syspref FilterBeforeOverdueReport is set to 'Don't require' >5) Apply patch and refresh page >6) Notice empty table is no longer showing and page says "There are no > overdues" >7) Apply a filter to search >8) Page now says "There are no overdues matching your search" with a > link to reset filter. >9) Click Reset filter -> confirm any filters you applied are cleared. >10) Set FilterBeforeOverdueReport to 'Require' and refresh overdue > report >11) Page should say "Please choose one or more filters to proceed" >12) Check out an item to a member, ensure due date is a date that has > passed (i.e. yesterday) >13) Refresh overdue report page >14) Page should still say "Please choose one or more filters to proceed" >15) Set FilterBeforeOverdueReport to 'Don't require' >16) Confirm table now shows correctly with '1 items overdue' heading > etc. > >Sponsored-by: Catalyst IT >Signed-off-by: Owen Leonard <oleonard@myacpl.org> >--- > .../intranet-tmpl/prog/en/modules/circ/overdue.tt | 86 ++++++++++++---------- > 1 file changed, 48 insertions(+), 38 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >index 4ebc7d2..64eb871 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt >@@ -78,55 +78,65 @@ > <div class="yui-b"> > > [% IF ( noreport ) %] >- >-<h2>Overdue report</h2> >- >-<p>Please choose one or more filters to proceed.</p> >- >+ <h2>Overdue report</h2> >+ <p>Please choose one or more filters to proceed.</p> > [% ELSE %] > >-<h2>[% nnoverdue %] [% IF ( noverdue_is_plural ) %]Items[% ELSE %]Item[% END %] >-overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70%;">(Filtered. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a>)</span>[% END %]</h2> >+[% IF ( overdueloop ) %] > >-<p> >+ <h2>[% nnoverdue %] [% IF ( noverdue_is_plural ) %]Items[% ELSE %]Item[% END %] overdue as of [% todaysdate %][% IF ( isfiltered ) %] <span style="font-size:70%;">(Filtered. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a>)</span>[% END %]</h2> >+ >+ <p> > [% IF ( isfiltered ) %] > <a href="overdue.pl?op=csv&[% csv_param_string |html %]">Download file of displayed overdues</a> > [% ELSE %] > <a href="overdue.pl?op=csv">Download file of all overdues</a> > [% END %] >-</p> >-<div class="sql"><pre>[% sql |html %]</pre></div> >-<div class="searchresults"> >-<table id="overduest"> >-<thead><tr> >- <th>Due date</th> >- <th>Patron</th> >- <th>Library</th> >- <th>Title</th> >- <th>Barcode</th> >- <th>Call number</th> >- <th>Price</th> >-</tr></thead> >- >-[%- BLOCK subject -%]Overdue:[%- END -%] >+ </p> > >-<tbody>[% FOREACH overdueloo IN overdueloop %] >- <tr> >- <td>[% overdueloo.duedate %]</td> >- <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overdueloo.borrowernumber %]">[% overdueloo.surname %][% IF (overdueloo.firstname) %], [% overdueloo.firstname %][% END %] ([% overdueloo.cardnumber %])</a> >- [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=[% INCLUDE subject %] [% overdueloo.title |html %]">email</a>][% END %] >- [% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %]</td> >- <td>[% IF overdueloo.branchcode %][% Branches.GetName( overdueloo.branchcode ) %][% END %]</td> >- <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% overdueloo.title |html %] [% overdueloo.subtitle %]</a> [% IF ( overdueloo.author ) %], by [% overdueloo.author %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron %][% END %] >- </td> >- <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber %]&itemnumber=[% overdueloo.itemnum %]#item[% overdueloo.itemnum %]">[% overdueloo.barcode %]</a></td> >- <td>[% overdueloo.itemcallnumber %]</td> >- <td>[% overdueloo.replacementprice %]</td> >+ <div class="sql"><pre>[% sql |html %]</pre></div> >+ <div class="searchresults"> >+ <table id="overduest"> >+ <thead> >+ <tr> >+ <th>Due date</th> >+ <th>Patron</th> >+ <th>Library</th> >+ <th>Title</th> >+ <th>Barcode</th> >+ <th>Call number</th> >+ <th>Price</th> >+ </tr> >+ </thead> >+ [%- BLOCK subject -%]Overdue:[%- END -%] >+ <tbody> >+ [% FOREACH overdueloo IN overdueloop %] >+ <tr> >+ <td>[% overdueloo.duedate %]</td> >+ <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% overdueloo.borrowernumber %]">[% overdueloo.surname %][% IF (overdueloo.firstname) %], [% overdueloo.firstname %][% END %] ([% overdueloo.cardnumber %])</a> >+ [% IF ( overdueloo.email ) %][<a href="mailto:[% overdueloo.email %]?subject=[% INCLUDE subject %] [% overdueloo.title |html %]">email</a>][% END %] >+ [% IF ( overdueloo.phone ) %]([% overdueloo.phone %])[% ELSIF ( overdueloo.mobile ) %]([% overdueloo.mobile %])[% ELSIF ( overdueloo.phonepro ) %]([% overdueloo.phonepro %])[% END %]</td> >+ <td>[% IF overdueloo.branchcode %][% Branches.GetName( overdueloo.branchcode ) %][% END %]</td> >+ <td>[% INCLUDE 'biblio-default-view.inc' biblionumber = overdueloo.biblionumber %][% overdueloo.title |html %] [% overdueloo.subtitle %]</a> [% IF ( overdueloo.author ) %], by [% overdueloo.author %][% END %][% IF ( overdueloo.enumchron ) %], [% overdueloo.enumchron %][% END %]</td> >+ <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% overdueloo.biblionumber %]&itemnumber=[% overdueloo.itemnum %]#item[% overdueloo.itemnum %]">[% overdueloo.barcode %]</a></td> >+ <td>[% overdueloo.itemcallnumber %]</td> >+ <td>[% overdueloo.replacementprice %]</td> > </tr> >-[% END %]</tbody> >-</table> >+ [% END %] >+ </tbody> >+ </table> >+ </div> > >-</div> >+[% ELSE %] >+ >+ <h2>Overdue report</h2> >+ [% IF ( isfiltered ) %] >+ <p>There are no overdues matching your search. <a href="/cgi-bin/koha/circ/overdue.pl">Reset filter</a></p> >+ [% ELSE %] >+ <p>There are no overdues.</p> >+ [% END %] >+ >+[% END %] <!-- overdueloop --> > [% END %] <!-- noreport --> > > </div> >-- >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 16531
:
51556
|
51557
|
51729
|
51769
|
53059
|
53322
|
53434