@@ -, +, @@ the hold ratios report --- circ/reserveratios.pl | 20 ++++----- .../prog/en/modules/circ/reserveratios.tt | 44 +++++++++++++++++--- 2 files changed, 49 insertions(+), 15 deletions(-) --- a/circ/reserveratios.pl +++ a/circ/reserveratios.pl @@ -93,15 +93,15 @@ my $strsth = items.itemcallnumber, items.itemnumber, GROUP_CONCAT(DISTINCT items.itemcallnumber - ORDER BY items.itemnumber SEPARATOR '
') as listcall, + ORDER BY items.itemnumber SEPARATOR '|') as listcall, GROUP_CONCAT(DISTINCT homebranch - ORDER BY items.itemnumber SEPARATOR '
') as homebranch_list, + ORDER BY items.itemnumber SEPARATOR '|') as homebranch_list, GROUP_CONCAT(DISTINCT holdingbranch - ORDER BY items.itemnumber SEPARATOR '
') as holdingbranch_list, + ORDER BY items.itemnumber SEPARATOR '|') as holdingbranch_list, GROUP_CONCAT(DISTINCT items.location - ORDER BY items.itemnumber SEPARATOR '
') as l_location, + ORDER BY items.itemnumber SEPARATOR '|') as l_location, GROUP_CONCAT(DISTINCT items.itype - ORDER BY items.itemnumber SEPARATOR '
') as l_itype, + ORDER BY items.itemnumber SEPARATOR '|') as l_itype, reserves.found, biblio.title, @@ -147,18 +147,18 @@ while ( my $data = $sth->fetchrow_hashref ) { itemnum => $data->{itemnumber}, biblionumber => $data->{biblionumber}, holdingbranch => $data->{holdingbranch}, - homebranch_list => $data->{homebranch_list}, - holdingbranch_list => $data->{holdingbranch_list}, + homebranch_list => [split('\|', $data->{homebranch_list})], + holdingbranch_list => [split('\|', $data->{holdingbranch_list})], branch => $data->{branch}, itemcallnumber => $data->{itemcallnumber}, - location => $data->{l_location}, - itype => $data->{l_itype}, + location => => [split('\|', $data->{l_location})], + itype => => [split('\|', $data->{l_itype})], reservecount => $data->{reservecount}, itemcount => $data->{itemcount}, ratiocalc => sprintf( "%.0d", $ratio_atleast1 ? ( $thisratio / $ratio ) : $thisratio ), thisratio => sprintf( "%.2f", $thisratio ), thisratio_atleast1 => ( $thisratio >= 1 ) ? 1 : 0, - listcall => $data->{listcall} + listcall => [split('\|', $data->{listcall})] } ); } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -1,4 +1,7 @@ [% USE KohaDates %] +[% USE AuthorisedValues %] +[% USE Branches %] +[% USE ItemTypes %] [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Hold ratios [% INCLUDE 'doc-head-close.inc' %] @@ -30,6 +33,7 @@ .sql { display: none; } .ulined { text-decoration: underline; } .ratiolimit { color: blue; cursor: pointer; } + #holdst ul li { list-style: outside url("[% interface %]/[% theme %]/img/item-bullet.gif") disc; } @@ -72,11 +76,41 @@

[% reserveloo.thisratio %]

[% INCLUDE 'biblio-default-view.inc' biblionumber = reserveloo.biblionumber %][% reserveloo.title |html %] [% IF ( reserveloo.subtitle ) %][% FOREACH subtitl IN reserveloo.subtitle %][% subtitl.subfield %][% END %][% END %][% IF ( reserveloo.author ) %] by [% reserveloo.author %][% END %] -

[% reserveloo.homebranch_list %]

-

[% reserveloo.holdingbranch_list %]

-

[% reserveloo.location %]

-

[% reserveloo.itype %]

-

[% reserveloo.listcall %]

+ + + + + + + + + + + + + + + [% IF ( reserveloo.thisratio_atleast1 ) %]

[% IF ( CAN_user_acquisition && basketno && booksellerid ) %][% END %][% reserveloo.ratiocalc %] to order[% IF ( CAN_user_acquisition && basketno && booksellerid ) %][% END %] [% IF ( reserveloo.pendingorders ) %]
[% reserveloo.pendingorders %] pending[% END %]

[% END %] --