Zusätzliche Änderungen
This commit is contained in:
ja
@@ -77,25 +77,25 @@
|
||||
<div class="d-none d-md-block">
|
||||
<div style=" width:780px; margin-left:8px">
|
||||
<fieldset>
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
|
||||
<label><input id="rbt_Alle" onselect="GetSelectedVal(this)" type="radio" name="art" value="Alle" data-bs-toggle="tooltip" style="margin-right:4px" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." runat="server"/>Alle</label>
|
||||
<label style="margin-right:4px;"><input id="rbt_Erf" onclick="GetSelectedVal(this)" aria-selected="true" type="radio" name="art" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</label>
|
||||
<label style="margin-right:4px;"><input id="rbt_Vorb" onclick="GetSelectedVal(this)" type="radio" name="art" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
|
||||
<label style="margin-right:4px;"><input id="rbt_Vorg" onclick="GetSelectedVal(this)" type="radio" name="art" value="Vorgeschrieben" style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
|
||||
<label style="margin-right:4px;"><input id="rbt_Ankunft" onclick="GetSelectedVal(this)" type="radio" name="art" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
|
||||
<label style="margin-right:4px;"><input id="rbt_Freig" onclick="GetSelectedVal(this)" type="radio" name="art" value="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="margin-right:4px" runat="server">Freigabe</label>
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
|
||||
<label style="margin-right:4px;"><input id="rbt_Alle" onchange="changeval(this.value)" type="radio" name="art" value="Alle" aria-selected="true" data-bs-toggle="tooltip" style="margin-right:4px" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." runat="server"/>Alle</label>
|
||||
<label style="margin-right:4px;"><input id="rbt_Erf" onchange="changeval(this.value)" type="radio" name="art" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</label>
|
||||
<label style="margin-right:4px;"><input id="rbt_Vorb" onchange="changeval(this.value)" type="radio" name="art" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
|
||||
<label style="margin-right:4px;"><input id="rbt_Vorg" onchange="changeval(this.value)" type="radio" name="art" value="Vorgeschrieben" style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
|
||||
<label style="margin-right:4px;"><input id="rbt_Ankunft" onchange="changeval(this.value)" type="radio" name="art" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
|
||||
<label style="margin-right:4px;"><input id="rbt_Freig" onchange="changeval(this.value)" type="radio" name="art" value="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="margin-right:4px" runat="server">Freigabe</label>
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
<div class="d-md-none">
|
||||
<div class="col-8" style="margin-left:8px">
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
|
||||
<label><input id="rbt_Alle_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Alle" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." class="CSS_input" runat="server"/>Alle</label>
|
||||
<label style="margin-right:144px;"><input id="rbt_Erf_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</label>
|
||||
<label><input id="rbt_Vorb_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
|
||||
<label><input id="rbt_Vorg_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Vorgeschrieben" style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
|
||||
<label style="margin-right:22px"><input id="rbt_Ankunft_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
|
||||
<label style="margin-right:52px"><input id="rbt_Freig_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="margin-right:4px" runat="server">Freigabe</label>
|
||||
<label><input id="rbt_Alle_M" type="radio" name="art2" onchange="changeval(this.value)" value="Alle" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." class="CSS_input" runat="server"/>Alle</label>
|
||||
<label style="margin-right:144px;"><input id="rbt_Erf_M" onchange="changeval(this.value)" value="Erfasst" type="radio" name="art2" style="margin-right:4px" runat="server"/>Erfasst</label>
|
||||
<label><input id="rbt_Vorb_M" type="radio" name="art2" onchange="changeval(this.value)" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
|
||||
<label><input id="rbt_Vorg_M" type="radio" name="art2" onchange="changeval(this.value)" value="Vorgeschrieben" style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
|
||||
<label style="margin-right:22px"><input id="rbt_Ankunft_M" onchange="changeval(this.value)" type="radio" name="art2" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
|
||||
<label style="margin-right:52px"><input id="rbt_Freig_M" onchange="changeval(this.value)" type="radio" name="art2" value="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="margin-right:4px" runat="server">Freigabe</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -104,15 +104,17 @@
|
||||
<div class="col-12" id="container2" style="margin-left:2px;">
|
||||
<asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label>
|
||||
<%Dim erster = New Date(Now().Year, Now().Month, 1) %>
|
||||
<asp:TextBox id="pickdate1" Type="Date" CssClass="classTarget" minDate="<%=erster %>" requiered="true" OnTextChanged="pickdate1_TextChanged" runat="server"></asp:TextBox>
|
||||
<asp:TextBox id="pickdate1" Type="Date" CssClass="classTarget" minDate="<%=erster %>" OnTextChanged="pickdate1_TextChanged" runat="server"></asp:TextBox>
|
||||
<asp:RequiredFieldValidator ControlToValidate="pickdate1" ID="valreqpickdate1" Display="Dynamic" runat="server" Enabled ="true" Visible ="true"></asp:RequiredFieldValidator>
|
||||
<asp:CustomValidator runat="server" ID="valDateRange_1" ControlToValidate="pickdate1" Display="Dynamic" onservervalidate="valDateRange_1_ServerValidate" ErrorMessage="" SetFocusOnError="true" ValidationGroup="DateValid" />
|
||||
<!--<asp:RequiredFieldValidator ID="RequiredFieldValidatorvon" runat="server" ErrorMessage="Field required" ControlToValidate="pickdate1" Text="Required" ForeColor="White" Font-Strikeout="False" Font-Underline="False" Font-Overline="False" Font-Bold="True" BackColor="Red"></asp:RequiredFieldValidator>
|
||||
<asp:CustomValidator ValidateEmptyText="false" ClientValidationFunction="instantValidation"></asp:CustomValidator> -->
|
||||
<asp:Label ID="lbl_bis" runat="server" Text="Bis:"></asp:Label>
|
||||
<!-- <asp:RequiredFieldValidator ID="RequiredFieldValidatorbis" ClientValidationFunction="validate" runat="server" ErrorMessage="Field required" ControlToValidate="pickdate2" Text="Required" ForeColor="White" Font-Strikeout="False" Font-Underline="False" Font-Overline="False" Font-Bold="True" BackColor="Red"></asp:RequiredFieldValidator> -->
|
||||
<%Dim jetzt = DateTime.Now.Date %>
|
||||
<asp:TextBox id="pickdate2" Type="Date" CssClass="classTarget" minDate="<%=jetzt %>" OnTextChanged="pickdate2_TextChanged" required="true" runat="server"></asp:TextBox>
|
||||
<asp:CustomValidator runat="server" ID="valDateRange_2" ControlToValidate="pickdate2" Display="Dynamic" onservervalidate="valDateRange_2_ServerValidate" ErrorMessage="" SetFocusOnError="true" ValidationGroup="DateValid"/>
|
||||
<asp:TextBox id="pickdate2" Type="Date" CssClass="classTarget" minDate="<%=jetzt %>" OnTextChanged="pickdate2_TextChanged" runat="server"></asp:TextBox>
|
||||
<asp:RequiredFieldValidator ControlToValidate="pickdate2" ID="valreqpickdate2" Display="Dynamic" runat="server" Enabled ="true" Visible ="true"></asp:RequiredFieldValidator>
|
||||
<asp:CustomValidator runat="server" ID="valDateRange_2" ControlToValidate="pickdate2" Display="Dynamic" onservervalidate="valDateRange_2_ServerValidate" ErrorMessage="" SetFocusOnError="true" ValidationGroup="DateValid"/>
|
||||
</div>
|
||||
<div id="Abstand"></div>
|
||||
<hr>
|
||||
@@ -228,30 +230,27 @@
|
||||
|
||||
<script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/jquery.validate.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/additional-methods.min.js"></script>
|
||||
<script>
|
||||
function GetSelectedVal(ele) {
|
||||
var el = $(ele).closest('label').text();
|
||||
|
||||
var date1 = document.getElementById('<%=pickdate1.ClientID%>');
|
||||
var date2 = document.getElementById('<%=pickdate2.ClientID%>');
|
||||
$("#container2").hide();
|
||||
if (el == "Alle") {
|
||||
date1.required = true;
|
||||
date2.required = true;
|
||||
$("#container2").show();
|
||||
} else if (el == "Freigabe") {
|
||||
date1.required = true;
|
||||
date2.required = true;
|
||||
$("#container2").show();
|
||||
} else {
|
||||
date1.required = false;
|
||||
date2.required = false;
|
||||
date1.text() = null;
|
||||
date2.text() = null;
|
||||
$("#container2").hide();
|
||||
|
||||
<script>
|
||||
function changeval(value) {
|
||||
if (value == "Alle") {
|
||||
date1.required = true;
|
||||
date2.required = true;
|
||||
$("#container2").show();
|
||||
} else if (value == "Freigabe") {
|
||||
date1.required = true;
|
||||
date2.required = true;
|
||||
$("#container2").show();
|
||||
} else {
|
||||
date1.required = false;
|
||||
date2.required = false;
|
||||
date1.text() = null;
|
||||
date2.text() = null;
|
||||
$("#container2").hide();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
}
|
||||
</script>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
Sys.WebForms.PageRequestManager.getInstance().add_endRequest(EndRequestHandler);
|
||||
|
||||
Reference in New Issue
Block a user