Report in der richtigen Reihenfolge speichern und anzeigen.

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 830d5ff7799c3dce0c6290902612b07215dbc17d..cb54de9ad61cd8bcdbd197fc25eafb61ec4e0d16 100644 (file)
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -282,15 +282,19 @@ sub save_report {
   my $sth = $dbh->prepare($query);
   my $sth2 = $dbh->prepare($query2);
 
   my $sth = $dbh->prepare($query);
   my $sth2 = $dbh->prepare($query2);
 

+#  $::lxdebug->dump(0,  "self", $self->info_headers);
+#  $::lxdebug->dump(0,  "self", $self->headers);
+#  $::lxdebug->dump(0,  "self", $self->raw_data_headers);
+

   # save headers
   my @headers = (
   # save headers
   my @headers = (

-    @{ $self->info_headers->{headers} || [] },
-    @{ $self->headers->{headers} || [] },
-    @{ $self->raw_data_headers->{headers} || [] },
+    grep({ $self->info_headers->{used}->{$_}     } @{ $self->info_headers->{headers} }),
+    grep({ $self->headers->{used}->{$_}          } @{ $self->headers->{headers} }),
+    grep({ $self->raw_data_headers->{used}->{$_} } @{ $self->raw_data_headers->{headers} }),

   );
   );

-  my @info_methods = keys %{ $self->info_headers->{methods} || {} };
-  my @methods      = @{ $self->headers->{methods} || [] };
-  my @raw_methods  = keys %{ $self->raw_data_headers->{used} || {} };
+  my @info_methods = grep { $self->info_headers->{used}->{$_}     } @{ $self->info_headers->{headers} };
+  my @methods      = grep { $self->headers->{used}->{$_}          } @{ $self->headers->{methods} };
+  my @raw_methods  = grep { $self->raw_data_headers->{used}->{$_} } @{ $self->raw_data_headers->{headers} };

 
   $sth->execute($report->id, $_, 0, $headers[$_]) for 0 .. $#headers;
 
 
   $sth->execute($report->id, $_, 0, $headers[$_]) for 0 .. $#headers;
 

diff --git a/templates/webpages/csv_import/report.html b/templates/webpages/csv_import/report.html
index e6c34b0047b124bd8ea5162b47f8387e3633c175..353e87318d90bf23484e2e0fb07160ec47f67522 100644 (file)
--- a/templates/webpages/csv_import/report.html
+++ b/templates/webpages/csv_import/report.html
@@ -15,7 +15,7 @@
   </tr>
  [%- ELSE %]
   [% csv_import_report_errors = SELF.report.folded_status.${loop.index}.errors %]
   </tr>
  [%- ELSE %]
   [% csv_import_report_errors = SELF.report.folded_status.${loop.index}.errors %]

-  <tr class="[% IF csv_import_report_errors.size %]redrow[% ELSE %]listrow[% END %][% loop.count % 2 %]">
+  <tr class="[% IF csv_import_report_errors.size %]redrow[% ELSE %]listrow[% END %][% 1 - loop.count % 2 %]">

   [%- FOREACH value = row %]
    <td>[%- value | html  %]</td>
   [%- END %]
   [%- FOREACH value = row %]
    <td>[%- value | html  %]</td>
   [%- END %]