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;
(
scalar => [ qw(type profile file all_profiles all_charsets sep_char all_sep_chars quote_char all_quote_chars escape_char all_escape_chars all_buchungsgruppen all_units
import_status errors headers raw_data_headers info_headers data num_imported num_importable displayable_columns file) ],
- 'scalar --get_set_init' => [ qw(worker) ],
+ 'scalar --get_set_init' => [ qw(worker task_server) ],
'array' => [
progress_tracker => { },
add_progress_tracker => { interface => 'add', hash_key => 'progress_tracker' },
__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');
}
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 });
}
}
my $report_id = $params{report_id} || $::form->{id};
$self->{report} = SL::DB::Manager::CsvImportReport->find_by(id => $report_id);
- my $num_rows = SL::DB::Manager::CsvImportReportRow->get_all_count(query => [ csv_import_report_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 ]);
# manual paginating, yuck
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;
- $pages->{common} = SL::DB::Helper::Paginated::make_common_pages($pages->{cur}, $pages->{max});
+ $pages->{common} = [ grep { $_->{visible} } @{ SL::DB::Helper::Paginated::make_common_pages($pages->{cur}, $pages->{max}) } ];
$self->{display_rows} = [
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 = (
$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}) });
}
$file->fh->close;
}
+ my $file = SL::SessionFile->new($self->csv_file_name, mode => '<', encoding => $self->profile->get('charset'));
+ if (!$file->fh) {
+ flash('error', $::locale->text('No file has been uploaded yet.'));
+ return $self->action_new;
+ }
+
$self->{background_job} = SL::BackgroundJob::CsvImport->create_job(
file => $self->csv_file_name,
profile => $self->profile,
test => $params{test},
)->save;
- SL::System::TaskServer->start_if_not_running;
- SL::System::TaskServer->wake_up;
+ if ($self->task_server->is_running) {
+ $self->task_server->wake_up;
+ } else {
+ $self->task_server->start;
+ }
flash('info', $::locale->text('Your import is beig processed.'));
my $worker = $self->worker();
- $worker->run;
+ $worker->run(%params);
return if $self->errors;
profile => $clone_profile,
type => $self->type,
file => '',
- )->save(cascade => 1);
+ numrows => scalar @{ $self->data },
+ );
+
+ $report->save(cascade => 1) or die $report->db->error;
my $dbh = $::form->get_standard_dbh;
$dbh->begin_work;
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];
}
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;
}
}
+sub init_task_server {
+ SL::System::TaskServer->new;
+}
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;
projects / kivitendo-erp.git / blobdiff