gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup view_holdsqueue.pl and .tmpl (minor) 

Convert to GetBranchesLoop.
Insert template message to display for ALL libraries search, so that the
message is n0t truncated like "X items found for".

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
This commit is contained in:
Joe Atzberger 2009-05-22 16:45:51 -05:00 committed by Henri-Damien LAURENT
parent 755bf6aca7
commit 426c8b474e
2 changed files with 29 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
circ/view_holdsqueue.pl
View File

@ -29,7 +29,7 @@ use C4::Auth;
use C4::Output;
use C4::Biblio;
use C4::Items;
use C4::Koha; # GetItemTypes
use C4::Koha; # GetItemTypes
use C4::Branch; # GetBranches
use C4::Dates qw/format_date/;
@ -46,48 +46,34 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
);
my $params = $query->Vars;
my $run_report = $params->{'run_report'};
my $branchlimit = $params->{'branchlimit'};
my $run_report = $params->{'run_report'};
my $branchlimit = $params->{'branchlimit'};
my $itemtypeslimit = $params->{'itemtypeslimit'};
if ( $run_report ) {
my $items = GetHoldsQueueItems( $branchlimit,$itemtypeslimit );
my $items = GetHoldsQueueItems($branchlimit, $itemtypeslimit);
$template->param(
branch => $branchlimit,
total => scalar @$items,
itemsloop => $items,
run_report => $run_report,
dateformat => C4::Context->preference("dateformat"),
);
}
# getting all branches.
my $branches = GetBranches;
my $branch = C4::Context->userenv->{"branchname"};
my @branchloop;
foreach my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches ) {
my $selected = 1 if $thisbranch eq $branch;
my %row = (
value => $thisbranch,
selected => $selected,
branchname => $branches->{$thisbranch}->{'branchname'},
branch => $branchlimit,
total => scalar @$items,
itemsloop => $items,
run_report => $run_report,
dateformat => C4::Context->preference("dateformat"),
);
push @branchloop, \%row;
}
# getting all itemtypes
my $itemtypes = &GetItemTypes();
my @itemtypesloop;
foreach my $thisitemtype ( sort keys %$itemtypes ) {
my %row = (
push @itemtypesloop, {
value => $thisitemtype,
description => $itemtypes->{$thisitemtype}->{'description'},
);
push @itemtypesloop, \%row;
};
}
$template->param( branchloop => \@branchloop,
itemtypeloop => \@itemtypesloop,
$template->param(
branchloop => GetBranchesLoop(C4::Context->userenv->{'branch'}),
itemtypeloop => \@itemtypesloop,
);
sub GetHoldsQueueItems {
@ -97,9 +83,9 @@ sub GetHoldsQueueItems {
my @bind_params = ();
my $query = q/SELECT tmp_holdsqueue.*, biblio.author, items.ccode, items.location, items.enumchron, items.cn_sort, biblioitems.publishercode,biblio.copyrightdate,biblioitems.publicationyear,biblioitems.pages,biblioitems.size,biblioitems.publicationyear,biblioitems.isbn
FROM tmp_holdsqueue
JOIN biblio USING (biblionumber)
JOIN biblio USING (biblionumber)
LEFT JOIN biblioitems USING (biblionumber)
LEFT JOIN items USING (itemnumber)
LEFT JOIN items USING ( itemnumber)
/;
if ($branchlimit) {
$query .=" WHERE tmp_holdsqueue.holdingbranch = ?";
@ -114,7 +100,6 @@ sub GetHoldsQueueItems {
push @$items, $row;
}
return $items;
}
# writing the template
output_html_with_http_headers $query, $cookie, $template->output;

23
koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl
View File

@ -7,7 +7,11 @@
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a><!-- TMPL_IF NAME="run_report" --> &rsaquo; <a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds Queue</a> &rsaquo; Results<!-- TMPL_ELSE --> &rsaquo; Holds Queue<!-- /TMPL_IF --></div>
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a>
&rsaquo; <a href="/cgi-bin/koha/circ/circulation-home.pl">Circulation</a>
&rsaquo; <a href="/cgi-bin/koha/circ/view_holdsqueue.pl">Holds Queue</a>
<!-- TMPL_IF NAME="run_report" --> &rsaquo; Results<!-- /TMPL_IF -->
</div>
<div id="doc" class="yui-t7">
@ -18,15 +22,14 @@
<h1>Holds Queue</h1>
<!-- TMPL_IF NAME="run_report" -->
<!-- TMPL_IF NAME="total" -->
<div class="results"><!-- TMPL_VAR NAME="total" --> items found for <!-- TMPL_VAR NAME="branch" --></div>
<div class="results"><!-- TMPL_VAR NAME="total" --> items found for
<!-- TMPL_IF NAME="branch" --><!-- TMPL_VAR NAME="branch" --><!-- TMPL_ELSE-->ALL libraries<!-- /TMPL_IF -->
</div>
<!-- TMPL_ELSE-->
<div class="dialog message">No items found.</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="itemsloop" -->
<table id="holdst">
<thead>
@ -69,7 +72,7 @@
<!-- /TMPL_IF -->
<!-- TMPL_UNLESS NAME="total" -->
<form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl" method="post">
<form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl" method="post">
<fieldset class="rows">
<ol>
<li><label for="branchlimit">Library: </label><select name="branchlimit" id="branchlimit">
@ -92,11 +95,11 @@
<!-- /TMPL_LOOP -->
</select></li>
-->
</ol></fieldset>
<fieldset class="action"> <input type="submit" value="Submit" />
<input type="hidden" name="run_report" value="1" /></fieldset>
</ol></fieldset>
<fieldset class="action"> <input type="submit" value="Submit" />
<input type="hidden" name="run_report" value="1" /></fieldset>
</form>
<!-- /TMPL_UNLESS -->
<!-- /TMPL_UNLESS -->
</div>
</div>