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

diff --git a/SL/BackgroundJob/CsvImport.pm b/SL/BackgroundJob/CsvImport.pm
index 60147f8e2..00f76d537 100644
--- a/SL/BackgroundJob/CsvImport.pm
+++ b/SL/BackgroundJob/CsvImport.pm
@@ -4,10 +4,9 @@ use strict;
 
 use parent qw(SL::BackgroundJob::Base);
 
-use YAML ();
-use SL::Controller::CsvImport;
+use SL::JSON;
+use SL::YAML;
 use SL::DB::CsvImportProfile;
-use SL::SessionFile::Random;
 
 sub create_job {
   my ($self_or_class, %params) = @_;
@@ -15,13 +14,8 @@ sub create_job {
   my $package       = ref($self_or_class) || $self_or_class;
   $package          =~ s/SL::BackgroundJob:://;
 
-  my $profile = delete $params{profile} || SL::DB::CsvImportProfile->new;
-  my $new_profile = $profile->clone_and_reset_deep;
-  $new_profile->save;
-
   my %data = (
     %params,
-    profile_id => $new_profile->id,
     session_id => $::auth->get_session_id,
   );
 
@@ -29,7 +23,7 @@ sub create_job {
     type         => 'once',
     active       => 1,
     package_name => $package,
-    data         => YAML::Dump(\%data),
+    data         => SL::YAML::Dump(\%data),
   );
 
   return $job;
@@ -39,7 +33,7 @@ sub profile {
   my ($self) = @_;
 
   if (!$self->{profile}) {
-    my $data = YAML::Load($self->{db_obj}->data);
+    my $data = SL::YAML::Load($self->{db_obj}->data);
     $self->{profile} = SL::DB::Manager::CsvImportProfile->find_by(id => $data->{profile_id});
   }
 
@@ -51,39 +45,71 @@ 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->mappings(SL::JSON::from_json($self->profile->get('json_mappings'))) if $self->profile->get('json_mappings');
+  $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);
+  my $result;
+  if ($c->errors) {
+    $job->set_data(
+      errors   => $c->errors,
+    )->save;
+    $result = $::locale->text('Import finished with errors.');
+  } else {
+
+    my $report_id = $c->save_report(session_id => $session_id, test => $test);
+    $job->set_data(report_id => $report_id)->save;
 
-  $c->track_progress(100);
+    $c->track_progress(finished => 1);
+    $result = $::locale->text('Import finished without errors.');
+  }
+
+  return $result;
 }
 
 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__