Jonathan Druart
0ab22e1c7c
In order to simplify and make uniform the code, the controller scripts send a Koha::Patron object to the templates instead of all attributes of a patron. That will make the code much more easier to maintain and will be less error-prone. The variable "patron" sent to the templates is supposed to represent the patron the librarian is editing the detail. In the members module and some scripts of the circulation module, the patron's detail are sent one by one to the template. That leads to frustration from developpers (making sure everything is passed from all scripts) and to regression (we got tone of bugs in the last year because of this way to do). With this patch set it will be easy access patron's detail, passing only 1 variable from the controllers. Test plan: Play with the patron and circulation module and make sur the detail of the patron you are editing/seeing info are correctly displayed. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
230 lines
6.6 KiB
Perl
Executable file
230 lines
6.6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2012 BibLibre
|
|
# 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 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.
|
|
|
|
=head1 members/statistics.pl
|
|
|
|
Generate statistic issues for a member
|
|
|
|
=cut
|
|
|
|
use Modern::Perl;
|
|
|
|
use CGI qw ( -utf8 );
|
|
use C4::Auth;
|
|
use C4::Context;
|
|
use C4::Members;
|
|
use C4::Members::Statistics;
|
|
use C4::Members::Attributes qw(GetBorrowerAttributes);
|
|
use C4::Output;
|
|
use Koha::Patrons;
|
|
|
|
my $input = new CGI;
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{ template_name => "members/statistics.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { borrowers => 'edit_borrowers' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $borrowernumber = $input->param('borrowernumber');
|
|
|
|
my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
|
|
my $patron = Koha::Patrons->find( $borrowernumber );
|
|
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
|
|
|
my $category = $patron->category;
|
|
|
|
# Construct column names
|
|
my $fields = C4::Members::Statistics::get_fields();
|
|
our @statistic_column_names = split '\|', $fields;
|
|
our @value_column_names = ( 'count_precedent_state', 'count_total_issues_today', 'count_total_issues_returned_today' );
|
|
our @column_names = ( @statistic_column_names, @value_column_names );
|
|
|
|
# Get statistics
|
|
my $precedent_state = GetPrecedentStateByBorrower( $borrowernumber );
|
|
my $total_issues_today = GetTotalIssuesTodayByBorrower( $borrowernumber );
|
|
my $total_issues_returned_today = GetTotalIssuesReturnedTodayByBorrower( $borrowernumber );
|
|
my $r = merge (
|
|
@$precedent_state, @$total_issues_today, @$total_issues_returned_today
|
|
);
|
|
|
|
add_actual_state( $r );
|
|
my ( $total, $datas ) = build_array( $r );
|
|
|
|
# Gettings sums
|
|
my $count_total_precedent_state = $total->{count_precedent_state} || 0;
|
|
my $count_total_issues = $total->{count_total_issues_today} || 0;
|
|
my $count_total_issues_returned = $total->{count_total_issues_returned_today} || 0;
|
|
my $count_total_actual_state = ($count_total_precedent_state - $count_total_issues_returned + $count_total_issues);
|
|
|
|
if (C4::Context->preference('ExtendedPatronAttributes')) {
|
|
my $attributes = GetBorrowerAttributes($borrowernumber);
|
|
$template->param(
|
|
ExtendedPatronAttributes => 1,
|
|
extendedattributes => $attributes
|
|
);
|
|
}
|
|
|
|
$template->param( picture => 1 ) if $patron->image;
|
|
|
|
$template->param( adultborrower => 1 ) if ( $category->category_type eq 'A' || $category->category_type eq 'I' );
|
|
|
|
$template->param(
|
|
patron => $patron,
|
|
statisticsview => 1,
|
|
datas => $datas,
|
|
column_names => \@statistic_column_names,
|
|
count_total_issues => $count_total_issues,
|
|
count_total_issues_returned => $count_total_issues_returned,
|
|
count_total_precedent_state => $count_total_precedent_state,
|
|
count_total_actual_state => $count_total_actual_state,
|
|
);
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|
|
|
|
=head1 FUNCTIONS
|
|
|
|
=head2 add_actual_state
|
|
|
|
Add a 'count_actual_state' key in all hashes
|
|
count_actual_state = count_precedent_state - count_total_issues_returned_today + count_total_issues_today
|
|
|
|
=cut
|
|
|
|
sub add_actual_state {
|
|
my ( $array ) = @_;
|
|
for my $hash ( @$array ) {
|
|
$hash->{count_actual_state} = ( $hash->{count_precedent_state} // 0 ) - ( $hash->{count_total_issues_returned_today} // 0 ) + ( $hash->{count_total_issues_today} // 0 );
|
|
}
|
|
}
|
|
|
|
=head2 build_array
|
|
|
|
Build a new array containing values of hashes.
|
|
It used by template whitch display silly values.
|
|
ex:
|
|
$array = [
|
|
{
|
|
'count_total_issues_returned_today' => 1,
|
|
'ccode' => 'ccode',
|
|
'count_actual_state' => 1,
|
|
'count_precedent_state' => 1,
|
|
'homebranch' => 'homebranch',
|
|
'count_total_issues_today' => 1,
|
|
'itype' => 'itype'
|
|
}
|
|
];
|
|
and returns:
|
|
[
|
|
[
|
|
'homebranch',
|
|
'itype',
|
|
'ccode',
|
|
1,
|
|
1,
|
|
1,
|
|
1
|
|
]
|
|
];
|
|
|
|
=cut
|
|
|
|
sub build_array {
|
|
my ( $array ) = @_;
|
|
my ( @r, $total );
|
|
for my $hash ( @$array) {
|
|
my @line;
|
|
for my $cn ( ( @column_names, 'count_actual_state') ) {
|
|
if ( grep /$cn/, ( @value_column_names, 'count_actual_state') ) {
|
|
$hash->{$cn} //= 0;
|
|
if ( exists $total->{$cn} ) {
|
|
$total->{$cn} += $hash->{$cn} if $hash->{$cn};
|
|
} else {
|
|
$total->{$cn} = $hash->{$cn};
|
|
}
|
|
}
|
|
push @line, $hash->{$cn};
|
|
}
|
|
push @r, \@line;
|
|
}
|
|
return ( $total, \@r );
|
|
}
|
|
|
|
=head2 merge
|
|
|
|
Merge hashes with the same statistic column names into one
|
|
param: array, a arrayref of arrayrefs
|
|
ex:
|
|
@array = (
|
|
{
|
|
'ccode' => 'ccode',
|
|
'count_precedent_state' => '1',
|
|
'homebranch' => 'homebranch',
|
|
'itype' => 'itype'
|
|
},
|
|
{
|
|
'count_total_issues_returned_today' => '1',
|
|
'ccode' => 'ccode',
|
|
'homebranch' => 'homebranch',
|
|
'itype' => 'itype'
|
|
}
|
|
);
|
|
and returns:
|
|
[
|
|
{
|
|
'count_total_issues_returned_today' => '1',
|
|
'ccode' => 'ccode',
|
|
'count_precedent_state' => '1',
|
|
'homebranch' => 'homebranch',
|
|
'itype' => 'itype'
|
|
}
|
|
];
|
|
|
|
=cut
|
|
|
|
sub merge {
|
|
my @array = @_;
|
|
my @r;
|
|
for my $h ( @array ) {
|
|
my $exists = 0;
|
|
for my $ch ( @r ) {
|
|
$exists = 1;
|
|
for my $cn ( @statistic_column_names ) {
|
|
if ( $ch->{$cn} and not $ch->{$cn} eq $h->{$cn} ) {
|
|
$exists = 0;
|
|
last;
|
|
}
|
|
}
|
|
if ($exists){
|
|
for my $cn ( @value_column_names ) {
|
|
next if not exists $h->{$cn};
|
|
$ch->{$cn} = $h->{$cn} ? $h->{$cn} : 0;
|
|
}
|
|
last;
|
|
}
|
|
}
|
|
|
|
if ( not $exists ) {push @r, $h;}
|
|
}
|
|
return \@r;
|
|
}
|