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

---
 Customers/LKWs.aspx    | 69 ++++++++++++++++++++----------------------
 Customers/LKWs.aspx.vb |  2 ++
 2 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index 529f6b7..5a6624c 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -68,8 +68,7 @@
                                  <asp:Button ID="btn_Suchen" OnClick="btn_Suchen_Click" runat="server" Text="Suchen" style="margin-left:5px"/> </div>
                             <div class="col-9">       
                                 <div class="col-9"style="height:10px;"></div>                               
-                              <div class="flex-col-9">
-                                  <asp:Table ID="Table1" runat="server"></asp:Table>
+                              <div class="flex-col-9">                                 
                                   <asp:Table ID="tbl_sidemenue" runat="server" CssClass="table table-striped" style="width:310px;margin-left:-32px;">
                                       <asp:TableHeaderRow style="background-color:#043381;color:#fff;font-size:0.86em"><asp:TableHeaderCell ID="tbhc_KFZKennz">KFZ-Kennzeichen</asp:TableHeaderCell><asp:TableHeaderCell ID="tbhc_Nat">Nat.</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Verk">Verk</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Kz">KZ-An</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Verm">Vermerk</asp:TableHeaderCell></asp:TableHeaderRow>
                                   </asp:Table>                                  
@@ -88,9 +87,9 @@
                                  <asp:Label ID="lbl_SDL" runat="server" Font-Size="1.331em" style="color:#043381;font-weight:500">SDL-Leistungen:</asp:Label>
                             </div>
                               <div class="col-12"style="height:10px;"></div>
-                            <div id="conovertab" class="col-12" style="margin-left:-10px;background-color:#fff;overflow-y:auto;height:fit-content">
-                                <asp:Table ID="tbl_mainpage" runat="server" Width="100%" style="overflow-y:auto;height:312px;" CssClass="table table-striped col-12">
-                                    <asp:TableHeaderRow ID="headrow1" runat="server" style="background-color:#043381;color:#fff"><asp:TableHeaderCell ID="tblhc_SDLNr">SDL-Nr</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Bez">Bezeichnung</asp:TableHeaderCell><asp:TableHeaderCell ID="tbl_gueltig">Gültig Bis</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_KarteNr">Karten-Nummer</asp:TableHeaderCell></asp:TableHeaderRow>
+                            <div id="conovertab" class="col-12" style="margin-left:-10px;background-color:#fff;overflow-y:auto;">
+                                <asp:Table ID="tbl_mainpage" runat="server" Width="100%" style="background-color:#fff;overflow-y:auto;" CssClass="table table-striped col-12">
+                                    <asp:TableHeaderRow ID="headrow1" runat="server" style="background-color:#043381;color:#fff;height:10px"><asp:TableHeaderCell ID="tblhc_SDLNr">SDL-Nr</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Bez">Bezeichnung</asp:TableHeaderCell><asp:TableHeaderCell ID="tbl_gueltig">Gültig Bis</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_KarteNr">Karten-Nummer</asp:TableHeaderCell></asp:TableHeaderRow>
                                </asp:Table>
                             </div>
                         </div>                          
