Sortierung in Berichten über Lieferscheine auch auf- und absteigbar sortierbar gemacht.

diff --git a/SL/DO.pm b/SL/DO.pm
index 3f623ec6d63b60a734dd39335f52031946bb3cde..390f51f32b89f7064b9d2ec71e6b8d7c478df06c 100644 (file)
--- a/SL/DO.pm
+++ b/SL/DO.pm
@@ -142,12 +142,13 @@ sub transactions {
     "transaction_description" => "dord.transaction_description"
   );
 
     "transaction_description" => "dord.transaction_description"
   );
 

-  my $sortoder = "dord.id";
+  my $sortdir   = $form->{sortdir} ? 'ASC' : 'DESC';
+  my $sortorder = "dord.id";

   if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
     $sortorder = $allowed_sort_columns{$form->{sort}};
   }
 
   if ($form->{sort} && grep($form->{sort}, keys(%allowed_sort_columns))) {
     $sortorder = $allowed_sort_columns{$form->{sort}};
   }
 

-  $query .= qq| ORDER by | . $sortorder;
+  $query .= qq| ORDER by | . $sortorder . " $sortdir";

 
   $form->{DO} = selectall_hashref_query($form, $dbh, $query, @values);
 
 
   $form->{DO} = selectall_hashref_query($form, $dbh, $query, @values);
 

diff --git a/bin/mozilla/do.pl b/bin/mozilla/do.pl
index c88f3b0ecf6a7fd43ba38789707c1f64412e0573..c3c4b07e40ae743ff491bb21e11476d0597b58c8 100644 (file)
--- a/bin/mozilla/do.pl
+++ b/bin/mozilla/do.pl
@@ -409,7 +409,9 @@ sub orders {
 
   ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} });
 
 
   ($form->{ $form->{vc} }, $form->{"${form->{vc}}_id"}) = split(/--/, $form->{ $form->{vc} });
 

-  $form->{sort} ||= 'transdate';
+  $form->{sort}    ||= 'transdate';
+  $form->{sortdir}   = 1 unless (defined $form->{sortdir});
+  $form->{sortdir}   = $form->{sortdir} ? 1 : 0;

 
   DO->transactions();
 
 
   DO->transactions();
 


@@ -456,7 +458,8 @@ sub orders {
   );
 
   foreach my $name (qw(id transdate donumber ordnumber name employee shipvia)) {
   );
 
   foreach my $name (qw(id transdate donumber ordnumber name employee shipvia)) {

-    $column_defs{$name}->{link} = $href . "&sort=$name";
+    my $sortdir                 = $form->{sort} eq $name ? 1 - $form->{sortdir} : $form->{sortdir};
+    $column_defs{$name}->{link} = $href . "&sort=$name&sortdir=$sortdir";

   }
 
   $form->{"l_type"} = "Y";
   }
 
   $form->{"l_type"} = "Y";


@@ -469,7 +472,7 @@ sub orders {
 
   $report->set_export_options('orders', @hidden_variables);
 
 
   $report->set_export_options('orders', @hidden_variables);
 

-  $report->set_sort_indicator($form->{sort}, 1);
+  $report->set_sort_indicator($form->{sort}, $form->{sortdir});

 
   my @options;
   if ($form->{customer}) {
 
   my @options;
   if ($form->{customer}) {