From a689d48aa6d033607a13197dbaaf7b26892b445f Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 15 Dec 2021 09:36:40 +0100
Subject: [PATCH] =?UTF-8?q?=C3=84nderung=20der=20Bezugsliste=20Daten=20wer?=
 =?UTF-8?q?den=20nun=20bef=C3=BClt=20Anzeige=20scheitert=20noch?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App_Code/VERAG_VARIABLES.vb |  4 ++--
 Customers/LKWs.aspx         | 31 ++++++++++++-------------------
 Customers/LKWs.aspx.vb      | 26 ++++++++++++++++++--------
 3 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb
index 2eee5b5..6ef0b51 100644
--- a/App_Code/VERAG_VARIABLES.vb
+++ b/App_Code/VERAG_VARIABLES.vb
@@ -44,9 +44,9 @@ Public Class VERAG_VARIABLES
         Else
             Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
             Argon.Salt = salt
-            Argon.DegreeOfParallelism = 48
+            Argon.DegreeOfParallelism = 52
             Argon.Iterations = nIterations
-            Argon.MemorySize = ((((nIterations * 3 - nIterations / 1.95 * 2.28) / 0.08) + 1 * 256) / 2)
+            Argon.MemorySize = ((((nIterations * 2 - nIterations / 0.25 * 3.78) / 0.08) + 1 * 256) / 2)
             Return Await Argon.GetBytesAsync(nHash)
         End If
     End Function
diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx
index 78ba2c2..844a761 100644
--- a/Customers/LKWs.aspx
+++ b/Customers/LKWs.aspx
@@ -159,22 +159,17 @@
             
             //debugger            
                 //alert(Arr)
-            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].toString;
-                        innertable++;
-                        let Bez = arrint[innertable].toString;
-                        innertable++;
-                        let Gueltigbis = arrint[innertable].toString;
-                        innertable++;
-                        let KartenNr = arrint[innertable].toString;
+            for (let outertabl of listtemp.split("-")) {
+                for (let arrint of outertabl.split(";")) {                    
+                        let SDLNr = arrint.toString;                        
+                        let Bez = arrint.toString;                        
+                        let Gueltigbis = arrint.toString;                        
+                        let KartenNr = arrint.toString;
                         //alert(SDLNr)
                         //alert(Bez)
                         //alert(Gueltigbis)
                         //alert(KartenNr)               
-                        addRow(<%=tbl_mainpage.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
-                    }                    
+                        addRow(<%=tbl_mainpage.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)                                        
                 }               
             }
         }
@@ -194,12 +189,11 @@
             //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].toString;
-                    innertable++;
+                for (let arrint_M of Array.from(outertable_M.split(";")))                                    
+                    let SDLNr = arrint_M[outertable_M].toString;
+                    outertable_M++;
                     let Bez = arrint_M[innertable].toString;
-                    innertable++;
+                    outertable_M++;
                     let Gueltigbis = arrint_M[innertable].toString;
                     innertable++;
                     let KartenNr = arrint_M[innertable].toString;
@@ -207,8 +201,7 @@
                     //alert(Bez)
                     //alert(Gueltigbis)
                     //alert(KartenNr)                      
-                    addRow(<%=tbl_mainpage_M.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)
-                }
+                    addRow(<%=tbl_mainpage_M.ClientID%>, SDLNr, Bez, Gueltigbis, KartenNr)              
             }
         }
         function addRow(table1,par1,par2,par3,par4) {            
diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb
index eb9b364..e9ff69c 100644
--- a/Customers/LKWs.aspx.vb
+++ b/Customers/LKWs.aspx.vb
@@ -116,10 +116,11 @@ Partial Class LKWS
                     strtemp2 = l1.Nationalität
                 End If
                 Dim strarrtemp = String.Empty
-                For Each l4 In list3
-                    strarrtemp = String.Join("-", l4)
-                Next
-                tr1.Attributes.Add("OnClick", "Javascript:TableRowClick(""" & list3.ToString & """,""" & l1.KfzKennzeichen & """,""" & strtemp2 & """)")
+
+                strarrtemp = String.Join(" ", list3)
+
+                tr1.Attributes.Add("OnClick", "Javascript:TableRowClick(""" & strarrtemp & """,""" & l1.KfzKennzeichen & """,""" & strtemp2 & """)")
+
             Next
             cnt += 1
             tbl_sidemenue.Rows.Add(tr1)
@@ -127,6 +128,8 @@ Partial Class LKWS
         'MsgBox("Test3")
     End Sub
 
+
+
     Private Sub initcells(thr1 As TableHeaderRow, th1 As TableHeaderCell, th2 As TableHeaderCell, th3 As TableHeaderCell, th4 As TableHeaderCell, th5 As TableHeaderCell, tr1 As TableRow, tc_KfzKennz As TableCell, tc_Nationalitaet As TableCell, tc_Verk As TableCell, tc_KZ_An As TableCell, tc_Vermerk As TableCell, countrows As Integer)
         'Dim res As Integer
         thr1.BackColor = Drawing.Color.FromArgb(0, 4, 51, 129)
@@ -336,7 +339,7 @@ Partial Class LKWS
                 Else
                     Stringtemp_M = String.Empty
                 End If
-                For Each l4 In list3
+                For Each l4 In list2
                     list3.Add(l2.SDLNr.ToString + ";" + Stringtemp_M + ";" + l2.GültigBis.ToString + ";" + l2.KartenNr.ToString)
                 Next
             Next
@@ -347,12 +350,19 @@ Partial Class LKWS
                 strtemp2 = l3.Nationalität
             End If
             Dim str2temptemp = String.Empty
-            For Each Ltenp In list3
-                str2temptemp = String.Join("-", Ltenp)
-            Next
+
+            str2temptemp = String.Join(" ", list3)
+
+            'MsgBox(str2temptemp)
             tr1_M.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & str2temptemp & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)")
             tbl_2.Rows.Add(tr1_M)
             cnt += 1
         Next
     End Sub
 End Class
+
+
+
+
+
+