Die Historiensuchmaske nicht mehr per JavaScript abschicken und dem <form>-Element...

diff --git a/SL/Form.pm b/SL/Form.pm
index 2d4d5e432ef5f55524123f82b95cc0be594c54f2..675d9adc6563b39400a71169f024da689d0e9752 100644 (file)
--- a/SL/Form.pm
+++ b/SL/Form.pm
@@ -3168,9 +3168,8 @@ sub get_history {
       qq|SELECT h.employee_id, h.itime::timestamp(0) AS itime, h.addition, h.what_done, emp.name, h.snumbers, h.trans_id AS id | .
       qq|FROM history_erp h | .
       qq|LEFT JOIN employee emp ON (emp.id = h.employee_id) | .
       qq|SELECT h.employee_id, h.itime::timestamp(0) AS itime, h.addition, h.what_done, emp.name, h.snumbers, h.trans_id AS id | .
       qq|FROM history_erp h | .
       qq|LEFT JOIN employee emp ON (emp.id = h.employee_id) | .

-      qq|WHERE trans_id = | . $trans_id
-      . $restriction . qq| |
-      . $order;
+      qq|WHERE (trans_id = | . $trans_id . qq|) $restriction | .
+      $order;

 
     my $sth = $dbh->prepare($query) || $self->dberror($query);
 
 
     my $sth = $dbh->prepare($query) || $self->dberror($query);
 

diff --git a/js/show_am_history.js b/js/show_am_history.js
deleted file mode 100644 (file)
index ff1db6c..0000000
--- a/js/show_am_history.js
+++ /dev/null
@@ -1,11 +0,0 @@
-function set_history_uri() {
-  document.location.href = "am.pl?" +
-    "action=show_am_history&" +
-    "longdescription=" + "&" +
-    "einschraenkungen=" + document.getElementById("einschraenkungen").value + "&" +
-    "fromdate=" + document.getElementById("fromdate_hidden").value + "&" +
-    "todate=" + document.getElementById("todate_hidden").value + "&" +
-    "what2search=" + document.getElementById("what2search").value + "&" +
-    "searchid=" + document.getElementById("searchid").value + "&" +
-    "mitarbeiter=" + document.getElementById("mitarbeiter_hidden").value + "&";
-}

diff --git a/locale/de/am b/locale/de/am
index 3aaf11513594e24a3f7609cc75d8627c36c7e848..ebce22afbe610ab9016f1ea1487d86f668b0d8e9 100644 (file)
--- a/locale/de/am
+++ b/locale/de/am
@@ -474,6 +474,7 @@ $self->{subs} = {
   'neue_ware'                   => 'new_part',
   'speichern'                   => 'save',
   'als_neu_speichern'           => 'save_as_new',
   'neue_ware'                   => 'new_part',
   'speichern'                   => 'save',
   'als_neu_speichern'           => 'save_as_new',

+  'abschicken'                  => 'submit',

 };
 
 1;
 };
 
 1;

diff --git a/templates/webpages/common/search_history_de.html b/templates/webpages/common/search_history_de.html
index 8f8b130af2fc84d64b17825ce870a40cd412eeb1..a8f58e932501e6e395714314a08a3e61b78871ca 100644 (file)
--- a/templates/webpages/common/search_history_de.html
+++ b/templates/webpages/common/search_history_de.html
@@ -2,9 +2,8 @@
 <script type="text/javascript" src="js/jscalendar/calendar.js"></script>
 <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
 <script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>
 <script type="text/javascript" src="js/jscalendar/calendar.js"></script>
 <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
 <script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>

-<script type="text/javascript" src="js/show_am_history.js"></script>

 
 

-<form method="post" onSubmit="javascript:set_history_uri();">
+<form method="post" action="am.pl">

 
 <input type="hidden" name="action" value="show_am_history">
 
 
 <input type="hidden" name="action" value="show_am_history">
 


@@ -55,14 +54,14 @@
                                        var jscalender = "<table valign=\"top\">"
                                                                        + "<tr><td colspan=\"2\"><b>Zeitraum:&nbsp;</b></td></tr>"
                                                                        + "<tr><td>von:&nbsp;"
                                        var jscalender = "<table valign=\"top\">"
                                                                        + "<tr><td colspan=\"2\"><b>Zeitraum:&nbsp;</b></td></tr>"
                                                                        + "<tr><td>von:&nbsp;"

-                                                                       + "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\" onChange=\"document.getElementById(\'fromdate_hidden\').value=this.value;\">"
+                                                                       + "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\">"

                                                                        + "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
                                                                        + "&nbsp;</td><td>bis:&nbsp;"
                                                                        + "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
                                                                        + "&nbsp;</td><td>bis:&nbsp;"

-                                                                       + "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\" onChange=\"document.getElementById(\'todate_hidden\').value=this.value;\">"
+                                                                       + "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\">"

                                                                        + "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
                                        var mitarbeiter = "<table valign=\"top\">"
                                                                        + "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
                                                                        + "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
                                        var mitarbeiter = "<table valign=\"top\">"
                                                                        + "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"

