@@ -, +, @@ certain item type. requesting cancellation. to be requested cancellation. --- admin/columns_settings.yml | 31 +++++++++++++++++++ circ/waitingreserves.pl | 4 +++ .../prog/en/includes/waiting_holds.inc | 11 +++++++ .../prog/en/modules/circ/waitingreserves.tt | 31 +++++++++++++++++-- 4 files changed, 75 insertions(+), 2 deletions(-) --- a/admin/columns_settings.yml +++ a/admin/columns_settings.yml @@ -1439,6 +1439,37 @@ modules: - columnname: action + holdscr: + columns: + - + columnname: checkbox + cannot_be_toggled: 1 + cannot_be_modified: 1 + - + columnname: waiting_since + - + columnname: date_hold_placed + - + columnname: expiration_date + - + columnname: title + - + columnname: patron + - + columnname: home_library + - + columnname: current_location + - + columnname: shelving_location + - + columnname: call_number + - + columnname: copy_number + - + columnname: enumeration + - + columnname: action + overdues: circ-overdues: default_display_length: 20 --- a/circ/waitingreserves.pl +++ a/circ/waitingreserves.pl @@ -116,6 +116,8 @@ while ( my $hold = $holds->next ) { } +my $holds_with_cancellation_requests = Koha::Holds->waiting->filter_by_has_cancellation_requests; + $template->param(cancel_result => \@cancel_result) if @cancel_result; $template->param( @@ -123,6 +125,8 @@ $template->param( reservecount => scalar @reserve_loop, overloop => \@over_loop, overcount => scalar @over_loop, + cancel_reqs_count => $holds_with_cancellation_requests->count, + cancel_reqs => $holds_with_cancellation_requests, show_date => output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }), tab => $tab, ); --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -1,3 +1,4 @@ +[% USE KohaDates %] [% USE ItemTypes %] [% USE AuthorisedValues %]
Waiting since | Date hold placed | + [% IF table_name == 'holdscr' %] +Date cancellation requested | + [% END %]Expiration date | Title | Patron | @@ -24,6 +28,13 @@[% reserveloo.waitingdate | $KohaDates %] | [% reserveloo.reservedate | $KohaDates %] | + [% IF table_name == 'holdscr' %] ++ [% FOREACH cancellation_request IN reserveloo.cancellation_requests %] + [% cancellation_request.creation_date | $KohaDates %] + [% END %] + | + [% END %][% reserveloo.expirationdate | $KohaDates %] |
[% INCLUDE 'biblio-title.inc' biblio=reserveloo.biblio link = 1 %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt
@@ -48,6 +48,15 @@
View all libraries
[% END %]
+ [% IF reject_result_error %]
+
@@ -125,6 +139,13 @@
+
[% END %]
+ [% IF cancel_reqs_count %]
+ [% INCLUDE waiting_holds.inc select_column='1' table_name='holdscr' reserveloop=cancel_reqs tab='holdscr' %]
+ [% ELSE %]
+
+ [% END %]
+ |
+ [% END %]
[% IF ( cancel_result ) %]
[% FOREACH cancel_result %]
[% IF ( messagetransfert ) %]
@@ -88,6 +97,11 @@
Holds waiting over [% Koha.Preference('ReservesMaxPickUpDelay') | html %] days: [% overcount | html %]
+
---|