From 630710cbe847023998ad6c961678fc2f9e17f4b9 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 14 Dec 2021 13:41:29 +0100
Subject: [PATCH] =?UTF-8?q?tabellenproblem=20gel=C3=B6st=20dass=20zu=20vie?=
 =?UTF-8?q?le=20Zeile=20hinzugef=C3=BCgt=20und=20keine=20gel=C3=B6scht=20w?=
 =?UTF-8?q?erden.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/LKWs.aspx    | 80 ++++++++++++++++++++++--------------------
 Customers/LKWs.aspx.vb | 31 +++++++---------
 2 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index 064ed4b..8a742df 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -41,7 +41,7 @@
             #tableSearch {
                 width: 53%;
                 border: 1px solid grey;
-            }
+            }           
         }
     </style>
 </asp:Content>
@@ -69,7 +69,7 @@
                             <div class="col-9">       
                                 <div class="col-9"style="height:10px;"></div>                               
                               <div class="flex-col-9">                                 
-                                  <asp:Table ID="tbl_sidemenue" runat="server" CssClass="table table-striped" style="width:310px;margin-left:-32px;">
+                                  <asp:Table ID="tbl_sidemenue" runat="server" CssClass="table table-striped" style="width:310px;margin-left:-32px;cursor:default">
                                       <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>                                  
                               </div>                                
@@ -145,31 +145,32 @@
      <!-- Popper.JS -->
     <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 type="text/javascript">
