Änderungen zu iframe statt strings in der ajaxabfrage
This commit is contained in:
@@ -130,7 +130,7 @@ Public Class TestPerformance
|
|||||||
For zahl As Integer = 0 To zahlint
|
For zahl As Integer = 0 To zahlint
|
||||||
sw1.Start()
|
sw1.Start()
|
||||||
hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 8))))
|
hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 8))))
|
||||||
arrzahl_iterats.Add(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 2), Math.Pow(2, 5)))
|
arrzahl_iterats.Add(VERAG_VARIABLES.RandomInteger(Math.Pow(2, 2), 68))
|
||||||
arrzahl.Add(zahlint)
|
arrzahl.Add(zahlint)
|
||||||
sw1.Stop()
|
sw1.Stop()
|
||||||
arrzeitp1.Add(sw1.ElapsedMilliseconds)
|
arrzeitp1.Add(sw1.ElapsedMilliseconds)
|
||||||
@@ -180,7 +180,7 @@ Public Class TestPerformance
|
|||||||
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
||||||
hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, 254)))
|
hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, 254)))
|
||||||
Else
|
Else
|
||||||
hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, 105)))
|
hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, 365)))
|
||||||
End If
|
End If
|
||||||
arrzahl_iterats.Add(VERAG_VARIABLES.RandomInteger(25, 45))
|
arrzahl_iterats.Add(VERAG_VARIABLES.RandomInteger(25, 45))
|
||||||
arrzahl.Add(zahlint)
|
arrzahl.Add(zahlint)
|
||||||
|
|||||||
@@ -28,98 +28,101 @@
|
|||||||
<link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css" />
|
<link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css" />
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<form id="form1" runat="server">
|
<form id="form1" runat="server" style="width:875px;height:250px">
|
||||||
<div>
|
<div class="card" style="width:875px;height:250px">
|
||||||
<div class="card">
|
|
||||||
<div class="card-header">
|
<div class="card-header">
|
||||||
<div class="row" style="background-color:#003680">
|
<div class="row" style="background-color: #003680">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="float-start">
|
<div class="float-start">
|
||||||
<label class="col-form-label-lg" runat="server" style="color:#fff;font-weight:bold;font-size:19px">SDL</label>
|
<label class="col-form-label-lg" runat="server" style="color: #fff; font-weight: bold; font-size: 19px">SDL</label>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="float-end">
|
<div class="float-end">
|
||||||
<label runat="server" style="color: #fff; font-weight: bold; font-size: 19px">KartenNr</label>
|
<label runat="server" style="color: #fff; font-weight: bold; font-size: 19px">KartenNr</label>
|
||||||
<input type="text" runat="server" placeholder="" aria-label="CardNumber" readonly="readonly" />
|
<input type="text" runat="server" placeholder="" aria-label="CardNumber" readonly="readonly" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="card" style="width: 80rem;">
|
<div class="card" style="width: 975px; height: 250px">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="row">
|
|
||||||
<div class="col">
|
|
||||||
<label id="lbl_BestNr">Bestell-Nr.:</label>
|
|
||||||
</div>
|
|
||||||
<div class="col"><input id="txt_BestNr" readonly="readonly" runat="server" style="margin-left:10px" /></div>
|
|
||||||
</div>
|
|
||||||
<div class="row" style="height:20px">
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
<div class="col">
|
||||||
|
<label id="lbl_BestNr">Bestell-Nr.:</label>
|
||||||
|
</div>
|
||||||
|
<div class="col">
|
||||||
|
<input id="txt_BestNr" readonly="readonly" runat="server" style="margin-left: 10px" /></div>
|
||||||
|
</div>
|
||||||
|
<div class="row" style="height: 20px">
|
||||||
|
</div>
|
||||||
|
<div class="row w-100">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<label id="lbl_Umstellungsdatum">Umstellungsdatum:</label>
|
<label id="lbl_Umstellungsdatum">Umstellungsdatum:</label>
|
||||||
<input id="Text1" readonly="readonly" runat="server" style="width: 68px;margin-left:42px" value="Text" /></div>
|
<input id="Text1" readonly="readonly" runat="server" style="width: 68px; margin-left: 0px" value="Text" />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<label id="lbl_Kategorie">Kategorie:</label>
|
<label id="lbl_Kategorie">Kategorie:</label>
|
||||||
<input id="txt_Kategorie" readonly="readonly" runat="server" style="width: 45px; margin-left: 54px" value="Text" /></div>
|
<input id="txt_Kategorie" readonly="readonly" runat="server" style="width: 45px; margin-left: 58px" value="Text" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<label id="lbl_Vertrabschldat">Vertragabschlussdatum:</label>
|
<label id="lbl_Vertrabschldat">Vertragabschlussdatum:</label>
|
||||||
<input id="txt_Vertrabschldat" readonly="readonly" runat="server" style="width: 68px; margin-left: 12px" value="Text" />
|
<input id="txt_Vertrabschldat" readonly="readonly" runat="server" style="width: 68px; margin-left:0px" value="Text" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<label id="lbl_Status">Status:</label>
|
<label id="lbl_Status">Status:</label>
|
||||||
<input id="txt_Status" readonly="readonly" runat="server" style="width: 45px; margin-left: 74px" value="Text" />
|
<input id="txt_Status" readonly="readonly" runat="server" style="width: 45px; margin-left: 64px" value="Text" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="row">
|
<div class="row w-20">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<label id="lbl_Schadstoffklasse">Schadstoffklasse:</label>
|
<label id="lbl_Schadstoffklasse">Schadstoffklasse:</label>
|
||||||
<input id="txt_Schadstoffklasse" readonly="readonly" runat="server" style="width: 45px; margin-left:12px" value="Text" />
|
<input id="txt_Schadstoffklasse" readonly="readonly" runat="server" style="width: 45px" value="Text" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<label id="lbl_GueltigBis">Gueltig Bis:</label>
|
<label id="lbl_GueltigBis">Gueltig Bis:</label>
|
||||||
<input id="GueltigBis" readonly="readonly" runat="server" /></div>
|
<input id="GueltigBis" readonly="readonly" runat="server" />
|
||||||
</div>
|
</div>
|
||||||
<div class="row" style="height:40px;"></div>
|
</div>
|
||||||
|
<div class="row" style="height: 40px;"></div>
|
||||||
<div id="checkboxes">
|
<div id="checkboxes">
|
||||||
<asp:CheckBoxList runat="server" Enabled="false">
|
<asp:CheckBoxList runat="server" Enabled="false">
|
||||||
<asp:ListItem Text="Verloren" Value="Verloren" Selected="false"></asp:ListItem>
|
<asp:ListItem Text="Verloren" Value="Verloren" Selected="false"></asp:ListItem>
|
||||||
<asp:ListItem Text="Gestohlen" Value="Verloren" Enabled="false"></asp:ListItem>
|
<asp:ListItem Text="Gestohlen" Value="Verloren" Enabled="false"></asp:ListItem>
|
||||||
<asp:ListItem Text="Gesperrt" Value="Verloren" Enabled="false"></asp:ListItem>
|
<asp:ListItem Text="Gesperrt" Value="Verloren" Enabled="false"></asp:ListItem>
|
||||||
<asp:ListItem Text="Defekt" Value="Verloren" Enabled="false"></asp:ListItem>
|
<asp:ListItem Text="Defekt" Value="Verloren" Enabled="false"></asp:ListItem>
|
||||||
<asp:ListItem Text="Archiviert" Value="Verloren" Enabled="false"></asp:ListItem>
|
<asp:ListItem Text="Archiviert" Value="Verloren" Enabled="false"></asp:ListItem>
|
||||||
</asp:CheckBoxList>
|
</asp:CheckBoxList>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</body>
|
</body>
|
||||||
|
|||||||
@@ -40,6 +40,11 @@
|
|||||||
border: 1px solid grey;
|
border: 1px solid grey;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
<style>
|
||||||
|
|
||||||
|
iframe {overflow:hidden}
|
||||||
|
|
||||||
|
</style>
|
||||||
</style>
|
</style>
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
@@ -158,7 +163,7 @@
|
|||||||
</asp:Table>-->
|
</asp:Table>-->
|
||||||
<table runat="server" id="tablemain_m" class="col-12 table table-hover" style="width: 385.5px">
|
<table runat="server" id="tablemain_m" class="col-12 table table-hover" style="width: 385.5px">
|
||||||
<tr style="width: 385.5px">
|
<tr style="width: 385.5px">
|
||||||
<td>Bitte Daten auswählen durch Klicken der Buttons</td>
|
<td>Bitte Daten auswählen durch Klicken der Buttons</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
@@ -530,9 +535,10 @@
|
|||||||
//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)
|
||||||
|
|
||||||
|
let iframe = '<iframe sandbox="allow-same-origin allow-scripts" runat="server" enableviewstate="true" style="width:99.75%;height:250px;overflow:cut; margin-top: -3px;padding-right:5px;padding-bottom:-20px;" id="iframe" scrolling="no" contenteditable="false" src="FormtemplateLKWS.aspx"></iframe>'
|
||||||
|
|
||||||
|
let strHTML4 = '<tr data-bs-toggle="collapse" data-bs-target="#accordion' + result[i]["3"] + '" class="clickable"><td style="width:224.25px">' + result[i]["0"] + '</td><td style="width:224.25px">' + result[i]["1"] + '</td><td style="width:224.25px">' + result[i]["2"] + '</td><td style="width:224.25px">' + result[i]["3"] + '</td><span class="sign"></span></tr><tr id="accordion' + result[i]["3"] + '" class="collapse accordion-collapse"><td colspan="4">' + iframe + '</td></tr>'
|
||||||
let strHTML4 = '<tr data-bs-toggle="collapse" data-bs-target="#accordion' + result[i]["3"] + '" class="clickable"><td style="width:224.25px">' + result[i]["0"] + '</td><td style="width:224.25px">' + result[i]["1"] + '</td><td style="width:224.25px">' + result[i]["2"] + '</td><td style="width:224.25px">' + result[i]["3"] + '</td><span class="sign"></span></tr><tr id="accordion' + result[i]["3"] + '" class="collapse accordion-collapse"><td colspan="4">' + testfunchtmlinhalt(id.split(',')[0] + ',' + result[i]["3"])+'</td><tr>'
|
|
||||||
//alert(strHTML4)
|
//alert(strHTML4)
|
||||||
$('#<%=tablemain.ClientID%>').append(strHTML4);
|
$('#<%=tablemain.ClientID%>').append(strHTML4);
|
||||||
}
|
}
|
||||||
@@ -590,8 +596,8 @@
|
|||||||
//alert('Horray! 200 status code!' + result[i]);
|
//alert('Horray! 200 status code!' + result[i]);
|
||||||
// alert(result.rows.length)
|
// alert(result.rows.length)
|
||||||
detailtabelle_M(id_M.split(',')[0])
|
detailtabelle_M(id_M.split(',')[0])
|
||||||
|
let iframe_M = ' <iframe sandbox="allow-same-origin allow-scripts" runat="server" enableviewstate="true" style="width:385.5px;height:206px" id="iframe1_m" contenteditable="true" src="FormtemplateLKWS.aspx" ></iframe>';
|
||||||
let strHTML4 = '<tr style="width:385.5px" data-bs-toggle="collapse" data-bs-target="#accordion_m' + result[i]["3"] + '" class="clickable"><td style="width:96.375px">' + result[i]["0"] + '</td><td style="width:96.375px">' + result[i]["1"] + '</td><td style="width:96.375px">' + result[i]["2"] + '</td><td style="width:96.375px">' + result[i]["3"] + '</td><span class="sign"></span></tr><tr id="accordion_m' + result[i]["3"] + '" class="collapse accordion-collapse"><td colspan="4">' + detailtabelle_M(id_M.split(',')[0] + ',' + result[i]["3"])+'</td><tr>'
|
let strHTML4 = '<tr style="width:385.5px" data-bs-toggle="collapse" data-bs-target="#accordion_m' + result[i]["3"] + '" class="clickable"><td style="width:96.375px">' + result[i]["0"] + '</td><td style="width:96.375px">' + result[i]["1"] + '</td><td style="width:96.375px">' + result[i]["2"] + '</td><td style="width:96.375px">' + result[i]["3"] + '</td><span class="sign"></span></tr><tr id="accordion_m' + result[i]["3"] + '" class="collapse accordion-collapse"><td colspan="4">'+iframe_M+'</td><tr>'
|
||||||
//alert(strHTML4)
|
//alert(strHTML4)
|
||||||
$('#<%=tablemain_m.ClientID%>').append(strHTML4);
|
$('#<%=tablemain_m.ClientID%>').append(strHTML4);
|
||||||
}
|
}
|
||||||
@@ -607,8 +613,7 @@
|
|||||||
}
|
}
|
||||||
function testfunchtmlinhalt(id) {
|
function testfunchtmlinhalt(id) {
|
||||||
alert(id.split(',')[0])
|
alert(id.split(',')[0])
|
||||||
let strhtmlform_maut = `<div class="card"><label id="lbl_Schadstoffklasse">Schadstoffklasse:</label><input id="txt_Schadstoffklasse" readonly="readonly" runat="server" style="width: 45px; margin-left:12px" value="Text" /></div>
|
let strhtmlform_maut = ``
|
||||||
`
|
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: url,
|
url: url,
|
||||||
type: 'GET',
|
type: 'GET',
|
||||||
@@ -639,7 +644,7 @@
|
|||||||
//alert(data.d.AaData)
|
//alert(data.d.AaData)
|
||||||
result = data.d.AaData;
|
result = data.d.AaData;
|
||||||
//addheader();
|
//addheader();
|
||||||
var rowCount = table_M.rows.length;
|
var rowCount = table.rows.length;
|
||||||
let tablewhole = {}
|
let tablewhole = {}
|
||||||
let tablestart = '<table>'
|
let tablestart = '<table>'
|
||||||
let tableend = '</table>'
|
let tableend = '</table>'
|
||||||
@@ -689,32 +694,5 @@
|
|||||||
|
|
||||||
return strlisttabledetails_M
|
return strlisttabledetails_M
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<script>
|
|
||||||
function gethtmlofpage(url) {
|
|
||||||
let data = {};
|
|
||||||
data['url'] = url;
|
|
||||||
alert("before json");
|
|
||||||
$.ajax({
|
|
||||||
type: "POST",
|
|
||||||
url: "LKWs.aspx/gethtmltostring",
|
|
||||||
contentType: "application/json; charset=utf-8",
|
|
||||||
dataType: "json",
|
|
||||||
async: "true",
|
|
||||||
data: JSON.stringify(data),
|
|
||||||
success: OnSuccess,
|
|
||||||
failure: function (response) {
|
|
||||||
alert(response.d);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
alert("after json");
|
|
||||||
}
|
|
||||||
|
|
||||||
function OnSuccess(response) {
|
|
||||||
alert(response);
|
|
||||||
return response
|
|
||||||
}
|
|
||||||
//filltable2(id.split(',')[0])
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
</asp:Content>
|
</asp:Content>
|
||||||
@@ -1107,7 +1107,7 @@ Partial Class LKWS
|
|||||||
Else
|
Else
|
||||||
readStream = New StreamReader(receiveStream, Encoding.GetEncoding(Response.CharacterSet))
|
readStream = New StreamReader(receiveStream, Encoding.GetEncoding(Response.CharacterSet))
|
||||||
|
|
||||||
''Get news data in json string
|
''Get data in json string
|
||||||
''You will get html source here......
|
''You will get html source here......
|
||||||
Dim Data As String = readStream.ReadToEnd()
|
Dim Data As String = readStream.ReadToEnd()
|
||||||
Return Data
|
Return Data
|
||||||
|
|||||||
@@ -7,8 +7,7 @@
|
|||||||
|
|
||||||
<!-- Required meta tags -->
|
<!-- Required meta tags -->
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
|
|
||||||
<%@ Import Namespace="MySql.Data.MySqlClient" %>
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" title="VERAG IndexCustomer" />
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" title="VERAG IndexCustomer" />
|
||||||
|
|
||||||
<link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico" />
|
<link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico" />
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user