Einheiten sortierbar gemacht.

diff --git a/SL/AM.pm b/SL/AM.pm
index a0a1589..e0b983a 100644 (file)
--- a/SL/AM.pm
+++ b/SL/AM.pm
@@ -2284,7 +2284,7 @@ sub unit_select_data {
     push(@{$select}, { "name" => "", "base_unit" => "", "factor" => "", "selected" => "" });
   }
 
-  foreach my $unit (sort({ lc($a) cmp lc($b) } keys(%{$units}))) {
+  foreach my $unit (sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } keys(%{$units}))) {
     push(@{$select}, { "name" => $unit,
                        "base_unit" => $units->{$unit}->{"base_unit"},
                        "factor" => $units->{$unit}->{"factor"},
@@ -2303,7 +2303,7 @@ sub unit_select_html {
 
   my $select = "<select name=${name}>";
 
-  foreach my $unit (sort({ lc($a) cmp lc($b) } keys(%{$units}))) {
+  foreach my $unit (sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } keys(%{$units}))) {
     if (!$convertible_into ||
         ($units->{$convertible_into} &&
          ($units->{$convertible_into}->{"base_unit"} eq $units->{$unit}->{"base_unit"}))) {
@@ -2324,8 +2324,12 @@ sub add_unit {
 
   my $dbh = $form->dbconnect_noauto($myconfig);
 
-  my $query = "INSERT INTO units (name, base_unit, factor, type) VALUES (?, ?, ?, ?)";
-  $dbh->do($query, undef, $name, $base_unit, $factor, $type) || $form->dberror($query . " ($name, $base_unit, $factor, $type)");
+  my $query = qq|SELECT COALESCE(MAX(sortkey), 0) + 1 FROM units|;
+  my ($sortkey) = selectrow_query($form, $dbh, $query);
+
+  $query = "INSERT INTO units (name, base_unit, factor, type, sortkey) " .
+    "VALUES (?, ?, ?, ?, ?)";
+  do_query($form, $dbh, $query, $name, $base_unit, $factor, $type, $sortkey);
 
   if ($languages) {
     $query = "INSERT INTO units_language (unit, language_id, localized, localized_plural) VALUES (?, ?, ?, ?)";
@@ -2401,4 +2405,43 @@ sub save_units {
   $main::lxdebug->leave_sub();
 }
 
+sub swap_units {
+  $main::lxdebug->enter_sub();
+
+  my ($self, $myconfig, $form, $dir, $name_1, $unit_type) = @_;
+
+  my $dbh = $form->dbconnect_noauto($myconfig);
+
+  my $query;
+
+  $query = qq|SELECT sortkey FROM units WHERE name = ?|;
+  my ($sortkey_1) = selectrow_query($form, $dbh, $query, $name_1);
+
+  $query =
+    qq|SELECT sortkey FROM units | .
+    qq|WHERE sortkey | . ($dir eq "down" ? ">" : "<") . qq| ? AND type = ? | .
+    qq|ORDER BY sortkey | . ($dir eq "down" ? "ASC" : "DESC") . qq| LIMIT 1|;
+  my ($sortkey_2) = selectrow_query($form, $dbh, $query, $sortkey_1, $unit_type);
+
+  $main::lxdebug->message(0, "name1 $name_1 dir $dir sk1 $sortkey_1 sk2 $sortkey_2");
+
+  if (defined($sortkey_1)) {
+    $query = qq|SELECT name FROM units WHERE sortkey = ${sortkey_2}|;
+    my ($name_2) = selectrow_query($form, $dbh, $query);
+
+    if (defined($name_2)) {
+      $query = qq|UPDATE units SET sortkey = ? WHERE name = ?|;
+      my $sth = $dbh->prepare($query);
+
+      do_statement($form, $sth, $query, $sortkey_1, $name_2);
+      do_statement($form, $sth, $query, $sortkey_2, $name_1);
+    }
+  }
+
+  $dbh->commit();
+  $dbh->disconnect();
+
+  $main::lxdebug->leave_sub();
+}
+
 1;

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index 27ccd06..5868fa2 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -3665,12 +3665,8 @@ sub edit_units {
 
   @languages = AM->language(\%myconfig, $form, 1);
 
-  @unit_list = ();
-  foreach $name (sort({ lc($a) cmp lc($b) } grep({ !$units->{$_}->{"base_unit"} } keys(%{$units})))) {
-    map({ push(@unit_list, $units->{$_}); }
-        sort({ ($units->{$a}->{"resolved_factor"} * 1) <=> ($units->{$b}->{"resolved_factor"} * 1) }
-             grep({ $units->{$_}->{"resolved_base_unit"} eq $name } keys(%{$units}))));
-  }
+  @unit_list = sort({ $a->{"sortkey"} <=> $b->{"sortkey"} } values(%{$units}));
+
   my $i = 1;
   foreach (@unit_list) {
     $_->{"factor"} = $form->format_amount(\%myconfig, $_->{"factor"} * 1) if ($_->{"factor"});
@@ -3690,12 +3686,15 @@ sub edit_units {
   $units = AM->retrieve_units(\%myconfig, $form, $form->{"unit_type"});
   $ddbox = AM->unit_select_data($units, undef, 1);
 
+  my $updownlink = build_std_url("action=swap_units", "unit_type");
+
   $form->{"title"} = sprintf($locale->text("Add and edit %s"), $form->{"unit_type"} eq "dimension" ? $locale->text("dimension units") : $locale->text("service units"));
   $form->header();
   print($form->parse_html_template("am/edit_units",
                                    { "UNITS" => \@unit_list,
                                      "NEW_BASE_UNIT_DDBOX" => $ddbox,
-                                     "LANGUAGES" => \@languages }));
+                                     "LANGUAGES" => \@languages,
+                                     "updownlink" => $updownlink }));
 
   $lxdebug->leave_sub();
 }
@@ -3831,3 +3830,16 @@ sub save_unit {
 
   $lxdebug->leave_sub();
 }
+
+sub swap_units {
+  $lxdebug->enter_sub();
+
+  my $dir = $form->{"dir"} eq "down" ? "down" : "up";
+  my $unit_type = $form->{"unit_type"} eq "dimension" ?
+    "dimension" : "service";
+  AM->swap_units(\%myconfig, $form, $dir, $form->{"name"}, $unit_type);
+
+  edit_units();
+
+  $lxdebug->leave_sub();
+}

diff --git a/image/transparent16x16.gif b/image/transparent16x16.gif
new file mode 100644 (file)
index 0000000..ede75be
Binary files /dev/null and b/image/transparent16x16.gif differ

diff --git a/locale/de/am b/locale/de/am
index da9aa81..4fe8096 100644 (file)
--- a/locale/de/am
+++ b/locale/de/am
@@ -440,6 +440,7 @@ $self->{subs} = {
   'sic_header'                  => 'sic_header',
   'swap_buchungsgruppen'        => 'swap_buchungsgruppen',
   'swap_payment_terms'          => 'swap_payment_terms',
+  'swap_units'                  => 'swap_units',
   'vendor_selection'            => 'vendor_selection',
   'warehouse_header'            => 'warehouse_header',
   'erfassen'                    => 'add',

diff --git a/sql/Pg-upgrade2/units_sortkey.sql b/sql/Pg-upgrade2/units_sortkey.sql
new file mode 100644 (file)
index 0000000..b1d12a6
--- /dev/null
+++ b/sql/Pg-upgrade2/units_sortkey.sql
@@ -0,0 +1,8 @@
+-- @tag: units_sortkey
+-- @description: Neue Spalte für Sortierreihenfolge der Einheiten
+-- @depends: release_2_4_1
+ALTER TABLE units ADD COLUMN sortkey integer;
+CREATE SEQUENCE tmp_counter;
+UPDATE units SET sortkey = nextval('tmp_counter');
+DROP SEQUENCE tmp_counter;
+ALTER TABLE units ALTER COLUMN sortkey SET NOT NULL;

diff --git a/templates/webpages/am/edit_units_de.html b/templates/webpages/am/edit_units_de.html
index d36d3c7..20699ab 100644 (file)
--- a/templates/webpages/am/edit_units_de.html
+++ b/templates/webpages/am/edit_units_de.html
@@ -94,7 +94,7 @@
 
  <table>
   <tr>
-   <th class="listheading">&nbsp;</th>
+   <th class="listheading" width="32" align="center" valign="center"><img alt="hoch" src="image/up.png"><img alt="runter" src="image/down.png"></th>
    <th class="listheading">Löschen</th>
    <th class="listheading">Einheit</th>
    <th class="listheading">Basiseinheit</th>
@@ -106,8 +106,8 @@
 
   <TMPL_LOOP NAME=UNITS>
    <tr>
+    <td width="32" align="center" valign="center"><TMPL_IF __first__><img src="image/transparent16x16.gif"><TMPL_ELSE><a href="<TMPL_VAR updownlink>&dir=up&name=<TMPL_VAR name ESCAPE=URL>"><img alt="hoch" src="image/up.png"></a></TMPL_IF><TMPL_IF __last__><img src="image/transparent16x16.gif"><TMPL_ELSE><a href="<TMPL_VAR updownlink>&dir=down&name=<TMPL_VAR name ESCAPE=URL>"><img alt="runter" src="image/down.png"></a></TMPL_IF></td>
     <TMPL_IF NAME=in_use>
-     <td><TMPL_VAR NAME=__counter__></td>
      <td>
       <input type="hidden" name="unchangeable_<TMPL_VAR NAME=__counter__>" value="1">
       <input type="hidden" name="old_name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name>">
@@ -119,7 +119,6 @@
 
      <TMPL_ELSE>
 
-     <td><TMPL_VAR NAME=__counter__></td>
      <td align="center"><input type="checkbox" name="delete_<TMPL_VAR NAME=__counter__>"></td>
      <td>
       <input type="hidden" name="old_name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name>">

diff --git a/templates/webpages/am/edit_units_master.html b/templates/webpages/am/edit_units_master.html
index f873e0f..da1c7e4 100644 (file)
--- a/templates/webpages/am/edit_units_master.html
+++ b/templates/webpages/am/edit_units_master.html
@@ -94,7 +94,7 @@
 
  <table>
   <tr>
-   <th class="listheading">&nbsp;</th>
+   <th class="listheading" width="32" align="center" valign="center"><img alt="<translate>up</translate>" src="image/up.png"><img alt="<translate>down</translate>" src="image/down.png"></th>
    <th class="listheading"><translate>Delete</translate></th>
    <th class="listheading"><translate>Unit</translate></th>
    <th class="listheading"><translate>Base unit</translate></th>
@@ -106,8 +106,8 @@
 
   <TMPL_LOOP NAME=UNITS>
    <tr>
+    <td width="32" align="center" valign="center"><TMPL_IF __first__><img src="image/transparent16x16.gif"><TMPL_ELSE><a href="<TMPL_VAR updownlink>&dir=up&name=<TMPL_VAR name ESCAPE=URL>"><img alt="<translate>up</translate>" src="image/up.png"></a></TMPL_IF><TMPL_IF __last__><img src="image/transparent16x16.gif"><TMPL_ELSE><a href="<TMPL_VAR updownlink>&dir=down&name=<TMPL_VAR name ESCAPE=URL>"><img alt="<translate>down</translate>" src="image/down.png"></a></TMPL_IF></td>
     <TMPL_IF NAME=in_use>
-     <td><TMPL_VAR NAME=__counter__></td>
      <td>
       <input type="hidden" name="unchangeable_<TMPL_VAR NAME=__counter__>" value="1">
       <input type="hidden" name="old_name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name>">
@@ -119,7 +119,6 @@
 
      <TMPL_ELSE>
 
-     <td><TMPL_VAR NAME=__counter__></td>
      <td align="center"><input type="checkbox" name="delete_<TMPL_VAR NAME=__counter__>"></td>
      <td>
       <input type="hidden" name="old_name_<TMPL_VAR NAME=__counter__>" value="<TMPL_VAR NAME=name>">