From 33523ec7a3945bdac53ea0a2e30c94148cab17ba Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 3 Nov 2021 13:38:39 +0100
Subject: [PATCH] =?UTF-8?q?=C3=84nderung=20regex=20validierungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Invoices.aspx    |  8 ++++----
 Customers/Invoices.aspx.vb | 28 +++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx
index db49a5f..e762e67 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -113,10 +113,10 @@
                                             <div id="rowcol2" class="row-cols-1">
                                                 <asp:TextBox ID="txt_Absender" runat="server" PlaceHolder="Sender" style="width:145px;"></asp:TextBox>
                                                 <asp:RequiredFieldValidator ControlToValidate="txt_Absender" runat="server" Enabled="false"></asp:RequiredFieldValidator>
-                                                <asp:RegularExpressionValidator ControlToValidate="txt_Absender" runat="server" ID="regex_txt_Absender" ValidationExpression="[a-zA-Z0-9]{90}" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
+                                                <asp:RegularExpressionValidator ControlToValidate="txt_Absender" runat="server" ID="regex_txt_Absender" ValidationExpression="[^!,]{2,90}" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
                                                 <asp:TextBox ID="txt_Empfaenger" runat="server" PlaceHolder="Receiver" style="width:145px;margin-left:16px"></asp:TextBox>
                                                 <asp:RequiredFieldValidator ControlToValidate="txt_Empfaenger" runat="server" Enabled="false" ID="reqval_txt_Empfaenger"></asp:RequiredFieldValidator>
-                                                <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger" runat="server" ID="regex_txt_Empfaenger" ValidationExpression="[a-zA-Z0-9]{2,90}" Display="Dynamic" ErrorMessage="Empfänger: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                                                <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger" runat="server" ID="regex_txt_Empfaenger" ValidationExpression="[^!,]{2,90}" Display="Dynamic" ErrorMessage="Empfänger: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                            </div>
                                             <div id="rowcol3" class="row-row-cols-1">
                                                 <asp:TextBox ID="txt_ReNr" runat="server" PlaceHolder="invoice number" style="width:145px;" AutoCompleteType="Notes"></asp:TextBox>
@@ -139,10 +139,10 @@
                                            <div id="rowcols5" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
                                              <asp:TextBox ID="txt_Absender_M" runat="server" PlaceHolder="Sender" style="width:155px;margin-left:18px"></asp:TextBox>
                                              <asp:RequiredFieldValidator ControlToValidate="txt_Absender_M" runat="server" style="width:155px;margin-left:18px" Enabled="false" ID="req_txt_Absender_M" ErrorMessage="*"></asp:RequiredFieldValidator>
-                                             <asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regex_txt_Absender_M" Enabled="false" ValidationExpression="[a-zA-Z0-9]{90}" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
+                                             <asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regex_txt_Absender_M" Enabled="false" ValidationExpression="[^!,]{2,90}" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
                                              <asp:TextBox ID="txt_Empfaenger_M" runat="server" PlaceHolder="Receiver" style="width:155px;margin-left:-15px"></asp:TextBox>
                                              <asp:RequiredFieldValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="reqval_txt_Empfaenger_M" Enabled="false" Display="Dynamic"></asp:RequiredFieldValidator>
-                                             <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" ID="regex_txt_Empaenger_M" runat="server" Enabled="false" ValidationExpression="[a-zA-Z0-9]{2,90}" Display="Dynamic" style="width:105px;margin-left:13px" SetFocusOnError="true" ErrorMessage="Error! Try again!"></asp:RegularExpressionValidator>
+                                             <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" ID="regex_txt_Empaenger_M" runat="server" Enabled="false" ValidationExpression="[^!,]{2,90}" Display="Dynamic" style="width:105px;margin-left:13px" SetFocusOnError="true" ErrorMessage="Error! Try again!"></asp:RegularExpressionValidator>
                                           </div>
                                          <div id="rowcol6" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
                                              <asp:TextBox ID="txt_ReNr_M" runat="server" PlaceHolder="invoice number" style="width:155px;margin-left:18px"></asp:TextBox>  
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb
index 963a17d..2280e44 100644
--- a/Customers/Invoices.aspx.vb
+++ b/Customers/Invoices.aspx.vb
@@ -152,10 +152,12 @@ Partial Class Customers_Default3
                             Absender = txt_Absender.Text
                         Else
                             VERAG_VARIABLES.seterrorcount(1)
+                            lbl_status.ForeColor = Drawing.Color.Red
                             lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error with the Sender"
                         End If
                     Catch ex As Exception
                         VERAG_VARIABLES.seterrorcount(2)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation"
                     End Try
                 End If
@@ -168,10 +170,12 @@ Partial Class Customers_Default3
                             Empfaenger = txt_Empfaenger.Text
                         Else
                             VERAG_VARIABLES.seterrorcount(3)
+                            lbl_status.ForeColor = Drawing.Color.Red
                             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error with the Reciever"
                         End If
                     Catch ex As Exception
                         VERAG_VARIABLES.seterrorcount(4)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation"
                     End Try
                 End If
@@ -184,10 +188,12 @@ Partial Class Customers_Default3
                             KDNAFNR = txt_KdNrAuftrag.Text
                         Else
                             VERAG_VARIABLES.seterrorcount(5)
+                            lbl_status.ForeColor = Drawing.Color.Red
                             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error with the Customer Order number validation"
                         End If
                     Catch ex As Exception
                         VERAG_VARIABLES.seterrorcount(11)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation"
                     End Try
                 End If
