From cd960f46a17d6c9e03adf07ad5a87a60ab8a96ae Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Fri, 29 Oct 2021 16:36:18 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungenb=20Logik=20Programmablauf=20und?=
 =?UTF-8?q?=20Codedesign=20sowie=20GUI-Verbesserungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/Invoices.aspx    |  10 ++--
 Customers/Invoices.aspx.vb | 120 ++++++++++++++++++-------------------
 2 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx
index 28ee6be..f0a2e09 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -113,17 +113,17 @@
                                                                         <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>
+                                                                        <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>
                                                                     </form>
                                                                 </div>
                                                                 <div id="rowcol2" class="col-12">
                                                                      <form class="myform" id="commentform_2">
                                                                         <asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label>
                                                                         <asp:TextBox ID="txt_Absender" runat="server" style="width:117px;margin-left:78px"></asp:TextBox> 
-                                                                        <asp:RegularExpressionValidator ControlToValidate="txt_Absender" runat="server" ID="regexval_txt_Absender" ValidationGroup="additional_TXTs" ValidationExpression="([A-Z0-9]{90})" Display="Dynamic" ErrorMessage="Absender: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator> 
+                                                                        <asp:RegularExpressionValidator ControlToValidate="txt_Absender" runat="server" ID="regexval_txt_Absender" ValidationGroup="additional_TXTs" ValidationExpression="[a-zA-Z0-9]{90}" Display="Dynamic" ErrorMessage="Absender: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator> 
                                                                         <asp:Label ID="lbl_Empfaenger" runat="server" Text="Empfaenger" style="margin-left:45px"></asp:Label>
                                                                         <asp:TextBox id="txt_Empfaenger"  runat="server" style="width:155px;margin-left:49px" ></asp:TextBox>
-                                                                        <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger" runat="server" ID="regexval_txt_Empfaenger" ValidationGroup="additional_TXTs" ValidationExpression="([A-Z0-9]{90})" Display="Dynamic" ErrorMessage="Empfänger: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                                                                        <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger" runat="server" ID="regexval_txt_Empfaenger" ValidationGroup="additional_TXTs" ValidationExpression="[a-zA-Z0-9]{90}" Display="Dynamic" ErrorMessage="Empfänger: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                                                     </form>
                                                                 </div>
                                                                 <div id="rowcol3" class="col-12">
@@ -152,10 +152,10 @@
                                                                     <form class="myform_M" id="commentform_5">
                                                                         <asp:Label ID="lbl_Absender_M" runat="server" Text="Absender"></asp:Label>
                                                                         <asp:TextBox ID="txt_Absender_M" runat="server" style="width:105px;margin-left:85px"></asp:TextBox> 
-                                                                        <asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regexval_txt_Absender_M" ValidationGroup="additional_TXTs" ValidationExpression="([A-Z0-9]{90})" Display="Dynamic" ErrorMessage="Absender: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator> 
+                                                                        <asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regexval_txt_Absender_M" ValidationGroup="additional_TXTs" ValidationExpression="[a-zA-Z0-9]{90}" Display="Dynamic" ErrorMessage="Absender: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator> 
                                                                         <asp:Label ID="lbl_Empfaenger_M" runat="server" Text="Empfaenger"></asp:Label>
                                                                         <asp:TextBox id="txt_Empfaenger_M"  runat="server" style="width:105px;margin-left:65px"></asp:TextBox>
-                                                                        <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="regexval_txt_Empfaenger_M" ValidationGroup="additional_TXTs" ValidationExpression="([A-Z0-9]{90})" Display="Dynamic" ErrorMessage="Empfänger: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                                                                        <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="regexval_txt_Empfaenger_M" ValidationGroup="additional_TXTs" ValidationExpression="[a-zA-Z0-9]{90}" Display="Dynamic" ErrorMessage="Empfänger: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                                                     </form>
                                                                </div>
                                                                 <div id="rowcol6" class="col-12 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb
index f99e71d..36e1494 100644
--- a/Customers/Invoices.aspx.vb
+++ b/Customers/Invoices.aspx.vb
@@ -171,66 +171,66 @@ Partial Class Customers_Invoices
             '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
