From 1cf21831414148eaf0f2882da93c945fa82631a7 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 5 Oct 2021 11:58:13 +0200
Subject: [PATCH] Validatoren wurden erweitert.

---
 Customers/CustomsAviso.aspx     | 21 ++++++----
 Customers/CustomsAviso.aspx.vb  | 16 ++++++++
 css/Customers/CustomerAVISO.css | 73 +++++++++++++++++++++++++++------
 3 files changed, 90 insertions(+), 20 deletions(-)

diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index d749ce7..c72e2d0 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -136,19 +136,19 @@
                                                                   <form class="myform" id="commentForm">
                                                                     <asp:Label ID="lbl_LKWNr" runat="server" Text="LKW Nr"></asp:Label>                                        
                                                                     <asp:TextBox ID="txt_LKWNr" runat="server" style="width:117px; margin-left:25px;" OnTextChanged="txt_LKWNr_TextChanged"></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="Falsche Eingabe!"></asp:RegularExpressionValidator>
+                                                                    <asp:RegularExpressionValidator ControlToValidate="txt_LKWNr" runat="server" ID="regexval_txt_LKW" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{30})\d$" Display="Dynamic" ErrorMessage="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;" OnTextChanged="txt_KdNrAuftrag_TextChanged"></asp:TextBox> 
-                                                                      <asp:RegularExpressionValidator ControlToValidate="txt_KdNrAuftrag" runat="server" ID="regexval_txt_KdNrAuftrag" ValidationGroup="additional_TXTs" ValidationExpression="[0-9]{1,7}" Display="Dynamic" ErrorMessage="Falsche Eingabe!"></asp:RegularExpressionValidator>
+                                                                    <asp:RegularExpressionValidator ControlToValidate="txt_KdNrAuftrag" runat="server" ID="regexval_txt_KdNrAuftrag" ValidationGroup="additional_TXTs" ValidationExpression="[0-9]{7}" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                                                  </form>
                                                              </div>
                                                              <div  id="rowcol2" class="col-12">
                                                                     <asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label>                              
                                                                     <asp:TextBox ID="txt_Absender" runat="server" style="width:155px; margin-left:8px;" OnTextChanged="txt_Absender_TextChanged"></asp:TextBox>             
-                                                                     <asp:RegularExpressionValidator ControlToValidate="txt_Absender" runat="server" ID="regexval_txt_Absender" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic" ErrorMessage="Falsche Eingabe!"></asp:RegularExpressionValidator>
+                                                                    <asp:RegularExpressionValidator ControlToValidate="txt_Absender" runat="server" ID="regexval_txt_Absender" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                                                     <asp:Label ID="lbl_Empfaenger" runat="server" Text="Empfänger" style="margin-left:9px"></asp:Label>                                         
                                                                     <asp:TextBox ID="txt_Empfaenger" runat="server" style="width:155px; margin-left:52px;" OnTextChanged="txt_Empfaenger_TextChanged"></asp:TextBox>
-                                                                    <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger" runat="server" ID="regexval_txt_Empfaenger" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic" ErrorMessage="Falsche Eingabe!"></asp:RegularExpressionValidator>
+                                                                    <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger" runat="server" ID="regexval_txt_Empfaenger" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                                             </div>                                                             
                                                              </div>
                                                                   </div>
@@ -156,19 +156,24 @@
                                                                 <div id="rowcol3" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
                                                                  <div class="row">
                                                                     <asp:Label ID="lbl_LKWNr_M" runat="server" Text="LKW Nr"></asp:Label>                                        
-                                                                    <asp:TextBox ID="txt_LKWNr_M" runat="server" style="width:117px; margin-left:25px;"></asp:TextBox>                                                                     
+                                                                    <asp:TextBox ID="txt_LKWNr_M" runat="server" style="width:117px; margin-left:25px;" OnTextChanged="txt_LKWNr_M_TextChanged"></asp:TextBox> 
+                                                                     <asp:RegularExpressionValidator ControlToValidate="txt_LKWNr" runat="server" ID="regexval_txt_LKWNr_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{30})\d$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                                                  </div>
                                                                  <div id="rowcol4" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
+
                                                                         <asp:Label ID="lbl_KdNrAuftrag_M" runat="server" Text="Kunden Auftrags Nr" style="margin-left:45px"></asp:Label>                                                                  
-                                                                        <asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" style="width:117px; margin-left:6px;"></asp:TextBox>
+                                                                        <asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" style="width:117px; margin-left:6px;" OnTextChanged="txt_KdNrAuftrag_M_TextChanged"></asp:TextBox>
+                                                                     <asp:RegularExpressionValidator ControlToValidate="txt_KdNrAuftrag_M" runat="server" ID="regval_txt_KdNrAuftrag_M" ValidationGroup="additional_TXTs" ValidationExpression="^[0-9]{7}$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                                                     </div>
                                                                  <div  id="rowcol5" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
                                                                         <asp:Label ID="lbl_Absender_M" runat="server" Text="Absender"></asp:Label>                              
