Adding checks for dateformat preference so that tablesorter script can be passed...

[koha_fer] / tools / viewlog.pl

diff --git a/tools/viewlog.pl b/tools/viewlog.pl
index 69254fc..f9c5952 100755 (executable)
--- a/tools/viewlog.pl
+++ b/tools/viewlog.pl
@@ -26,6 +26,9 @@ use C4::Koha;
 use C4::Dates;
 use C4::Output;
 use C4::Log;
+use C4::Items;
+use C4::Branch;
+use Data::Dumper;
 
 use vars qw($debug);
 
@@ -40,6 +43,7 @@ plugin that shows a stats on borrowers
 =cut
 
 my $input    = new CGI;
+
 $debug or $debug = $input->param('debug') || 0;
 my $do_it    = $input->param('do_it');
 my $module   = $input->param("module");
@@ -53,6 +57,7 @@ my $basename = $input->param("basename");
 my $mime     = $input->param("MIME");
 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(
     {
@@ -60,11 +65,37 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         query           => $input,
         type            => "intranet",
         authnotrequired => 0,
-        flagsrequired   => { tools => 1 },
+        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->{'cardnumber'});
+    $template->param( picture => 1 ) if $picture;
+    $template->param(   menu            => 1,
+                        title           => $data->{'title'},
+                        initials        => $data->{'initials'},
+                        surname         => $data->{'surname'},
+                        borrowernumber  => $borrowernumber,
+                        firstname       => $data->{'firstname'},
+                        cardnumber      => $data->{'cardnumber'},
+                        categorycode    => $data->{'categorycode'},
+                        categoryname   => $data->{'description'},
+                        address         => $data->{'address'},
+                        address2        => $data->{'address2'},
+                        city            => $data->{'city'},
+                        phone           => $data->{'phone'},
+                        phonepro        => $data->{'phonepro'},
+                        email           => $data->{'email'},
+                        branchcode      => $data->{'branchcode'},
+                        branchname             => GetBranchName($data->{'branchcode'}),
+    );
+}
+
 $template->param(
        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
                      dateformat => C4::Dates->new()->format(),
@@ -75,10 +106,20 @@ if ($do_it) {
 
     my $results = GetLogs($datefrom,$dateto,$user,$module,$action,$object,$info);
     my $total = scalar @$results;
+    warn "Total records retrieved = $total";
+    foreach my $result (@$results){
+       if ($result->{'info'} eq 'item'){
+           # get item information so we can create a working link
+           my $item=GetItem($result->{'object'});
+           $result->{'biblionumber'}=$item->{'biblionumber'};
+           $result->{'biblioitemnumber'}=$item->{'biblionumber'};              
+       }
+    }
     
     if ( $output eq "screen" ) {
         # Printing results to screen
         $template->param (
+                       logview => 1,
             total    => $total,
             $module  => 1,
             looprow  => $results,
@@ -90,6 +131,7 @@ if ($do_it) {
             object   => $object,
             action   => $action,
             info     => $info,
+            src      => $src,
         );
         output_html_with_http_headers $input, $cookie, $template->output;
     } else {