@@ -200,10 +206,12 @@ Partial Class Customers_Default3
                             LKWNR = txt_LKW.Text
                         Else
                             VERAG_VARIABLES.seterrorcount(6)
+                            lbl_status.ForeColor = Drawing.Color.Red
                             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error at Validation in LKW number plate field"
                         End If
                     Catch Ex As Exception
                         VERAG_VARIABLES.seterrorcount(12)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation"
                     End Try
                 End If
@@ -217,10 +225,12 @@ Partial Class Customers_Default3
                         Else
                             reNr = "-1"
                             VERAG_VARIABLES.seterrorcount(7)
+                            lbl_status.ForeColor = Drawing.Color.Red
                             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error at the Validation in the invoice number field"
                         End If
                     Catch ex As Exception
                         VERAG_VARIABLES.seterrorcount(13)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error invoice number validation"
                     End Try
                 End If
@@ -233,10 +243,12 @@ Partial Class Customers_Default3
                             Absender = txt_Absender_M.Text
                         Else
                             VERAG_VARIABLES.seterrorcount(1)
+                            lbl_status.ForeColor = Drawing.Color.Red
                             lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error with the Sender"
                         End If
                     Catch ex As Exception
                         VERAG_VARIABLES.seterrorcount(2)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation"
                     End Try
                 End If
@@ -249,10 +261,12 @@ Partial Class Customers_Default3
                             Empfaenger = txt_Empfaenger_M.Text
                         Else
                             VERAG_VARIABLES.seterrorcount(3)
+                            lbl_status.ForeColor = Drawing.Color.Red
                             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error with the Reciever"
                         End If
                     Catch ex As Exception
                         VERAG_VARIABLES.seterrorcount(4)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation"
                     End Try
                 End If
@@ -265,10 +279,12 @@ Partial Class Customers_Default3
                             KDNAFNR = txt_KdNrAuftrag_M.Text
                         Else
                             VERAG_VARIABLES.seterrorcount(5)
+                            lbl_status.ForeColor = Drawing.Color.Red
                             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error with the Customer Order number validation"
                         End If
                     Catch ex As Exception
                         VERAG_VARIABLES.seterrorcount(11)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation"
                     End Try
                 End If
@@ -281,10 +297,12 @@ Partial Class Customers_Default3
                             LKWNR = txt_LKW_M.Text
                         Else
                             VERAG_VARIABLES.seterrorcount(6)
+                            lbl_status.ForeColor = Drawing.Color.Red
                             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error at Validation in LKW number plate field"
                         End If
                     Catch Ex As Exception
                         VERAG_VARIABLES.seterrorcount(12)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation"
                     End Try
                 End If
@@ -298,10 +316,12 @@ Partial Class Customers_Default3
                         Else
                             reNr = "-1"
                             VERAG_VARIABLES.seterrorcount(7)
+                            lbl_status.ForeColor = Drawing.Color.Red
                             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error at the Validation in the invoice number field"
                         End If
                     Catch ex As Exception
                         VERAG_VARIABLES.seterrorcount(13)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error invoice number validation"
                     End Try
                 End If
@@ -315,6 +335,7 @@ Partial Class Customers_Default3
                         pickdate2.Text = datebis.ToShortDateString
                     Catch ex As Exception
                         VERAG_VARIABLES.seterrorcount(14)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error in date time conversions"
                     End Try
                 Else
@@ -323,6 +344,7 @@ Partial Class Customers_Default3
                         datebis = CDate(pickdate2.Text)
                     Catch ex As Exception
                         VERAG_VARIABLES.seterrorcount(14)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error in date time conversions"
                     End Try
                 End If
@@ -334,6 +356,7 @@ Partial Class Customers_Default3
                     valreq_pickdate2.Validate()
                     If valreq_pickdate1.IsValid AndAlso valreq_pickdate2.IsValid Then
                         VERAG_VARIABLES.seterrorcount(15)
+                        lbl_status.ForeColor = Drawing.Color.Red
                         lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error in form validation. Please fill in all fields"
                     End If
                 End If
@@ -401,6 +424,7 @@ Partial Class Customers_Default3
                 End If
             Else
                 VERAG_VARIABLES.seterrorcount(16)
+                lbl_status.ForeColor = Drawing.Color.Red
                 lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error in getting Customer-ID from login"
             End If
             Else
@@ -408,7 +432,7 @@ Partial Class Customers_Default3
             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "The time chosen is newer then today or older than april 2001. Please correct"
         End If
 
-        MsgBox("Test")
+        'MsgBox("Test")
     End Sub
 
     Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
@@ -439,6 +463,7 @@ Partial Class Customers_Default3
     Protected Sub valdaterage_1_ServerValidate(source As Object, args As ServerValidateEventArgs)
         If Date.Parse(pickdate1.Text) < Date.ParseExact("01.04.2001", "dd.MM.yyyy", provider) Then
             VERAG_VARIABLES.seterrorcount(9)
+            lbl_status.ForeColor = Drawing.Color.Red
             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "The chosen time " + pickdate1.Text + " is too early"
         End If
     End Sub
@@ -447,6 +472,7 @@ Partial Class Customers_Default3
 
         If Date.Parse(pickdate2.Text) > Date.ParseExact(Date.Now.ToShortDateString, "dd.MM.yyyy", provider) Then
             VERAG_VARIABLES.seterrorcount(10)
+            lbl_status.ForeColor = Drawing.Color.Red
             lbl_status.Text = VERAG_VARIABLES.geterrornumb + "The chosen time " + pickdate2.Text + " is too far in the future"
         End If
     End Sub