From 31865eb7887bcdfb59c46ebc46fc873fcb1aac8d Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 14 Dec 2021 16:38:31 +0100
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20Tabelle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/LKWs.aspx    | 89 ++++++++++++++++++++++++------------------
 Customers/LKWs.aspx.vb |  6 ++-
 2 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index ed68fb0..47cb8a3 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -157,20 +157,62 @@
                 tb.deleteRow(1);
             }
 
-            const arr2 = Array.from(listtemp.split(";"));            
+            
             //debugger            
                 //alert(Arr)
-                for (let arrint of arr2) {
-                    let SDLNr = arrint
-                    let Bez = arrint
-                    let Gueltigbis = arrint
-                    let KartenNr = arrint
+            for (let outertabl of Array.from(listtemp.split("-"))) {
+                for (let arrint of Array.from(outertabl.split(";"))) {
+                    for (let innertable = 0; innertable < arrint.length; innertable++) {
+                        let SDLNr = arrint[innertable];
+                        innertable++;
+                        let Bez = arrint[innertable];
+                        innertable++;
+                        let Gueltigbis = arrint[innertable];
+                        innertable++;
+                        let KartenNr = arrint[innertable];
+                        //alert(SDLNr)
+                        //alert(Bez)
+                        //alert(Gueltigbis)
+                        //alert(KartenNr)               
+                        
+                    }
+                    addRow(<%=tbl_mainpage.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
+                }               
+            }
+        }
+        function TableRowClick_M(listtemp_M, Kennzeichen, Nat) {
+            let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder_M.ClientID%>")
+            let natplaceholder = document.getElementById("<%=lbl_Placeholder_M.ClientID%>")            
+            
+            Speditionslabel.textContent = Kennzeichen
+            natplaceholder.textContent = Nat
+
+            var tb = document.getElementById("<%=tbl_mainpage_M.ClientID%>");
+            while (tb.rows.length > 1) {
+                tb.deleteRow(1);
+            }
+
+            
+            //debugger            
+                //alert(Arr)
+            for (let outertable_M of Array.from(listtemp_M.split("-"))) {
+                for (let arrint_M of Array.from(outertable_M.split(";")))
+                for (let innertable = 0; innertable < arrint_M.length; innertable++) {
+                    
+                    let SDLNr = arrint_M[innertable]
+                    innertable++;
+                    let Bez = arrint_M[innertable]
+                    innertable++;
+                    let Gueltigbis = arrint_M[innertable]
+                    innertable++;
+                    let KartenNr = arrint_M[innertable]
                     //alert(SDLNr)
                     //alert(Bez)
                     //alert(Gueltigbis)
-                    //alert(KartenNr)                    
-                    addRow(<%=tbl_mainpage.ClientID%>,SDLNr, Bez, Gueltigbis, KartenNr)                    
-                }            
+                    //alert(KartenNr)                      
+                    }
+                addRow(<%=tbl_mainpage_M.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
+            }
         }
         function addRow(table1,par1,par2,par3,par4) {            
             let tableRef = table1;
@@ -207,33 +249,6 @@
             newCell1.innerHTML = par2
             newCell2.innerHTML = par3
             newCell3.innerHTML = par4
-        }
-        function TableRowClick_M(listtemp_M, Kennzeichen, Nat) {
-            let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder.ClientID%>")
-            let natplaceholder = document.getElementById("<%=lbl_Placeholder.ClientID%>")            
-            
-            Speditionslabel.textContent = Kennzeichen
-            natplaceholder.textContent = Nat
-
-            var tb = document.getElementById("<%=tbl_mainpage_M.ClientID%>");
-            while (tb.rows.length > 1) {
-                tb.deleteRow(1);
-            }
-
-            const arr2 = Array.from(listtemp_M.split(";"));            
-            //debugger            
-                //alert(Arr)
-                for (let arrint_M of arr2) {
-                    let SDLNr = arrint_M
-                    let Bez = arrint_M
-                    let Gueltigbis = arrint_M
-                    let KartenNr = arrint_M
-                    //alert(SDLNr)
-                    //alert(Bez)
-                    //alert(Gueltigbis)
-                    //alert(KartenNr)                    
-                addRow(<%=tbl_mainpage_M.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
-            }
-        }        
+        }                
     </script>
 </asp:Content>
\ No newline at end of file
diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb
index 3870757..6aeb876 100644
--- a/Customers/LKWs.aspx.vb
+++ b/Customers/LKWs.aspx.vb
@@ -345,7 +345,11 @@ Partial Class LKWS
             Else
                 strtemp2 = l3.Nationalität
             End If
-            tr1_M.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & list3.ToString & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)")
+            Dim str2temptemp = String.Empty
+            For Each Ltenp In list3
+                str2temptemp = String.Join("-", Ltenp)
+            Next
+            tr1_M.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & str2temptemp & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)")
             tbl_2.Rows.Add(tr1_M)
             cnt += 1
         Next