Merge branch 'debian' into b-3.6.1

[mfinanz.git] / SL / Controller / BackgroundJobHistory.pm

diff --git a/SL/Controller/BackgroundJobHistory.pm b/SL/Controller/BackgroundJobHistory.pm
index 3e11106990b78a3f56af133bb9669c90bfbe3aa4..4fbd7ece0c3614725f58ae06848a73d3c9341714 100644 (file)
--- a/SL/Controller/BackgroundJobHistory.pm
+++ b/SL/Controller/BackgroundJobHistory.pm
@@ -5,34 +5,21 @@ use strict;
 use parent qw(SL::Controller::Base);
 
 use SL::Controller::Helper::GetModels;
 use parent qw(SL::Controller::Base);
 
 use SL::Controller::Helper::GetModels;

-use SL::Controller::Helper::Paginated;
-use SL::Controller::Helper::Sorted;

 use SL::DB::BackgroundJobHistory;
 use SL::Helper::Flash;
 use SL::DB::BackgroundJobHistory;
 use SL::Helper::Flash;

+use SL::Locale::String;

 use SL::System::TaskServer;
 
 use Rose::Object::MakeMethods::Generic
 (
 use SL::System::TaskServer;
 
 use Rose::Object::MakeMethods::Generic
 (

-  scalar                  => [ qw(history) ],
-  'scalar --get_set_init' => [ qw(task_server) ],
+  scalar                  => [ qw(history filter_summary) ],
+  'scalar --get_set_init' => [ qw(task_server models) ],

 );
 
 __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('add_stylesheet');
 __PACKAGE__->run_before('check_task_server');
 
 );
 
 __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('add_stylesheet');
 __PACKAGE__->run_before('check_task_server');
 

-__PACKAGE__->make_paginated(ONLY => [ qw(list) ]);
-
-__PACKAGE__->make_sorted(
-  ONLY         => [ qw(list) ],
-
-  package_name => 'Package name',
-  run_at       => 'Run at',
-  status       => 'Execution status',
-  result       => 'Result',
-  error        => 'Error',
-);
-

 #
 # actions
 #
 #
 # actions
 #


@@ -40,9 +27,13 @@ __PACKAGE__->make_sorted(
 sub action_list {
   my ($self) = @_;
 
 sub action_list {
   my ($self) = @_;
 

+  $self->make_filter_summary;
+
+  $self->setup_list_action_bar;

   $self->render('background_job_history/list',
                 title   => $::locale->text('Background job history'),
   $self->render('background_job_history/list',
                 title   => $::locale->text('Background job history'),

-                ENTRIES => $self->get_models);
+                ENTRIES => $self->models->get,
+                MODELS  => $self->models);

 }
 
 sub action_show {
 }
 
 sub action_show {


@@ -51,6 +42,7 @@ sub action_show {
   my $back_to = $::form->{back_to} || $self->url_for(action => 'list');
 
   $self->history(SL::DB::BackgroundJobHistory->new(id => $::form->{id})->load);
   my $back_to = $::form->{back_to} || $self->url_for(action => 'list');
 
   $self->history(SL::DB::BackgroundJobHistory->new(id => $::form->{id})->load);

+  $self->setup_show_action_bar;

   $self->render('background_job_history/show',
                 title   => $::locale->text('View background job execution result'),
                 back_to => $back_to);
   $self->render('background_job_history/show',
                 title   => $::locale->text('View background job execution result'),
                 back_to => $back_to);


@@ -78,7 +70,77 @@ sub check_task_server {
 }
 
 sub add_stylesheet {
 }
 
 sub add_stylesheet {

-  $::form->use_stylesheet('lx-office-erp/background_jobs.css');
+  $::request->{layout}->use_stylesheet('background_jobs.css');
+}
+
+sub make_filter_summary {
+  my ($self)  = @_;
+
+  my $filter  = $::form->{filter} || {};
+  my @filters = (
+    [ "package_name:substr::ilike", $::locale->text('Package name')                                ],
+    [ "result:substr::ilike",       $::locale->text('Result')                                      ],
+    [ "error:substr::ilike",        $::locale->text('Error')                                       ],
+    [ "run_at:date::ge",            $::locale->text('Run at') . " " . $::locale->text('From Date') ],
+    [ "run_at:date::le",            $::locale->text('Run at') . " " . $::locale->text('To Date')   ],
+  );
+
+  my @filter_strings = grep { $_ }
+                       map  { $filter->{ $_->[0] } ? $_->[1] . ' ' . $filter->{ $_->[0] } : undef }
+                       @filters;
+
+  my %status = (
+    failure  => $::locale->text('failed'),
+    success  => $::locale->text('succeeded'),
+  );
+  push @filter_strings, $status{ $filter->{'status:eq_ignore_empty'} } if $filter->{'status:eq_ignore_empty'};
+
+  $self->filter_summary(join(', ', @filter_strings));
+}
+
+sub init_models {
+  my ($self) = @_;
+
+  SL::Controller::Helper::GetModels->new(
+    controller => $self,
+    sorted => {
+      package_name => t8('Package name'),
+      run_at       => t8('Run at'),
+      status       => t8('Execution status'),
+      result       => t8('Result'),
+      error        => t8('Error'),
+    },
+  );
+}
+
+sub setup_list_action_bar {
+  my ($self) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      link => [
+        t8('Server control'),
+        link => $self->url_for(controller => 'TaskServer', action => 'show'),
+      ],
+      link => [
+        t8('List of jobs'),
+        link => $self->url_for(controller => 'BackgroundJob', action => 'list'),
+      ],
+    );
+  }
+}
+
+sub setup_show_action_bar {
+  my ($self) = @_;
+
+  for my $bar ($::request->layout->get('actionbar')) {
+    $bar->add(
+      link => [
+        t8('Back'),
+        link => $self->url_for(action => 'list'),
+      ],
+    );
+  }

 }
 
 1;
 }
 
 1;