Iframes bekommen Ladenachricht, dass User nicht versehentlich nerulädt.

This commit is contained in:
ja
2022-01-28 16:10:33 +01:00
parent da01fd2e8b
commit 6522bb2f40
14 changed files with 3906 additions and 3863 deletions

View File

@@ -50,7 +50,7 @@ Public Class VERAG_VARIABLES
Else Else
Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password)))
Argon.Salt = salt Argon.Salt = salt
Argon.DegreeOfParallelism = 14 Argon.DegreeOfParallelism = 18
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3)
Argon.MemorySize = (((nIterations * 7.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416) Argon.MemorySize = (((nIterations * 7.685 - (nIterations * 0.56) / 1.85 * 2.28) / 10.28) + 1.024 * 416)
Return Argon.GetBytes(nHash) Return Argon.GetBytes(nHash)

View File

@@ -132,12 +132,12 @@
detailtabelle(param1,param2) detailtabelle(param1,param2)
//alert(param1) //alert(param1)
function detailtabelle(id, CardNumber) { function detailtabelle(id, CardNo) {
// alert("Testdata:" + id) // alert("Testdata:" + id)
let data = {}; let data = {};
data['Kennzeichen'] = id; data['Kennzeichen'] = id;
data['CardNo'] = CardNumber data['CardNo'] = CardNo;
$.ajax({ $.ajax({
type: "POST", type: "POST",
@@ -155,7 +155,7 @@
//let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>' //let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
//alert('Horray! 200 status code!' + result[i]); //alert('Horray! 200 status code!' + result[i]);
// alert(result.rows.length) // alert(result.rows.length)
if (CardNumber == result[i]["7"]) { if (CardNo == result[i]["2"]) {
document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result[i]["0"]); document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result[i]["0"]);
document.getElementById('<%=Txt_Lieferdat.ClientID%>').setAttribute('value', result[i]["1"]); document.getElementById('<%=Txt_Lieferdat.ClientID%>').setAttribute('value', result[i]["1"]);
document.getElementById('<%=txt_KartenNr.ClientID%>').setAttribute('value', result[i]["2"]); document.getElementById('<%=txt_KartenNr.ClientID%>').setAttribute('value', result[i]["2"]);

View File

@@ -73,12 +73,12 @@ Partial Class Customers_Default3
<WebMethod> <WebMethod>
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)> <ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
Public Shared Function filltabledetails(Kennzeichen As String, CardNumber As String) As FormattedList Public Shared Function filltabledetails(Kennzeichen As String, CardNo As String) As FormattedList
Dim list As List(Of String) = New List(Of String) Dim list As List(Of String) = New List(Of String)
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), Kennzeichen) Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), Kennzeichen)
Dim listdetails As New List(Of List(Of String)) Dim listdetails As New List(Of List(Of String))
For Each l2 In list2 For Each l2 In list2
If l2.KartenNr = CardNumber Then If l2.KartenNr.ToString = CardNo Then
Dim strtempbestelltam As String = String.Empty Dim strtempbestelltam As String = String.Empty
Dim strtempLieferdatum As String = String.Empty Dim strtempLieferdatum As String = String.Empty
Dim strtempKartenNr As String = String.Empty Dim strtempKartenNr As String = String.Empty
@@ -138,7 +138,7 @@ Partial Class Customers_Default3
list.Add(strtempGueltigBis) list.Add(strtempGueltigBis)
list.Add(strtempErsatzKarte) list.Add(strtempErsatzKarte)
list.Add(l2.KfzKennzeichen) list.Add(l2.KfzKennzeichen)
If String.Equals(strtempVerloren, "False") Or String.Equals(strtempGestohlen, "False") Or String.Equals(strtempGesperrt, "False") Or String.Equals(strtempDefekt, "False") Or String.Equals(strtempArchivt, "False") And l2.KartenNr = CardNr Then If String.Equals(strtempVerloren, "False") Or String.Equals(strtempGestohlen, "False") Or String.Equals(strtempGesperrt, "False") Or String.Equals(strtempDefekt, "False") Or String.Equals(strtempArchivt, "False") Then
listdetails.Add(list) listdetails.Add(list)
End If End If
End If End If

View File

@@ -151,11 +151,12 @@
detailtabelle(param1,param2) detailtabelle(param1,param2)
alert(param2) alert(param2)
function detailtabelle(id,kennzeichen) { function detailtabelle(id,cardnumber) {
// alert("Testdata:" + id) // alert("Testdata:" + id)
let data = {}; let data = {};
data['Kennzeichen'] = id; data['Kennzeichen'] = id;
data['CardNo'] = cardnumber;
$.ajax({ $.ajax({
type: "POST", type: "POST",
@@ -173,7 +174,7 @@
//let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>' //let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
//alert('Horray! 200 status code!' + result[i]); //alert('Horray! 200 status code!' + result[i]);
// alert(result.rows.length) // alert(result.rows.length)
if (kennzeichen == result[i]["6"]) { if (cardnumber == result[i]["2"]) {
document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result[i]["0"]); document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result[i]["0"]);
document.getElementById('<%=txt_Lieferdat.ClientID%>').setAttribute('value', result[i]["1"]); document.getElementById('<%=txt_Lieferdat.ClientID%>').setAttribute('value', result[i]["1"]);
document.getElementById('<%=txt_Kartennr.ClientID%>').setAttribute('value', result[i]["2"]); document.getElementById('<%=txt_Kartennr.ClientID%>').setAttribute('value', result[i]["2"]);

View File

@@ -74,11 +74,12 @@ Partial Class Customers_Default3
<WebMethod> <WebMethod>
<ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)> <ScriptMethod(ResponseFormat:=ResponseFormat.Json, UseHttpGet:=False)>
Public Shared Function filltabledetails(Kennzeichen As String) As FormattedList Public Shared Function filltabledetails(Kennzeichen As String, kartenummer As String) As FormattedList
Dim list As List(Of String) = New List(Of String) Dim list As List(Of String) = New List(Of String)
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), Kennzeichen) Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), Kennzeichen)
Dim listdetails As New List(Of List(Of String)) Dim listdetails As New List(Of List(Of String))
For Each l2 In list2 For Each l2 In list2
If l2.KartenNr = kartenummer Then
Dim strtempbestelltam As String = String.Empty Dim strtempbestelltam As String = String.Empty
Dim strtempLieferdatum As String = String.Empty Dim strtempLieferdatum As String = String.Empty
Dim strtempTELEPASS_Nr As String = String.Empty Dim strtempTELEPASS_Nr As String = String.Empty
@@ -91,6 +92,7 @@ Partial Class Customers_Default3
Dim strtempArchivt As String = String.Empty Dim strtempArchivt As String = String.Empty
Dim strtempErsatztelepass As String = String.Empty Dim strtempErsatztelepass As String = String.Empty
Dim strtempVIACARD As String = String.Empty Dim strtempVIACARD As String = String.Empty
Dim strtempKartenNummer As String = String.Empty
If IsNothing(l2.Bestelldatum) = False Then If IsNothing(l2.Bestelldatum) = False Then
@@ -129,7 +131,9 @@ Partial Class Customers_Default3
If IsNothing(l2.Archiviert) = False Then If IsNothing(l2.Archiviert) = False Then
strtempArchivt = l2.Archiviert.ToString strtempArchivt = l2.Archiviert.ToString
End If End If
If IsNothing(l2.KartenNr) = False Then
strtempKartenNummer = l2.KartenNr.ToString
End If
' list.Add(New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr, strtempKaut, strtempArchivt, strtempBelegNr, strtempErsatzkarte, strtempDefektAm, strtempFahrer, strtempGesperrtAm, strtempHistory, strtempHasEntry, strtempFlottenPIN, strtempFREJUS_CARD_Nr, strtempGestohlenAm, strtempLKWAbgemeldet, strtempLKWAbgemeldetAM, strtempLieferdatum, strtempMasterPIN, strtempMOTORWAY_CARD_Nr, strtempMSE_Kd_Nr, strtempOBUID, strtempPAN_Nr, strtempPartner, strtempPIN, strtempRefKundenNr, strtempRetourniert, strtempRetourniertAm, strtempSachbearbeiter, strtempSERIE_Nr, strtempStatus, strtempTelepassErsatzkarte, strtempTelepassErsatzkarteAm, strtempTELEPASS_Kd_Nr, strtempTELEPASS_Nr, strtempUmstellungsdatum, strtempVerloren, strtempVertragsabschlussdatum, strtempVertragsNr, strtempVIACARD, strtempAenderungsdatum, strtempVermerk)) ' list.Add(New Entry(l2.SDLNr.ToString, strtempKat, strtempGueltigBis, strtempKartenNr, strtempKaut, strtempArchivt, strtempBelegNr, strtempErsatzkarte, strtempDefektAm, strtempFahrer, strtempGesperrtAm, strtempHistory, strtempHasEntry, strtempFlottenPIN, strtempFREJUS_CARD_Nr, strtempGestohlenAm, strtempLKWAbgemeldet, strtempLKWAbgemeldetAM, strtempLieferdatum, strtempMasterPIN, strtempMOTORWAY_CARD_Nr, strtempMSE_Kd_Nr, strtempOBUID, strtempPAN_Nr, strtempPartner, strtempPIN, strtempRefKundenNr, strtempRetourniert, strtempRetourniertAm, strtempSachbearbeiter, strtempSERIE_Nr, strtempStatus, strtempTelepassErsatzkarte, strtempTelepassErsatzkarteAm, strtempTELEPASS_Kd_Nr, strtempTELEPASS_Nr, strtempUmstellungsdatum, strtempVerloren, strtempVertragsabschlussdatum, strtempVertragsNr, strtempVIACARD, strtempAenderungsdatum, strtempVermerk))
list.Add(strtempbestelltam) list.Add(strtempbestelltam)
@@ -141,9 +145,12 @@ Partial Class Customers_Default3
list.Add(strtempRetourniert) list.Add(strtempRetourniert)
list.Add(strtempVermerk) list.Add(strtempVermerk)
list.Add(l2.KfzKennzeichen) list.Add(l2.KfzKennzeichen)
list.Add(strtempKartenNummer)
If String.Equals(strtempVerloren, "False") Or String.Equals(strtempGestohlen, "False") Or String.Equals(strtempGesperrt, "False") Or String.Equals(strtempDefekt, "False") Or String.Equals(strtempArchivt, "False") Then If String.Equals(strtempVerloren, "False") Or String.Equals(strtempGestohlen, "False") Or String.Equals(strtempGesperrt, "False") Or String.Equals(strtempDefekt, "False") Or String.Equals(strtempArchivt, "False") Then
listdetails.Add(list) listdetails.Add(list)
End If End If
End If
Next Next
HttpContext.Current.Response.ContentType = "application/json" HttpContext.Current.Response.ContentType = "application/json"

View File

@@ -173,7 +173,6 @@
//alert(data.d.AaData) //alert(data.d.AaData)
result = data.d.AaData; result = data.d.AaData;
//addheader(); //addheader();
for (var i = 0; i < result.length; i++) { for (var i = 0; i < result.length; i++) {
//let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>' //let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
//alert('Horray! 200 status code!' + result[i]); //alert('Horray! 200 status code!' + result[i]);
@@ -187,7 +186,6 @@
document.getElementById('<%=ckb_ErsatztelePass.ClientID%>').setAttribute('checked', result[i]["5"]); document.getElementById('<%=ckb_ErsatztelePass.ClientID%>').setAttribute('checked', result[i]["5"]);
document.getElementById('<%=ckb_retourniert.ClientID%>').setAttribute('checked', result[i]["6"]); document.getElementById('<%=ckb_retourniert.ClientID%>').setAttribute('checked', result[i]["6"]);
} }
} }
//renderTable(data.d); //renderTable(data.d);
//alert(strHTML); //alert(strHTML);

View File

@@ -84,6 +84,7 @@ Partial Class Customers_Default3
Dim strtempLieferdatum As String = String.Empty Dim strtempLieferdatum As String = String.Empty
Dim strtempVIACARD As String = String.Empty Dim strtempVIACARD As String = String.Empty
Dim strtempTELEPASS_Nr As String = String.Empty Dim strtempTELEPASS_Nr As String = String.Empty
Dim strtempTELEPASSErsatz As String = String.Empty
Dim strtempVermerk As String = String.Empty Dim strtempVermerk As String = String.Empty
Dim strtempRetourniert As String = String.Empty Dim strtempRetourniert As String = String.Empty
Dim strtempVerloren As String = String.Empty Dim strtempVerloren As String = String.Empty
@@ -104,6 +105,9 @@ Partial Class Customers_Default3
If IsNothing(l2.TELEPASS_Nr) = False Then If IsNothing(l2.TELEPASS_Nr) = False Then
strtempTELEPASS_Nr = l2.TELEPASS_Nr.ToString strtempTELEPASS_Nr = l2.TELEPASS_Nr.ToString
End If End If
If IsNothing(l2.TelepassErsatzkarte) = False Then
strtempTELEPASSErsatz = l2.TelepassErsatzkarte.ToString
End If
If IsNothing(l2.Vermerk) = False Then If IsNothing(l2.Vermerk) = False Then
strtempVermerk = l2.Vermerk.ToString strtempVermerk = l2.Vermerk.ToString
End If End If
@@ -131,8 +135,9 @@ Partial Class Customers_Default3
list.Add(strtempbestelltam) list.Add(strtempbestelltam)
list.Add(strtempLieferdatum) list.Add(strtempLieferdatum)
list.Add(strtempVIACARD) list.Add(strtempVIACARD)
list.Add(strtempTELEPASS_Nr)
list.Add(strtempVermerk) list.Add(strtempVermerk)
list.Add(strtempTELEPASSErsatz)
list.Add(strtempTELEPASS_Nr)
list.Add(strtempRetourniert) list.Add(strtempRetourniert)
list.Add(l2.KfzKennzeichen) list.Add(l2.KfzKennzeichen)
If String.Equals(strtempVerloren, "False") Or String.Equals(strtempGestohlen, "False") Or String.Equals(strtempGesperrt, "False") Or String.Equals(strtempDefekt, "False") Or String.Equals(strtempArchivt, "False") And l2.KartenNr = CardNr Then If String.Equals(strtempVerloren, "False") Or String.Equals(strtempGestohlen, "False") Or String.Equals(strtempGesperrt, "False") Or String.Equals(strtempDefekt, "False") Or String.Equals(strtempArchivt, "False") And l2.KartenNr = CardNr Then

View File

@@ -162,7 +162,7 @@
//let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>' //let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
//alert('Horray! 200 status code!' + result[i]); //alert('Horray! 200 status code!' + result[i]);
// alert(result.rows.length) // alert(result.rows.length)
if (Cardnummer == result[i]["5"]) { if (Cardnummer == result[i]["2"]) {
document.getElementById('<%=txt_BestDatum.ClientID%>').setAttribute('value', result[i]["0"]); document.getElementById('<%=txt_BestDatum.ClientID%>').setAttribute('value', result[i]["0"]);
document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result[i]["1"]); document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result[i]["1"]);
document.getElementById('<%=txt_KartenNr.ClientID%>').setAttribute('value', result[i]["2"]); document.getElementById('<%=txt_KartenNr.ClientID%>').setAttribute('value', result[i]["2"]);

View File

@@ -166,7 +166,7 @@
//let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>' //let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
//alert('Horray! 200 status code!' + result[i]); //alert('Horray! 200 status code!' + result[i]);
// alert(result.rows.length) // alert(result.rows.length)
if (CardNumber == result[i]["7"]) { if (CardNumber == result[i]["2"]) {
document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result[i]["0"]); document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result[i]["0"]);
document.getElementById('<%=txt_Lieferdat.ClientID%>').setAttribute('value', result[i]["1"]); document.getElementById('<%=txt_Lieferdat.ClientID%>').setAttribute('value', result[i]["1"]);
document.getElementById('<%=txt_KartenNr.ClientID%>').setAttribute('value', result[i]["2"]); document.getElementById('<%=txt_KartenNr.ClientID%>').setAttribute('value', result[i]["2"]);

View File

@@ -160,7 +160,7 @@
//let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>' //let strHTML4 = '<tr><td>878465464634</td><td>DIESEL</td><td>12/05/2026</td><td>151515313521351</td></tr>'
//alert('Horray! 200 status code!' + result[i]); //alert('Horray! 200 status code!' + result[i]);
// alert(result.rows.length) // alert(result.rows.length)
if (Cardnummer == result[i]["7"]) { if (Cardnummer == result[i]["2"]) {
document.getElementById('<%=txt_BestellDatum.ClientID%>').setAttribute('value', result[i]["0"]); document.getElementById('<%=txt_BestellDatum.ClientID%>').setAttribute('value', result[i]["0"]);
document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result[i]["1"]); document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result[i]["1"]);
document.getElementById('<%=txt_KartNr.ClientID%>').setAttribute('value', result[i]["2"]); document.getElementById('<%=txt_KartNr.ClientID%>').setAttribute('value', result[i]["2"]);

View File

@@ -78,7 +78,7 @@ Partial Class Customers_Default3
Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), Kennzeichen) Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), Kennzeichen)
Dim listdetails As New List(Of List(Of String)) Dim listdetails As New List(Of List(Of String))
For Each l2 In list2 For Each l2 In list2
If String.Equals(CardNo, l2.KartenNr.ToString) = True Then If l2.KartenNr.ToString = CardNo Then
Dim strtempbestelltam As String = String.Empty Dim strtempbestelltam As String = String.Empty
Dim strtempLieferdatum As String = String.Empty Dim strtempLieferdatum As String = String.Empty
Dim strtempKartenNr As String = String.Empty Dim strtempKartenNr As String = String.Empty