-                                                                        <asp:TextBox ID="txt_Absender_M" runat="server" style="width:155px; margin-left:8px;"></asp:TextBox> 
+                                                                        <asp:TextBox ID="txt_Absender_M" runat="server" style="width:155px; margin-left:8px;" OnTextChanged="txt_Absender_M_TextChanged"></asp:TextBox> 
+                                                                     <asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regval_txt_Absender_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                                                  </div>
                                                                     <div id="rowcol6" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
                                                                         <asp:Label ID="lbl_Empfaenger_M" runat="server" Text="Empfänger" style="margin-left:9px"></asp:Label>                                         
-                                                                        <asp:TextBox ID="txt_Empfaenger_M" runat="server" style="width:155px; margin-left:52px;"></asp:TextBox>
+                                                                        <asp:TextBox ID="txt_Empfaenger_M" runat="server" style="width:155px; margin-left:52px;" OnTextChanged="txt_Empfaenger_M_TextChanged"></asp:TextBox>
+                                                                        <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="regval_txt_Empfaenger_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                                                     </div>                                                                     
                                                              </div>
                                                            </div>
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 975c81b..9278d43 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -510,4 +510,20 @@ Partial Class Kundenbereich_Default
     Protected Sub txt_Empfaenger_TextChanged(sender As Object, e As EventArgs)
         regexval_txt_Empfaenger.Validate()
     End Sub
+
+    Protected Sub txt_LKWNr_M_TextChanged(sender As Object, e As EventArgs)
+        regexval_txt_LKWNr_M.Validate()
+    End Sub
+
+    Protected Sub txt_Empfaenger_M_TextChanged(sender As Object, e As EventArgs)
+        regval_txt_Empfaenger_M.Validate()
+    End Sub
+
+    Protected Sub txt_Absender_M_TextChanged(sender As Object, e As EventArgs)
+        regval_txt_Absender_M.Validate()
+    End Sub
+
+    Protected Sub txt_KdNrAuftrag_M_TextChanged(sender As Object, e As EventArgs)
+        regval_txt_KdNrAuftrag_M.Validate()
+    End Sub
 End Class
\ No newline at end of file
diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css
index c0516a2..cb5c156 100644
--- a/css/Customers/CustomerAVISO.css
+++ b/css/Customers/CustomerAVISO.css
@@ -165,13 +165,6 @@ hr{
     border: 1px solid red;
     background-color:lightcoral;
 }
-#txt_LKWNr:valid {
-    color: black;
-}
-#txt_LKWNr:invalid {
-    border: 1px solid red;
-    background-color: lightcoral;
-}
 @media (max-width: 558.98px) {
     h1 {
         color: #043381;
@@ -181,22 +174,22 @@ hr{
         width: 53%;
         border:1px solid grey;
     }
-    #txt_Absender {
+    #txt_Absender_M {
         width: 250px;
         padding-right: -2px;
         padding-left: 60px;
     }
-    #txt_Empfaenger {
+    #txt_Empfaenger_M {
         width: 250px;
         padding-right: -2px;
         padding-left: 60px;
     }
-    #txt_LKWNr {
+    #txt_LKWNr_M {
         width: 250px;
         padding-right: -2px;
         padding-left: 60px;
     }
-    #txt_KdNrAuftrag {
+    #txt_KdNrAuftrag_M {
         width: 250px;
         padding-right: -2px;
         padding-left: 60px;
@@ -244,6 +237,35 @@ hr{
         #pickdate1 {
             border: 1px solid #000000;
         }
+    #txt_LKWNr_M:valid {
+        color: black;
+    }
+    #txt_LKWNr_M:invalid {
+        border: 1px solid red;
+        background-color: lightcoral;
+    }
+    #txt_KdNrAuftrag_M:valid {
+        color: black;
+    }
+    #txt_KdNrAuftrag_M:invalid {
+        border: 1px solid red;
+        background-color: lightcoral;
+    }
+    #txt_Absender_M:valid {
+        color: black;
+    }
+    #txt_Absender_M:invalid {
+        border: 1px solid red;
+        background-color: lightcoral;
+    }
+    #txt_Empfaenger_M:valid {
+        color: black;
+    }
+
+    #txt_Empfaenger_M:invalid {
+        border: 1px solid red;
+        background-color: lightcoral;
+    }
 }
 @media (min-width: 558.98px) {
     #txt_Absender {
@@ -260,5 +282,32 @@ hr{
     }
     #normaltable {
         width: 100%;
-    }    
+    }
+    #txt_LKWNr:valid {
+        color: black;
+    }
+    #txt_LKWNr:invalid {
+        border: 1px solid red;
+        background-color: lightcoral;
+    }
+    #txt_KdNrAuftrag:valid {
+        color: black;
+    }
+    #txt_KdNrAuftrag:invalid {
+        border: 1px solid red;
+        background-color: lightcoral;
+    }
+    #txt_Absender:valid {
+        color: black;
+    }
+    #txt_Absender:invalid {
+        border: 1px solid red;
+        background-color: lightcoral;
+    }    #txt_Empfaenger:valid {
+        color: black;
+    }
+    #txt_Empfaenger:invalid {
+        border: 1px solid red;
+        background-color: lightcoral;
+    }
 }