X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport.pm;h=c509e2108d48ee614327fd9723275dc9430d2eae;hb=df91c9fde8209d66dab26e657a2b1a4a105b5ee7;hp=0736d917b15f0863fcd506308f271dba218e5aea;hpb=bc447b5b0eb9d7c6fc7f70e2dfd4c5f2a11c2569;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 0736d917b..c509e2108 100644
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -8,6 +8,7 @@ use SL::DB::CsvImportReport;
 use SL::DB::Unit;
 use SL::DB::Helper::Paginated ();
 use SL::Helper::Flash;
+use SL::Locale::String;
 use SL::SessionFile;
 use SL::Controller::CsvImport::Contact;
 use SL::Controller::CsvImport::CustomerVendor;
@@ -37,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');
 
@@ -98,9 +100,18 @@ 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 {
-    $self->render('csv_import/_deferred_results', { no_layout => 1 });
+    if (!$self->task_server->is_running) {
+      $self->task_server->start;
+      $self->{status_text} = t8('Task Server is not running, starting it now. If this does not change, please check your task server config');
+    } elsif (my $phase = $data->{progress}{phase}) {
+      $self->{status_text} = "$data->{progress}{plan}{$phase} / $data->{progress}{num_phases} " . t8($phase);
+    } else {
+      $self->{status_text} = t8('Import not started yet, please wait...');
+    }
+
+    $self->render('csv_import/_deferred_results', { layout => 0 });
   }
 }
 
@@ -130,6 +141,10 @@ sub action_report {
   my $report_id = $params{report_id} || $::form->{id};
 
   $self->{report}      = SL::DB::Manager::CsvImportReport->find_by(id => $report_id);
+
+  if (!$self->{report}) {
+    $::form->error(t8('No report with id #1', $report_id));
+  }
   my $num_rows         = $self->{report}->numrows;
   my $num_cols         = SL::DB::Manager::CsvImportReportRow->get_all_count(query => [ csv_import_report_id => $report_id, row => 0 ]);
 
@@ -137,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;
@@ -147,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 = (
@@ -169,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}) });
 }
 
 
@@ -290,7 +305,7 @@ sub test_and_import {
 
   my $worker = $self->worker();
 
-  $worker->run;
+  $worker->run(%params);
 
   return if $self->errors;
 
@@ -384,7 +399,9 @@ sub save_report {
     type       => $self->type,
     file       => '',
     numrows    => scalar @{ $self->data },
-  )->save(cascade => 1);
+  );
+
+  $report->save(cascade => 1) or die $report->db->error;
 
   my $dbh = $::form->get_standard_dbh;
   $dbh->begin_work;
@@ -399,7 +416,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];
   }
@@ -421,7 +438,7 @@ sub save_report {
   my $o2 = $o1 + @methods;
 
   for my $row (0 .. $#{ $self->data }) {
-    $self->track_progress(progress => $row / @{ $self->data } * 100) if $row % 100 == 0;
+    $self->track_progress(progress => $row / @{ $self->data } * 100) if $row % 1000 == 0;
     my $data_row = $self->{data}[$row];
 
     $sth->execute($report->id,       $_, $row + 1, $data_row->{info_data}{ $info_methods[$_] }) for 0 .. $#info_methods;
@@ -481,4 +498,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;