diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index bcdb494..64d3cc3 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -636,6 +636,7 @@ Partial Class CustomsAviso Protected Sub btn_Auftraege_Click(ByVal sender As Object, e As EventArgs) Handles btn_Auftraege.Click dt = Nothing + MsgBox("TEst") Session.Add("mytable", Nothing) If Session.Item("mytable") = Nothing Then If txt_Absender.Text IsNot "" Then @@ -654,7 +655,11 @@ Partial Class CustomsAviso regexval_txt_Absender.ForeColor = Drawing.Color.Red regexval_txt_Absender.ErrorMessage = "Der Absender ist nicht richtig formatiert." End If - ElseIf txt_Empfaenger.Text IsNot "" Then + Else + txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regexval_txt_Absender.Enabled = False + End If + If txt_Empfaenger.Text IsNot "" Then txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled regexval_txt_Empfaenger.Enabled = True regexval_txt_Empfaenger.Validate() @@ -669,7 +674,11 @@ Partial Class CustomsAviso regexval_txt_Empfaenger.ForeColor = Drawing.Color.Red regexval_txt_Empfaenger.ErrorMessage = "Der Empfänger ist nicht richtig formatiert." End If - ElseIf txt_KdNrAuftrag.Text IsNot "" Then + Else + txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regexval_txt_Empfaenger.Enabled = False + End If + If txt_KdNrAuftrag.Text IsNot "" Then txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled regexval_txt_KdNrAuftrag.Enabled = True regexval_txt_KdNrAuftrag.Validate() @@ -684,7 +693,11 @@ Partial Class CustomsAviso regexval_txt_KdNrAuftrag.ForeColor = Drawing.Color.Red regexval_txt_KdNrAuftrag.ErrorMessage = "Die Kundenummer ist nicht richtig formatiert." End If - ElseIf txt_LKWNr.Text IsNot "" Then + Else + txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regexval_txt_KdNrAuftrag.Enabled = False + End If + If txt_LKWNr.Text IsNot "" Then txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled regexval_txt_LKW.Enabled = True regexval_txt_LKW.Validate() @@ -698,7 +711,11 @@ Partial Class CustomsAviso regexval_txt_LKW.ForeColor = Drawing.Color.Red regexval_txt_LKW.ErrorMessage = "Das LKW Kennzeichen ist nicht richtig formatiert." End If - ElseIf txt_Absender_M.Text IsNot "" Then + Else + txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regexval_txt_LKW.Enabled = False + End If + If txt_Absender_M.Text IsNot "" Then txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled regval_txt_Absender_M.Enabled = True regval_txt_Absender_M.Validate() @@ -713,12 +730,17 @@ Partial Class CustomsAviso regval_txt_Absender_M.ForeColor = Drawing.Color.Red regval_txt_Absender_M.ErrorMessage = "Der Absender ist nicht richtig formatiert." End If - ElseIf txt_Empfaenger_M.Text IsNot "" Then + Else + txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regval_txt_Absender_M.Enabled = False + End If + If txt_Empfaenger_M.Text IsNot "" Then txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled regval_txt_Empfaenger_M.Enabled = True regval_txt_Empfaenger_M.Validate() If regval_txt_Empfaenger_M.IsValid = True Then Try + wasmobile = True Empfaenger = txt_Empfaenger_M.Text Catch ex As FormatException MsgBox("Diese Daten können nicht validiert werden", MsgBoxStyle.Critical) @@ -727,7 +749,11 @@ Partial Class CustomsAviso regval_txt_Empfaenger_M.ForeColor = Drawing.Color.Red regval_txt_Empfaenger_M.ErrorMessage = "Der Empfänger ist nicht richtig formatiert." End If - ElseIf txt_KdNrAuftrag_M.Text IsNot "" Then + Else + txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regval_txt_Empfaenger_M.Enabled = False + End If + If txt_KdNrAuftrag_M.Text IsNot "" Then txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled regval_txt_KdNrAuftrag_M.Enabled = True regval_txt_KdNrAuftrag_M.Validate() @@ -742,7 +768,11 @@ Partial Class CustomsAviso regval_txt_KdNrAuftrag_M.ForeColor = Drawing.Color.Red regval_txt_KdNrAuftrag_M.ErrorMessage = "Die Kundennummer ist nicht richtig formatiert." End If - ElseIf txt_LKWNr_M.Text IsNot "" Then + Else + txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regval_txt_KdNrAuftrag_M.Enabled = False + End If + If txt_LKWNr_M.Text IsNot "" Then txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled regexval_txt_LKWNr_M.Enabled = True regexval_txt_LKWNr_M.Validate() @@ -757,6 +787,9 @@ Partial Class CustomsAviso regexval_txt_LKWNr_M.ForeColor = Drawing.Color.Red regexval_txt_LKWNr_M.ErrorMessage = "Das LKW Kennzeichen ist nicht richtig formatiert." End If + Else + txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regexval_txt_LKWNr_M.Enabled = False End If If rbt_Alle.Checked = True Then pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx index 4954cd7..1472ca1 100644 --- a/Customers/Invoices.aspx +++ b/Customers/Invoices.aspx @@ -94,7 +94,7 @@
- <%Response.Write(Server.HtmlEncode("Formular zurücksetzen"))%> + Formular zurücksetzen
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb index 5d2011f..af1538c 100644 --- a/Customers/Invoices.aspx.vb +++ b/Customers/Invoices.aspx.vb @@ -317,6 +317,9 @@ Partial Class Customers_Default3 lbl_status.ForeColor = Drawing.Color.Red lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation" End Try + Else + txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regex_txt_Absender.Enabled = False End If If txt_Empfaenger.Text IsNot "" Then txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled @@ -335,6 +338,9 @@ Partial Class Customers_Default3 lbl_status.ForeColor = Drawing.Color.Red lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation" End Try + Else + txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regex_txt_Empfaenger.Enabled = False End If If txt_KdNrAuftrag.Text IsNot "" Then txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled @@ -353,6 +359,9 @@ Partial Class Customers_Default3 lbl_status.ForeColor = Drawing.Color.Red lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation" End Try + Else + txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regex_txt_KdNrAuftrag.Enabled = False End If If txt_LKW.Text IsNot "" Then txt_LKW.ValidateRequestMode = UI.ValidateRequestMode.Enabled @@ -371,6 +380,9 @@ Partial Class Customers_Default3 lbl_status.ForeColor = Drawing.Color.Red lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation" End Try + Else + txt_LKW.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regex_txt_LKW.Enabled = False End If If txt_ReNr.Text IsNot "" Then txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled @@ -390,6 +402,9 @@ Partial Class Customers_Default3 lbl_status.ForeColor = Drawing.Color.Red lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error invoice number validation" End Try + Else + txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regex_txt_ReNr.Enabled = False End If If txt_Absender_M.Text IsNot "" Then txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled @@ -408,6 +423,9 @@ Partial Class Customers_Default3 lbl_status.ForeColor = Drawing.Color.Red lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation" End Try + Else + txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regex_txt_Absender_M.Enabled = False End If If txt_Empfaenger_M.Text IsNot "" Then txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled @@ -426,6 +444,9 @@ Partial Class Customers_Default3 lbl_status.ForeColor = Drawing.Color.Red lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation" End Try + Else + txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regex_txt_Empaenger_M.Enabled = False End If If txt_KdNrAuftrag_M.Text IsNot "" Then txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled @@ -444,6 +465,9 @@ Partial Class Customers_Default3 lbl_status.ForeColor = Drawing.Color.Red lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation" End Try + Else + regex_txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regex_txt_KdNrAuftrag_M.Enabled = False End If If txt_LKW_M.Text IsNot "" Then txt_LKW_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled @@ -462,6 +486,9 @@ Partial Class Customers_Default3 lbl_status.ForeColor = Drawing.Color.Red lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation" End Try + Else + txt_LKW_M.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regex_txt_LKW_M.Enabled = False End If If txt_ReNr_M.Text IsNot "" Then txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled @@ -481,6 +508,9 @@ Partial Class Customers_Default3 lbl_status.ForeColor = Drawing.Color.Red lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error invoice number validation" End Try + Else + txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Disabled + regex_txt_ReNr_M.Enabled = False End If If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then