Attachment 110456 Details for Bug 25771 – Bug 25771: Allow the user to sort checkouts by the renew column in the OPAC

[patch] Bug 25771: Allow the user to sort checkouts by the renew column in the OPAC

Bug-25771-Allow-the-user-to-sort-checkouts-by-the-.patch (text/plain), 11.47 KB, created by PTFS Europe Sandboxes on 2020-09-21 11:41:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: PTFS Europe Sandboxes

Created: 2020-09-21 11:41:40 UTC

Size: 11.47 KB

patch

obsolete

>From 7b57d5663cc1ea34de3dd6bab734a5443fe73ea1 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 16 Jun 2020 13:16:30 +0000
>Subject: [PATCH] Bug 25771: Allow the user to sort checkouts by the renew
> column in the OPAC
>
>This patch makes it possible for the logged-in OPAC user to sort their
>checkouts by the number of renewals they have remaining on their
>checkouts.
>
>To test, apply the patch and log in to the OPAC as a user with multiple
>checkouts. To fully test the patch's functionality the user's checkouts
>should have a varying number of renewals available.
>
>On the "your summary" page, confirm that the "Renew" column is now
>sortable and that it sorts correctly by the number of renewals left on
>each checked-out item.
>
>Signed-off-by: Henry Bolshaw <bolshawh@parliament.uk>
>---
> .../opac-tmpl/bootstrap/en/modules/opac-user.tt | 82 ++++++++++++----------
> 1 file changed, 43 insertions(+), 39 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index 13cd1843ee..c48502cb45 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -244,7 +244,7 @@
> [% END %]
> <th>Call no.</th>
> [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
>- <th class="nosort">Renew</th>
>+ <th>Renew</th>
> [% END %]
> [% IF ( OPACFinesTab ) %]
> <th>Fines</th>
>@@ -345,45 +345,49 @@
> [% ISSUE.itemcallnumber | html %]
> </td>
> [% IF ( OpacRenewalAllowed && !( logged_in_user.is_expired && logged_in_user.category.effective_BlockExpiredPatronOpacActions ) ) %]
>- <td class="renew">
>- [% IF ISSUE.renewed %]Renewed! [% END %]
>- [% IF ( ISSUE.status ) %]
>- [% IF ( canrenew ) %]
>- <input type="checkbox" name="item" value="[% ISSUE.itemnumber | uri %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber | uri %]&amp;borrowernumber=[% ISSUE.borrowernumber | uri %]">Renew</a>
>- [% END %]
>- [% IF ISSUE.renewalfee > 0 %]
>- Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %]
>- [% END %]
>- [% IF ISSUE.itemtype_object.rentalcharge_daily > 0 %]
>- [% ISSUE.itemtype_object.rentalcharge_daily | $Price %] per day
>- [% END %]
>- [% IF ISSUE.itemtype_object.rentalcharge_hourly > 0 %]
>- [% ISSUE.itemtype_object.rentalcharge_hourly | $Price %] per hour
>- [% END %]
>- ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)
>- [% ELSIF ( ISSUE.on_reserve ) %]
>- Not renewable (on hold)
>- [% ELSIF ( ISSUE.too_many ) %]
>- Not renewable
>- [% ELSIF ( ISSUE.norenew_overdue ) %]
>- Not allowed (overdue)
>- [% ELSIF ( ISSUE.auto_too_late ) %]
>- No longer renewable
>- [% ELSIF ISSUE.auto_too_much_oweing %]
>- Automatic renewal failed, you have unpaid fines.
>- ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)
>- [% ELSIF ISSUE.auto_account_expired %]
>- Automatic renewal failed, your account is expired.
>- ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)
>- [% ELSIF ( ISSUE.too_soon ) %]
>- No renewal before [% ISSUE.soonestrenewdate | html %]
>- ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)
>- [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
>- Automatic renewal
>- ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)
>- [% ELSIF ( ISSUE.item_denied_renewal ) %]
>- Renewal not allowed
>+ [% IF ( ISSUE.status && canrenew ) %]
>+ <td class="renew" data-order="[% ISSUE.renewsleft | html %]">
>+ [% ELSE %]
>+ <td class="renew" data-order="0">
> [% END %]
>+ [% IF ISSUE.renewed %]Renewed! [% END %]
>+ [% IF ( ISSUE.status ) %]
>+ [% IF ( canrenew ) %]
>+ <input type="checkbox" name="item" value="[% ISSUE.itemnumber | uri %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&amp;item=[% ISSUE.itemnumber | uri %]&amp;borrowernumber=[% ISSUE.borrowernumber | uri %]">Renew</a>
>+ [% END %]
>+ [% IF ISSUE.renewalfee > 0 %]
>+ Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %]
>+ [% END %]
>+ [% IF ISSUE.itemtype_object.rentalcharge_daily > 0 %]
>+ [% ISSUE.itemtype_object.rentalcharge_daily | $Price %] per day
>+ [% END %]
>+ [% IF ISSUE.itemtype_object.rentalcharge_hourly > 0 %]
>+ [% ISSUE.itemtype_object.rentalcharge_hourly | $Price %] per hour
>+ [% END %]
>+ ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)
>+ [% ELSIF ( ISSUE.on_reserve ) %]
>+ Not renewable (on hold)
>+ [% ELSIF ( ISSUE.too_many ) %]
>+ Not renewable
>+ [% ELSIF ( ISSUE.norenew_overdue ) %]
>+ Not allowed (overdue)
>+ [% ELSIF ( ISSUE.auto_too_late ) %]
>+ No longer renewable
>+ [% ELSIF ISSUE.auto_too_much_oweing %]
>+ Automatic renewal failed, you have unpaid fines.
>+ ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)
>+ [% ELSIF ISSUE.auto_account_expired %]
>+ Automatic renewal failed, your account is expired.
>+ ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)
>+ [% ELSIF ( ISSUE.too_soon ) %]
>+ No renewal before [% ISSUE.soonestrenewdate | html %]
>+ ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)
>+ [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
>+ Automatic renewal
>+ ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)
>+ [% ELSIF ( ISSUE.item_denied_renewal ) %]
>+ Renewal not allowed
>+ [% END %]
> </td>
> [% END %]
> [% IF ( OPACFinesTab ) %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 25771: 109830 | 110456 | 110488