Bug 19671: Map itemtypes to hash for correct display in issues_stats.pl

[koha.git] / reports / itemtypes.plugin

diff --git a/reports/itemtypes.plugin b/reports/itemtypes.plugin
index e4164a5..ffa6fb7 100755 (executable)
--- a/reports/itemtypes.plugin
+++ b/reports/itemtypes.plugin
@@ -5,38 +5,32 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use C4::Auth;
-use CGI;
+use CGI qw ( -utf8 );
 use C4::Context;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
-use C4::Branch; # GetBranches
 =head1
 
 =cut
 
 sub set_parameters {
     my ($template) = @_;
-    my $userbranch = '';
-    if (C4::Context->userenv && C4::Context->userenv->{'branch'}) {
-        $userbranch = C4::Context->userenv->{'branch'};
-    }
-    $template->param( branchloop => GetBranchesLoop($userbranch) );
     return $template;
 }
 
@@ -49,7 +43,7 @@ sub calculate {
        if ($branch) {
                if (C4::Context->preference('item-level_itypes')) {
                $sth = $dbh->prepare("
-        SELECT description, items.itype as itemtype, COUNT(*) AS total 
+        SELECT itemtype, description, items.itype as itemtype, COUNT(*) AS total
                        FROM itemtypes,items         
                WHERE items.itype=itemtypes.itemtype         
                AND items.holdingbranch=?            
@@ -59,7 +53,7 @@ sub calculate {
                }
                else {
                $sth = $dbh->prepare("
-               SELECT description, biblioitems.itemtype, COUNT(*) AS total 
+        SELECT itemtype, description, biblioitems.itemtype, COUNT(*) AS total
                        FROM itemtypes, biblioitems, items 
                WHERE biblioitems.itemtype=itemtypes.itemtype 
                AND items.biblioitemnumber=biblioitems.biblioitemnumber
@@ -71,14 +65,14 @@ sub calculate {
        } else {
                if (C4::Context->preference('item-level_itypes')) {
                $sth = $dbh->prepare("
-               SELECT description,items.itype AS itemtype, COUNT(*) AS total 
+        SELECT itemtype, description,items.itype AS itemtype, COUNT(*) AS total
                        FROM itemtypes,items
                WHERE items.itype=itemtypes.itemtype
                        GROUP BY items.itype
                        ORDER BY itemtypes.description");
                }
                else {
-               $sth = $dbh->prepare("SELECT description, biblioitems.itemtype, COUNT(*) AS total
+        $sth = $dbh->prepare("SELECT itemtype, description, biblioitems.itemtype, COUNT(*) AS total
                        FROM itemtypes, biblioitems,items 
                WHERE biblioitems.itemtype=itemtypes.itemtype 
                AND biblioitems.biblioitemnumber = items.biblioitemnumber
@@ -87,17 +81,17 @@ sub calculate {
                }
                $sth->execute;
        }
-       my ($description,$biblioitems,$total);
+    my ($itemtype, $description,$biblioitems,$total);
        my $grantotal = 0;
        my $count = 0;
-       while (($description,$biblioitems,$total) = $sth->fetchrow) {
+    while (($itemtype, $description,$biblioitems,$total) = $sth->fetchrow) {
                my %line;
                if($count % 2){
                        $line{toggle} = 1;
                        } else {
                                $line{toggle} = 0;
                        }
-               $line{itemtype} = $description;
+        $line{itemtype} = $itemtype;
                $line{count} = $total;
                $grantotal += $total;
                push @results,\%line;
@@ -108,7 +102,6 @@ sub calculate {
        $globalline{loopitemtype} = \@results;
        $globalline{total} = $grantotal;
        $globalline{branch} = $branch;
-       $globalline{branchname} = GetBranchName($branch);
        push @mainloop,\%globalline;
        return \@mainloop;
 }