Die Felder "transdate" und "reqdate" in "fromdate" und "todate" umbenannt.

diff --git a/bin/mozilla/am.pl b/bin/mozilla/am.pl
index c812814438f99da072f5c7bf198ad124e549ebd5..f14ea6685cb4d2847cef9553df411bc5524acfce 100644 (file)
--- a/bin/mozilla/am.pl
+++ b/bin/mozilla/am.pl
@@ -2848,9 +2848,9 @@ sub show_am_history {
     }
   }
   $restriction .=
     }
   }
   $restriction .=

-      $form->{transdate} ne "" && $form->{reqdate} ne "" ? qq| AND st.itime::date >= '| . $form->{transdate} . qq|' AND st.itime::date <= '| . $form->{reqdate} . qq|'|
-    : $form->{transdate} ne "" && $form->{reqdate} eq "" ? qq| AND st.itime::date >= '| . $form->{transdate} . qq|'|
-    : $form->{transdate} eq "" && $form->{reqdate} ne "" ? qq| AND st.itime::date <= '| . $form->{reqdate} . qq|'|
+      $form->{fromdate} ne "" && $form->{todate} ne "" ? qq| AND st.itime::date >= '| . $form->{fromdate} . qq|' AND st.itime::date <= '| . $form->{todate} . qq|'|
+    : $form->{fromdate} ne "" && $form->{todate} eq "" ? qq| AND st.itime::date >= '| . $form->{fromdate} . qq|'|
+    : $form->{fromdate} eq "" && $form->{todate} ne "" ? qq| AND st.itime::date <= '| . $form->{todate} . qq|'|

     :                                                        ""
     ;
   $restriction .=
     :                                                        ""
     ;
   $restriction .=

diff --git a/templates/webpages/common/search_history_de.html b/templates/webpages/common/search_history_de.html
index 8bc24a39ac16c242ae2f8bfe751cb389ca272c83..8f8b130af2fc84d64b17825ce870a40cd412eeb1 100644 (file)
--- a/templates/webpages/common/search_history_de.html
+++ b/templates/webpages/common/search_history_de.html
@@ -55,11 +55,11 @@
                                        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=\"transdate\" id=\"transdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(transdate) %]\" onChange=\"document.getElementById(\'transdate_hidden\').value=this.value;\">"
-                                                                       + "<input type=\"button\" name=\"transdate\" id=\"trigger1\" value=\"?\">"
+                                                                       + "<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 type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"

                                                                        + "&nbsp;</td><td>bis:&nbsp;"
                                                                        + "&nbsp;</td><td>bis:&nbsp;"

-                                                                       + "<input name=\"reqdate\" id=\"reqdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(reqdate) %]\" onChange=\"document.getElementById(\'reqdate_hidden\').value=this.value;\">"
-                                                                       + "<input type=\"button\" name=\"reqdate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
+                                                                       + "<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 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>"
                                        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>"


@@ -79,7 +79,7 @@
 
                                                        Calendar.setup(
                                        {
 
                                                        Calendar.setup(
                                        {

-                                     inputField : "transdate",
+                                     inputField : "fromdate",

                                      ifFormat :"%d.%m.%Y",
                                      align : "BL",
                                      button : "trigger1"
                                      ifFormat :"%d.%m.%Y",
                                      align : "BL",
                                      button : "trigger1"


@@ -87,7 +87,7 @@
 
                                            Calendar.setup(
                                                {
 
                                            Calendar.setup(
                                                {

-                                     inputField : "reqdate",
+                                     inputField : "todate",

                                          ifFormat :"%d.%m.%Y",
                                          align : "BL",
                                          button : "trigger2"
                                          ifFormat :"%d.%m.%Y",
                                          align : "BL",
                                          button : "trigger2"


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

-              <input type="hidden" value="" id="transdate_hidden">
-              <input type="hidden" value="" id="reqdate_hidden">
+              <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="hidden" value="" id="mitarbeiter_hidden">
                                                        <input type="button" value="abschicken" onClick="javascript:set_history_uri();">
                                                        <input type="reset" value="zurücksetzen" onClick="javascript:resetAll();">

diff --git a/templates/webpages/common/search_history_master.html b/templates/webpages/common/search_history_master.html
index 6aa176fbb3fe709b8e7dc33b51f5894c4d8eb293..2bcd7601cb58809412d9d8eb8036f30daf8452af 100644 (file)
--- a/templates/webpages/common/search_history_master.html
+++ b/templates/webpages/common/search_history_master.html
@@ -55,11 +55,11 @@
                                        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=\"transdate\" id=\"transdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(transdate) %]\" onChange=\"document.getElementById(\'transdate_hidden\').value=this.value;\">"
-                                                                       + "<input type=\"button\" name=\"transdate\" id=\"trigger1\" value=\"?\">"
+                                                                       + "<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 type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"

                                                                        + "&nbsp;</td><td><translate>to (time)</translate>:&nbsp;"
                                                                        + "&nbsp;</td><td><translate>to (time)</translate>:&nbsp;"

-                                                                       + "<input name=\"reqdate\" id=\"reqdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(reqdate) %]\" onChange=\"document.getElementById(\'reqdate_hidden\').value=this.value;\">"
-                                                                       + "<input type=\"button\" name=\"reqdate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
+                                                                       + "<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 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>"
                                        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>"


@@ -79,7 +79,7 @@
 
                                                        Calendar.setup(
                                        {
 
                                                        Calendar.setup(
                                        {

-                                     inputField : "transdate",
+                                     inputField : "fromdate",

                                      ifFormat :"%d.%m.%Y",
                                      align : "BL",
                                      button : "trigger1"
                                      ifFormat :"%d.%m.%Y",
                                      align : "BL",
                                      button : "trigger1"


@@ -87,7 +87,7 @@
 
                                            Calendar.setup(
                                                {
 
                                            Calendar.setup(
                                                {

-                                     inputField : "reqdate",
+                                     inputField : "todate",

                                          ifFormat :"%d.%m.%Y",
                                          align : "BL",
                                          button : "trigger2"
                                          ifFormat :"%d.%m.%Y",
                                          align : "BL",
                                          button : "trigger2"


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

-              <input type="hidden" value="" id="transdate_hidden">
-              <input type="hidden" value="" id="reqdate_hidden">
+              <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="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();">