Attachment #106006 for bug #25699

View | Details | Raw Unified | Return to bug 25699
Collapse All | Expand All




            biblio.part_number,
            biblio.part_name,
            biblio.author,
            biblioitems.editionstatement,
            count(DISTINCT items.itemnumber) as icount,
            count(DISTINCT reserves.borrowernumber) as rcount,
            borrowers.firstname,

while ( my $data = $sth->fetchrow_hashref ) {
    push(
        @reservedata, {
            reservedate      => $data->{l_reservedate},
            firstname        => $data->{firstname} || '',
            surname          => $data->{surname},
            title            => $data->{title},
            editionstatement => $data->{editionstatement},
            subtitle         => $data->{subtitle},
            medium           => $data->{medium},
            part_number      => $data->{part_number},
            part_name        => $data->{part_name},
            author           => $data->{author},
            borrowernumber   => $data->{borrowernumber},
            biblionumber     => $data->{biblionumber},
            holdingbranches  => [split('\|', $data->{l_holdingbranch})],
            branch           => $data->{l_branch},
            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},
            itemTypes        => [split('\|', $data->{l_item_type})],
            locations        => [split('\|', $data->{l_location})],
            reserve_id       => $data->{reserve_id},
            holdingbranch    => $data->{holdingbranch},
            homebranch       => $data->{homebranch},
            itemnumber       => $data->{itemnumber},
        }
    );
}

Lines 80-85 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt (-1 / +1 lines)
80	[% INCLUDE 'biblio-title.inc' biblio=reserveloo %]	80	[% INCLUDE 'biblio-title.inc' biblio=reserveloo %]
81	</a></p>	81	</a></p>
82	[% IF ( reserveloo.author ) %]<p> by [% reserveloo.author \| html %]</p>[% END %]	82	[% IF ( reserveloo.author ) %]<p> by [% reserveloo.author \| html %]</p>[% END %]
		83	[% IF ( reserveloo.editionstatement ) %]<p>[% reserveloo.editionstatement \| html %]</p>[% END %]
83	</td>	84	</td>
84	[% ELSE %]	85	[% ELSE %]
85	<td>"</td>	86	<td>"</td>
86	-

Return to bug 25699

Lines 206-211 my $strsth = Link Here

(-)a/circ/pendingreserves.pl (-25 / +27 lines)
206	biblio.part_number,	206	biblio.part_number,
207	biblio.part_name,	207	biblio.part_name,
208	biblio.author,	208	biblio.author,
		209	biblioitems.editionstatement,
209	count(DISTINCT items.itemnumber) as icount,	210	count(DISTINCT items.itemnumber) as icount,
210	count(DISTINCT reserves.borrowernumber) as rcount,	211	count(DISTINCT reserves.borrowernumber) as rcount,
211	borrowers.firstname,	212	borrowers.firstname,
Lines 246-276 $sth->execute(@query_params); Link Here
246	while ( my $data = $sth->fetchrow_hashref ) {	247	while ( my $data = $sth->fetchrow_hashref ) {
247	push(	248	push(
248	@reservedata, {	249	@reservedata, {
249	reservedate => $data->{l_reservedate},	250	reservedate => $data->{l_reservedate},
250	firstname => $data->{firstname} \|\| '',	251	firstname => $data->{firstname} \|\| '',
251	surname => $data->{surname},	252	surname => $data->{surname},
252	title => $data->{title},	253	title => $data->{title},
253	subtitle => $data->{subtitle},	254	editionstatement => $data->{editionstatement},
254	medium => $data->{medium},	255	subtitle => $data->{subtitle},
255	part_number => $data->{part_number},	256	medium => $data->{medium},
256	part_name => $data->{part_name},	257	part_number => $data->{part_number},
257	author => $data->{author},	258	part_name => $data->{part_name},
258	borrowernumber => $data->{borrowernumber},	259	author => $data->{author},
259	biblionumber => $data->{biblionumber},	260	borrowernumber => $data->{borrowernumber},
260	holdingbranches => [split('\\|', $data->{l_holdingbranch})],	261	biblionumber => $data->{biblionumber},
261	branch => $data->{l_branch},	262	holdingbranches => [split('\\|', $data->{l_holdingbranch})],
262	itemcallnumber => [split('\\|', $data->{l_itemcallnumber})],	263	branch => $data->{l_branch},
263	enumchron => [split('\\|', $data->{l_enumchron})],	264	itemcallnumber => [split('\\|', $data->{l_itemcallnumber})],
264	copyno => [split('\\|', $data->{l_copynumber})],	265	enumchron => [split('\\|', $data->{l_enumchron})],
265	count => $data->{icount},	266	copyno => [split('\\|', $data->{l_copynumber})],
266	rcount => $data->{rcount},	267	count => $data->{icount},
267	pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},	268	rcount => $data->{rcount},
268	itemTypes => [split('\\|', $data->{l_item_type})],	269	pullcount => $data->{icount} <= $data->{rcount} ? $data->{icount} : $data->{rcount},
269	locations => [split('\\|', $data->{l_location})],	270	itemTypes => [split('\\|', $data->{l_item_type})],
270	reserve_id => $data->{reserve_id},	271	locations => [split('\\|', $data->{l_location})],
271	holdingbranch => $data->{holdingbranch},	272	reserve_id => $data->{reserve_id},
272	homebranch => $data->{homebranch},	273	holdingbranch => $data->{holdingbranch},
273	itemnumber => $data->{itemnumber},	274	homebranch => $data->{homebranch},
		275	itemnumber => $data->{itemnumber},
274	}	276	}
275	);	277	);
276	}	278	}