Bug 30462: (follow-up) Limit completed to 60 minutes

[koha-ffzg.git] / admin / background_jobs.pl

diff --git a/admin/background_jobs.pl b/admin/background_jobs.pl
index 9a47485..cccb3bb 100755 (executable)
--- a/admin/background_jobs.pl
+++ b/admin/background_jobs.pl
@@ -19,6 +19,7 @@ use Modern::Perl;
 use CGI qw ( -utf8 );
 
 use C4::Context;
+use Koha::DateUtils qw( dt_from_string );
 use C4::Auth qw( get_template_and_user );
 use C4::Output qw( output_html_with_http_headers );
 
@@ -29,36 +30,33 @@ my $input             = CGI->new;
 my $op                = $input->param('op') || 'list';
 my @messages;
 
-# The "view" view should be accessible for the user who create this job.
-my $flags_required = $op ne 'view' ? { parameters => 'manage_background_jobs' } : undef;
-
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
         template_name   => "admin/background_jobs.tt",
         query           => $input,
         type            => "intranet",
-        flagsrequired   => $flags_required,
+        flagsrequired   => { catalogue => 1 },
     }
 );
 
+my $logged_in_user = Koha::Patrons->find($loggedinuser);
+my $can_manage_background_jobs =
+  $logged_in_user->has_permission( { parameters => 'manage_background_jobs' } );
+
 if ( $op eq 'view' ) {
     my $id = $input->param('id');
     if ( my $job = Koha::BackgroundJobs->find($id) ) {
         if ( $job->borrowernumber ne $loggedinuser
-            && !Koha::Patrons->find($loggedinuser)->has_permission( { parameters => 'manage_background_jobs' } ) )
+            && !$can_manage_background_jobs )
         {
             push @messages, { code => 'cannot_view_job' };
         }
         else {
             $template->param( job => $job, );
-            $template->param(
-                lists => scalar Koha::Virtualshelves->search(
-                    [
-                        { category => 1, owner => $loggedinuser },
-                        { category => 2 }
-                    ]
-                )
-            ) if $job->type eq 'batch_biblio_record_modification';
+            if ( $job->status ne 'new' ) {
+                my $report = $job->additional_report() || {};
+                $template->param( %$report );
+            }
         }
     } else {
         $op = 'list';
@@ -67,16 +65,49 @@ if ( $op eq 'view' ) {
 
 if ( $op eq 'cancel' ) {
     my $id = $input->param('id');
-    if ( my $job = Koha::BackgroundJobs->find($id) ) { # FIXME Make sure logged in user can cancel this job
+    my $job = Koha::BackgroundJobs->find($id);
+    if (   $can_manage_background_jobs
+        || $job->borrowernumber eq $logged_in_user->borrowernumber )
+    {
         $job->cancel;
     }
+    else {
+        push @messages, { code => 'cannot_cancel_job' };
+    }
     $op = 'list';
 }
 
 
 if ( $op eq 'list' ) {
-    my $jobs = Koha::BackgroundJobs->search({}, { order_by => { -desc => 'enqueued_on' }});
-    $template->param( jobs => $jobs );
+    my $queued_jobs =
+      $can_manage_background_jobs
+      ? Koha::BackgroundJobs->search( { ended_on => undef },
+        { order_by => { -desc => 'enqueued_on' } } )
+      : Koha::BackgroundJobs->search(
+        { borrowernumber => $logged_in_user->borrowernumber, ended_on => undef },
+        { order_by       => { -desc => 'enqueued_on' } }
+      );
+    $template->param( queued => $queued_jobs );
+
+    my $ended_since = dt_from_string->subtract( minutes => '60' );
+    my $dtf = Koha::Database->new->schema->storage->datetime_parser;
+
+    my $complete_jobs =
+      $can_manage_background_jobs
+      ? Koha::BackgroundJobs->search(
+        {
+            ended_on => { '>=' => $dtf->format_date($ended_since) }
+        },
+        { order_by => { -desc => 'enqueued_on' } }
+      )
+      : Koha::BackgroundJobs->search(
+        {
+            borrowernumber => $logged_in_user->borrowernumber,
+            ended_on       => { '>=' => $dtf->format_date($ended_since) }
+        },
+        { order_by => { -desc => 'enqueued_on' } }
+      );
+    $template->param( complete => $complete_jobs );
 }
 
 $template->param(