From 85b09f8d0ebfe26daec58d4c4596337853761e8c Mon Sep 17 00:00:00 2001 From: Joe Atzberger Date: Fri, 22 May 2009 16:45:51 -0500 Subject: [PATCH] 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 --- circ/view_holdsqueue.pl | 47 +++++++------------ .../prog/en/modules/circ/view_holdsqueue.tmpl | 23 +++++---- 2 files changed, 29 insertions(+), 41 deletions(-) diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl index 920f852a05..668bdd15e0 100755 --- a/circ/view_holdsqueue.pl +++ b/circ/view_holdsqueue.pl @@ -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; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl index ebd04a6b41..52ddd859aa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tmpl @@ -7,7 +7,11 @@ - +
@@ -18,15 +22,14 @@

Holds Queue

- - -
items found for
+
items found for + ALL libraries +
No items found.
- @@ -69,7 +72,7 @@ - +
    2. --> -
-
-
+ +
+
- + -- 2.39.5