X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FBackgroundJob%2FCsvImport.pm;h=b5e6f2908f2b75ebf6a6d38a8a10af212f2c02f6;hb=541a31c295de935edd2b357ba25d8da811bbf465;hp=60147f8e20fa4dec9cba2bac5b9392209cd298bf;hpb=d74921657d967900bded4aaf4805647e9cf83562;p=kivitendo-erp.git

diff --git a/SL/BackgroundJob/CsvImport.pm b/SL/BackgroundJob/CsvImport.pm
index 60147f8e2..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,39 +50,66 @@ 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($self->{db_obj}->data_as_hash->{type});
+  $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,
+      'building report' => ($test ? 3 : 4),
+    },
+    num_phases => ($test ? 3 : 4),
+  );
   $c->add_progress_tracker($self);
 
-  $c->test_and_import(test => 1, session_id => $self->{db_obj}->data_as_hash->{session_id});
+  my $session_id = $job->data_as_hash->{session_id};
 
-  my $report_id = $c->save_report;
-  $self->{db_obj}->set_data(report_id => $report_id);
-  $self->{db_obj}->save;
+  $c->test_and_import(test => $test, session_id => $session_id);
+
+  if ($c->errors) {
+    $job->set_data(
+      errors   => $c->errors,
+    )->save;
+  } else {
+
+    my $report_id = $c->save_report(session_id => $session_id);
+    $job->set_data(report_id => $report_id)->save;
 
-  $c->track_progress(100);
+    $c->track_progress(finished => 1);
+  }
 }
 
 sub track_progress {
-  my ($self, $progress) = @_;
+  my ($self, %params) = @_;
+
+  my $data = $self->{db_obj}->data_as_hash;
+  my $progress = $data->{progress} || {};
 
+  $progress->{$_} = $params{$_} for keys %params;
   $self->{db_obj}->set_data(progress => $progress);
   $self->{db_obj}->save;
 }
 
-sub cleanup {
-
-}
-
 1;
 
 __END__