# 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 warnings; FIXME - Bug 2505
-use C4::Auth;
+use Modern::Perl;
+use C4::Auth qw( get_template_and_user );
use CGI qw ( -utf8 );
use C4::Context;
-use C4::Branch; # GetBranches
-use C4::Output;
-use C4::Koha;
-use C4::Circulation;
-use C4::Reports;
-use Koha::DateUtils;
-use Date::Calc qw(Delta_Days);
+use C4::Output qw( output_html_with_http_headers );
+use C4::Reports qw( GetDelimiterChoices );
+use Koha::DateUtils qw( dt_from_string output_pref );
+use Koha::ItemTypes;
+use Koha::Patron::Categories;
+use Date::Calc qw( Delta_Days );
=head1 NAME
=head1 DESCRIPTION
-=over 2
-
=cut
-my $input = new CGI;
+my $input = CGI->new;
my $do_it=$input->param('do_it');
my $fullreportname = "reports/issues_avg_stats.tt";
my $line = $input->param("Line");
my $calc = $input->param("Cellvalue");
my $output = $input->param("output");
my $basename = $input->param("basename");
+
#warn "calcul : ".$calc;
my ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => $fullreportname,
query => $input,
type => "intranet",
- authnotrequired => 0,
flagsrequired => {reports => '*'},
- debug => 1,
});
our $sep = $input->param("sep");
$sep = "\t" if ($sep eq 'tabulation');
}
# Displaying choices
} else {
- my $dbh = C4::Context->dbh;
- my @values;
- my $req;
- $req = $dbh->prepare("select distinctrow categorycode,description from categories order by description");
- $req->execute;
- my %labelsc;
- my @selectc;
- while (my ($value, $desc) =$req->fetchrow) {
- push @selectc, $value;
- $labelsc{$value} = $desc;
- }
- my $BorCat = {
- values => \@selectc,
- labels => \%labelsc,
- };
+ my $patron_categories = Koha::Patron::Categories->search({}, {order_by => ['description']});
- my $itemtypes = GetItemTypes( style => 'array' );
+ my $itemtypes = Koha::ItemTypes->search_with_localization;
- $req = $dbh->prepare("select distinctrow sort1 from borrowers where sort1 is not null order by sort1");
+ my $dbh = C4::Context->dbh;
+ my $req = $dbh->prepare("select distinctrow sort1 from borrowers where sort1 is not null order by sort1");
$req->execute;
my @selects1;
my $hassort1;
my $CGIsepChoice=GetDelimiterChoices;
$template->param(
- BorCat => $BorCat,
+ patron_categories => $patron_categories,
itemtypes => $itemtypes,
- branchloop => GetBranchesLoop(),
hassort1 => $hassort1,
hassort2 => $hassort2,
HlghtSort2 => $hglghtsort2,
my @looprow;
my %globalline;
my $grantotal =0;
+ my $itype = C4::Context->preference('item-level_itypes') ? "items.itype" : "biblioitems.itemtype";
# extract parameters
my $dbh = C4::Context->dbh;
# warn "filtres ".@filters[2];
# warn "filtres ".@filters[3];
$line = "old_issues.".$line if ($line=~/branchcode/) or ($line=~/timestamp/);
- $line = "biblioitems.".$line if $line=~/itemtype/;
-
+ if ( $line=~/itemtype/ ) { $line = $itype; }
$linefilter[0] = @$filters[0] if ($line =~ /timestamp/ ) ;
$linefilter[1] = @$filters[1] if ($line =~ /timestamp/ ) ;
$linefilter[2] = @$filters[2] if ($line =~ /timestamp/ ) ;
$linefilter[2] = @$filters[6] if ($line =~ /returndate/ ) ;
$linefilter[3] = @$filters[7] if ($line =~ /returndate/ ) ;
$linefilter[0] = @$filters[8] if ($line =~ /category/ ) ;
- $linefilter[0] = @$filters[9] if ($line =~ /itemtype/ ) ;
+ $linefilter[0] = @$filters[9] if ($line eq $itype);
$linefilter[0] = @$filters[10] if ($line =~ /branch/ ) ;
-# $linefilter[0] = @$filters[11] if ($line =~ /sort2/ ) ;
$linefilter[0] = @$filters[11] if ($line =~ /sort1/ ) ;
$linefilter[0] = @$filters[12] if ($line =~ /sort2/ ) ;
-#warn "filtre lignes".$linefilter[0]." ".$linefilter[1];
-#
+
$column = "old_issues.".$column if (($column=~/branchcode/) or ($column=~/timestamp/));
- $column = "biblioitems.".$column if $column=~/itemtype/;
+ if ( $column=~/itemtype/ ) { $column = $itype; }
my @colfilter ;
$colfilter[0] = @$filters[0] if ($column =~ /timestamp/ ) ;
$colfilter[1] = @$filters[1] if ($column =~ /timestamp/ ) ;
$colfilter[2] = @$filters[6] if ($column =~ /returndate/ ) ;
$colfilter[3] = @$filters[7] if ($column =~ /returndate/ ) ;
$colfilter[0] = @$filters[8] if ($column =~ /category/ ) ;
- $colfilter[0] = @$filters[9] if ($column =~ /itemtype/ ) ;
+ $colfilter[0] = @$filters[9] if ($column eq $itype);
$colfilter[0] = @$filters[10] if ($column =~ /branch/ ) ;
-# $colfilter[0] = @$filters[11] if ($column =~ /sort2/ ) ;
$colfilter[0] = @$filters[11] if ($column =~ /sort1/ ) ;
$colfilter[0] = @$filters[12] if ($column =~ /sort2/ ) ;
-#warn "filtre col ".$colfilter[0]." ".$colfilter[1];
# 1st, loop rows.
my $linefield;
LEFT JOIN borrowers ON borrowers.borrowernumber=old_issues.borrowernumber
LEFT JOIN items ON old_issues.itemnumber=items.itemnumber
LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber)
- LEFT JOIN issuingrules ON
- (issuingrules.branchcode=old_issues.branchcode
- AND issuingrules.itemtype=biblioitems.itemtype
- AND issuingrules.categorycode=borrowers.categorycode)
WHERE 1";
if (($line=~/timestamp/) or ($line=~/returndate/)){
my $sth = $dbh->prepare( $strsth );
$sth->execute;
-
while ( my ($celvalue) = $sth->fetchrow) {
my %cell;
if ($celvalue) {
$colfield .= $column;
$colorder .= $column;
}
-
+
my $strsth2;
$strsth2 .= "SELECT distinctrow $colfield
FROM `old_issues`
LEFT JOIN borrowers ON borrowers.borrowernumber=old_issues.borrowernumber
LEFT JOIN items ON items.itemnumber=old_issues.itemnumber
LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber)
- LEFT JOIN issuingrules ON
- (issuingrules.branchcode=old_issues.branchcode
- AND issuingrules.itemtype=biblioitems.itemtype
- AND issuingrules.categorycode=borrowers.categorycode)
WHERE 1";
if (($column=~/timestamp/) or ($column=~/returndate/)){
$strsth2 .=" ORDER BY $colorder";
my $sth2 = $dbh->prepare( $strsth2 );
- if (( @colfilter ) and ($colfilter[1])){
- $sth2->execute("'".$colfilter[0]."'","'".$colfilter[1]."'");
- } elsif ($colfilter[0]) {
- $sth2->execute($colfilter[0]);
- } else {
- $sth2->execute;
- }
-
+
+ $sth2->execute;
while (my ($celvalue) = $sth2->fetchrow) {
my %cell;
# warn "fin des titres colonnes";
my $i=0;
- my @totalcol;
my $hilighted=-1;
#Initialization of cell values.....
# Processing average loanperiods
$strcalc .= "SELECT $linefield, $colfield, ";
- $strcalc .= " issuedate, returndate, old_issues.timestamp, COUNT(*), date_due, old_issues.renewals, issuelength FROM `old_issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) LEFT JOIN issuingrules ON (issuingrules.branchcode=branchcode AND issuingrules.itemtype=biblioitems.itemtype AND issuingrules.categorycode=categorycode) WHERE old_issues.itemnumber=items.itemnumber AND old_issues.borrowernumber=borrowers.borrowernumber";
+ $strcalc .= " issuedate, returndate, COUNT(*) FROM `old_issues`,borrowers,biblioitems LEFT JOIN items ON (biblioitems.biblioitemnumber=items.biblioitemnumber) WHERE old_issues.itemnumber=items.itemnumber AND old_issues.borrowernumber=borrowers.borrowernumber";
@$filters[0]=~ s/\*/%/g if (@$filters[0]);
$strcalc .= " AND old_issues.timestamp > '" . @$filters[0] ."'" if ( @$filters[0] );
@$filters[8]=~ s/\*/%/g if (@$filters[8]);
$strcalc .= " AND borrowers.categorycode like '" . @$filters[8] ."'" if ( @$filters[8] );
@$filters[9]=~ s/\*/%/g if (@$filters[9]);
- $strcalc .= " AND biblioitems.itemtype like '" . @$filters[9] ."'" if ( @$filters[9] );
+ $strcalc .= " AND $itype like '" . @$filters[9] ."'" if ( @$filters[9] );
@$filters[10]=~ s/\*/%/g if (@$filters[10]);
$strcalc .= " AND old_issues.branchcode like '" . @$filters[10] ."'" if ( @$filters[10] );
@$filters[11]=~ s/\*/%/g if (@$filters[11]);
$dbcalc->execute;
# warn "filling table";
my $issues_count=0;
- my $previous_row;
- my $previous_col;
my $loanlength;
- my $err;
my $emptycol;
- my $weightrow;
-
+
while (my @data = $dbcalc->fetchrow) {
my ($row, $col, $issuedate, $returndate, $weight)=@data;
# warn "filling table $row / $col / $issuedate / $returndate /$weight";
$emptycol=1 if (!defined($col));
$col = "zzEMPTY" if (!defined($col));
$row = "zzEMPTY" if (!defined($row));
- # fill returndate to avoid an error with date calc (needed for all non returned issues)
- $returndate= join '-',Date::Calc::Today if $returndate eq '0000-00-00';
# DateCalc returns => 0:0:WK:DD:HH:MM:SS the weeks, days, hours, minutes,
# and seconds between the two
$loanlength = Delta_Days(split(/-/,$issuedate),split (/-/,$returndate)) ;
$globalline{column} = $column;
push @mainloop,\%globalline;
return \@mainloop;
+
}
1;
projects / srvgit / blobdiff