diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb index 42c72e8..c61186a 100644 --- a/App_Code/VERAG_VARIABLES.vb +++ b/App_Code/VERAG_VARIABLES.vb @@ -77,15 +77,15 @@ Public Class VERAG_VARIABLES Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt Argon.DegreeOfParallelism = 8 - Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) - Argon.MemorySize = (((nIterations * 19.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) + Argon.Iterations = nIterations + Argon.MemorySize = (((nIterations * 9.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) Return Await Argon.GetBytesAsync(nHash) Else Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt - Argon.DegreeOfParallelism = 10 - Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) - Argon.MemorySize = (((nIterations * 21.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) + Argon.DegreeOfParallelism = 16 + Argon.Iterations = nIterations + Argon.MemorySize = (((nIterations * 11.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) Return Await Argon.GetBytesAsync(nHash) End If End Function diff --git a/App_Data/PublishProfiles/FolderProfile.pubxml b/App_Data/PublishProfiles/FolderProfile.pubxml new file mode 100644 index 0000000..f3bbe47 --- /dev/null +++ b/App_Data/PublishProfiles/FolderProfile.pubxml @@ -0,0 +1,17 @@ + + + + + true + false + Release + Any CPU + true + FileSystem + \\192.168.3.101\g\Websites\loginTEST.verag.ag + FileSystem + + + \ No newline at end of file diff --git a/Customers/SDL/Formtemplate EcoTAX.aspx b/Customers/SDL/Formtemplate EcoTAX.aspx index 5aaf7ca..b275e09 100644 --- a/Customers/SDL/Formtemplate EcoTAX.aspx +++ b/Customers/SDL/Formtemplate EcoTAX.aspx @@ -182,22 +182,22 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + result = data.d.AaData[i]; //addheader(); for (var i = 0; i < result.length; i++) { //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' //alert('Horray! 200 status code!' + result[i]); // alert(result.rows.length) - if (CardNumber == result[i]["8"]) { - document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=txt_Umstellungsdatum.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txt_Kategorie.ClientID%>').setAttribute('value', result[i]["2"]); - document.getElementById('<%=txt_Vertrabschldat.ClientID%>').setAttribute('value', result[i]["3"]); - document.getElementById('<%=txt_Status.ClientID%>').setAttribute('checked', result[i]["4"]); - document.getElementById('<%=txt_Schadstoffklasse.ClientID%>').setAttribute('checked', result[i]["5"]); - document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('checked', result[i]["6"]); - document.getElementById('<%=cb_retourniert%>').setAttribute('checked', result[i]["7"]); + if (CardNumber == result["8"]) { + document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=txt_Umstellungsdatum.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txt_Kategorie.ClientID%>').setAttribute('value', result["2"]); + document.getElementById('<%=txt_Vertrabschldat.ClientID%>').setAttribute('value', result["3"]); + document.getElementById('<%=txt_Status.ClientID%>').setAttribute('checked', result["4"]); + document.getElementById('<%=txt_Schadstoffklasse.ClientID%>').setAttribute('checked', result["5"]); + document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('checked', result["6"]); + document.getElementById('<%=cb_retourniert%>').setAttribute('checked', result["7"]); } } //renderTable(data.d); diff --git a/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx b/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx index 943b30b..7bafb88 100644 --- a/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx +++ b/Customers/SDL/Formtemplate FRESJUS_Tunnelkarte.aspx @@ -162,7 +162,7 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + result = data.d.AaData[i]; //addheader(); for (var i = 0; i < result.length; i++) { @@ -170,12 +170,12 @@ //alert('Horray! 200 status code!' + result[i]); // alert(result.rows.length) if (CardNumber == result[i]["6"]) { - document.getElementById('<%=txt_BestDatum.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=txt_LieferDatum.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txt_FresjusNr.ClientID%>').setAttribute('value', result[i]["2"]); - document.getElementById('<%=txt_ECOKlasse.ClientID%>').setAttribute('value', result[i]["3"]); - document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result[i]["4"]); - document.getElementById('<%=cb_retounriert.ClientID%>').setAttribute('checked', result[i]["5"]); + document.getElementById('<%=txt_BestDatum.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=txt_LieferDatum.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txt_FresjusNr.ClientID%>').setAttribute('value', result["2"]); + document.getElementById('<%=txt_ECOKlasse.ClientID%>').setAttribute('value', result["3"]); + document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result["4"]); + document.getElementById('<%=cb_retounriert.ClientID%>').setAttribute('checked', result["5"]); } } //renderTable(data.d); diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx b/Customers/SDL/Formtemplate IDS Tankkarte.aspx index abc1635..d961a84 100644 --- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx +++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx @@ -156,7 +156,7 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + result = data.d.AaData[i]; //addheader(); for (var i = 0; i < result.length; i++) { diff --git a/Customers/SDL/Formtemplate MAN Abgaspalette.aspx b/Customers/SDL/Formtemplate MAN Abgaspalette.aspx index 777106e..418b0b9 100644 --- a/Customers/SDL/Formtemplate MAN Abgaspalette.aspx +++ b/Customers/SDL/Formtemplate MAN Abgaspalette.aspx @@ -136,17 +136,17 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + result = data.d.AaData[i]; //addheader(); for (var i = 0; i < result.length; i++) { //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' //alert('Horray! 200 status code!' + result[i]); // alert(result.rows.length) - if (CardNo == result[i]["7"]) { - document.getElementById('<%=txt_Bestelldatum.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result[i]["2"]); + if (CardNo == result["7"]) { + document.getElementById('<%=txt_Bestelldatum.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result["2"]); } } //renderTable(data.d); diff --git a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx index e5742c5..768728a 100644 --- a/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx +++ b/Customers/SDL/Formtemplate MultiBox_EcoTAX.aspx @@ -181,21 +181,21 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + result = data.d.AaData[i]; //addheader(); for (var i = 0; i < result.length; i++) { //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' //alert('Horray! 200 status code!' + result[i]); // alert(result.rows.length) - if (CardNumber == result[i]["7"]) { - document.getElementById('<%=txt_Bestelldatum.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txt_PANNr.ClientID%>').setAttribute('value', result[i]["2"]); - document.getElementById('<%=txt_SERIENr.ClientID%>').setAttribute('value', result[i]["3"]); - document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result[i]["4"]); - document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result[i]["5"]); - document.getElementById('<%=ckb_retourniert.ClientID%>').setAttribute('checked', result[i]["6"]); + if (CardNumber == result["7"]) { + document.getElementById('<%=txt_Bestelldatum.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txt_PANNr.ClientID%>').setAttribute('value', result["2"]); + document.getElementById('<%=txt_SERIENr.ClientID%>').setAttribute('value', result["3"]); + document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result["4"]); + document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result["5"]); + document.getElementById('<%=ckb_retourniert.ClientID%>').setAttribute('checked', result["6"]); } } //renderTable(data.d); diff --git a/Customers/SDL/Formtemplate Plose.aspx b/Customers/SDL/Formtemplate Plose.aspx index e36050b..011fece 100644 --- a/Customers/SDL/Formtemplate Plose.aspx +++ b/Customers/SDL/Formtemplate Plose.aspx @@ -173,20 +173,20 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + result = data.d.AaData[i]; //addheader(); for (var i = 0; i < result.length; i++) { //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' //alert('Horray! 200 status code!' + result[i]); // alert(result.rows.length) - if (CardNumber == result[i]["6"]) { - document.getElementById('<%=txt_BestDatum.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txtOBU_Id.ClientID%>').setAttribute('value', result[i]["2"]); - document.getElementById('<%=txt_Pin.ClientID%>').setAttribute('value', result[i]["3"]); - document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result[i]["4"]); - document.getElementById('<%=cb_retourniert.ClientID%>').setAttribute('checked', result[i]["5"]); + if (CardNumber == result["6"]) { + document.getElementById('<%=txt_BestDatum.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txtOBU_Id.ClientID%>').setAttribute('value', result["2"]); + document.getElementById('<%=txt_Pin.ClientID%>').setAttribute('value', result["3"]); + document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result["4"]); + document.getElementById('<%=cb_retourniert.ClientID%>').setAttribute('checked', result["5"]); } } //renderTable(data.d); diff --git a/Customers/SDL/Formtemplate VERAG_Card.aspx b/Customers/SDL/Formtemplate VERAG_Card.aspx index 8f1cd87..fc44e56 100644 --- a/Customers/SDL/Formtemplate VERAG_Card.aspx +++ b/Customers/SDL/Formtemplate VERAG_Card.aspx @@ -185,22 +185,22 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + result = data.d.AaData[i]; //addheader(); for (var i = 0; i < result.length; i++) { //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' //alert('Horray! 200 status code!' + result[i]); // alert(result.rows.length) - if (CardNumber == result[i]["8"]) { - document.getElementById('<%=txt_BestDatum.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txt_KartenNr.ClientID%>').setAttribute('value', result[i]["2"]); - document.getElementById('<%=txt_Fahrer.ClientID%>').setAttribute('value', result[i]["3"]); - document.getElementById('<%=txt_Kaution.ClientID%>').setAttribute('value', result[i]["4"]); - document.getElementById('<%=txt_Beleg.ClientID%>').setAttribute('value', result[i]["5"]); - document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result[i]["6"]); - document.getElementById('<%=cb_Ersatzkarte.ClientID%>').setAttribute('checked', result[i]["7"]); + if (CardNumber == result["2"]) { + document.getElementById('<%=txt_BestDatum.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txt_KartenNr.ClientID%>').setAttribute('value', result["2"]); + document.getElementById('<%=txt_Fahrer.ClientID%>').setAttribute('value', result["3"]); + document.getElementById('<%=txt_Kaution.ClientID%>').setAttribute('value', result["4"]); + document.getElementById('<%=txt_Beleg.ClientID%>').setAttribute('value', result["5"]); + document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result["6"]); + document.getElementById('<%=cb_Ersatzkarte.ClientID%>').setAttribute('checked', result["7"]); } } //renderTable(data.d); diff --git a/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx b/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx index c78de4d..3ff137c 100644 --- a/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx +++ b/Customers/SDL/MAUT/FormtemplateMAUT_DE_Toll Collect.aspx @@ -171,7 +171,7 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + result = data.d.AaData[i]; //addheader(); for (var i = 0; i < result.length; i++) { @@ -179,12 +179,12 @@ //alert('Horray! 200 status code!' + result[i]); // alert(result.rows.length) if (CardNo == result[i]["7"]) { - document.getElementById('<%=txt_Bestelldat.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=txt_lieferdat.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txt_Kartennummer.ClientID%>').setAttribute('value', result[i]["2"]); - document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result[i]["3"]); - document.getElementById('<%=cbx_Ersatzkarte.ClientID%>').setAttribute('checked', result[i]["4"]); - document.getElementById('<%=cbx_Abgemeldet.ClientID%>').setAttribute('checked', result[i]["5"]); + document.getElementById('<%=txt_Bestelldat.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=txt_lieferdat.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txt_Kartennummer.ClientID%>').setAttribute('value', result["2"]); + document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result["3"]); + document.getElementById('<%=cbx_Ersatzkarte.ClientID%>').setAttribute('checked', result["4"]); + document.getElementById('<%=cbx_Abgemeldet.ClientID%>').setAttribute('checked', result["5"]); } } //renderTable(data.d); diff --git a/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx b/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx index e73185e..19de6dc 100644 --- a/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx +++ b/Customers/SDL/MAUT/FormtemplateMAUT_MSECard.aspx @@ -175,22 +175,22 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + result = data.d.AaData[i]; //addheader(); for (var i = 0; i < result.length; i++) { //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' //alert('Horray! 200 status code!' + result[i]); // alert(result.rows.length) - if (cardno == result[i]["7"]) { - document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=txt_Umstellungsdatum.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txt_Kategorie.ClientID%>').setAttribute('value', result[i]["2"]); - document.getElementById('<%=txt_Vertrabschldat.ClientID%>').setAttribute('value', result[i]["3"]); - document.getElementById('<%=txt_Status.ClientID%>').setAttribute('value', result[i]["4"]); - document.getElementById('<%=txt_Schadstoffklasse.ClientID%>').setAttribute('value', result[i]["5"]); - document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result[i]["5"]); - document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result[i]["6"]); + if (cardno == result["7"]) { + document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=txt_Umstellungsdatum.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txt_Kategorie.ClientID%>').setAttribute('value', result["2"]); + document.getElementById('<%=txt_Vertrabschldat.ClientID%>').setAttribute('value', result["3"]); + document.getElementById('<%=txt_Status.ClientID%>').setAttribute('value', result["4"]); + document.getElementById('<%=txt_Schadstoffklasse.ClientID%>').setAttribute('value', result["5"]); + document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result["5"]); + document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result["6"]); } } //renderTable(data.d); diff --git a/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx b/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx index c796457..541b9fc 100644 --- a/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx +++ b/Customers/SDL/MAUT/Formtemplate_MAUT_AT GoBox.aspx @@ -187,7 +187,7 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + result = data.d.AaData[i]; //addheader(); for (var i = 0; i < result.length; i++) { @@ -195,15 +195,15 @@ //alert('Horray! 200 status code!' + result[i]); // alert(result.rows.length) if (Cardnumber == result[i]["7"]) { - document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=txt_Umstellungsdatum.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txt_Kategorie.ClientID%>').setAttribute('value', result[i]["2"]); - document.getElementById('<%=txt_Vertrabschldat.ClientID%>').setAttribute('value', result[i]["3"]); - document.getElementById('<%=txt_Status.ClientID%>').setAttribute('value', result[i]["4"]); - document.getElementById('<%=txt_Schadstoffklasse.ClientID%>').setAttribute('value', result[i]["5"]); - document.getElementById('<%=txt_OBIU_ID.ClientID%>').setAttribute('value', result[i]["6"]); - document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result[i]["7"]); - document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result[i]["8"]); + document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=txt_Umstellungsdatum.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txt_Kategorie.ClientID%>').setAttribute('value', result["2"]); + document.getElementById('<%=txt_Vertrabschldat.ClientID%>').setAttribute('value', result["3"]); + document.getElementById('<%=txt_Status.ClientID%>').setAttribute('value', result["4"]); + document.getElementById('<%=txt_Schadstoffklasse.ClientID%>').setAttribute('value', result["5"]); + document.getElementById('<%=txt_OBIU_ID.ClientID%>').setAttribute('value', result["6"]); + document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result["7"]); + document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result["8"]); } } //renderTable(data.d);