Hochladen und Anzeigen von hochgeladenen Dateien implementiert

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index d11747ad505d82045663c55b7ce6643ff286ef32..03b9b400642d0a314b67546ceecc67241b9483a7 100644 (file)
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -5,6 +5,7 @@ use strict;
 use SL::DB::Buchungsgruppe;
 use SL::DB::CsvImportProfile;
 use SL::Helper::Flash;
 use SL::DB::Buchungsgruppe;
 use SL::DB::CsvImportProfile;
 use SL::Helper::Flash;

+use SL::SessionFile;

 
 use List::MoreUtils qw(none);
 
 
 use List::MoreUtils qw(none);
 


@@ -12,7 +13,7 @@ use parent qw(SL::Controller::Base);
 
 use Rose::Object::MakeMethods::Generic
 (
 
 use Rose::Object::MakeMethods::Generic
 (

- scalar => [ qw(type profile all_profiles all_charsets sep_char all_sep_chars quote_char all_quote_chars escape_char all_escape_chars all_buchungsgruppen) ],
+ 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) ],

 );
 
 __PACKAGE__->run_before('check_auth');
 );
 
 __PACKAGE__->run_before('check_auth');


@@ -108,6 +109,8 @@ sub render_inputs {
     $self->$sub(($char_map{$type}->{$char} || [])->[0] || $char);
   }
 
     $self->$sub(($char_map{$type}->{$char} || [])->[0] || $char);
   }
 

+  $self->file(SL::SessionFile->new($self->csv_file_name));
+

   my $title = $self->type eq 'customers_vendors' ? $::locale->text('CSV import: customers and vendors')
             : $self->type eq 'addresses'         ? $::locale->text('CSV import: shipping addresses')
             : $self->type eq 'contacts'          ? $::locale->text('CSV import: contacts')
   my $title = $self->type eq 'customers_vendors' ? $::locale->text('CSV import: customers and vendors')
             : $self->type eq 'addresses'         ? $::locale->text('CSV import: shipping addresses')
             : $self->type eq 'contacts'          ? $::locale->text('CSV import: contacts')


@@ -124,6 +127,18 @@ sub test_and_import {
 
   $self->profile_from_form;
 
 
   $self->profile_from_form;
 

+  if ($::form->{file}) {
+    my $file = SL::SessionFile->new($self->csv_file_name, "w");
+    $file->fh->print($::form->{file});
+    $file->fh->close;
+  }
+
+  my $file = SL::SessionFile->new($self->csv_file_name, "w");
+  if (!$file->fh) {
+    flash('error', $::locale->text('No file has been uploaded yet.'));
+    return $self->action_new;
+  }
+

   # do the import thingy...
   $self->action_new;
 }
   # do the import thingy...
   $self->action_new;
 }


@@ -186,4 +201,9 @@ sub char_map {
          );
 }
 
          );
 }
 

+sub csv_file_name {
+  my ($self) = @_;
+  return "csv-import-" . $self->type . ".csv";
+}
+

 1;
 1;

diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 32e91dbd12a6bd64240b0f3850d14ee040c996b1..56e307255d9351cb4c97b1158b8805cddbf4c96c 100644 (file)
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -5,7 +5,7 @@
 
  [%- INCLUDE 'common/flash.html' %]
 
 
  [%- INCLUDE 'common/flash.html' %]
 

- <form method="post" action="controller.pl">
+ <form method="post" action="controller.pl" enctype="multipart/form-data">

   [% L.hidden_tag('action', 'CsvImport/dispatch') %]
   [% L.hidden_tag('profile.type', SELF.profile.type) %]
 
   [% L.hidden_tag('action', 'CsvImport/dispatch') %]
   [% L.hidden_tag('profile.type', SELF.profile.type) %]
 


@@ -125,6 +125,18 @@
  [%- INCLUDE 'csv_import/_form_customers_vendors.html' %]
 [%- END %]
 
  [%- INCLUDE 'csv_import/_form_customers_vendors.html' %]
 [%- END %]
 

+   <tr>
+    <th align="right">[%- LxERP.t8('Import file') %]:</th>
+    <td colspan="10">[% L.input_tag('file', '', type => 'file', accept => '*') %]</td>
+   </tr>
+
+   [%- IF SELF.file.exists %]
+    <tr>
+     <th align="right">[%- LxERP.t8('Existing file on server') %]:</th>
+     <td colspan="10">[%- LxERP.t8('Uploaded on #1, size #2 kB', SELF.file.displayable_mtime, LxERP.format_amount(SELF.file.size / 1024, 2)) %]</td>
+    </tr>
+   [%- END %]
+

   </table>
 
   [% L.submit_tag('action_test', LxERP.t8('Gogogo')) %]
   </table>
 
   [% L.submit_tag('action_test', LxERP.t8('Gogogo')) %]