Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision fa65335e

Von Moritz Bunkus vor mehr als 15 Jahren hinzugefügt

  • ID fa65335e3fad0e06a6552b2265e8c8aaffa68472
  • Vorgänger 96d4a37b
  • Nachfolger 74076701

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

Unterschiede anzeigen:

bin/mozilla/am.pl
2848 2848
    }
2849 2849
  }
2850 2850
  $restriction .=
2851
      $form->{transdate} ne "" && $form->{reqdate} ne "" ? qq| AND st.itime::date >= '| . $form->{transdate} . qq|' AND st.itime::date <= '| . $form->{reqdate} . qq|'|
2852
    : $form->{transdate} ne "" && $form->{reqdate} eq "" ? qq| AND st.itime::date >= '| . $form->{transdate} . qq|'|
2853
    : $form->{transdate} eq "" && $form->{reqdate} ne "" ? qq| AND st.itime::date <= '| . $form->{reqdate} . qq|'|
2851
      $form->{fromdate} ne "" && $form->{todate} ne "" ? qq| AND st.itime::date >= '| . $form->{fromdate} . qq|' AND st.itime::date <= '| . $form->{todate} . qq|'|
2852
    : $form->{fromdate} ne "" && $form->{todate} eq "" ? qq| AND st.itime::date >= '| . $form->{fromdate} . qq|'|
2853
    : $form->{fromdate} eq "" && $form->{todate} ne "" ? qq| AND st.itime::date <= '| . $form->{todate} . qq|'|
2854 2854
    :                                                        ""
2855 2855
    ;
2856 2856
  $restriction .=
templates/webpages/common/search_history_de.html
55 55
					var jscalender = "<table valign=\"top\">"
56 56
									+ "<tr><td colspan=\"2\"><b>Zeitraum:&nbsp;</b></td></tr>"
57 57
									+ "<tr><td>von:&nbsp;"
58
									+ "<input name=\"transdate\" id=\"transdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(transdate) %]\" onChange=\"document.getElementById(\'transdate_hidden\').value=this.value;\">"
59
									+ "<input type=\"button\" name=\"transdate\" id=\"trigger1\" value=\"?\">"
58
									+ "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\" onChange=\"document.getElementById(\'fromdate_hidden\').value=this.value;\">"
59
									+ "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
60 60
									+ "&nbsp;</td><td>bis:&nbsp;"
61
									+ "<input name=\"reqdate\" id=\"reqdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(reqdate) %]\" onChange=\"document.getElementById(\'reqdate_hidden\').value=this.value;\">"
62
									+ "<input type=\"button\" name=\"reqdate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
61
									+ "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\" onChange=\"document.getElementById(\'todate_hidden\').value=this.value;\">"
62
									+ "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
63 63
					var mitarbeiter = "<table valign=\"top\">"
64 64
									+ "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
65 65
									+ "<td><input type='text' name='mitarbeiter' id='mitarbeiter' onChange=\"document.getElementById(\'mitarbeiter_hidden\').value=this.value;\"></td>"
......
79 79

  
80 80
							Calendar.setup(
81 81
      			    		{
82
		                      inputField : "transdate",
82
		                      inputField : "fromdate",
83 83
        		              ifFormat :"%d.%m.%Y",
84 84
                		      align : "BL",
85 85
		                      button : "trigger1"
......
87 87

  
88 88
		        		    Calendar.setup(
89 89
		          			{
90
        		              inputField : "reqdate",
90
        		              inputField : "todate",
91 91
                		  	  ifFormat :"%d.%m.%Y",
92 92
		                  	  align : "BL",
93 93
        		          	  button : "trigger2"
......
172 172
					</tr>
173 173
					<tr>
174 174
						<td colspan="6">
175
              <input type="hidden" value="" id="transdate_hidden">
176
              <input type="hidden" value="" id="reqdate_hidden">
175
              <input type="hidden" value="" id="fromdate_hidden">
176
              <input type="hidden" value="" id="todate_hidden">
177 177
              <input type="hidden" value="" id="mitarbeiter_hidden">
178 178
							<input type="button" value="abschicken" onClick="javascript:set_history_uri();">
179 179
							<input type="reset" value="zur?cksetzen" onClick="javascript:resetAll();">
templates/webpages/common/search_history_master.html
55 55
					var jscalender = "<table valign=\"top\">"
56 56
									+ "<tr><td colspan=\"2\"><b><translate>Period</translate>:&nbsp;</b></td></tr>"
57 57
									+ "<tr><td><translate>from (time)</translate>:&nbsp;"
58
									+ "<input name=\"transdate\" id=\"transdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(transdate) %]\" onChange=\"document.getElementById(\'transdate_hidden\').value=this.value;\">"
59
									+ "<input type=\"button\" name=\"transdate\" id=\"trigger1\" value=\"?\">"
58
									+ "<input name=\"fromdate\" id=\"fromdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(fromdate) %]\" onChange=\"document.getElementById(\'fromdate_hidden\').value=this.value;\">"
59
									+ "<input type=\"button\" name=\"fromdate\" id=\"trigger1\" value=\"?\">"
60 60
									+ "&nbsp;</td><td><translate>to (time)</translate>:&nbsp;"
61
									+ "<input name=\"reqdate\" id=\"reqdate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(reqdate) %]\" onChange=\"document.getElementById(\'reqdate_hidden\').value=this.value;\">"
62
									+ "<input type=\"button\" name=\"reqdate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
61
									+ "<input name=\"todate\" id=\"todate\" size=\"11\" title=\"[% HTML.escape(myconfig_dateformat) %]\" value=\"[% HTML.escape(todate) %]\" onChange=\"document.getElementById(\'todate_hidden\').value=this.value;\">"
62
									+ "<input type=\"button\" name=\"todate\" id=\"trigger2\" value=\"?\"></td></tr></table>";
63 63
					var mitarbeiter = "<table valign=\"top\">"
64 64
									+ "<tr><td><b>Mitarbeiter:</b>&nbsp;</td>"
65 65
									+ "<td><input type='text' name='mitarbeiter' id='mitarbeiter' onChange=\"document.getElementById(\'mitarbeiter_hidden\').value=this.value;\"></td>"
......
79 79

  
80 80
							Calendar.setup(
81 81
      			    		{
82
		                      inputField : "transdate",
82
		                      inputField : "fromdate",
83 83
        		              ifFormat :"%d.%m.%Y",
84 84
                		      align : "BL",
85 85
		                      button : "trigger1"
......
87 87

  
88 88
		        		    Calendar.setup(
89 89
		          			{
90
        		              inputField : "reqdate",
90
        		              inputField : "todate",
91 91
                		  	  ifFormat :"%d.%m.%Y",
92 92
		                  	  align : "BL",
93 93
        		          	  button : "trigger2"
......
172 172
					</tr>
173 173
					<tr>
174 174
						<td colspan="6">
175
              <input type="hidden" value="" id="transdate_hidden">
176
              <input type="hidden" value="" id="reqdate_hidden">
175
              <input type="hidden" value="" id="fromdate_hidden">
176
              <input type="hidden" value="" id="todate_hidden">
177 177
              <input type="hidden" value="" id="mitarbeiter_hidden">
178 178
							<input type="button" value="<translate>submit</translate>" onClick="javascript:set_history_uri();">
179 179
							<input type="reset" value="<translate>reset</translate>" onClick="javascript:resetAll();">

Auch abrufbar als: Unified diff