From 8971416b8143c8488da980918438baa8788b733f Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 9 Nov 2021 15:58:21 +0100
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20zur=20Implementierung=20einer?=
 =?UTF-8?q?=20automatsicnen=20Autovervollst=C3=A4ndigungs=20"KI"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App_Code/WebService.vb         |  2 +-
 Customers/CustomsAviso.aspx    | 11 +++++------
 Customers/CustomsAviso.aspx.vb |  2 +-
 Customers/Invoices.aspx        |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/App_Code/WebService.vb b/App_Code/WebService.vb
index ea66b4d..adb5e3e 100644
--- a/App_Code/WebService.vb
+++ b/App_Code/WebService.vb
@@ -12,7 +12,7 @@ Public Class WebService
     Inherits System.Web.Services.WebService
 
     <WebMethod()>
-    Public Function Show(ByVal sLookUP As String) As List(Of String)
+    Public Function ShowLKWs(ByVal sLookUP As String) As List(Of String)
         Dim lstCountries As New List(Of String)()
         Dim Connectionstring As String = String.Empty
 
diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 8de2010..788a44b 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -151,12 +151,12 @@
                                                               <div id="rowcol1" class="col-12">    
                                                                   <form class="myform" id="commentForm">
                                                                     <asp:Label ID="lbl_LKWNr" runat="server" Text="LKW Nr"></asp:Label>  
-                                                                     <script language="javascript" type="text/javascript">
+                                                                   <!--  <script language="javascript" type="text/javascript">
                                                                          $(function () {
                                                                              $('#<%=txt_LKWNr.ClientID%>').autocomplete({
             source: function (request, response) {
                 $.ajax({
-                    url: "CustomsAviso.aspx/GetCompanyName",
+                    url: "WebService.asmx/ShowLKWs",
                     data: "{ 'pre':'" + request.term + "'}",
                     dataType: "json",
                     type: "POST",
@@ -173,10 +173,9 @@
             }
         });
     });
-                                                                     </script>
-                                                                    <asp:TextBox ID="txt_LKWNr" runat="server" AutoCompleteType="Search" 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!" ForeColor="Red" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                                                                     </script>-->
+                                                                    <asp:TextBox ID="txt_LKWNr" runat="server" AutoCompleteType="Search" 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]{5,30})" Display="Dynamic" ErrorMessage="Falsches Kennzeichenformat!" ForeColor="Red" 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" AutoCompleteType="Search" 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]{7}" Display="Dynamic" ForeColor="Red" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index b12e96c..b4c20d8 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -495,7 +495,7 @@ 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 String.IsNullOrEmpty(txt_LKWNr_M.Text) = False Then
+            ElseIf txt_LKWNr_M.Text IsNot "" Then
                 txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regexval_txt_LKWNr_M.Enabled = True
                 regexval_txt_LKWNr_M.Validate()
diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx
index 0ced49c..a84f244 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -222,7 +222,7 @@
         $("#txt_LKW").autocomplete({
             source: function(request, response) {
                 $.ajax({
-                    url: "WebService.asmx/Show",
+                    url: "WebService.asmx/ShowLKWs",
                     data: "{ 'sLookUP': '" + request.term + "' }",
                     dataType: "json",
                     type: "POST",