edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Änderung der Bezugsliste Daten werden nun befült Anzeige scheitert noch"

Browse Source 
This reverts commit a689d48aa6.
This commit is contained in:
ja
2021-12-15 11:48:15 +01:00
parent cb7be47bb2
commit bf0fa83e39
3 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
App_Code/VERAG_VARIABLES.vb
View File

@@ -44,9 +44,9 @@ Public Class VERAG_VARIABLES
Else Else
Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Dim Argon As Argon2d = New Argon2d(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
Argon.Salt = salt Argon.Salt = salt
Argon.DegreeOfParallelism = 52 Argon.DegreeOfParallelism = 48
Argon.Iterations = nIterations Argon.Iterations = nIterations
Argon.MemorySize = ((((nIterations * 2 - nIterations / 0.25 * 3.78) / 0.08) + 1 * 256) / 2) Argon.MemorySize = ((((nIterations * 3 - nIterations / 1.95 * 2.28) / 0.08) + 1 * 256) / 2)
Return Await Argon.GetBytesAsync(nHash) Return Await Argon.GetBytesAsync(nHash)
End If End If
End Function End Function

25
Customers/LKWs.aspx
View File

@@ -159,12 +159,16 @@
//debugger //debugger
//alert(Arr) //alert(Arr)
for (let outertabl of listtemp.split("-")) { for (let outertabl of Array.from(listtemp.split("-"))) {
for (let arrint of outertabl.split(";")) { for (let arrint of Array.from(outertabl.split(";"))) {
let SDLNr = arrint.toString; for (let innertable = 0; innertable < arrint.length; innertable++) {
let Bez = arrint.toString; let SDLNr = arrint[innertable].toString;
let Gueltigbis = arrint.toString; innertable++;
let KartenNr = arrint.toString; let Bez = arrint[innertable].toString;
innertable++;
let Gueltigbis = arrint[innertable].toString;
innertable++;
let KartenNr = arrint[innertable].toString;
//alert(SDLNr) //alert(SDLNr)
//alert(Bez) //alert(Bez)
//alert(Gueltigbis) //alert(Gueltigbis)
@@ -173,6 +177,7 @@
} }
} }
} }
}
function TableRowClick_M(listtemp_M, Kennzeichen, Nat) { function TableRowClick_M(listtemp_M, Kennzeichen, Nat) {
let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder_M.ClientID%>") let Speditionslabel = document.getElementById("<%=lbl_sped_Placeholder_M.ClientID%>")
let natplaceholder = document.getElementById("<%=lbl_Placeholder_M.ClientID%>") let natplaceholder = document.getElementById("<%=lbl_Placeholder_M.ClientID%>")
@@ -190,10 +195,11 @@
//alert(Arr) //alert(Arr)
for (let outertable_M of Array.from(listtemp_M.split("-"))) { for (let outertable_M of Array.from(listtemp_M.split("-"))) {
for (let arrint_M of Array.from(outertable_M.split(";"))) for (let arrint_M of Array.from(outertable_M.split(";")))
let SDLNr = arrint_M[outertable_M].toString; for (let innertable = 0; innertable < arrint_M.length; innertable++) {
outertable_M++; let SDLNr = arrint_M[innertable].toString;
innertable++;
let Bez = arrint_M[innertable].toString; let Bez = arrint_M[innertable].toString;
outertable_M++; innertable++;
let Gueltigbis = arrint_M[innertable].toString; let Gueltigbis = arrint_M[innertable].toString;
innertable++; innertable++;
let KartenNr = arrint_M[innertable].toString; let KartenNr = arrint_M[innertable].toString;
@@ -204,6 +210,7 @@
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) { function addRow(table1,par1,par2,par3,par4) {
let tableRef = table1; let tableRef = table1;

26
Customers/LKWs.aspx.vb
View File

@@ -116,11 +116,10 @@ Partial Class LKWS
strtemp2 = l1.Nationalität strtemp2 = l1.Nationalität
End If End If
Dim strarrtemp = String.Empty Dim strarrtemp = String.Empty
For Each l4 In list3
strarrtemp = String.Join(" ", list3) strarrtemp = String.Join("-", l4)
Next
tr1.Attributes.Add("OnClick", "Javascript:TableRowClick(""" & strarrtemp & """,""" & l1.KfzKennzeichen & """,""" & strtemp2 & """)") tr1.Attributes.Add("OnClick", "Javascript:TableRowClick(""" & list3.ToString & """,""" & l1.KfzKennzeichen & """,""" & strtemp2 & """)")
Next Next
cnt += 1 cnt += 1
tbl_sidemenue.Rows.Add(tr1) tbl_sidemenue.Rows.Add(tr1)
@@ -128,8 +127,6 @@ Partial Class LKWS
'MsgBox("Test3") 'MsgBox("Test3")
End Sub 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) 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 'Dim res As Integer
thr1.BackColor = Drawing.Color.FromArgb(0, 4, 51, 129) thr1.BackColor = Drawing.Color.FromArgb(0, 4, 51, 129)
@@ -339,7 +336,7 @@ Partial Class LKWS
Else Else
Stringtemp_M = String.Empty Stringtemp_M = String.Empty
End If End If
For Each l4 In list2 For Each l4 In list3
list3.Add(l2.SDLNr.ToString + ";" + Stringtemp_M + ";" + l2.GültigBis.ToString + ";" + l2.KartenNr.ToString) list3.Add(l2.SDLNr.ToString + ";" + Stringtemp_M + ";" + l2.GültigBis.ToString + ";" + l2.KartenNr.ToString)
Next Next
Next Next
@@ -350,19 +347,12 @@ Partial Class LKWS
strtemp2 = l3.Nationalität strtemp2 = l3.Nationalität
End If End If
Dim str2temptemp = String.Empty Dim str2temptemp = String.Empty
For Each Ltenp In list3
str2temptemp = String.Join(" ", list3) str2temptemp = String.Join("-", Ltenp)
Next
'MsgBox(str2temptemp)
tr1_M.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & str2temptemp & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)") tr1_M.Attributes.Add("OnClick", "Javascript:TableRowClick_M(""" & str2temptemp & """,""" & l3.KfzKennzeichen & """,""" & strtemp2 & """)")
tbl_2.Rows.Add(tr1_M) tbl_2.Rows.Add(tr1_M)
cnt += 1 cnt += 1
Next Next
End Sub End Sub
End Class End Class