-                    Try
-                        If regexval_txt_Absender.IsValid = True Then
-                            Absender = txt_Absender.Text
-                        Else
-                            Absender = String.Empty
-                        End If
-                    Catch ex As FormatException
-                        lbl_status.Text = ex.Message
-                    End Try
-                End If
-                If Not String.IsNullOrEmpty(txt_Empfaenger.Text) Then
-                    regexval_txt_Empfaenger.Enabled = True
-                    regexval_txt_Empfaenger.Validate()
-                    txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-                    Try
-                        If regexval_txt_Empfaenger.IsValid = True Then
-                            Empfaenger = txt_Empfaenger.Text
-                        Else
-                            Empfaenger = String.Empty
-                        End If
-                    Catch ex As FormatException
-                        lbl_status.Text = ex.Message
-                    End Try
-                End If
-                If Not String.IsNullOrEmpty(txt_KdNrAuftrag.Text) Then
-                    regexval_txt_KdNrAuftrag.Enabled = True
-                    regexval_txt_KdNrAuftrag.Validate()
-                    txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-                    Try
-                        If regexval_txt_KdNrAuftrag.IsValid = True Then
-                            KDNAFNR = txt_KdNrAuftrag.Text
-                        Else
-                            KDNAFNR = String.Empty
-                        End If
-                    Catch ex As FormatException
-                        lbl_status.Text = ex.Message
-                    End Try
-                End If
-                If Not String.IsNullOrEmpty(txt_LKWNr.Text) Then
-                    regexval_txt_LKW.Enabled = True
-                    regexval_txt_LKW.Validate()
-                    txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-                    Try
-                        If regexval_txt_LKW.IsValid = True Then
-                            LKWNR = txt_LKWNr.Text
-                        Else
-                            LKWNR = String.Empty
-                        End If
-                    Catch ex As FormatException
-                        lbl_status.Text = ex.Message
-                    End Try
-                End If
-                If Not String.IsNullOrEmpty(txt_ReNr.Text) Then
-                    regexval_txt_ReNr.Enabled = True
-                    regexval_txt_ReNr.Validate()
-                    txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-                    Try
+                txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+                regexval_txt_Absender.Enabled = True
+                regexval_txt_Absender.Validate()
+                Try
+                    If regexval_txt_Absender.IsValid = True Then
+                        Absender = txt_Absender.Text
+                    Else
+                        Absender = String.Empty
+                    End If
+                Catch ex As FormatException
+                    lbl_status.Text = ex.Message
+                End Try
+            End If
+            If Not String.IsNullOrEmpty(txt_Empfaenger.Text) Then
+                txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+                regexval_txt_Empfaenger.Enabled = True
+                regexval_txt_Empfaenger.Validate()
+                Try
+                    If regexval_txt_Empfaenger.IsValid = True Then
+                        Empfaenger = txt_Empfaenger.Text
+                    Else
+                        Empfaenger = String.Empty
+                    End If
+                Catch ex As FormatException
+                    lbl_status.Text = ex.Message
+                End Try
+            End If
+            If Not String.IsNullOrEmpty(txt_KdNrAuftrag.Text) Then
+                txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+                regexval_txt_KdNrAuftrag.Enabled = True
+                regexval_txt_KdNrAuftrag.Validate()
+                Try
+                    If regexval_txt_KdNrAuftrag.IsValid = True Then
+                        KDNAFNR = txt_KdNrAuftrag.Text
+                    Else
+                        KDNAFNR = String.Empty
+                    End If
+                Catch ex As FormatException
+                    lbl_status.Text = ex.Message
+                End Try
+            End If
+            If Not String.IsNullOrEmpty(txt_LKWNr.Text) Then
+                txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+                regexval_txt_LKW.Enabled = True
+                regexval_txt_LKW.Validate()
+                Try
+                    If regexval_txt_LKW.IsValid = True Then
+                        LKWNR = txt_LKWNr.Text
+                    Else
+                        LKWNR = String.Empty
+                    End If
+                Catch ex As FormatException
+                    lbl_status.Text = ex.Message
+                End Try
+            End If
+            If Not String.IsNullOrEmpty(txt_ReNr.Text) Then
+                txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+                regexval_txt_ReNr.Enabled = True
+                regexval_txt_ReNr.Validate()
+                Try
                         If regexval_txt_ReNr.IsValid = True Then
                             reNr = txt_ReNr.Text
                         Else