X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FBackgroundJob%2FCsvImport.pm;h=b5e6f2908f2b75ebf6a6d38a8a10af212f2c02f6;hb=590708a7a8d02ecd60267271f276e975c08d56c6;hp=66d830f9059846279ba904bbee132da0d64a6f33;hpb=98f37c1019ea0e80d5a45a5633a0a182a43cbf9a;p=kivitendo-erp.git

diff --git a/SL/BackgroundJob/CsvImport.pm b/SL/BackgroundJob/CsvImport.pm
index 66d830f90..b5e6f2908 100644
--- a/SL/BackgroundJob/CsvImport.pm
+++ b/SL/BackgroundJob/CsvImport.pm
@@ -5,7 +5,6 @@ use strict;
 use parent qw(SL::BackgroundJob::Base);
 
 use YAML ();
-use SL::Controller::CsvImport;
 use SL::DB::CsvImportProfile;
 use SL::SessionFile::Random;
 
@@ -51,44 +50,49 @@ sub run {
   $self->{db_obj} = shift;
 
   $self->do_import;
-
-  $self->cleanup;
 }
 
 sub do_import {
   my ($self) = @_;
 
+  require SL::Controller::CsvImport;
   my $c = SL::Controller::CsvImport->new;
   my $job = $self->{db_obj};
 
   $c->profile($self->profile);
   $c->type($job->data_as_hash->{type});
+  $c->{employee_id} = $job->data_as_hash->{employee_id};
 
   my $test = $job->data_as_hash->{test};
 
+
+  # $::locale->text('parsing csv')
+  # $::locale->text('building data')
+  # $::locale->text('saving data')
+  # $::locale->text('building report')
   $self->track_progress(
     progress => 0,
     plan => {
       'parsing csv'     => 1,
       'building data'   => 2,
-    ( 'saving data'     => 3, )x!!$test,
+    ( 'saving data'     => 3, )x!$test,
       'building report' => ($test ? 3 : 4),
     },
     num_phases => ($test ? 3 : 4),
   );
   $c->add_progress_tracker($self);
 
+  my $session_id = $job->data_as_hash->{session_id};
 
-  $c->test_and_import(test => 1, session_id => $job->data_as_hash->{session_id});
+  $c->test_and_import(test => $test, session_id => $session_id);
 
   if ($c->errors) {
     $job->set_data(
       errors   => $c->errors,
-      progress => -1,
     )->save;
   } else {
 
-    my $report_id = $c->save_report;
+    my $report_id = $c->save_report(session_id => $session_id);
     $job->set_data(report_id => $report_id)->save;
 
     $c->track_progress(finished => 1);
@@ -106,10 +110,6 @@ sub track_progress {
   $self->{db_obj}->save;
 }
 
-sub cleanup {
-
-}
-
 1;
 
 __END__