Sortierung in Berichten über Kunden und Lieferanten auch auf- und absteigbar sortierb...

diff --git a/SL/CT.pm b/SL/CT.pm
index 0468c379d210001590c5c6f5a0094e65ea5f6605..31ba176ee2ec6ea3b77cb725ad31a7d0799b745d 100644 (file)
--- a/SL/CT.pm
+++ b/SL/CT.pm
@@ -682,15 +682,16 @@ sub search {
   my %allowed_sort_columns =
     map({ $_, 1 } qw(id customernumber vendornumber name address contact phone fax email
                      taxnumber sic_code business invnumber ordnumber quonumber));
   my %allowed_sort_columns =
     map({ $_, 1 } qw(id customernumber vendornumber name address contact phone fax email
                      taxnumber sic_code business invnumber ordnumber quonumber));

-  $sortorder =
-    $form->{sort} && $allowed_sort_columns{$form->{sort}} ?
-    $form->{sort} : "name";
+  $sortorder    = $form->{sort} && $allowed_sort_columns{$form->{sort}} ? $form->{sort} : "name";

   $form->{sort} = $sortorder;
   $form->{sort} = $sortorder;

+  my $sortdir   = !defined $form->{sortdir} ? 'ASC' : $form->{sortdir} ? 'ASC' : 'DESC';

 
   if ($sortorder eq "address") {
 
   if ($sortorder eq "address") {

-    $sortorder = "lower(country), lower(city), lower(street)";
+    $sortorder = "lower(country) ${sortdir}, lower(city) ${sortdir}, lower(street) ${sortdir}";

   } elsif ($sortorder ne 'id') {
   } elsif ($sortorder ne 'id') {

-    $sortorder = "lower($sortorder)";
+    $sortorder = "lower($sortorder) ${sortdir}";
+  } else {
+    $sortorder .= " ${sortdir}";

   }
 
   if ($form->{"${cv}number"}) {
   }
 
   if ($form->{"${cv}number"}) {

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 29603c94d098fb46ff791352d8010b642d4fc60d..086565d7d4a20fbc10c1eb88ed2634dcbbf35669 100644 (file)
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -108,6 +108,8 @@ sub list_names {
 
   $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
 
 
   $form->{IS_CUSTOMER} = $form->{db} eq 'customer';
 

+  report_generator_set_default_sort('name', 1);
+

   CT->search(\%myconfig, \%$form);
 
   my $cvar_configs = CVar->get_configs('module' => 'CT');
   CT->search(\%myconfig, \%$form);
 
   my $cvar_configs = CVar->get_configs('module' => 'CT');


@@ -159,9 +161,12 @@ sub list_names {
   my @hidden_variables  = (qw(db status obsolete), map { "l_$_" } @columns);
   my @hidden_nondefault = grep({ $form->{$_} } @hidden_variables);
   my $callback          = build_std_url('action=list_names', grep { $form->{$_} } @hidden_variables);
   my @hidden_variables  = (qw(db status obsolete), map { "l_$_" } @columns);
   my @hidden_nondefault = grep({ $form->{$_} } @hidden_variables);
   my $callback          = build_std_url('action=list_names', grep { $form->{$_} } @hidden_variables);

-  $form->{callback}     = "$callback&sort=" . E($form->{sort});
+  $form->{callback}     = "$callback&sort=" . E($form->{sort}) . "&sortdir=" . E($form->{sortdir});

 
 

-  map { $column_defs{$_}->{link} = "${callback}&sort=${_}" } @columns;
+  foreach (@columns) {
+    my $sortdir              = $form->{sort} eq $_ ? 1 - $form->{sortdir} : $form->{sortdir};
+    $column_defs{$_}->{link} = "${callback}&sort=${_}&sortdir=${sortdir}";
+  }

 
   my ($ordertype, $quotationtype, $attachment_basename);
   if ($form->{IS_CUSTOMER}) {
 
   my ($ordertype, $quotationtype, $attachment_basename);
   if ($form->{IS_CUSTOMER}) {


@@ -192,7 +197,7 @@ sub list_names {
 
   $report->set_export_options('list_names', @hidden_variables);
 
 
   $report->set_export_options('list_names', @hidden_variables);
 

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

 
   CVar->add_custom_variables_to_report('module'         => 'CT',
                                        'trans_id_field' => 'id',
 
   CVar->add_custom_variables_to_report('module'         => 'CT',
                                        'trans_id_field' => 'id',