X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FStats.pm;h=6afb538092218fff114507194c74c3433f589bce;hb=eded6edacc5e3bf8dd0be21ed05842c3b78aadce;hp=745798398e1e4ea0f2429c4d13f3faa385f8e958;hpb=068e5be6395088793aeab66d67c36c2b9da2c5d9;p=koha-ffzg.git diff --git a/C4/Stats.pm b/C4/Stats.pm index 745798398e..6afb538092 100644 --- a/C4/Stats.pm +++ b/C4/Stats.pm @@ -5,36 +5,34 @@ package C4::Stats; # # 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 . -use strict; -use warnings; -require Exporter; +use Modern::Perl; +use Carp qw( croak ); use C4::Context; -use C4::Debug; -use vars qw($VERSION @ISA @EXPORT); -our $debug; +use Koha::DateUtils qw( dt_from_string ); +use Koha::Statistics; +use Koha::PseudonymizedTransactions; +our (@ISA, @EXPORT_OK); BEGIN { - # set the version for version checking - $VERSION = 3.07.00.049; - @ISA = qw(Exporter); - @EXPORT = qw( - &UpdateStats - &TotalPaid - ); + require Exporter; + @ISA = qw(Exporter); + @EXPORT_OK = qw( + UpdateStats + ); } @@ -48,81 +46,110 @@ C4::Stats - Update Koha statistics (log) =head1 DESCRIPTION -The C<&UpdateStats> function adds an entry to the statistics table in -the Koha database, which acts as an activity log. +The functions of this module deals with statistics table of Koha database. =head1 FUNCTIONS -=over 2 +=head2 UpdateStats + + &UpdateStats($params); -=item UpdateStats +Adds an entry to the statistics table in the Koha database, which acts as an activity log. - &UpdateStats($branch, $type, $value, $other, $itemnumber, - $itemtype, $borrowernumber); +C<$params> is an hashref whose expected keys are: + branch : the branch where the transaction occurred + type : the type of transaction (renew, issue, localuse, return, writeoff, payment + itemnumber : the itemnumber of the item + borrowernumber : the borrowernumber of the patron + amount : the amount of the transaction + other : sipmode + itemtype : the type of the item + ccode : the collection code of the item -Adds a line to the statistics table of the Koha database. In effect, -it logs an event. +type key is mandatory. +For types used in C4::Circulation (renew,issue,localuse,return), the following other keys are mandatory: +branch, borrowernumber, itemnumber, ccode, itemtype +For types used in C4::Accounts (writeoff, payment), the following other keys are mandatory: +branch, borrowernumber, itemnumber, ccode, itemtype +If an optional key is not provided, the value '' is used for this key. -C<$branch>, C<$type>, C<$value>, C<$other>, C<$itemnumber>, -C<$itemtype>, and C<$borrowernumber> correspond to the fields of the -statistics table in the Koha database. +Returns undef if no C<$param> is given =cut -#' sub UpdateStats { - - #module to insert stats data into stats table - my ( - $branch, $type, - $amount, $other, $itemnum, - $itemtype, $borrowernumber, $accountno - ) - = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare( - "INSERT INTO statistics - (datetime, branch, type, value, - other, itemnumber, itemtype, borrowernumber, proccode) - VALUES (now(),?,?,?,?,?,?,?,?)" - ); - $sth->execute( - $branch, $type, $amount, - $other, $itemnum, $itemtype, $borrowernumber, - $accountno - ); -} - -# Otherwise, it'd need a POD. -sub TotalPaid { - my ( $time, $time2, $spreadsheet ) = @_; - $time2 = $time unless $time2; - my $dbh = C4::Context->dbh; - my $query = "SELECT * FROM statistics - LEFT JOIN borrowers ON statistics.borrowernumber= borrowers.borrowernumber - WHERE (statistics.type='payment' OR statistics.type='writeoff') "; - if ( $time eq 'today' ) { - $query .= " AND datetime = now()"; + my ($params) = @_; +# make some controls + return () if ! defined $params; +# change these arrays if new types of transaction or new parameters are allowed + my @allowed_keys = qw (type branch amount other itemnumber itemtype borrowernumber ccode location); + my @allowed_circulation_types = qw (renew issue localuse return onsite_checkout recall); + my @allowed_accounts_types = qw (writeoff payment); + my @circulation_mandatory_keys = qw (type branch borrowernumber itemnumber ccode itemtype); + my @accounts_mandatory_keys = qw (type branch borrowernumber amount); + + my @mandatory_keys = (); + if (! exists $params->{type} or ! defined $params->{type}) { + croak ("UpdateStats did not received type param"); + } + if (grep ($_ eq $params->{type}, @allowed_circulation_types )) { + @mandatory_keys = @circulation_mandatory_keys; + } elsif (grep ($_ eq $params->{type}, @allowed_accounts_types )) { + @mandatory_keys = @accounts_mandatory_keys; } else { - $query .= " AND datetime > '$time'"; # FIXME: use placeholders + croak ("UpdateStats received forbidden type param: ".$params->{type}); + } + my @missing_params = (); + for my $mykey (@mandatory_keys ) { + push @missing_params, $mykey if !grep (/^$mykey/, keys %$params); } - if ( $time2 ne '' ) { - $query .= " AND datetime < '$time2'"; # FIXME: use placeholders + if (scalar @missing_params > 0 ) { + croak ("UpdateStats did not received mandatory param(s): ".join (", ",@missing_params )); } - if ($spreadsheet) { - $query .= " ORDER BY branch, type"; + my @invalid_params = (); + for my $myparam (keys %$params ) { + push @invalid_params, $myparam unless grep { $_ eq $myparam } @allowed_keys; } - $debug and warn "TotalPaid query: $query"; - my $sth = $dbh->prepare($query); - $sth->execute(); - return @{$sth->fetchall_arrayref({})}; + if (scalar @invalid_params > 0 ) { + croak ("UpdateStats received invalid param(s): ".join (", ",@invalid_params )); + } +# get the parameters + my $branch = $params->{branch}; + my $type = $params->{type}; + my $borrowernumber = exists $params->{borrowernumber} ? $params->{borrowernumber} : ''; + my $itemnumber = exists $params->{itemnumber} ? $params->{itemnumber} : undef; + my $amount = exists $params->{amount} ? $params->{amount} : 0; + my $other = exists $params->{other} ? $params->{other} : ''; + my $itemtype = exists $params->{itemtype} ? $params->{itemtype} : ''; + my $location = exists $params->{location} ? $params->{location} : undef; + my $ccode = exists $params->{ccode} ? $params->{ccode} : ''; + + my $dtf = Koha::Database->new->schema->storage->datetime_parser; + my $statistic = Koha::Statistic->new( + { + datetime => $dtf->format_datetime( dt_from_string ), + branch => $branch, + type => $type, + value => $amount, + other => $other, + itemnumber => $itemnumber, + itemtype => $itemtype, + location => $location, + borrowernumber => $borrowernumber, + ccode => $ccode, + } + )->store; + + Koha::PseudonymizedTransaction->new_from_statistic($statistic)->store + if C4::Context->preference('Pseudonymization') + && $borrowernumber # Not a real transaction if the patron does not exist + # For instance can be a transfer, or hold trigger + && grep { $_ eq $params->{type} } qw(renew issue return onsite_checkout); } 1; __END__ -=back - =head1 AUTHOR Koha Development Team