@@ -, +, @@ --- circ/pendingreserves.pl | 12 ++--- .../prog/en/modules/circ/pendingreserves.tt | 51 +++++++++++++++++++--- 2 files changed, 50 insertions(+), 13 deletions(-) --- a/circ/pendingreserves.pl +++ a/circ/pendingreserves.pl @@ -192,11 +192,11 @@ my $strsth = GROUP_CONCAT(DISTINCT items.location ORDER BY items.itemnumber SEPARATOR '|') l_location, GROUP_CONCAT(DISTINCT items.itemcallnumber - ORDER BY items.itemnumber SEPARATOR '
') l_itemcallnumber, + ORDER BY items.itemnumber SEPARATOR '|') l_itemcallnumber, GROUP_CONCAT(DISTINCT items.enumchron - ORDER BY items.itemnumber SEPARATOR '
') l_enumchron, + ORDER BY items.itemnumber SEPARATOR '|') l_enumchron, GROUP_CONCAT(DISTINCT items.copynumber - ORDER BY items.itemnumber SEPARATOR '
') l_copynumber, + ORDER BY items.itemnumber SEPARATOR '|') l_copynumber, biblio.title, biblio.author, count(DISTINCT items.itemnumber) as icount, @@ -251,9 +251,9 @@ while ( my $data = $sth->fetchrow_hashref ) { biblionumber => $data->{biblionumber}, holdingbranches => [split('\|', $data->{l_holdingbranch})], branch => $data->{l_branch}, - itemcallnumber => $data->{l_itemcallnumber}, - enumchron => $data->{l_enumchron}, - copyno => $data->{l_copynumber}, + itemcallnumber => [split('\|', $data->{l_itemcallnumber})], + enumchron => [split('\|', $data->{l_enumchron})], + copyno => [split('\|', $data->{l_copynumber})], count => $data->{icount}, rcount => $data->{rcount}, pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount}, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -46,7 +46,7 @@

Holds to pull placed between [% from | $KohaDates %] and [% to | $KohaDates %]

Reported on [% todaysdate | $KohaDates %]

The following holds have not been filled. Please retrieve them and check them in.

-
+
[% IF ( reserveloop ) %] @@ -54,7 +54,7 @@ - @@ -88,13 +88,49 @@ [% END %] + + + - - - [% END %] --
Pull this many items Items available Patrons with holdsFirst patron + First patron Title Libraries Available call numbers" - [% FOREACH holdingbranch IN reserveloo.holdingbranches %] - [% Branches.GetName ( holdingbranch ) | html %] + [% IF ( reserveloo.holdingbranches ) %] +
    + [% FOREACH holdingbranch IN reserveloo.holdingbranches %] +
  • + [% Branches.GetName ( holdingbranch ) | html %] +
  • + [% END %] +
+ [% END %] +
+ [% IF ( reserveloo.itemcallnumber ) %] +
    + [% FOREACH itemcallnumber IN reserveloo.itemcallnumber %] +
  • + [% itemcallnumber | html %] +
  • + [% END %] +
+ [% END %] +
+ [% IF ( reserveloo.copyno ) %] +
    + [% FOREACH copyno IN reserveloo.copyno %] +
  • + [% copyno | html %] +
  • + [% END %] +
+ [% END %] +
+ [% IF ( reserveloo.enumchron ) %] +
    + [% FOREACH enumchron IN reserveloo.enumchron %] +
  • + [% enumchron | html %] +
  • + [% END %] +
[% END %]

[% reserveloo.itemcallnumber | html %]

[% reserveloo.copyno | html %]

[% reserveloo.enumchron | html %]

[% FOREACH itemType IN reserveloo.itemTypes %] [% ItemTypes.GetDescription( itemType ) | html %] @@ -135,6 +171,7 @@ Biblio level hold. [% END %] [% END %] +