use C4::Auth;
use C4::Context;
-use C4::Branch; # GetBranches
use C4::Koha;
-use Koha::DateUtils;
use C4::Acquisition;
use C4::Output;
use C4::Reports;
use C4::Circulation;
use C4::Members::AttributeTypes;
+
+use Koha::AuthorisedValues;
+use Koha::DateUtils;
+use Koha::Libraries;
+use Koha::Patron::Categories;
+
use Date::Calc qw(
Today
Add_Delta_YM
my $fullreportname = "reports/borrowers_stats.tt";
my $line = $input->param("Line");
my $column = $input->param("Column");
-my @filters = $input->param("Filter");
+my @filters = $input->multi_param("Filter");
$filters[3] = eval { output_pref( { dt => dt_from_string( $filters[3]), dateonly => 1, dateformat => 'iso' } ); }
if ( $filters[3] );
$filters[4] = eval { output_pref ({ dt => dt_from_string( $filters[4]), dateonly => 1, dateformat => 'iso' } ); }
my $basename = $input->param("basename");
our $sep = $input->param("sep");
$sep = "\t" if ($sep and $sep eq 'tabulation');
-my $selected_branch; # = $input->param("?");
-
-our $branches = GetBranches;
my ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => $fullreportname,
} else {
my $dbh = C4::Context->dbh;
my $req;
- $template->param( CAT_LOOP => &catcode_aref);
- my @branchloop;
- foreach (sort {$branches->{$a}->{branchname} cmp $branches->{$b}->{branchname}} keys %$branches) {
- my $line = {branchcode => $_, branchname => $branches->{$_}->{branchname} || 'UNKNOWN'};
- $line->{selected} = 'selected' if ($selected_branch and $selected_branch eq $_);
- push @branchloop, $line;
- }
- $template->param(BRANCH_LOOP => \@branchloop);
+ my $patron_categories = Koha::Patron::Categories->search({}, {order_by => ['description']});
+ $template->param( patron_categories => $patron_categories );
$req = $dbh->prepare("SELECT DISTINCTROW zipcode FROM borrowers WHERE zipcode IS NOT NULL AND zipcode <> '' ORDER BY zipcode");
$req->execute;
$template->param( ZIP_LOOP => $req->fetchall_arrayref({}));
$req->execute;
$template->param( SORT1_LOOP => $req->fetchall_arrayref({}));
$req = $dbh->prepare("SELECT DISTINCTROW sort2 AS value FROM borrowers WHERE sort2 IS NOT NULL AND sort2 <> '' ORDER BY sort2 LIMIT 200");
- # More than 200 items in a dropdown is not going to be useful anyway, and w/ 50,000 patrons we can destory DB performance.
+ # More than 200 items in a dropdown is not going to be useful anyway, and w/ 50,000 patrons we can destroy DB performance.
$req->execute;
$template->param( SORT2_LOOP => $req->fetchall_arrayref({}));
}
output_html_with_http_headers $input, $cookie, $template->output;
-sub catcode_aref {
- my $req = C4::Context->dbh->prepare("SELECT categorycode, description FROM categories ORDER BY description");
- $req->execute;
- return $req->fetchall_arrayref({});
-}
-sub catcodes_hash {
- my %cathash;
- my $catcodes = &catcode_aref;
- foreach (@$catcodes) {
- $cathash{$_->{categorycode}} = ($_->{description} || 'NO_DESCRIPTION') . " ($_->{categorycode})";
- }
- return %cathash;
-}
-
sub calculate {
my ($line, $column, $digits, $status, $activity, $filters, $attr_filters) = @_;
}
}
+ my @branchcodes = map { $_->branchcode } Koha::Libraries->search;
($status ) and push @loopfilter,{crit=>"Status", filter=>$status };
($activity) and push @loopfilter,{crit=>"Activity",filter=>$activity};
- push @loopfilter,{debug=>1, crit=>"Branches",filter=>join(" ", sort keys %$branches)};
- push @loopfilter,{debug=>1, crit=>"(line, column)", filter=>"($line,$column)"};
# year of activity
my ( $period_year, $period_month, $period_day )=Add_Delta_YM( Today(),-$period, 0);
my $newperioddate=$period_year."-".$period_month."-".$period_day;
} else {
$linefield = $line;
}
-
- my %cathash = ($line eq 'categorycode' or $column eq 'categorycode') ? &catcodes_hash : ();
- push @loopfilter, {debug=>1, crit=>"\%cathash", filter=>join(", ", map {$cathash{$_}} sort keys %cathash)};
+ my $patron_categories = Koha::Patron::Categories->search({}, {order_by => ['categorycode']});
my $strsth;
my @strparams; # bind parameters for the query
$strsth .= " AND $status='1' " if ($status);
$strsth .=" order by $linefield";
- push @loopfilter, {sql=>1, crit=>"Query", filter=>$strsth};
my $sth = $dbh->prepare($strsth);
$sth->execute(@strparams);
while (my ($celvalue) = $sth->fetchrow) {
my %cell;
if ($celvalue) {
$cell{rowtitle} = $celvalue;
- # $cell{rowtitle_display} = ($linefield eq 'branchcode') ? $branches->{$celvalue}->{branchname} : $celvalue;
- $cell{rowtitle_display} = ($cathash{$celvalue} || "$celvalue\*") if ($line eq 'categorycode');
+ $cell{rowtitle_display} = ($patron_categories->find($celvalue)->description || "$celvalue\*") if ($line eq 'categorycode');
}
$cell{totalrow} = 0;
push @loopline, \%cell;
$strsth2 .= " AND $status='1' " if ($status);
$strsth2 .= " order by $colfield";
- push @loopfilter, {sql=>1, crit=>"Query", filter=>$strsth2};
my $sth2 = $dbh->prepare($strsth2);
$sth2->execute(@strparams2);
while (my ($celvalue) = $sth2->fetchrow) {
if (defined $celvalue) {
$cell{coltitle} = $celvalue;
# $cell{coltitle_display} = ($colfield eq 'branchcode') ? $branches->{$celvalue}->{branchname} : $celvalue;
- $cell{coltitle_display} = $cathash{$celvalue} if ($column eq 'categorycode');
+ $cell{coltitle_display} = $patron_categories->find($celvalue)->description if ($column eq 'categorycode');
}
push @loopcol, \%cell;
}
$strcalc .= " AND attribute_$type.attribute LIKE '" . $filter . "' ";
}
}
- $strcalc .= " AND borrowernumber in (select distinct(borrowernumber) from old_issues where issuedate > '" . $newperioddate . "')" if ($activity eq 'active');
- $strcalc .= " AND borrowernumber not in (select distinct(borrowernumber) from old_issues where issuedate > '" . $newperioddate . "')" if ($activity eq 'nonactive');
+ $strcalc .= " AND borrowers.borrowernumber in (select distinct(borrowernumber) from old_issues where issuedate > '" . $newperioddate . "')" if ($activity eq 'active');
+ $strcalc .= " AND borrowers.borrowernumber not in (select distinct(borrowernumber) from old_issues where issuedate > '" . $newperioddate . "' AND borrowernumber IS NOT NULL)" if ($activity eq 'nonactive');
$strcalc .= " AND $status='1' " if ($status);
$strcalc .= " GROUP BY ";
$strcalc .= " $colfield ";
}
- push @loopfilter, {sql=>1, crit=>"Query", filter=>$strcalc};
my $dbcalc = $dbh->prepare($strcalc);
(scalar(@calcparams)) ? $dbcalc->execute(@calcparams) : $dbcalc->execute();
my @attribute_loop;
foreach my $class ( sort keys %items_by_class ) {
- my $lib = GetAuthorisedValueByCode( 'PA_CLASS', $class ) || $class;
+ my $av = Koha::AuthorisedValues->search({ category => 'PA_CLASS', authorised_value => $class });
+ my $lib = $av->count ? $av->next->lib : $class;
push @attribute_loop, {
class => $class,
items => $items_by_class{$class},
projects / koha.git / blobdiff