Recalls history for [% patron.firstname %] [% patron.surname %]

+ + +

+ +

Recalls history

+ + [% IF RECALLS.count %] +

+ + + + + + + + + + + + + [% FOREACH RECALL IN RECALLS %] + + + + + + + + [% END %] + + +

Title	Placed on	Expires on	Pickup location	Status	Cancel
+ + [% RECALL.biblio.title %] + [% FOREACH s IN RECALL.biblio.subtitles %] + [% s %] + [% END %] + [% RECALL.item.enumchron %] + + [% RECALL.biblio.author %] +	+ + Recall date: + [% RECALL.recalldate \| $KohaDates %] + +	+ [% IF ( RECALL.is_waiting ) %] + [% IF ( RECALL.expirationdate ) %] + + Expiration: + [% RECALL.expirationdate \| $KohaDates %] + + [% ELSE %] + + Expiration: + Never expires + + [% END %] + [% ELSIF ( RECALL.has_expired && RECALL.expirationdate ) %] + + Expiration: + [% RECALL.expirationdate \| $KohaDates %] + + [% ELSE %] + - + [% END %] +	+ Pick up location: + [% RECALL.branch.branchname %] +	+ Status: + [% IF ( RECALL.is_requested ) %] + Requested + [% ELSIF ( RECALL.is_waiting ) %] + Ready for pickup + [% ELSIF ( RECALL.has_expired ) %] + Expired + [% ELSIF ( RECALL.is_cancelled ) %] + Cancelled + [% END %] +	+ [% IF ( !RECALL.cancellationdate && ( RECALL.is_requested \|\| RECALL.is_overdue ) ) %] + + + + + + + [% END %] +

+ + [% END # / # RECALLS.count %] + + + + + + + +[% INCLUDE 'opac-bottom.inc' %] + +[% BLOCK jsinclude %] + [% INCLUDE 'datatables.inc' %] + +[% END %] 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 fda493e..a325ff6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -789,7 +789,7 @@ Using this account is not recommended because some parts of Koha will not functi - + @@ -843,20 +843,16 @@ Using this account is not recommended because some parts of Koha will not functi Requested [% ELSIF ( RECALL.is_waiting ) %] Ready for pickup - [% ELSIF ( RECALL.has_expired ) %] - Expired [% END %] [% END %] @@ -1004,7 +1000,7 @@ Using this account is not recommended because some parts of Koha will not functi return confirmDelete(MSG_CONFIRM_CANCEL_RECALL); }); - var dTables = $("#checkoutst,#holdst,#overduest,#opac-user-relative-issues-table"); + var dTables = $("#checkoutst,#holdst,#overduest,#opac-user-relative-issues-table,#recalls-table"); dTables.each(function(){ var thIndex = $(this).find("th.psort").index(); $(this).dataTable($.extend(true, {}, dataTablesDefaults, { diff --git a/members/moremember.pl b/members/moremember.pl index 2da7d18..936e3d8 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -254,7 +254,7 @@ if ( $data->{dateofbirth} ) { # BUILD HTML # show all recalls and reserves of this borrower, and the position of the reservation .... if ($borrowernumber) { - my $recalls = Koha::Recalls->search({ borrowernumber => $borrowernumber }); + my $recalls = Koha::Recalls->search({ borrowernumber => $borrowernumber, status => { '=', ['R','W'] } }); $template->param( holds_count => Koha::Database->new()->schema()->resultset('Reserve') ->count( { borrowernumber => $borrowernumber } ), diff --git a/members/recallshistory.pl b/members/recallshistory.pl new file mode 100755 index 0000000..3a6bc2f --- /dev/null +++ b/members/recallshistory.pl @@ -0,0 +1,53 @@ +#!/usr/bin/perl + +# Copyright 2017 Aleisha Amohia +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; + +use CGI qw ( -utf8 ); + +use C4::Auth; +use C4::Output; + +use Koha::Recalls; +use Koha::Patrons; + +my $input = CGI->new; + +my ($template, $loggedinuser, $cookie)= get_template_and_user( + { + template_name => "members/recallshistory.tt", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {borrowers => 1}, + debug => 1, + } +); + +my $recalls = Koha::Recalls->search({ borrowernumber => $loggedinuser }); + +my $patron = Koha::Patrons->find($loggedinuser); + +$template->param( + recalls => $recalls, + patron => $patron, + recallsview => 1 +); + +output_html_with_http_headers $input, $cookie, $template->output; diff --git a/opac/opac-recalls.pl b/opac/opac-recalls.pl new file mode 100755 index 0000000..dc8b681 --- /dev/null +++ b/opac/opac-recalls.pl @@ -0,0 +1,45 @@ +#!/usr/bin/perl + +# Copyright 2017 Aleisha Amohia +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# Koha is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Koha; if not, see . + +use Modern::Perl; + +use CGI qw ( -utf8 ); +use Encode qw( encode ); +use C4::Auth; # get_template_and_user +use C4::Output; +use Koha::Recalls; + +my $input = new CGI; + +my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { + template_name => "opac-recalls.tt", + query => $input, + type => "opac", + authnotrequired => 0, + } +); + +my $recalls = Koha::Recalls->search({ borrowernumber => $borrowernumber }); +$template->param( + RECALLS => $recalls, + recallsview => 1 +); + +output_html_with_http_headers $input, $cookie, $template->output; diff --git a/opac/opac-user.pl b/opac/opac-user.pl index d0a58ed..e3274c3 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -294,7 +294,7 @@ $template->param( show_barcode => 1 ) if $show_barcode; # now the reserved items.... my $reserves = Koha::Holds->search( { borrowernumber => $borrowernumber } ); -my $recalls = Koha::Recalls->search( { borrowernumber => $borrowernumber } ); +my $recalls = Koha::Recalls->search( { borrowernumber => $borrowernumber, status => { '=', ['R', 'W'] } } ); $template->param( RESERVES => $reserves, -- 2.1.4

Expires on	Pickup location	Status	Cancel	Cancel
- [% IF ( !RECALL.cancellationdate ) %] + [% IF ( !RECALL.cancellationdate && ( RECALL.is_requested \|\| RECALL.is_overdue ) ) %] - [% ELSE %] - Cancelled [% END %]