diff --git a/App_Code/VERAG_VARIABLES.vb b/App_Code/VERAG_VARIABLES.vb index ab18baa..8f344e4 100644 --- a/App_Code/VERAG_VARIABLES.vb +++ b/App_Code/VERAG_VARIABLES.vb @@ -74,7 +74,7 @@ Public Class VERAG_VARIABLES If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then Dim Argon As Argon2id = New Argon2id(Encoding.UTF8.GetBytes(VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(password))) Argon.Salt = salt - Argon.DegreeOfParallelism = 24 + Argon.DegreeOfParallelism = 44 Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3) Argon.MemorySize = (((nIterations * 15.98 - (nIterations * 10.23) / 14 * 2) / 4.058) + 1 * 190) Return Await Argon.GetBytesAsync(nHash) diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx index e61d452..6aeae9f 100644 --- a/Customers/LKWs.aspx +++ b/Customers/LKWs.aspx @@ -550,86 +550,86 @@ iframe {overflow:hidden} //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' //alert('Horray! 200 status code!' + result[i]); //alert(result.rows.length) - let result = result2.AaData[i] - alert(result) + let result = result2.AaData; + //alert(result) let iframe = ''; let strHTML4 = ''; - let SDLNr = result["0"]; - let Kundennr = result["5"]; - let cardno = result["3"]; - let Kennz = result["4"]; - let History = result["7"]; - alert(SDLNr + 'SDLnummer'); - alert(Kundennr + 'Kundennummer'); - alert(cardno + 'Kartenummer'); - alert(Kennz + 'Kennzeichen'); - alert(History + 'History'); + let SDLNr = result[i]["0"]; + let Kundennr = result[i]["5"]; + let cardno = result[i]["3"]; + let Kennz = result[i]["4"]; + let History = result[i]["7"]; + //alert(SDLNr + 'SDLnummer' + id.split(',')[4]); + //alert(Kundennr + 'Kundennummer' + id.split(',')[2]); + //alert(cardno + 'Kartenummer'+id.split(',')[3]); + //alert(Kennz + 'Kennzeichen' + id.split(',')[0]); + // alert(History + 'History' + id.split(',')[5]); let customerid = '<%=Request.QueryString("CustomerID")%>'; // alert("Var:" + id.split(',')[0]+customerid); - if (result["0"] == 200 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + if (result[i]["0"] == 200 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4]){ iframe = ''; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 100 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 100 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 101 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 101 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 201 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 201 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 202 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 202 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 203 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 203 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - // } else if (result["0"] == 204 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + // } else if (result[i]["0"] == 204 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ // iframe = ' '; - // strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - //} else if (result["0"] == 205 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + //} else if (result[i]["0"] == 205 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ // iframe = ' '; - // strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - //} else if (result["0"] == 206 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + //} else if (result[i]["0"] == 206 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ // iframe = ' '; - // strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 207 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 207 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 208 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 208 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 209 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 209 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 210 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 210 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 211 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 211 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 212 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 212 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 213 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 213 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 214 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 214 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 215 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 215 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 216 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 216 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 500 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 500 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' - } else if (result["0"] == 501 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[0] && History == id.split(',')[5]){ + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' + } else if (result[i]["0"] == 501 && Kennz == id.split(',')[0] && Kundennr == customerid && Kundennr == id.split(',')[2] && cardno == id.split(',')[3] && SDLNr == id.split(',')[4] && History == id.split(',')[5]){ iframe = ' '; - strHTML4 = '' + result["0"] + '' + result["1"] + '' + result["2"] + '' + result["3"] + '' + iframe + '' + strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe + '' } $('#<%=tablemain.ClientID%>').append(strHTML4); } @@ -662,11 +662,11 @@ iframe {overflow:hidden} // Pagemethods.filltable2(<%' =tbl_mainpage_M%> , SDL, Bez, Datguenstig, KartNr) //} let data_m = {}; - data_m['Kennzeichen'] = id.split(',')[0]; - data_m['Kundennr'] = id.split(',')[2]; - data_m['CardNo'] = id.split(',')[3]; - data_m['SDLNr'] = id.split(',')[4]; - data_m['History'] = id.split(',')[5]; + data_m['Kennzeichen'] = id_M.split(',')[0]; + data_m['Kundennr'] = id_M.split(',')[2]; + data_m['CardNo'] = id_M.split(',')[3]; + data_m['SDLNr'] = id_M.split(',')[4]; + data_m['History'] = id_M.split(',')[5]; $.ajax({ type: "POST", @@ -681,86 +681,93 @@ iframe {overflow:hidden} // addheader(); var rowCount = table_M.rows.length; var iframe_M = '' - let strHTML4 = '' - for (let i = rowCount - 1; i >= 0; i--) { - table_M.deleteRow(i); - } - let strheader_M = 'SDL-NrBezeichnungGueltig bisKarten-Nummer'; - $('#<%=tablemain_m.ClientID%>').append(strheader_M); - let SDLNr = result[i]["0"]; - let cardno = result[i]["3"]; - let Kennz = result[i]["4"]; - - let KundenNR = result[i]["5"]; - let History = result[i]["6"]; + + for (var i = 0; i < result2.AaData.length; i++) { + //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' + //alert('Horray! 200 status code!' + result[i][i]); + //alert(result.rows.length) + let result = result2.AaData + alert(result) + let iframe = ''; + let strHTML4 = ''; + let SDLNr = result[i]["0"]; + let Kundennr = result[i]["5"]; + let cardno = result[i]["3"]; + let Kennz = result[i]["4"]; + let History = result[i]["7"]; + alert(SDLNr + 'SDLnummer'); + alert(Kundennr + 'Kundennummer'); + alert(cardno + 'Kartenummer'); + alert(Kennz + 'Kennzeichen'); + alert(History + 'History'); let customerid = '<%=Request.QueryString("P1")%>' - for (var i = 0; i < result.AaData.d.length; i++) { + //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' - //alert('Horray! 200 status code!' + result[i]); + //alert('Horray! 200 status code!' + result[i][i]); // alert(result.rows.length) - if (result[i]["0"] == 200 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + if (result[i]["0"] == 200 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] ){ iframe_M = ''; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 100 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 100 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 101 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 101 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 201 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 201 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 202 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 202 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 203 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 203 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - // } else if (result[i]["0"] == 204 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + // } else if (result[i]["0"] == 204 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ // iframe_M = ' '; // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - //} else if (result[i]["0"] == 205 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + //} else if (result[i]["0"] == 205 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ // iframe_M = ' '; // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - //} else if (result[i]["0"] == 206) && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + //} else if (result[i]["0"] == 206) && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ // iframe_M = ' '; // strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 207 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 207 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 208 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 208 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 209 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 209 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 210 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 210 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 211 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 211 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 212 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 212 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 213 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 213 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 214 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 214 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 215 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 215 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 216 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 216 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + ifram_M + '' - } else if (result[i]["0"] == 500 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 500 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' - } else if (result[i]["0"] == 501 && Kennz == id.split(',')[0] && Kundennr == id.split(',')[1] && SDLNr == id.split(',')[2] && History == id.split(',')[3]) { + } else if (result[i]["0"] == 501 && Kennz == id_M.split(',')[0] && Kundennr == customerid && Kundennr == id_M.split(',')[2] && cardno == id_M.split(',')[3] && SDLNr == id_M.split(',')[4] && History == id_M.split(',')[5]){ iframe_M = ' '; strHTML4 = '' + result[i]["0"] + '' + result[i]["1"] + '' + result[i]["2"] + '' + result[i]["3"] + '' + iframe_M + '' } @@ -774,7 +781,7 @@ iframe {overflow:hidden} alert("Status:" + jqXHR.status + "\nStatusText: " + textStatus + "\nError:" + errorThrown); } }); - //filltable2(id.split(',')[0]) + //filltable2(id_M.split(',')[0]) } function testfunchtmlinhalt(id) { alert(id.split(',')[0]) diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb index d9c11c6..7064445 100644 --- a/Customers/LKWs.aspx.vb +++ b/Customers/LKWs.aspx.vb @@ -160,13 +160,14 @@ Partial Class LKWS Else Stringtemp = l2.Kategorie.ToString End If - strstrstrstrtempSDL = l2.SDLNr.ToString - strstrstrstrtempCardno = l2.KartenNr.ToString - strstrstrstrtempKennz = l2.KfzKennzeichen.ToString + Dim tc_SDL As TableCell = New TableCell Dim tc_Bez As TableCell = New TableCell Dim tc_gueltigbis As TableCell = New TableCell Dim tc_Karten_Nr As TableCell = New TableCell + strstrstrstrtempSDL = l2.SDLNr.ToString + strstrstrstrtempCardno = l2.KartenNr.ToString + strstrstrstrtempKennz = l2.KfzKennzeichen.ToString tc_SDL.Text = l2.SDLNr.ToString tc_Bez.Text = Stringtemp tc_gueltigbis.Text = l2.GültigBis.ToString @@ -192,7 +193,7 @@ Partial Class LKWS strtemp2 = l1.Nationalität End If - tr1.Attributes.Add("onclick", "Javascript:doPostBack('""" + tr1.Cells.Item(0).Text + """,""" + strtemp2 + """,""" + Kdnrtext + """,""" + strstrstrstrtempCardno + """,""" + strstrstrstrtempSDL + """,""" + strstrstrstrtempHistory + """')") + tr1.Attributes.Add("onclick", "Javascript:doPostBack('" + tr1.Cells.Item(0).Text + "," + strtemp2 + "," + Kdnrtext + "," + strstrstrstrtempCardno + "," + strstrstrstrtempSDL + "," + strstrstrstrtempHistory + "')") cnt += 1 tbl_sidemenue.Rows.Add(tr1) Next @@ -370,10 +371,58 @@ Partial Class LKWS Dim tc_Verk_M As TableCell = New TableCell() Dim tc_KZ_Ab_M As TableCell = New TableCell() Dim tc_Vermerk_M As TableCell = New TableCell() - + Dim strstrstrstrtemp As String = String.Empty + Dim strstrstrstrtempCardno As String = String.Empty + Dim strstrstrstrtempKennz As String = String.Empty + Dim strstrstrstrtempKundNr As String = String.Empty + Dim strstrstrstrtempHistory As String = String.Empty + Dim strstrstrstrtempSDL As String = String.Empty Dim strstrtemp As String = String.Empty tc_KfzKennz_M.Text = l3.KfzKennzeichen tr1_M.Cells.Add(tc_KfzKennz_M) + Dim strtemparr As String = String.Empty + Dim strtemp2 As String = String.Empty + Dim strarrtemp = String.Empty + Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), l3.KfzKennzeichen) + Dim stringtemtr As String = String.Empty + Dim tr As TableRow = New TableRow + Dim list3 As List(Of String) = New List(Of String) + + For Each l2 In list2 + Dim String2 As String = String.Empty + + If IsNothing(l2.Kategorie) = True Then + stringtemtr = "Keine Angabe" + Else + stringtemtr = l2.Kategorie.ToString + End If + + Dim tc_SDL As TableCell = New TableCell + Dim tc_Bez As TableCell = New TableCell + Dim tc_gueltigbis As TableCell = New TableCell + Dim tc_Karten_Nr As TableCell = New TableCell + strstrstrstrtempSDL = l2.SDLNr.ToString + strstrstrstrtempCardno = l2.KartenNr.ToString + strstrstrstrtempKennz = l2.KfzKennzeichen.ToString + tc_SDL.Text = l2.SDLNr.ToString + tc_Bez.Text = stringtemtr + tc_gueltigbis.Text = l2.GültigBis.ToString + tc_Karten_Nr.Text = l2.KartenNr.ToString + strstrstrstrtempKundNr = l2.KundenNr.ToString + strstrstrstrtempHistory = l2.History.ToString + If String.Equals(l2.KfzKennzeichen.ToString, l3.KfzKennzeichen.ToString) = True Then + tr.Cells.Add(tc_SDL) + tr.Cells.Add(tc_Bez) + tr.Cells.Add(tc_gueltigbis) + tr.Cells.Add(tc_Karten_Nr) + 'tbl_mainpage.Rows.Add(tr) + TableRows.Add(tr) + strstrstrstrtemp += String.Join("-", tc_SDL.Text + "," + tc_Bez.Text + "," + tc_gueltigbis.Text + "," + tc_Karten_Nr.Text) + End If + list3.Add(strstrstrstrtemp) + + 'MsgBox(TableRows.Count.ToString) + Next If IsNothing(l3.Nationalität) = True Then tc_Nationalitaet_M.Text = String.Empty ElseIf String.IsNullOrEmpty(l3.Nationalität.ToString) = True Then @@ -411,14 +460,14 @@ Partial Class LKWS initcells(tblhrow_M, tbhc_KFZKennz_M, tbhc_Nat_M, tbhc_Verk_M, tbhc_KZ_An_M, tbhc_Verm_M, tr1_M, tc_KfzKennz_M, tc_Nationalitaet_M, tc_Verk_M, tc_KZ_Ab_M, tc_Vermerk_M, cnt) Dim Stringtemp_M As String = String.Empty - Dim strtemp2 As String = String.Empty + If String.IsNullOrEmpty(l3.Nationalität) Then strtemp2 = "Keine Angabe" Else strtemp2 = l3.Nationalität End If tbl_mainpage_M.Rows.Clear() - tr1_M.Attributes.Add("onclick", "Javascript:doPostBack_M('""" & tr1_M.Cells.Item(0).Text & """,""" & strtemp2 & """,""" & Kdnrtext & """,""" & l3.KfzKennzeichen & """')") + tr1_M.Attributes.Add("onclick", "Javascript:doPostBack_M('" + tr1_M.Cells.Item(0).Text + "," + strtemp2 + "," + Kdnrtext + "," + strstrstrstrtempCardno + "," + strstrstrstrtempSDL + "," + strstrstrstrtempHistory + "')") cnt += 1 tbl_2.Rows.Add(tr1_M) Next @@ -578,15 +627,8 @@ Partial Class LKWS Public Shared Function filltable2(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String) As FormattedList Dim list As List(Of String) = New List(Of String) - Dim strtemp As String = Kennzeichen.Remove(0, 1) - Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1) - Dim sdlnrstrtemp As String = SDLNr.Remove(0, 1) - Dim finalSDLNrstr As String = sdlnrstrtemp.Remove(sdlnrstrtemp.Length - 1, 1) - Dim strtempKundennr As String = Kundennr.Remove(0, 1) - Dim finalstrKundNr As String = Kundennr.Remove(strtempKundennr.Length - 1, 1) - Dim Historytemp As String = History.Remove(0, 1) - Dim finalhistory As String = Historytemp.Remove(Historytemp.Length - 1, 1) - Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr) + + Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kundennr), Kennzeichen) Dim container As New List(Of List(Of String)) For Each l2 In list2 Dim strtempKat As String = String.Empty @@ -606,15 +648,15 @@ Partial Class LKWS ' If String.Equals(finalSDLNrstr, l2.SDLNr.ToString) = True AndAlso String.Equals(finalstr, l2.KfzKennzeichen.ToString) = True AndAlso String.Equals(finalstrKundNr, l2.KundenNr.ToString) = True Then Dim Entrytemp As New List(Of String) - Entrytemp.Add(l2.SDLNr.ToString) - Entrytemp.Add(strtempKat) - Entrytemp.Add(strtempGueltigBis) - Entrytemp.Add(strtempKartenNr) - Entrytemp.Add(finalstr) - Entrytemp.Add(finalstrKundNr) - Entrytemp.Add(finalSDLNrstr) - Entrytemp.Add(finalhistory) - container.Add(Entrytemp) + Entrytemp.Add(l2.SDLNr.ToString) + Entrytemp.Add(strtempKat) + Entrytemp.Add(strtempGueltigBis) + Entrytemp.Add(strtempKartenNr) + Entrytemp.Add(Kennzeichen) + Entrytemp.Add(Kdnrtext) + Entrytemp.Add(SDLNr) + Entrytemp.Add(History) + container.Add(Entrytemp) ' End If Next @@ -626,15 +668,8 @@ Partial Class LKWS Public Shared Function filltable2_M(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String) As FormattedList Dim list As List(Of String) = New List(Of String) - Dim strtemp As String = Kennzeichen.Remove(0, 1) - Dim finalstr As String = strtemp.Remove(strtemp.Length - 1, 1) - Dim sdlnrstrtemp As String = SDLNr.Remove(0, 1) - Dim finalSDLNrstr As String = sdlnrstrtemp.Remove(sdlnrstrtemp.Length - 1, 1) - Dim strtempKundennr As String = Kundennr.Remove(0, 1) - Dim finalstrKundNr As String = Kundennr.Remove(strtempKundennr.Length - 1, 1) - Dim Historytemp As String = History.Remove(0, 1) - Dim finalhistory As String = Historytemp.Remove(Historytemp.Length - 1, 1) - Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kdnrtext), finalstr) + + Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(Integer.Parse(Kundennr), Kennzeichen) Dim container As New List(Of List(Of String)) For Each l2 In list2 Dim strtempKat As String = String.Empty @@ -652,11 +687,15 @@ Partial Class LKWS End If Dim Entrytemp As New List(Of String) - 'If String.Equals(finalSDLNrstr, l2.SDLNr.ToString) = True AndAlso String.Equals(finalstr, l2.KfzKennzeichen.ToString) = True AndAlso String.Equals(finalstrKundNr, l2.KundenNr.ToString) = True Then + ' If String.Equals(SDLNr, l2.SDLNr.ToString) = True AndAlso String.Equals(Kennzeichen, l2.KfzKennzeichen.ToString) = True AndAlso String.Equals(Kundennr, l2.KundenNr.ToString) = True Then Entrytemp.Add(l2.SDLNr.ToString) Entrytemp.Add(strtempKat) Entrytemp.Add(strtempGueltigBis) Entrytemp.Add(strtempKartenNr) + Entrytemp.Add(Kennzeichen) + Entrytemp.Add(Kdnrtext) + Entrytemp.Add(SDLNr) + Entrytemp.Add(History) container.Add(Entrytemp) ' End If Next diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx b/Customers/SDL/Formtemplate IDS Tankkarte.aspx index eb1b214..2beffe6 100644 --- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx +++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx @@ -137,7 +137,27 @@ let data = {}; data['Kennzeichen'] = id; - data['CardNo'] = CardNo; + data['CardNo'] = CardNo; var param1 = getParamValue('Kennzeichen'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); + + $('txt_ClientNr').val(param1); + detailtabelle(param1, param2, param3, param4, param5, param6) + //alert(param1) + + function detailtabelle(id, CustomerID, Cardnummer, CustomerNo, SDLNr, History) { + // alert("Testdata:" + id) + + let data = {}; + data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; + data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", @@ -155,14 +175,14 @@ //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' //alert('Horray! 200 status code!' + result[i]); // alert(result.rows.length) - if (CardNo == result[i]["2"]) { - document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=Txt_Lieferdat.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txt_KartenNr.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('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result[i]["5"]); - document.getElementById('<%=cb_Ersatzkarte.ClientID%>').setAttribute('checked', result[i]["6"]); + if (CardNo == result["2"]) { + document.getElementById('<%=txt_BestNr.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=Txt_Lieferdat.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txt_KartenNr.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('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result["5"]); + document.getElementById('<%=cb_Ersatzkarte.ClientID%>').setAttribute('checked', result["6"]); } } //renderTable(data.d); diff --git a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb index cd07908..d64714d 100644 --- a/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb +++ b/Customers/SDL/Formtemplate IDS Tankkarte.aspx.vb @@ -73,12 +73,12 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, SDLNr As String, History As String) As FormattedList + Public Shared Function filltabledetails(Kennzeichen As String, KundenNr As String, Cardno As String, CustomerNo As String, SDLNr As String, History As String) As FormattedList 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 listdetails As New List(Of List(Of String)) For Each l2 In list2 - If l2.KfzKennzeichen = Kennzeichen And l2.KundenNr = KundenNr And l2.SDLNr = SDLNr And l2.History = History Then + If l2.KfzKennzeichen = Kennzeichen And l2.KundenNr = KundenNr And l2.KartenNr = Cardno And l2.SDLNr = SDLNr And l2.History = History Then Dim strtempbestelltam As String = String.Empty Dim strtempLieferdatum As String = String.Empty Dim strtempKartenNr As String = String.Empty diff --git a/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx b/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx index 8d88f7b..798772c 100644 --- a/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx +++ b/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx @@ -131,18 +131,26 @@ } } var param1 = getParamValue('Kennzeichen'); - var param2 = getParamValue('CardNo'); + var param2 = getParamValue('CustomerID'); + var param3 = getParamValue('CardNo'); + var param4 = getParamValue('CustomerNo'); + var param5 = getParamValue('SDLNr'); + var param6 = getParamValue('History'); $('txt_ClientNr').val(param1); - detailtabelle(param1,param2) + detailtabelle(param1,param2,param3,param4,param5,param6) //alert(param1) - function detailtabelle(id,Cardnummer) { + function detailtabelle(id,CustomerID,Cardnummer,CustomerNo,SDLNr,History) { // alert("Testdata:" + id) let data = {}; data['Kennzeichen'] = id; + data['Kundennr'] = CustomerID; data['CardNo'] = Cardnummer; + data['CustomerNo'] = CustomerNo; + data['SDLNr'] = SDLNr; + data['History'] = History; $.ajax({ type: "POST", @@ -153,22 +161,24 @@ data: JSON.stringify(data), success: function (data) { //alert(data.d.AaData) - result = data.d.AaData; + let result2 = data.d; //addheader(); - - for (var i = 0; i < result.length; i++) { + + for (var i = 0; i < result2.AaData.length; i++) { //let strHTML4 = '878465464634DIESEL12/05/2026151515313521351' //alert('Horray! 200 status code!' + result[i]); - // alert(result.rows.length) - if (Cardnummer == result[i]["2"]) { - document.getElementById('<%=txt_BestellDatum.ClientID%>').setAttribute('value', result[i]["0"]); - document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result[i]["1"]); - document.getElementById('<%=txt_KartNr.ClientID%>').setAttribute('value', result[i]["2"]); - document.getElementById('<%=txt_CardNr.ClientID%>').setAttribute('value', result[i]["3"]); - document.getElementById('<%=txt_PIN.ClientID%>').setAttribute('value', result[i]["4"]); - document.getElementById('<%=txt_Vermerk.ClientID%>').setAttribute('value', result[i]["5"]); - document.getElementById('<%=txt_GueltigBis.ClientID%>').setAttribute('value', result[i]["6"]); - } + // alert(result.rows.length) + let result = result2.AaData[i]; + alert(result+"Ergebnis detailtabelle") + + document.getElementById('<%=txt_BestellDatum.ClientID%>').setAttribute('value', result["0"]); + document.getElementById('<%=txt_Lieferdatum.ClientID%>').setAttribute('value', result["1"]); + document.getElementById('<%=txt_KartNr.ClientID%>').setAttribute('value', result["2"]); + document.getElementById('<%=txt_CardNr.ClientID%>').setAttribute('value', result["3"]); + document.getElementById('<%=txt_PIN.ClientID%>').setAttribute('value', result["4"]); + 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 UTA Karte.aspx.vb b/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx.vb index 2381191..1289dc9 100644 --- a/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx.vb +++ b/Customers/SDL/MAUT/Formtemplate UTA Karte.aspx.vb @@ -73,12 +73,12 @@ Partial Class Customers_Default3 - Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, SDLNr As String, History As String) As FormattedList + Public Shared Function filltabledetails(Kennzeichen As String, Kundennr As String, CardNo As String, SDLNr As String, History As String) As FormattedList 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 listdetails As New List(Of List(Of String)) For Each l2 In list2 - If l2.KundenNr.ToString = Kundennr AndAlso l2.SDLNr = SDLNr AndAlso l2.History = History Then + If l2.KundenNr.ToString = Kundennr AndAlso l2.SDLNr = SDLNr And l2.KartenNr = CardNo Then Dim strtempbestelltam As String = String.Empty Dim strtempLieferdatum As String = String.Empty Dim strtempKartenNr As String = String.Empty