Koha/members/statistics.pl
Owen Leonard 526af4ea07 Bug 12542: Tabs inconsistency in different circ-menu.inc uses
Differences between circ-menu.tt and circ-menu.inc always crop up when a
new menu item is added--usually only to circ-menu.inc as happened with
Bug 9261.

Other sidebar differences are present due to differences in the patron
data passed by various patron-related script to their templates. This
patch also irons out some of these inconsistencies.

To test, apply the patch and check out to a patron whose record has more
than just basic data: othername, country, patron attributes, street
number, road types, etc. View the following pages and compare the patron
data and visible tabs to confirm that they match:

circ/circulation.pl?borrowernumber=X
members/boraccount.pl?borrowernumber=X
members/files.pl?borrowernumber=X
members/mancredit.pl?borrowernumber=X
members/maninvoice.pl?borrowernumber=X
members/member-flags.pl?member=X
members/member-password.pl?member=X
members/moremember.pl?borrowernumber=X
members/notices.pl?borrowernumber=X
members/pay.pl?borrowernumber=X
members/paycollect.pl?borrowernumber=X
members/purchase-suggestions.pl?borrowernumber=X
members/readingrec.pl?borrowernumber=X
members/routing-lists.pl?borrowernumber=X
members/statistics.pl?borrowernumber=X
tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&src=circ&object=X

The only difference I've found which is not fixed by this patch is the
display of extended patron attributes in the sidebar of moremember.pl.
This is a piecemeal fix for a problem which really deserves a
centralized solution, but at least it gets us back to consistency for
the moment.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Going through all tabs shows consistency is back. A mid term solution should
implement this in a centralized way. Great job Owen!
No koha-qa errors btw.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-07-18 10:41:27 -03:00

244 lines
7 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;
use C4::Auth;
use C4::Branch;
use C4::Context;
use C4::Members;
use C4::Members::Statistics;
use C4::Members::Attributes qw(GetBorrowerAttributes);
use C4::Output;
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 => 1 },
debug => 1,
}
);
my $borrowernumber = $input->param('borrowernumber');
# Set informations for the patron
my $borrower = GetMemberDetails( $borrowernumber, 0 );
if ( not defined $borrower ) {
$template->param (unknowuser => 1);
output_html_with_http_headers $input, $cookie, $template->output;
exit;
}
foreach my $key ( keys %$borrower ) {
$template->param( $key => $borrower->{$key} );
}
$template->param(
categoryname => $borrower->{'description'},
branchname => GetBranchName($borrower->{'branchcode'}),
);
# 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
);
}
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
$template->param( picture => 1 ) if $picture;
# Computes full borrower address
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
$template->param(
statisticsview => 1,
datas => $datas,
address => $address,
column_names => \@statistic_column_names,
length_keys => scalar( @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,
RoutingSerials => C4::Context->preference('RoutingSerials'),
);
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;
}