From b506a7acc11ac1c78124a66042aa4940759c46d3 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 20 Dec 2021 08:42:52 +0100
Subject: [PATCH] =?UTF-8?q?Implementierung=20der=20Funktionsk=C3=B6rper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App_Code/WebService.vb | 31 ++++++++++++++++++++----
 Customers/LKWs.aspx    | 54 ++++++++++++++++++++----------------------
 2 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/App_Code/WebService.vb b/App_Code/WebService.vb
index f7a4906..2aec439 100644
--- a/App_Code/WebService.vb
+++ b/App_Code/WebService.vb
@@ -151,19 +151,42 @@ Public Class WebService
         myConn.Close() : Return lstCountries
     End Function
     <WebMethod()>
-    Private Function buildtablerow(page As Page, tbl As Table) As Table
+    Private Function buildtablerow(tbl As Table, SDLNumber As String, Bezstr As String, Datgueltigbisstr As String, KartNr As String) As Table
 
         Dim row As TableRow = New TableRow
         Dim c1 As TableCell = New TableCell
         Dim c2 As TableCell = New TableCell
         Dim c3 As TableCell = New TableCell
+        Dim c4 As TableCell = New TableCell
 
-        c1.Text = "ID"
-        c2.Text = "Stadt"
-        c3.Text = "Persona"
+        c1.Text = SDLNumber
+        c2.Text = Bezstr
+        c3.Text = Datgueltigbisstr
+        c4.Text = KartNr
         row.Cells.Add(c1)
         row.Cells.Add(c2)
         row.Cells.Add(c3)
+        row.Cells.Add(c4)
+        tbl.Rows.Add(row)
+        Return tbl
+    End Function
+    <WebMethod()>
+    Private Function buildtablerow_M(tbl As Table, SDLNumber_M As String, Bezstr_M As String, Datgueltigbisstr_M As String, KartNr_M As String) As Table
+
+        Dim row As TableRow = New TableRow
+        Dim c1 As TableCell = New TableCell
+        Dim c2 As TableCell = New TableCell
+        Dim c3 As TableCell = New TableCell
+        Dim c4 As TableCell = New TableCell
+
+        c1.Text = SDLNumber_M
+        c2.Text = Bezstr_M
+        c3.Text = Datgueltigbisstr_M
+        c4.Text = KartNr_M
+        row.Cells.Add(c1)
+        row.Cells.Add(c2)
+        row.Cells.Add(c3)
+        row.Cells.Add(c4)
         tbl.Rows.Add(row)
         Return tbl
     End Function
diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index 40b8d6d..6ee753b 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -143,11 +143,11 @@
     <script type="text/javascript">  
         
         function TableRow_Click(Nat, Kennzeichen) {
-
+            debugger
             var arr = new Array();
             var convertarr;
 
-            arr.push(BuildAddress(SDL, Bez, gueltigBis, KartNr));
+            arr.push(buildtablerow(<%=tbl_mainpage%>,SDL, Bez, gueltigBis, KartNr));
             convertarr = JSON.stringfy(arr);
 
             $.ajax({
@@ -158,23 +158,24 @@
                 success: function (arr) {
                     var resultarr = JSON.parse(arr);
                     // Do something with result, example: result[0].City
-   
 
-                let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder.ClientID%>")
-                let natplaceholder = document.getElementById("<%=lbl_Placeholder.ClientID%>")            
-                let table = document.getElementById("<%=tbl_mainpage.ClientID%>")
-                Speditionslabel.textContent = Kennzeichen;
-                natplaceholder.textContent = Nat;
-                var SDL = <%=VERAG_VARIABLES.RandomInteger(Math.Pow(2, 15), Math.Pow(2, 20)).ToString%>;
-                var Bez = "Testbezeichnung Diesel 2l";
-                var Datumgueltigbis = "20.04.2025";
-                var KartenNr = "303102350351310351313";
-                var rowCount = table.rows.length;
-            
-                for (var i = rowCount - 1; i > 0; i--) {
-                    table.deleteRow(i);
-                }
-                    buildtable(<%=VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6))%>, SDL, Bez, Datumgueltigbis, KartenNr)
+                    for (let i = 0; i < resultarr.length; i++) {
+                        let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder.ClientID%>")
+                        let natplaceholder = document.getElementById("<%=lbl_Placeholder.ClientID%>")
+                        let table = document.getElementById("<%=tbl_mainpage.ClientID%>")
+                        Speditionslabel.textContent = Kennzeichen;
+                        natplaceholder.textContent = Nat;
+                        var SDL = resultarr[i].SDLNumber<%'=VERAG_VARIABLES.RandomInteger(Math.Pow(2, 15), Math.Pow(2, 20)).ToString%>;
+                        var Bez = resultarr[i].Bezstr;
+                        var Datumgueltigbis = resultarr[i].Datgueltigbisstr;
+                        var KartenNr = resultarr[i].KartNr;
+                        var rowCount = table.rows.length;
+
+                        for (let i = rowCount - 1; i > 0; i--) {
+                            table.deleteRow(i);
+                        }
+                        buildtable(resultarr.length,SDL, Bez, Datumgueltigbis, KartenNr)
+                    }
                 }
            });
     }
@@ -183,12 +184,12 @@
             var arr_M = new Array();
             var convertArr_M;
 
-            address.push(BuildArr_M(SDL_M, Bez_M, gueltigBis, KartNr));
+            arr_M.push(buildtablerow(<%=tbl_mainpage_M%>, SDL, Bez, gueltigBis, KartNr));
             convertedArr_M = JSON.stringfy(arr_M);
 
             $.ajax({
                 url: '<%= Page.ResolveUrl("~/Services/Location.aspx") %>',
-                data: { Address: convertedArr_M },
+                data: { Address: convertArr_M },
                 type: 'POST',
 
                 success: function (arr_M) {
@@ -201,18 +202,15 @@
                     let table_M = document.getElementById("<%=tbl_mainpage_M.ClientID%>")
                     Speditionslabel.textContent = Kennzeichen;
                     natplaceholder.textContent = Nat;
-                    var SDL_M = "7544514114";
-                    var Bez_M = "Testbezeichnung Diesel 2l";
-                    var Datumgueltigbis_M = "20.04.2025";
-                    var KartenNr_M = "303102350351310351313";
+                    var SDL_M = resultArr_M[i].SDLNumber_M;
+                    var Bez_M = resultArr_M[i].Bezstr_M;
+                    var Datumgueltigbis_M = resultArr_M[i].Datgueltigbisstr_M;
+                    var KartenNr_M = resultArr_M[i].KartNr_M;
                     var rowCount_M = table_M.rows.length;
                     for (var i = rowCount_M - 1; i > 0; i--) {
                         table_M.deleteRow(i);
                     }
-
-
-
-                    buildtable_M(<%=VERAG_VARIABLES.RandomInteger(Math.Pow(2, 4), Math.Pow(2, 17))%>, SDL_M, Bez_M, Datumgueltigbis_M, KartenNr_M)
+                    buildtable_M(resultArr_M.length,SDL_M, Bez_M, Datumgueltigbis_M, KartenNr_M)
                 }
             });
         }