@@ -, +, @@
report
---
circ/reserveratios.pl | 45 ++++++++++++----------
.../prog/en/modules/circ/reserveratios.tt | 4 +-
2 files changed, 27 insertions(+), 22 deletions(-)
--- a/circ/reserveratios.pl
+++ a/circ/reserveratios.pl
@@ -100,8 +100,10 @@ my $strsth =
items.itemnumber,
GROUP_CONCAT(DISTINCT items.itemcallnumber
ORDER BY items.itemnumber SEPARATOR '
') as listcall,
+ GROUP_CONCAT(DISTINCT homebranch
+ ORDER BY items.itemnumber SEPARATOR '
') as homebranch_list,
GROUP_CONCAT(DISTINCT holdingbranch
- ORDER BY items.itemnumber SEPARATOR '
') as listbranch,
+ ORDER BY items.itemnumber SEPARATOR '
') as holdingbranch_list,
GROUP_CONCAT(DISTINCT items.location
ORDER BY items.itemnumber SEPARATOR '
') as l_location,
GROUP_CONCAT(DISTINCT items.itype
@@ -142,26 +144,27 @@ while ( my $data = $sth->fetchrow_hashref ) {
push(
@reservedata,
{
- reservedate => format_date( $data->{reservedate} ),
- priority => $data->{priority},
- name => $data->{borrower},
- title => $data->{title},
- subtitle => $data->{subtitle},
- author => $data->{author},
- itemnum => $data->{itemnumber},
- biblionumber => $data->{biblionumber},
- holdingbranch => $data->{holdingbranch},
- listbranch => $data->{listbranch},
- branch => $data->{branch},
- itemcallnumber => $data->{itemcallnumber},
- location => $data->{l_location},
- itype => $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}
+ reservedate => format_date( $data->{reservedate} ),
+ priority => $data->{priority},
+ name => $data->{borrower},
+ title => $data->{title},
+ subtitle => $data->{subtitle},
+ author => $data->{author},
+ itemnum => $data->{itemnumber},
+ biblionumber => $data->{biblionumber},
+ holdingbranch => $data->{holdingbranch},
+ homebranch_list => $data->{homebranch_list},
+ holdingbranch_list => $data->{holdingbranch_list},
+ branch => $data->{branch},
+ itemcallnumber => $data->{itemcallnumber},
+ location => $data->{l_location},
+ itype => $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}
}
);
}
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
@@ -55,6 +55,7 @@
[% reserveloo.thisratio %]
[% reserveloo.listbranch %]
[% reserveloo.homebranch_list %]
[% reserveloo.holdingbranch_list %]
[% reserveloo.location %]
[% reserveloo.itype %]
[% reserveloo.listcall %]