#
# 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 CGI;
+#use warnings; FIXME - Bug 2505
+use CGI qw ( -utf8 );
use C4::Auth;
use C4::Output;
use C4::Context;
-use C4::Branch; # GetBranches
use C4::Koha;
use C4::Circulation;
use C4::Members;
use C4::Reports;
use C4::Debug;
-use C4::Dates qw(format_date format_date_in_iso);
+
+use Koha::DateUtils;
+use Koha::Patron::Categories;
=head1 NAME
=head1 DESCRIPTION
-=over 2
-
=cut
$debug = 1;
$debug and open DEBUG, ">/tmp/bor_issues_top.debug.log";
my $input = new CGI;
-my $fullreportname = "reports/bor_issues_top.tmpl";
+my $fullreportname = "reports/bor_issues_top.tt";
my $do_it = $input->param('do_it');
my $limit = $input->param("Limit");
my $column = $input->param("Criteria");
-my @filters = $input->param("Filter");
+my @filters = $input->multi_param("Filter");
foreach ( @filters[0..3] ) {
- $_ and $_ = format_date_in_iso($_);
+ $_ and $_ = eval { output_pref( { dt => dt_from_string ( $_ ), dateonly => 1, dateformat => 'iso' }); };
}
my $output = $input->param("output");
my $basename = $input->param("basename");
-# my $mime = $input->param("MIME");
my ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => $fullreportname,
query => $input,
our $sep = $input->param("sep");
$sep = "\t" if ($sep eq 'tabulation');
$template->param(do_it => $do_it,
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
);
if ($do_it) {
# Displaying results
print join($sep, map {$_->{totalcol}} @$cols);
print $sep.@$results[0]->{total};
}
- exit(1);
+ exit;
}
my $dbh = C4::Context->dbh;
my @values;
# here each element returned by map is a hashref, get it?
-my @mime = ( map { {type =>$_} } (split /[;:]/,C4::Context->preference("MIME")) );
+my @mime = ( map { {type =>$_} } (split /[;:]/, 'CSV') ); # FIXME translation
my $delims = GetDelimiterChoices;
-my $branches = GetBranches;
-my @branchloop;
-foreach (sort keys %$branches) {
-# my $selected = 1 if $thisbranch eq $branch;
- my %row = ( value => $_,
-# selected => $selected,
- branchname => $branches->{$_}->{branchname},
- );
- push @branchloop, \%row;
-}
my $itemtypes = GetItemTypes;
my @itemtypeloop;
-foreach (sort {$itemtypes->{$a}->{description} cmp $itemtypes->{$b}->{description}} keys %$itemtypes) {
+foreach (sort {$itemtypes->{$a}->{translated_description} cmp $itemtypes->{$b}->{translated_description}} keys %$itemtypes) {
my %row = (value => $_,
- description => $itemtypes->{$_}->{description},
+ translated_description => $itemtypes->{$_}->{translated_description},
);
push @itemtypeloop, \%row;
}
-
-my ($codes,$labels) = GetborCatFromCatType(undef,undef);
-my @borcatloop;
-foreach (sort keys %$labels) {
- my %row =(value => $_,
- description => $labels->{$_},
- );
- push @borcatloop, \%row;
-}
-
+
+my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']});
+
$template->param(
mimeloop => \@mime,
CGIseplist => $delims,
- branchloop => \@branchloop,
itemtypeloop => \@itemtypeloop,
- borcatloop => \@borcatloop,
+patron_categories => $patron_categories,
);
output_html_with_http_headers $input, $cookie, $template->output;
sub calculate {
- my ($line, $column, $filters) = @_;
+ my ($limit, $column, $filters) = @_;
+
my @loopcol;
my @loopline;
my @looprow;
my $grantotal =0;
my $dbh = C4::Context->dbh;
+
# Checking filters
my @loopfilter;
my @cellmap = (
$cell{err} = 1 if (@$filters[$i]<@$filters[$i-1]) ;
}
# format the dates filters, otherwise just fill as is
- $cell{filter} .= ($i>=4) ? @$filters[$i] : format_date(@$filters[$i]);
+ $cell{filter} .= @$filters[$i];
defined ($cellmap[$i]) and
$cell{crit} .= $cellmap[$i];
push @loopfilter, \%cell;
} elsif ($column =~ /sort2/ ) {
# $colfilter[0] = @$filters[11];
}
- # $colfilter[0] = @$filters[7] if ($column =~ /timestamp/ ) ; FIXME This can't be right.
- # $colfilter[0] = @$filters[8] if ($column =~ /timestamp/ ) ; FIXME
- # $colfilter[0] = @$filters[9] if ($column =~ /timestamp/ ) ; FIXME Only this line would have effect.
-
- #warn "filtre col ".$colfilter[0]." ".$colfilter[1];
# loop cols.
if ($column eq "Day") {
$columns{''} = 1;
}
- #Initialization of cell values.....
- my @table;
- for (my $i=1;$i<=$line;$i++) {
- foreach (keys %columns) {
-# warn " init table : $row->{rowtitle} / $_ ";
- $table[$i]->{ $_ || "total" }->{'name'}=0;
- }
- }
-
my $strcalc ;
# Processing average loanperiods
- $strcalc .= "SELECT CONCAT(borrowers.surname , \",\\t\",borrowers.firstname), COUNT(*) AS RANK, borrowers.borrowernumber AS ID";
+ $strcalc .= "SELECT CONCAT_WS('', borrowers.surname , \",\\t\", borrowers.firstname), COUNT(*) AS RANK, borrowers.borrowernumber AS ID";
$strcalc .= " , $colfield " if ($colfield);
$strcalc .= " FROM `old_issues`
- LEFT JOIN borrowers ON old_issues.borrowernumber=borrowers.borrowernumber
- LEFT JOIN items ON items.itemnumber=old_issues.itemnumber
- LEFT JOIN biblioitems ON (biblioitems.biblioitemnumber=items.biblioitemnumber)
- WHERE 1";
+ LEFT JOIN borrowers USING(borrowernumber)
+ LEFT JOIN items USING(itemnumber)
+ LEFT JOIN biblioitems USING(biblioitemnumber)
+ WHERE old_issues.borrowernumber IS NOT NULL
+ ";
my @filterterms = (
- 'old_issues.timestamp >',
- 'old_issues.timestamp <',
+ 'old_issues.issuedate >',
+ 'old_issues.issuedate <',
'old_issues.returndate >',
'old_issues.returndate <',
'old_issues.branchcode like',
'biblioitems.itemtype like',
'borrowers.categorycode like',
- 'dayname(old_issues.timestamp) like',
- 'monthname(old_issues.timestamp) like',
- 'monthname(old_issues.timestamp) like',
- 'year(old_issues.timestamp) like',
);
foreach ((@$filters)[0..9]) {
my $term = shift @filterterms; # go through both arrays in step
s/\*/%/g;
$strcalc .= " AND $term '$_' ";
}
-
$strcalc .= " GROUP BY borrowers.borrowernumber";
$strcalc .= ", $colfield" if ($column);
$strcalc .= " ORDER BY RANK DESC";
$strcalc .= ",$colfield " if ($colfield);
-# my $max;
-# if (@loopcol) {
-# $max = $line*@loopcol;
-# } else { $max=$line;}
-# $strcalc .= " LIMIT 0,$max";
+ $strcalc .= " LIMIT $limit" if ($limit);
$debug and print DEBUG "(old_issues) SQL : $strcalc\n";
my $dbcalc = $dbh->prepare($strcalc);
} keys %patrons;
foreach my $id (@ranked_ids) {
my @loopcell;
+
foreach my $key (@cols_in_order) {
if($column){
push @loopcell, {
'loopcell' => \@loopcell,
'hilighted' => ($i%2),
};
+ # use a limit, if a limit is defined
+ last if $i > $limit and $limit
}
-
+
# the header of the table
$globalline{loopfilter}=\@loopfilter;
# the core of the table
# the foot (totals by borrower type)
$globalline{loopfooter} = [];
$globalline{total}= $grantotal; # FIXME: useless
- $globalline{line} = $line;
$globalline{column} = $column;
return [\%globalline]; # reference to a 1 element array: that element is a hashref
}
projects / koha.git / blobdiff