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

Änderungen Überprüfungen

Browse Source
This commit is contained in:
ja
2021-10-29 16:04:22 +02:00
parent 24f722369f
commit 8de29e261d
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Customers/Invoices.aspx
View File

@@ -110,7 +110,7 @@
<form class="myform" id="commentform">
<asp:Label ID="lbl_LKWNr" runat="server" Text="LKW Kennzeichen"></asp:Label>
<asp:TextBox ID="txt_LKWNr" runat="server" style="width:117px;margin-left:32px"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_LKWNr" runat="server" ID="regexval_txt_LKW" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{30})\d$" Display="Dynamic" ErrorMessage="LKW Kennzeichen: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_LKWNr" runat="server" ID="regexval_txt_LKW" ValidationGroup="additional_TXTs" ValidationExpression="^[A-Z0-9]{4,30}\d$" Display="Dynamic" ErrorMessage="LKW Kennzeichen: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
<asp:Label ID="lbl_KdNrAuftrag" runat="server" Text="Kunden Auftrags Nr" style="margin-left:45px"></asp:Label>
<asp:TextBox ID="txt_KdNrAuftrag" runat="server" style="width:117px;margin-left:6px"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_KdNrAuftrag" runat="server" ID="regexval_txt_KdNrAuftrag" ValidationGroup="additional_TXTs" ValidationExpression="^([0-9]{8})$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
@@ -142,7 +142,7 @@
<form class="myform_M" id="commentform_4">
<asp:Label ID="lbl_LKWNr_M" runat="server" Text="LKW Kennzeichen"></asp:Label>
<asp:TextBox ID="txt_LKWNr_M" runat="server" style="width:105px;margin-left:29px"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_LKWNr_M" runat="server" ID="regexval_txt_LKW_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{30})\d$" Display="Dynamic" ErrorMessage="LKW Kennzeichen: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_LKWNr_M" runat="server" ID="regexval_txt_LKW_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{5,30})\d$" Display="Dynamic" ErrorMessage="LKW Kennzeichen: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
<asp:Label ID="lbl_KdNrAuftrag_M" runat="server" Text="Kunden Auftrags Nr" ></asp:Label>
<asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" style="width:105px;margin-left:13px"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_KdNrAuftrag_M" runat="server" ID="regexval_txt_KdNrAuftrag_M" ValidationGroup="additional_TXTs" ValidationExpression="^([0-9]{7})$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
@@ -184,7 +184,7 @@
</div>
</div>
<div id="Abstand_laenger" style="height: /*24px*/ 1.873536299765808vh;"></div>
<asp:Button ID="Send_Data" class="btn btn-primary" OnClick="Send_Data_Click" runat="server" Text="Erhalte Rechnungen" CausesValidation="false" Autopostback="True" style="font-size:1.33em;width:260px;height:30px;color:#fff" />
<asp:Button ID="btn_Send_Data" class="btn btn-primary" OnClick="btn_Send_Data_Click" runat="server" Text="Erhalte Rechnungen" CausesValidation="false" style="font-size:1.33em;width:260px;height:30px;color:#fff" />
<div id="Abstand_lang" style="height: /*32px*/ 2.498048399687744vh;"></div>
<div class="g-3">
<div id="conovertab" style="overflow-x:auto;margin-left:-2px">

30
Customers/Invoices.aspx.vb
View File

@@ -33,8 +33,8 @@ Partial Class Customers_Invoices
normaltable.EnableViewState = True
lbl_von.Visible = True
lbl_bis.Visible = True
valDateRange_1.Enabled = True
valDateRange_2.Enabled = True
'valDateRange_1.Enabled = True
'valDateRange_2.Enabled = True
Dim erster = New Date(Now().Year, Now().Month, 1)
Dim ersterdat = "1." + Now().Month.ToString + "." + Now().Year.ToString
pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
@@ -162,15 +162,15 @@ Partial Class Customers_Invoices
reNr = ""
End Sub
Protected Sub Send_Data_Click(sender As Object, e As EventArgs)
Protected Sub btn_Send_Data_Click(sender As Object, e As EventArgs)
dt = Nothing
valreq_pickdate1.Validate()
valreq_pickdate2.Validate()
If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid And Kdnrtext = Not "" Then
valDateRange_1.Validate()
valDateRange_2.Validate()
If valDateRange_1.IsValid And valDateRange_2.IsValid Then
If Not String.IsNullOrEmpty(txt_Absender.Text) Then
' valDateRange_1.Validate()
'valDateRange_2.Validate()
'If valDateRange_1.IsValid And valDateRange_2.IsValid Then
If Not String.IsNullOrEmpty(txt_Absender.Text) Then
regexval_txt_Absender.Enabled = True
regexval_txt_Absender.Validate()
txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
@@ -304,13 +304,13 @@ Partial Class Customers_Invoices
End Try
End If
'lbl_status.Text=Kdnrtext)
If String.IsNullOrEmpty(Kdnrtext) = False And String.IsNullOrEmpty(datevon.ToString) = False And String.IsNullOrEmpty(datebis.ToString) = False Then
dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf String.IsNullOrEmpty(Kdnrtext) = True Or String.IsNullOrEmpty(datevon.ToString) = True And String.IsNullOrEmpty(datebis.ToString) = True And String.IsNullOrEmpty(reNr) = True And String.IsNullOrEmpty(Absender) = False And String.IsNullOrEmpty(LKWNR) = False And String.IsNullOrEmpty(Empfaenger) = False And String.IsNullOrEmpty(KDNAFNR) = False Then
valreq_pickdate1.Validate()
valreq_pickdate2.Validate()
'lbl_status.Text = Kdnrtext
If String.IsNullOrEmpty(Kdnrtext) = False And String.IsNullOrEmpty(datevon.ToString) = False And String.IsNullOrEmpty(datebis.ToString) = False Then
dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf String.IsNullOrEmpty(Kdnrtext) = True And String.IsNullOrEmpty(datevon.ToString) = True And String.IsNullOrEmpty(datebis.ToString) = True And String.IsNullOrEmpty(reNr) = True And String.IsNullOrEmpty(Absender) = False And String.IsNullOrEmpty(LKWNR) = False And String.IsNullOrEmpty(Empfaenger) = False And String.IsNullOrEmpty(KDNAFNR) = False Then
lbl_status.Text = "Bitte alle fehlenden Felder ausfüllen!"
valreq_pickdate1.Validate()
valreq_pickdate2.Validate()
End If
If dt IsNot Nothing AndAlso Not dt.Count = 0 Then
@@ -380,6 +380,6 @@ Partial Class Customers_Invoices
Else
lbl_status.Text = "Error in valid date room"
End If
End If
'End If
End Sub
End Class