David Cook
7e7b4c71be
This patch adds the first name and surname of the librarian and the user involved in a transaction log, if available. If neither the firstname or the surname is available, then the 'object' number will be prefaced with the 'Member' qualifier. _TEST PLAN_ 0) This patch depends on Bug 11473, so you must apply it first Before applying this patch (11477): 1) View the logs. 2) Note that the Librarian column just has a number 3) Note that the Object column will just say Member X (where X is a number), in the circulation, fines, and patron/member modules. Apply the patch. 4) Reload the logs (you don't need to make new ones) 5) Note that the Librarian and Object columns mentioned above now have firstname and surname appearing (where available) Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> Works as described, passes all tests and QA script. Signed-off-by: Galen Charlton <gmc@esilibrary.com>
199 lines
7.1 KiB
Perl
Executable file
199 lines
7.1 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2010 BibLibre
|
|
# Copyright 2011 MJ Ray and software.coop
|
|
#
|
|
# 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.
|
|
|
|
use strict;
|
|
#use warnings; FIXME - Bug 2505
|
|
use C4::Auth;
|
|
use CGI;
|
|
use C4::Context;
|
|
use C4::Koha;
|
|
use C4::Dates;
|
|
use C4::Output;
|
|
use C4::Log;
|
|
use C4::Items;
|
|
use C4::Branch;
|
|
use C4::Debug;
|
|
# use Data::Dumper;
|
|
use C4::Search; # enabled_staff_search_views
|
|
|
|
use vars qw($debug $cgi_debug);
|
|
|
|
=head1 viewlog.pl
|
|
|
|
plugin that shows stats
|
|
|
|
=cut
|
|
|
|
my $input = new CGI;
|
|
|
|
$debug or $debug = $cgi_debug;
|
|
my $do_it = $input->param('do_it');
|
|
my @modules = $input->param("modules");
|
|
my $user = $input->param("user");
|
|
my @action = $input->param("action");
|
|
my $object = $input->param("object");
|
|
my $info = $input->param("info");
|
|
my $datefrom = $input->param("from");
|
|
my $dateto = $input->param("to");
|
|
my $basename = $input->param("basename");
|
|
#my $del = $input->param("sep");
|
|
my $output = $input->param("output") || "screen";
|
|
my $src = $input->param("src"); # this param allows us to be told where we were called from -fbcit
|
|
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "tools/viewlog.tmpl",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { tools => 'view_system_logs' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
if ($src eq 'circ') { # if we were called from circulation, use the circulation menu and get data to populate it -fbcit
|
|
use C4::Members;
|
|
my $borrowernumber = $object;
|
|
my $data = GetMember('borrowernumber'=>$borrowernumber);
|
|
my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
|
|
$template->param( picture => 1 ) if $picture;
|
|
|
|
$template->param( menu => 1,
|
|
title => $data->{'title'},
|
|
initials => $data->{'initials'},
|
|
surname => $data->{'surname'},
|
|
othernames => $data->{'othernames'},
|
|
borrowernumber => $borrowernumber,
|
|
firstname => $data->{'firstname'},
|
|
cardnumber => $data->{'cardnumber'},
|
|
categorycode => $data->{'categorycode'},
|
|
category_type => $data->{'category_type'},
|
|
categoryname => $data->{'description'},
|
|
address => $data->{'address'},
|
|
address2 => $data->{'address2'},
|
|
city => $data->{'city'},
|
|
state => $data->{'state'},
|
|
zipcode => $data->{'zipcode'},
|
|
phone => $data->{'phone'},
|
|
phonepro => $data->{'phonepro'},
|
|
email => $data->{'email'},
|
|
branchcode => $data->{'branchcode'},
|
|
branchname => GetBranchName($data->{'branchcode'}),
|
|
RoutingSerials => C4::Context->preference('RoutingSerials'),
|
|
);
|
|
}
|
|
|
|
$template->param(
|
|
debug => $debug,
|
|
C4::Search::enabled_staff_search_views,
|
|
);
|
|
|
|
if ($do_it) {
|
|
|
|
my @data;
|
|
my ($results,$modules,$action);
|
|
if ($action[0] ne '') { $action = \@action; } # match All means no limit
|
|
if ($modules[0] ne '') { $modules = \@modules; } # match All means no limit
|
|
$results = GetLogs($datefrom,$dateto,$user,$modules,$action,$object,$info);
|
|
@data=@$results;
|
|
my $total = scalar @data;
|
|
foreach my $result (@data){
|
|
if (substr($result->{'info'}, 0, 4) eq 'item' || $result->{module} eq "CIRCULATION"){
|
|
# get item information so we can create a working link
|
|
my $itemnumber=$result->{'object'};
|
|
$itemnumber=$result->{'info'} if ($result->{module} eq "CIRCULATION");
|
|
my $item=GetItem($itemnumber);
|
|
$result->{'biblionumber'}=$item->{'biblionumber'};
|
|
$result->{'biblioitemnumber'}=$item->{'biblionumber'};
|
|
$result->{'barcode'}=$item->{'barcode'};
|
|
}
|
|
#always add firstname and surname for librarian/user
|
|
if ($result->{'user'}){
|
|
my $userdetails = C4::Members::GetMemberDetails($result->{'user'});
|
|
if ($userdetails->{'firstname'}){
|
|
$result->{'userfirstname'} = $userdetails->{'firstname'};
|
|
}
|
|
if ($userdetails->{'surname'}){
|
|
$result->{'usersurname'} = $userdetails->{'surname'};
|
|
}
|
|
}
|
|
#add firstname and surname for borrower, when using the CIRCULATION, MEMBERS, FINES
|
|
if ($result->{module} eq "CIRCULATION" || $result->{module} eq "MEMBERS" || $result->{module} eq "FINES"){
|
|
if($result->{'object'}){
|
|
my $borrowerdetails = C4::Members::GetMemberDetails($result->{'object'});
|
|
if ($borrowerdetails->{'firstname'}){
|
|
$result->{'borrowerfirstname'} = $borrowerdetails->{'firstname'};
|
|
}
|
|
if ($borrowerdetails->{'surname'}){
|
|
$result->{'borrowersurname'} = $borrowerdetails->{'surname'};
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if ( $output eq "screen" ) {
|
|
# Printing results to screen
|
|
$template->param (
|
|
logview => 1,
|
|
total => $total,
|
|
looprow => \@data,
|
|
do_it => 1,
|
|
datefrom => $datefrom,
|
|
dateto => $dateto,
|
|
user => $user,
|
|
object => $object,
|
|
action => \@action,
|
|
info => $info,
|
|
src => $src,
|
|
);
|
|
#module => 'fix this', #this seems unused in actual code
|
|
foreach my $module (@modules) {
|
|
$template->param($module => 1);
|
|
}
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
} else {
|
|
# Printing to a csv file
|
|
print $input->header(
|
|
-type => 'text/csv',
|
|
-attachment => "$basename.csv",
|
|
-filename => "$basename.csv"
|
|
);
|
|
my $sep = C4::Context->preference("delimiter");
|
|
foreach my $line (@data) {
|
|
#next unless $modules[0] eq "catalogue";
|
|
foreach (qw(timestamp firstname surname action info title author)) {
|
|
print $line->{$_} . $sep;
|
|
}
|
|
}
|
|
}
|
|
exit;
|
|
} else {
|
|
#my @values;
|
|
#my %labels;
|
|
#my %select;
|
|
#initialize some paramaters that might not be used in the template - it seems to evaluate EXPR even if a false TMPL_IF
|
|
$template->param(
|
|
total => 0,
|
|
module => "",
|
|
info => ""
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
}
|