edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Änderungen

Browse Source
This commit is contained in:
ja
2021-10-25 15:30:32 +02:00
parent 50532d85f2
commit 3a557324ab
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Customers/CustomsAviso.aspx
View File

@@ -79,7 +79,7 @@
<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)" type="radio" name="art" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</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>
@@ -102,14 +102,16 @@
<div style="height:0.936768149882904vh"></div>
<div class="col-12" id="cont4">
<div class="col-12" id="container2" style="margin-left:2px;">
<asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label>
<asp:TextBox id="pickdate1" Type="Date" CssClass="classTarget" requiered="true" OnTextChanged="pickdate1_TextChanged" runat="server"></asp:TextBox>
<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: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> -->
<asp:TextBox id="pickdate2" Type="Date" CssClass="classTarget" OnTextChanged="pickdate2_TextChanged" required="true" runat="server"></asp:TextBox>
<%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"/>
</div>
<div id="Abstand"></div>

3
Customers/CustomsAviso.aspx.vb
View File

@@ -69,6 +69,7 @@ Partial Class CustomsAviso
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
Else
rbt_Alle.Checked = True
normaltable.EnableViewState = True
Dim erster = New Date(Now().Year, Now().Month, 1)
Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
@@ -77,7 +78,7 @@ Partial Class CustomsAviso
datevon = ersterdat
datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
If txt_LKWNr.Text = "" Then
regexval_txt_LKW.Enabled = False
Else