@@ -147,19 +146,17 @@
     <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>  
     <script>
         function TableRowClick(list, Kennzeichen, Nat) {
-            debugger            
-            var table = document.getElementById("<%=tbl_mainpage.ClientID%>");
+            debugger                        
             var Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder.ClientID%>")
             var natplaceholder = document.getElementById("<%=lbl_Placeholder.ClientID%>")            
             
             Speditionslabel.textContent = Kennzeichen
             natplaceholder.textContent = Nat           
-            
-            for (let i = 0; i < list.length; i++) {
-                const Arr = list(i).split(";");
-                for (let arrint = 0; arrint < list.length; arrint++) {
-                    var SDLNr = Arr[arrint];
-                    alert(SD)
+            const arr2 = list.split(",", 4);
+            for (let i = 0; i < arr2.length; i++) {
+                const Arr = list(i).split(";",4);
+                for (let arrint = 0; arrint < arr2.length; arrint++) {
+                    var SDLNr = Arr[arrint];                    
                     arrint++;
                     var Bez = Arr[arrint];
                     arrint++;
@@ -171,13 +168,13 @@
                     alert(Bez)
                     alert(Gueltigbis)
                     alert(KartenNr)
-                    addRow(<%=tbl_2.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
+                    addRow(SDLNr, Bez, Gueltigbis, KartenNr)
                     arrint;
                 }            
             }
         }
-        function addRow(tableID,par1,par2,par3,par4) {            
-            let tableRef = document.getElementById(tableID);
+        function addRow(par1,par2,par3,par4) {            
+            let tableRef = document.getElementById(<%=tbl_mainpage.ClientID%>);
                         
             let newRow = tableRef.insertRow(-1);
 
@@ -191,14 +188,29 @@
             newCell2.innerHTML = par3
             newCell3.innerHTML = par4
         }
-        function TableRowClick_M(list, Kennzeichen, Nat) {            
-            var table = document.getElementById("<%=tbl_2.ClientID%>");
+        function addRow_tab2(par1, par2, par3, par4) {
+            let tableRef = document.getElementById(<%=tbl_mainpage_M.ClientID%>);
+
+            let newRow = tableRef.insertRow(-1);
+
+            let newCell = newRow.insertCell(0);
+            let newCell1 = newRow.insertCell(1)
+            let newCell2 = newRow.insertCell(2)
+            let newCell3 = newRow.insertCell(3)
+
+            newCell.innerHTML = par1
+            newCell1.innerHTML = par2
+            newCell2.innerHTML = par3
+            newCell3.innerHTML = par4
+        }
+        function TableRowClick_M(list, Kennzeichen, Nat) {                        
             var Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder_M.ClientID%>")
             var natplaceholder = document.getElementById("<%=lbl_Placeholder_M.ClientID%>")
 
             Speditionslabel.textContent = Kennzeichen
             natplaceholder.textContent = Nat
-            for (let i = 0; i < list.length; i++) {
+            const arr2 = list.split(",", 4);
+            for (let i = 0; i < arr2.length; i++) {
                 const Arr = list(i).split(";");
                 for (let arrint = 0; arrint < 5; arrint++) {
                     var SDLNr = Arr[arrint];
@@ -213,26 +225,11 @@
                     alert(Bez)
                     alert(Gueltigbis)
                     alert(KartenNr)
-                    addRow(<%=tbl_2.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
+                    addRow(SDLNr, Bez, Gueltigbis, KartenNr)
                     arrint;
                 }               
             }
-        }
-        function addRow(tableID, par1, par2, par3, par4) {
-            let tableRef = document.getElementById(tableID);
-
-            let newRow = tableRef.insertRow(-1);
-
-            let newCell = newRow.insertCell(0);
-            let newCell1 = newRow.insertCell(1)
-            let newCell2 = newRow.insertCell(2)
-            let newCell3 = newRow.insertCell(3)
-
-            newCell.innerHTML = par1
-            newCell1.innerHTML = par2
-            newCell2.innerHTML = par3
-            newCell3.innerHTML = par4
-        }
+        }        
     </script>
 </asp:Content>
 
diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb
index 2682a68..7bbf15b 100644
--- a/Customers/LKWs.aspx.vb
+++ b/Customers/LKWs.aspx.vb
@@ -97,6 +97,7 @@ Partial Class LKWS
             tr1.Cells.Add(tc_Vermerk)
             initcells(tblhrow, tbhc_KFZKennz, tbhc_Nat, tblhc_Verk, tblhc_Kz, tblhc_Verm, tr1, tc_KfzKennz, tc_Nationalitaet, tc_Verk, tc_KZ_Ab, tc_Vermerk, cnt)
             Dim Stringtemp As String = String.Empty
+            Dim strtemparr As String = String.Empty
             For Each l2 In list2
                 Dim String2 As String = String.Empty
 
@@ -116,6 +117,7 @@ Partial Class LKWS
             Else
                 strtemp2 = l1.Nationalität
             End If
+
             tr1.Attributes.Add("OnClick", "Javascript:TableRowClick(""" & list3.ToString & """,""" & l1.KfzKennzeichen & """,""" & strtemp2 & """)")
             cnt += 1
             tbl_sidemenue.Rows.Add(tr1)