-        function TableRowClick(listtemp, Kennzeichen, Nat) {
-            let Table1 = document.getElementById("<%=tbl_mainpage%>")
+        function TableRowClick(listtemp, Kennzeichen, Nat) {            
             let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder.ClientID%>")
             let natplaceholder = document.getElementById("<%=lbl_Placeholder.ClientID%>")            
             
             Speditionslabel.textContent = Kennzeichen
-            natplaceholder.textContent = Nat           
-            const arr2 = Array.from(listtemp.split(","));            
-            for (let i = 0; i < arr2.length; i++) {
-                //alert(arr2.length)
-                const Arr = Array.from(listtemp(i).split(";"));
-                debugger
-                alert(Arr)
-                for (let arrint of Arr) {
-                    let SDLNr = arrint[0]              
-                    let Bez = arrint[1]
-                    let Gueltigbis = arrint[2]
-                    let KartenNr = arrint[3]
-                    alert(SDLNr)
-                    alert(Bez)
-                    alert(Gueltigbis)
-                    alert(KartenNr)
-                    addRow(Table1,SDLNr, Bez, Gueltigbis, KartenNr)                    
-                }            
+            natplaceholder.textContent = Nat
+
+            var tb = document.getElementById("<%=tbl_mainpage.ClientID%>");
+            while (tb.rows.length > 1) {
+                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
+                    //alert(SDLNr)
+                    //alert(Bez)
+                    //alert(Gueltigbis)
+                    //alert(KartenNr)                    
+                    addRow(<%=tbl_mainpage.ClientID%>,SDLNr, Bez, Gueltigbis, KartenNr)                    
+                }            
         }
         function addRow(table1,par1,par2,par3,par4) {            
             let tableRef = table1;
@@ -186,8 +187,8 @@
             newCell2.innerHTML = par3
             newCell3.innerHTML = par4
         }
-        function addRow_tab2(par1, par2, par3, par4) {
-            let tableRef = document.getElementById(<%=tbl_mainpage_M.ClientID%>);
+        function addRow_tab2(tab1,par1, par2, par3, par4) {
+            let tableRef = tab1;
 
             let newRow = tableRef.insertRow(-1);
 
@@ -207,20 +208,23 @@
 
             Speditionslabel.textContent = Kennzeichen
             natplaceholder.textContent = Nat
-            const arr2 = Array.from(listtemp_M.split(","));
-            for (let i = 0; i < arr2.length; i++) {
-                const Arr = Array.from(listtemp_M(i).split(";"));
-                for (let arrint of Arr) {
-                    let SDLNr = arrint[0];                    
-                    let Bez = arrint[1];
-                    let Gueltigbis = arrint[2];
-                    let KartenNr = arrint[3];
-                    alert(SDLNr)
-                    alert(Bez)
-                    alert(Gueltigbis)
-                    alert(KartenNr)
-                    addRow(SDLNr, Bez, Gueltigbis, KartenNr)                    
-                }               
+
+            var tb = document.getElementById("<%=tbl_mainpage_M.ClientID%>");
+            while (tb.rows.length > 1) {
+                tb.deleteRow(1);
+            }
+
+            const arr2 = Array.from(listtemp_M.split(";"));
+            for (let i = 0; i < arr2.length; i++) {             
+                    let SDLNr = arrint[i];                    
+                    let Bez = arrint[i++];
+                    let Gueltigbis = arrint[i++];
+                    let KartenNr = arrint[i++];
+                    //alert(SDLNr)
+                    //alert(Bez)
+                    //alert(Gueltigbis)
+                    //alert(KartenNr)
+                addRow(<%=tbl_mainpage_M%>,SDLNr, Bez, Gueltigbis, KartenNr)
             }
         }        
     </script>
diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb
index e9823fd..3870757 100644
--- a/Customers/LKWs.aspx.vb
+++ b/Customers/LKWs.aspx.vb
@@ -109,16 +109,17 @@ Partial Class LKWS
                 For Each l3 In list3
                     list3.Add(l2.SDLNr.ToString + ";" + Stringtemp + ";" + l2.GültigBis.ToString + ";" + l2.KartenNr.ToString)
                 Next
+                Dim strtemp2 As String = String.Empty
+                If String.IsNullOrEmpty(l1.Nationalität) = True Then
+                    strtemp2 = "Keine Angabe"
+                Else
+                    strtemp2 = l1.Nationalität
+                End If
+                tr1.Attributes.Add("OnClick", "Javascript:TableRowClick(""" & list3.ToString & """,""" & l1.KfzKennzeichen & """,""" & strtemp2 & """)")
             Next
-            Dim strtemp2 As String = String.Empty
 
-            If String.IsNullOrEmpty(l1.Nationalität) Then
-                strtemp2 = "Keine Angabe"
-            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)
         Next
@@ -138,16 +139,12 @@ Partial Class LKWS
         th3.ForeColor = Drawing.Color.White
         th4.ForeColor = Drawing.Color.White
         th5.ForeColor = Drawing.Color.White
-
-
     End Sub
 
     Protected Sub btn_Suchen_Click(sender As Object, e As EventArgs)
-        'MsgBox("Test0")
         Dim txt_LkwNr As TextBox = txt_lkw
         'list = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB(401940, "COOPER8")
         list = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940)
-
         Dim tblhrow As TableHeaderRow = New TableHeaderRow()
         Dim cnt As Integer = 0
 
@@ -157,10 +154,10 @@ Partial Class LKWS
         tblhrow.Cells.Add(tblhc_Kz)
         tblhrow.Cells.Add(tblhc_Verm)
 
-        tbl_sidemenue.Rows.Clear()
         tbl_sidemenue.Height = Unit.Pixel(150)
+        tbl_sidemenue.Rows.Clear()
         tbl_sidemenue.Rows.Add(tblhrow)
-        'MsgBox("Test1")
+
         For Each l2 In list
             Dim tr2 As TableRow = New TableRow()
             Dim tc_KfzKennz As TableCell = New TableCell()
@@ -201,7 +198,6 @@ Partial Class LKWS
             tbl_sidemenue.Rows.Add(tr2)
             cnt += 1
         Next
-        'MsgBox("Test2")
     End Sub
 
     Protected Sub TableRowClick(ByVal sender As TableRow, e As EventArgs)
@@ -213,7 +209,7 @@ Partial Class LKWS
         Else
             VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
         End If
-
+        tbl_2.Rows.Clear()
         list_M = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940)
         Dim cnt As Integer = 0
 
@@ -273,7 +269,7 @@ Partial Class LKWS
         Else
             VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
         End If
-
+        tbl_2.Rows.Clear()
         Dim cnt As Integer = 0
         list_M = VERAG_PROG_ALLGEMEIN.cSDL_LKW.GET_LIST_WEB(401940)
         Dim tblhrow_M As TableHeaderRow = New TableHeaderRow
@@ -285,8 +281,6 @@ Partial Class LKWS
         tblhrow_M.Cells.Add(tbhc_Verm_M)
         tbl_2.Rows.Add(tblhrow_M)
 
-        'tbl_sidemenue.Rows.Clear()
-        'MsgBox("Test2")
         For Each l3 In list_M
             Dim tr1_M As TableRow = New TableRow()
             Dim tc_KfzKennz_M As TableCell = New TableCell()
@@ -355,6 +349,5 @@ Partial Class LKWS
             tbl_2.Rows.Add(tr1_M)
             cnt += 1
         Next
-        'MsgBox("Test3")
     End Sub
 End Class