X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/aee10de25a63ec46afee4aec4b50ff509c0dcfd1..af2053931fb484b246ba42f93df4889c4257ab42:/SL/Controller/CsvImport.pm?ds=inline

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index bc0534f10..c3b9d99cc 100644
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -38,6 +38,7 @@ __PACKAGE__->run_before('check_auth');
 __PACKAGE__->run_before('ensure_form_structure');
 __PACKAGE__->run_before('check_type', except => [ qw(report) ]);
 __PACKAGE__->run_before('load_all_profiles');
+__PACKAGE__->run_before('check_task_server');
 
 __PACKAGE__->run_after('cleanup_reports');
 
@@ -99,7 +100,7 @@ sub action_result {
   }
 
   if ($data->{progress}{finished} || $data->{errors}) {
-    $self->render('csv_import/_deferred_report', { no_layout => 1 });
+    $self->render('csv_import/_deferred_report', { layout => 0 });
   } else {
     if (!$self->task_server->is_running) {
       $self->task_server->start;
@@ -110,7 +111,7 @@ sub action_result {
       $self->{status_text} = t8('Import not started yet, please wait...');
     }
 
-    $self->render('csv_import/_deferred_results', { no_layout => 1 });
+    $self->render('csv_import/_deferred_results', { layout => 0 });
   }
 }
 
@@ -151,7 +152,7 @@ sub action_report {
   my $page = $::form->{page} || 1;
   my $pages = {};
   $pages->{per_page}        = $::form->{per_page} || 20;
-  $pages->{max}             = SL::DB::Helper::Paginated::ceil($num_rows / ($num_cols || 1), $pages->{per_page}) || 1;
+  $pages->{max}             = SL::DB::Helper::Paginated::ceil($num_rows, $pages->{per_page}) || 1;
   $pages->{cur}             = $page < 1 ? 1
                             : $page > $pages->{max} ? $pages->{max}
                             : $page;
@@ -161,7 +162,7 @@ sub action_report {
     0,
     $pages->{per_page} * ($pages->{cur}-1) + 1
       ..
-    min($pages->{per_page} * $pages->{cur}, $num_rows / ($num_cols || 1) - 1)
+    min($pages->{per_page} * $pages->{cur}, $num_rows)
   ];
 
   my @query = (
@@ -183,7 +184,7 @@ sub action_report {
   $self->{pages} = $pages;
   $self->{base_url} = $self->url_for(action => 'report', id => $report_id, no_layout => $params{no_layout} || $::form->{no_layout} );
 
-  $self->render('csv_import/report', { no_layout => $params{no_layout} || $::form->{no_layout} });
+  $self->render('csv_import/report', { layout => !($params{no_layout} || $::form->{no_layout}) });
 }
 
 
@@ -271,10 +272,11 @@ sub test_and_import_deferred {
   }
 
   $self->{background_job} = SL::BackgroundJob::CsvImport->create_job(
-    file    => $self->csv_file_name,
-    profile => $self->profile,
-    type    => $self->profile->type,
-    test    => $params{test},
+    file        => $self->csv_file_name,
+    profile     => $self->profile,
+    type        => $self->profile->type,
+    test        => $params{test},
+    employee_id => SL::DB::Manager::Employee->current->id,
   )->save;
 
   if ($self->task_server->is_running) {
@@ -304,7 +306,7 @@ sub test_and_import {
 
   my $worker = $self->worker();
 
-  $worker->run;
+  $worker->run(%params);
 
   return if $self->errors;
 
@@ -415,7 +417,7 @@ sub save_report {
   my (@headers, @info_methods, @raw_methods, @methods);
 
   for my $i (0 .. $#{ $self->info_headers->{headers} }) {
-    next unless         $self->info_headers->{used}->{ $self->info_headers->{headers}->[$i] };
+    next unless         $self->info_headers->{used}->{ $self->info_headers->{methods}->[$i] };
     push @headers,      $self->info_headers->{headers}->[$i];
     push @info_methods, $self->info_headers->{methods}->[$i];
   }
@@ -497,4 +499,12 @@ sub cleanup_reports {
   SL::DB::Manager::CsvImportReport->cleanup;
 }
 
+sub check_task_server {
+  return 1 if $_[0]->task_server->is_running;
+
+  flash('info', t8('The task server is not running at the moment but needed for this module'));
+
+  1;
+}
+
 1;