-                                                                       + "<td><input type='text' name='mitarbeiter' id='mitarbeiter' onChange=\"document.getElementById(\'mitarbeiter_hidden\').value=this.value;\"></td>"
+                                                                       + "<td><input type='text' name='mitarbeiter' id='mitarbeiter'></td>"

                                                                        + "</tr></table>";
 
                                        var tempString = "";
                                                                        + "</tr></table>";
 
                                        var tempString = "";


@@ -172,11 +171,8 @@
                                        </tr>
                                        <tr>
                                                <td colspan="6">
                                        </tr>
                                        <tr>
                                                <td colspan="6">

-              <input type="hidden" value="" id="fromdate_hidden">
-              <input type="hidden" value="" id="todate_hidden">
-              <input type="hidden" value="" id="mitarbeiter_hidden">
-                                                       <input type="button" value="abschicken" onClick="javascript:set_history_uri();">
-                                                       <input type="reset" value="zurücksetzen" onClick="javascript:resetAll();">
+                                                       <input type="submit" class="submit" value="abschicken">
+                                                       <input type="reset" class="submit" value="zurücksetzen" onClick="javascript:resetAll();">

                                                </td>
                                                <td>
                                                </td>
                                                </td>
                                                <td>
                                                </td>

diff --git a/templates/webpages/common/search_history_master.html b/templates/webpages/common/search_history_master.html
index 2bcd7601cb58809412d9d8eb8036f30daf8452af..e2a9ba779153e042bff027cb2e938699e3d5f594 100644 (file)
--- a/templates/webpages/common/search_history_master.html
+++ b/templates/webpages/common/search_history_master.html
@@ -2,9 +2,8 @@
 <script type="text/javascript" src="js/jscalendar/calendar.js"></script>
 <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
 <script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>
 <script type="text/javascript" src="js/jscalendar/calendar.js"></script>
 <script type="text/javascript" src="js/jscalendar/lang/calendar-de.js"></script>
 <script type="text/javascript" src="js/jscalendar/calendar-setup.js"></script>

-<script type="text/javascript" src="js/show_am_history.js"></script>

 
 

-<form method="post" onSubmit="javascript:set_history_uri();">
+<form method="post" action="am.pl">

 
 <input type="hidden" name="action" value="show_am_history">
 
 
 <input type="hidden" name="action" value="show_am_history">
 


@@ -55,14 +54,14 @@
                                        var jscalender = "<table valign=\"top\">"
                                                                        + "<tr><td colspan=\"2\"><b><translate>Period</translate>:&nbsp;</b></td></tr>"
                                                                        + "<tr><td><translate>from (time)</translate>:&nbsp;"
                                        var jscalender = "<table valign=\"top\">"
                                                                        + "<tr><td colspan=\"2\"><b><translate>Period</translate>:&nbsp;</b></td></tr>"
                                                                        + "<tr><td><translate>from (time)</translate>:&nbsp;"

-                                                                       + "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\" onChange=\"document.getElementById(\'fromdate_hidden\').value=this.value;\">"
+                                                                       + "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\">"

                                                                        + "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
                                                                        + "&nbsp;</td><td><translate>to (time)</translate>:&nbsp;"
                                                                        + "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
                                                                        + "&nbsp;</td><td><translate>to (time)</translate>:&nbsp;"

-                                                                       + "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\" onChange=\"document.getElementById(\'todate_hidden\').value=this.value;\">"
+                                                                       + "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\">"

                                                                        + "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
                                        var mitarbeiter = "<table valign=\"top\">"
                                                                        + "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
                                                                        + "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
                                        var mitarbeiter = "<table valign=\"top\">"
                                                                        + "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"

-                                                                       + "<td><input type='text' name='mitarbeiter' id='mitarbeiter' onChange=\"document.getElementById(\'mitarbeiter_hidden\').value=this.value;\"></td>"
+                                                                       + "<td><input type='text' name='mitarbeiter' id='mitarbeiter'></td>"

                                                                        + "</tr></table>";
 
                                        var tempString = "";
                                                                        + "</tr></table>";
 
                                        var tempString = "";


@@ -172,11 +171,8 @@
                                        </tr>
                                        <tr>
                                                <td colspan="6">
                                        </tr>
                                        <tr>
                                                <td colspan="6">

-              <input type="hidden" value="" id="fromdate_hidden">
-              <input type="hidden" value="" id="todate_hidden">
-              <input type="hidden" value="" id="mitarbeiter_hidden">
-                                                       <input type="button" value="<translate>submit</translate>" onClick="javascript:set_history_uri();">
-                                                       <input type="reset" value="<translate>reset</translate>" onClick="javascript:resetAll();">
+                                                       <input type="submit" class="submit" value="<translate>submit</translate>">
+                                                       <input type="reset" class="submit" value="<translate>reset</translate>" onClick="javascript:resetAll();">

                                                </td>
                                                <td>
                                                </td>
                                                </td>
                                                <td>
                                                </td>