View File

@@ -388,6 +388,10 @@
{ {
window.history.back() window.history.back()
} }
$('iframe').load(function () {
$(".loading").remove();
alert("iframe is done loading")
}).show()
</script> </script>
</head> </head>

View File

@@ -254,7 +254,7 @@ Partial Class login_FLEX
Login1.FailureText = VERAG_VARIABLES.geterrornumb + "Username is not in the database!" Login1.FailureText = VERAG_VARIABLES.geterrornumb + "Username is not in the database!"
End If End If
If String.Equals(tb3.Text, dr("Password")) = True Then If String.Equals(tb3.Text, dr("Password")) = True Then
intzahl = VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 6)) intzahl = VERAG_VARIABLES.RandomInteger(105, Math.Pow(2, 7))
salt = VERAG_VARIABLES.GenerateSalt(intzahl) salt = VERAG_VARIABLES.GenerateSalt(intzahl)
Dim hashpw As Byte() = Await VERAG_VARIABLES.HashPasswordAsync(passw, salt, intzahliterats, intzahl) Dim hashpw As Byte() = Await VERAG_VARIABLES.HashPasswordAsync(passw, salt, intzahliterats, intzahl)
If Await VERAG_VARIABLES.VerifyhashAsync(dr("Password").ToString, salt, hashpw, intzahliterats, intzahl) = True Then If Await VERAG_VARIABLES.VerifyhashAsync(dr("Password").ToString, salt, hashpw, intzahliterats, intzahl) = True Then