1110 : Balance carts and lists, follow-up : Added Opac lists features to admin lists

[koha.git] / reports / issues_by_borrower_category.plugin

diff --git a/reports/issues_by_borrower_category.plugin b/reports/issues_by_borrower_category.plugin
old mode 100644 (file)
new mode 100755 (executable)
index 9b3d542..8fea89c
--- a/reports/issues_by_borrower_category.plugin
+++ b/reports/issues_by_borrower_category.plugin
@@ -1,6 +1,5 @@
 #!/usr/bin/perl
 
-# $Id$
 
 # Copyright 2000-2002 Katipo Communications
 #
@@ -23,9 +22,13 @@ use strict;
 use C4::Auth;
 use CGI;
 use C4::Context;
+use HTML::Template::Pro;
 use C4::Search;
 use C4::Output;
 use C4::Koha;
+use C4::Members;
+
+use C4::Branch; # GetBranches
 
 =head1 NAME
 
@@ -73,12 +76,21 @@ sub set_parameters {
                $select_branches{$branch} = $branches->{$branch}->{'branchname'};
        }
        my $CGIbranch=CGI::scrolling_list( -name     => 'value',
-                               -id => 'value',
+                               -id => 'branch',
                                -values   => \@select_branch,
                                -labels   => \%select_branches,
                                -size     => 1,
                                -multiple => 0 );
        $template->param(CGIbranch => $CGIbranch);
+  
+  my ($codes,$labels)=GetborCatFromCatType(undef,undef);
+  my @borcatloop;
+  foreach my $thisborcat (sort keys %$labels) {
+            push @borcatloop, {value => $thisborcat,
+                               description => $labels->{$thisborcat},
+                            };
+  }
+  $template->param(loopcategories => \@borcatloop);
        return $template;
 }
 sub calculate {
@@ -100,13 +112,13 @@ sub calculate {
        }
 # now, parse each category. Before filling the result array, fill it with 0 to have every itemtype column.
        my $strsth="SELECT itemtype, count( * )
-                               FROM issues, borrowers, biblio, items
+                               FROM issues, borrowers, biblioitems, items
                                WHERE issues.borrowernumber = borrowers.borrowernumber 
                                        AND items.itemnumber = issues.itemnumber 
-                                       AND biblio.biblionumber = items.biblionumber 
+                                       AND biblioitems.biblionumber = items.biblionumber 
                                        AND borrowers.categorycode = ?";
        $strsth.= " AND borrowers.branchcode = ".$dbh->quote($branch) if ($branch);
-       $strsth .= " GROUP BY biblio.itemtype";
+       $strsth .= " GROUP BY biblioitems.itemtype";
        my $sth = $dbh->prepare($strsth);
        my $sthcategories = $dbh->prepare("select categorycode,description from categories");
        $sthcategories->execute;
@@ -227,4 +239,4 @@ sub calculate {
        return \@mainloop;
 }
 
-1;
\ No newline at end of file
+1;