calculate_qty (Formel): alu (?) und andere unbenutzte Parameter entfernt

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index b4ae880d158ff51b8e7f0c85890f3e69469b1c49..7cdc751bd8513b81ce3bcb6d2272421125009be7 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -319,8 +319,8 @@ sub display_row {
     my $qty_dec = ($form->{"qty_$i"} =~ /\.(\d+)/) ? length $1 : 2;
 
     $column_data{qty}  = $cgi->textfield(-name => "qty_$i", -size => 5, -class => "numeric", -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec));
     my $qty_dec = ($form->{"qty_$i"} =~ /\.(\d+)/) ? length $1 : 2;
 
     $column_data{qty}  = $cgi->textfield(-name => "qty_$i", -size => 5, -class => "numeric", -value => $form->format_amount(\%myconfig, $form->{"qty_$i"}, $qty_dec));

-    $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i','alu_$i', 'formel_$i', $i)", -value => $locale->text('*/'))
-                       . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"}) . $cgi->hidden("-name" => "alu_$i", "-value" => $form->{"alu_$i"})
+    $column_data{qty} .= $cgi->button(-onclick => "calculate_qty_selection_window('qty_$i', 'formel_$i')", -value => $locale->text('*/'))
+                       . $cgi->hidden(-name => "formel_$i", -value => $form->{"formel_$i"})

       if $form->{"formel_$i"};
 
     $column_data{ship} = '';
       if $form->{"formel_$i"};
 
     $column_data{ship} = '';

diff --git a/js/calculate_qty.js b/js/calculate_qty.js
index a3bf3ad5d94075dcc8928206e02174bd240b79f1..e0aecc431f7848f08a40ac676a7c95020c45f43f 100644 (file)
--- a/js/calculate_qty.js
+++ b/js/calculate_qty.js
@@ -1,19 +1,10 @@
-function calculate_qty_selection_window(input_name, alu, formel, row) {
+function calculate_qty_selection_window(input_name, formel) {

   var parm = centerParms(600,500) + ",width=600,height=500,status=yes,scrollbars=yes";
   var parm = centerParms(600,500) + ",width=600,height=500,status=yes,scrollbars=yes";

-  var name = document.getElementsByName(input_name)[0].value;
-  if (document.getElementsByName(alu)[0].value == "1") {
-    var action = "calculate_alu";
-    var qty = document.getElementsByName("qty_" + row)[0].value;
-    var description = document.getElementsByName("description_" + row)[0].value;
-  }  else var action = "calculate_qty";
+  var action = "calculate_qty";

   url = "common.pl?" +
     "INPUT_ENCODING=UTF-8&" +
     "action=" + action + "&" +
   url = "common.pl?" +
     "INPUT_ENCODING=UTF-8&" +
     "action=" + action + "&" +

-    "name=" + encodeURIComponent(name) + "&" +

     "input_name=" + encodeURIComponent(input_name) + "&" +
     "input_name=" + encodeURIComponent(input_name) + "&" +

-    "description=" + encodeURIComponent(description) + "&" +
-    "qty=" + encodeURIComponent(qty) + "&" +
-    "row=" + encodeURIComponent(row) + "&" +

    "formel=" + encodeURIComponent(document.getElementsByName(formel)[0].value)
   //alert(url);
   window.open(url, "_new_generic", parm);
    "formel=" + encodeURIComponent(document.getElementsByName(formel)[0].value)
   //alert(url);
   window.open(url, "_new_generic", parm);

diff --git a/templates/webpages/generic/calculate_qty.html b/templates/webpages/generic/calculate_qty.html
index 110ed4131583c71c097b14ad212e4ca0b78f460a..49c10548357a4b577c1e88565418cc7cdf055257 100644 (file)
--- a/templates/webpages/generic/calculate_qty.html
+++ b/templates/webpages/generic/calculate_qty.html
@@ -5,7 +5,6 @@
  <form name="Form">
 
   <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">
  <form name="Form">
 
   <input type="hidden" name="input_name" value="[% HTML.escape(input_name) %]">

-  <input type="hidden" name="input_id" value="[% HTML.escape(input_id) %]">

 
   <table width="100%">
    <tr><td>[% 'Please insert object dimensions below.' | $T8 %]</td></tr>
 
   <table width="100%">
    <tr><td>[% 'Please insert object dimensions below.' | $T8 %]</td></tr>


@@ -82,4 +81,3 @@
      return arr_int[0] + sep + arr_int[1];
    }
  </script>
      return arr_int[0] + sep + arr_int[1];
    }
  </script>

-