Änderungen
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.getiterationnumber)
|
arrzahl_iterats.Add(VERAG_VARIABLES.RandomInteger(5, 7))
|
||||||
arrzahl.Add(zahlint)
|
arrzahl.Add(zahlint)
|
||||||
sw1.Stop()
|
sw1.Stop()
|
||||||
arrzeitp1.Add(sw1.ElapsedMilliseconds)
|
arrzeitp1.Add(sw1.ElapsedMilliseconds)
|
||||||
@@ -178,11 +178,11 @@ Public Class TestPerformance
|
|||||||
For zahl As Integer = 0 To zahlint
|
For zahl As Integer = 0 To zahlint
|
||||||
sw1.Start()
|
sw1.Start()
|
||||||
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, Math.Pow(2, 7))))
|
hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, 105)))
|
||||||
Else
|
Else
|
||||||
hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, Math.Pow(2, 8))))
|
hashsalts.Add(VERAG_VARIABLES.GenerateSalt(VERAG_VARIABLES.RandomInteger(95, 105)))
|
||||||
End If
|
End If
|
||||||
arrzahl_iterats.Add(VERAG_VARIABLES.getiterationnumber)
|
arrzahl_iterats.Add(VERAG_VARIABLES.RandomInteger(5, 10))
|
||||||
arrzahl.Add(zahlint)
|
arrzahl.Add(zahlint)
|
||||||
sw1.Stop()
|
sw1.Stop()
|
||||||
arrzeitp1.Add(sw1.ElapsedMilliseconds)
|
arrzeitp1.Add(sw1.ElapsedMilliseconds)
|
||||||
@@ -192,7 +192,7 @@ Public Class TestPerformance
|
|||||||
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
||||||
pw = "PasswordV" + VERAG_VARIABLES.RandomInteger(5, zahlint - 5).ToString + "!!%"
|
pw = "PasswordV" + VERAG_VARIABLES.RandomInteger(5, zahlint - 5).ToString + "!!%"
|
||||||
Else
|
Else
|
||||||
pw = "&WAS5$WdAG&" + VERAG_VARIABLES.RandomInteger(55, zahlint - VERAG_VARIABLES.RandomInteger(5, 87)).ToString + "#*p(=+UY"
|
pw = "&WAS5$WdAG&" + VERAG_VARIABLES.RandomInteger(75, zahlint - VERAG_VARIABLES.RandomInteger(5, 7)).ToString + "#*p(=+UY"
|
||||||
End If
|
End If
|
||||||
For zahl As Integer = 0 To zahlint
|
For zahl As Integer = 0 To zahlint
|
||||||
sw2.Start()
|
sw2.Start()
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ Public Class VERAG_VARIABLES
|
|||||||
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
|
||||||
Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6))
|
Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6))
|
||||||
Else
|
Else
|
||||||
Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 9))
|
Return RandomInteger(Math.Pow(2, 4), Math.Pow(2, 6))
|
||||||
End If
|
End If
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
@@ -48,9 +48,9 @@ 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 = 28
|
Argon.DegreeOfParallelism = 30
|
||||||
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 7)
|
Argon.Iterations = nIterations * VERAG_VARIABLES.RandomInteger(2, 3)
|
||||||
Argon.MemorySize = (((nIterations * 9.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)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|||||||
@@ -354,9 +354,7 @@
|
|||||||
<%If Me.Page.User.Identity.Name = "test" Then %>
|
<%If Me.Page.User.Identity.Name = "test" Then %>
|
||||||
<li><a href="Invoices.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
|
<li><a href="Invoices.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
|
||||||
<%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
|
<%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
|
||||||
<li><a href="LKWs.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">LKWs</a></li>
|
<li><a href="LKWs.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">LKWs</a></li>
|
||||||
<%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%>
|
|
||||||
<li><a type="button" class="btn btn-primary" href="#" aria-disabled="true" data-bs-toggle="tooltip" data-bs-placement="top" title="Bald verfügbar!" style="background-color:#fff;color:#043381;text-align:left;border:none">Coming soon</a></li>
|
|
||||||
<%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
|
<%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
|
||||||
<li><a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%Response.Write(CustomerID) %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
|
<li><a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%Response.Write(CustomerID) %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
|
||||||
<%End If %>
|
<%End If %>
|
||||||
@@ -369,9 +367,7 @@
|
|||||||
<%If Me.Page.User.Identity.Name = "test" Then %>
|
<%If Me.Page.User.Identity.Name = "test" Then %>
|
||||||
<li><a href="CustomsAviso.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">Aufträge</a></li>
|
<li><a href="CustomsAviso.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">Aufträge</a></li>
|
||||||
<%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
|
<%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
|
||||||
<li><a href="Cards_Boxes.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">Karten_Boxen</a></li>
|
<li><a href="Cards_Boxes.aspx" style="background-color:#fff;color:#043381;text-align:left;border:none">Karten_Boxen</a></li>
|
||||||
<%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%>
|
|
||||||
<li><a type="button" class="btn btn-primary" href="CustomsAviso.aspx" aria-disabled="false" data-bs-toggle="tooltip" data-bs-placement="top" title="Aufträge" style="background-color:#fff;color:#043381;text-align:left;border:none">Aufträge</a></li>
|
|
||||||
<%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
|
<%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
|
||||||
<li><a type="button" class="btn btn-primary" href="#" aria-disabled="true" data-bs-toggle="tooltip" data-bs-placement="top" title="Bald verfügbar!" style="background-color:#fff;color:#043381;text-align:left;border:none">Coming soon</a></li>
|
<li><a type="button" class="btn btn-primary" href="#" aria-disabled="true" data-bs-toggle="tooltip" data-bs-placement="top" title="Bald verfügbar!" style="background-color:#fff;color:#043381;text-align:left;border:none">Coming soon</a></li>
|
||||||
<%End If %>
|
<%End If %>
|
||||||
@@ -384,23 +380,35 @@
|
|||||||
<%If Me.Page.User.Identity.Name = "test" Then %>
|
<%If Me.Page.User.Identity.Name = "test" Then %>
|
||||||
<li><a href="#" aria-disabled="true" data-bs-toggle="tooltip" data-bs-placement="top" title="Bald verfügbar!" style="background-color:#fff;color:#043381;text-align:left;border:none">Coming soon</a></li>
|
<li><a href="#" aria-disabled="true" data-bs-toggle="tooltip" data-bs-placement="top" title="Bald verfügbar!" style="background-color:#fff;color:#043381;text-align:left;border:none">Coming soon</a></li>
|
||||||
<%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
|
<%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
|
||||||
<li><a href="Invoices.aspx?P1=<%Response.Write(CustomerID) %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
|
<li><a href="Invoices.aspx?P1=<%Response.Write(CustomerID) %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
|
||||||
<%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%>
|
|
||||||
<li><a type="button" class="btn btn-primary" href="#" aria-disabled="true" data-bs-toggle="tooltip" data-bs-placement="top" title="Bald verfügbar!" style="background-color:#fff;color:#043381;text-align:left;border:none">Coming soon</a></li>
|
|
||||||
<%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
|
<%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
|
||||||
<li><a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%Response.Write(CustomerID) %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
|
<li><a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%Response.Write(CustomerID) %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
|
||||||
<%End If %>
|
<%End If %>
|
||||||
<!-- </ul>-->
|
<!-- </ul>-->
|
||||||
</li>
|
</li>
|
||||||
|
<li>
|
||||||
|
<%If Me.Page.User.Identity.Name = "Userwithlongername" Then %>
|
||||||
|
<li><a href="#" aria-disabled="true" data-bs-toggle="tooltip" data-bs-placement="top" title="Bald verfügbar!" style="background-color: #fff; color: #043381; text-align: left; border: none">Coming soon</a></li>
|
||||||
|
<%ElseIf Me.Page.User.Identity.Name = "test2" Then %>
|
||||||
|
<li><a href="Invoices.aspx?P1=<%Response.Write(CustomerID) %>" style="background-color: #fff; color: #043381; text-align: left; border: none">Rechnungen</a></li>
|
||||||
|
<%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
|
||||||
|
<li><a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%Response.Write(CustomerID) %>" style="background-color: #fff; color: #043381; text-align: left; border: none">Rechnungen</a></li>
|
||||||
|
<%End If %>
|
||||||
|
<!-- </ul>-->
|
||||||
|
</li>
|
||||||
<li>
|
<li>
|
||||||
|
<a href="#UserSubmenuFuhrpark" data-bs-toggle="collapse" aria-expanded="false" class="dropdown-toggle">Fuhrpark</a>
|
||||||
|
<ul style="list-style: none;" class="collapse list-unstyled" id="UserSubmenuFuhrpark">
|
||||||
|
<li><a type="button" class="btn btn-primary" href="LKWs.aspx?P1=<%Response.Write(CustomerID) %>" style="background-color: #fff; color: #043381; text-align: left; border: none;font-size:smaller">LKWs</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
<a href="#UserSubmenu1" data-bs-toggle="collapse" aria-expanded="false" class="dropdown-toggle">Benutzerprofil</a>
|
<a href="#UserSubmenu1" data-bs-toggle="collapse" aria-expanded="false" class="dropdown-toggle">Benutzerprofil</a>
|
||||||
<ul style="list-style: none;"class="collapse list-unstyled" id="UserSubmenu1">
|
<ul style="list-style: none;"class="collapse list-unstyled" id="UserSubmenu1">
|
||||||
<span class="navbar-toggler-icon"></span>
|
<span class="navbar-toggler-icon"></span>
|
||||||
<li><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;white-space: nowrap; height:20px"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button> </li>
|
<li><button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:16px;white-space: nowrap; height:20px"><img src="../images/Icons/main/gear_blue.png"; style="width:15px; height:15px;color:#043381;background-color:#fff;margin-right:6px;" />Profil bearbeiten</button> </li>
|
||||||
<li style="margin-top:12px"><a type="button" class="btn btn-primary" href="../login/Logout.aspx" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:20px;width:200px;z-index:1032;margin-left:-16px"><img src="../images/Icons/main/Logout.svg.png"; style="width:15px;height:15px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</a></li>
|
<li style="margin-top:12px"><a type="button" class="btn btn-primary" href="../login/Logout.aspx" style="text-decoration: none;background-color:#fff;color:#043381;text-align:left;border:none;font-size:20px;width:200px;z-index:1032;margin-left:-16px"><img src="../images/Icons/main/Logout.svg.png"; style="width:15px;height:15px;color:#043381;background-color:#fff; margin-right:6px;"/>Logout</a></li>
|
||||||
</ul>
|
</ul> </li>
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div></nav>
|
</div></nav>
|
||||||
<!-- Page Content -->
|
<!-- Page Content -->
|
||||||
<nav class="container-xxl" style="align-content:center">
|
<nav class="container-xxl" style="align-content:center">
|
||||||
|
|||||||
@@ -187,8 +187,8 @@
|
|||||||
<asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regex_txt_Absender_M" Enabled="false" ValidationExpression="[^!,]{2,90}" ForeColor="Red" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
|
<asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regex_txt_Absender_M" Enabled="false" ValidationExpression="[^!,]{2,90}" ForeColor="Red" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
|
||||||
</div>
|
</div>
|
||||||
<div id="rowcols8" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
|
<div id="rowcols8" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
|
||||||
<asp:Label ID="lbl_Empfaenger_M" runat="server" style="color:#043381" Font-Size="1em">Empfänger</asp:Label>
|
<asp:Label ID="lbl_Empfaenger_M" runat="server" Style="color: #043381" Font-Size="1em">Empfänger</asp:Label>
|
||||||
<asp:TextBox ID="txt_Empfaenger_M" runat="server" style="width:155px;margin-left:84px"></asp:TextBox>
|
<asp:TextBox ID="txt_Empfaenger_M" runat="server" style="width:155px;margin-left:85px"></asp:TextBox>
|
||||||
<asp:RequiredFieldValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="reqval_txt_Empfaenger_M" ForeColor="Red" Enabled="false" Display="Dynamic"></asp:RequiredFieldValidator>
|
<asp:RequiredFieldValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="reqval_txt_Empfaenger_M" ForeColor="Red" Enabled="false" Display="Dynamic"></asp:RequiredFieldValidator>
|
||||||
<asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" ID="regex_txt_Empaenger_M" runat="server" ForeColor="Red" Enabled="false" ValidationExpression="[^!,]{2,90}" Display="Dynamic" style="width:105px;margin-left:13px" SetFocusOnError="true" ErrorMessage="Error! Try again!"></asp:RegularExpressionValidator>
|
<asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" ID="regex_txt_Empaenger_M" runat="server" ForeColor="Red" Enabled="false" ValidationExpression="[^!,]{2,90}" Display="Dynamic" style="width:105px;margin-left:13px" SetFocusOnError="true" ErrorMessage="Error! Try again!"></asp:RegularExpressionValidator>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -88,32 +88,10 @@
|
|||||||
<!-- <asp:Table ID="tbl_mainpage" ClientIDMode="Static" runat="server" Width="100%" style="background-color:#fff;overflow-y:auto;" CssClass="table table-striped col-12">
|
<!-- <asp:Table ID="tbl_mainpage" ClientIDMode="Static" runat="server" Width="100%" style="background-color:#fff;overflow-y:auto;" CssClass="table table-striped col-12">
|
||||||
<asp:TableHeaderRow ID="headrow1" runat="server" style="background-color:#043381;color:#fff;height:10px"><asp:TableHeaderCell ID="tblhc_SDLNr">SDL-Nr</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Bez">Bezeichnung</asp:TableHeaderCell><asp:TableHeaderCell ID="tbl_gueltig">Gültig Bis</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_KarteNr">Karten-Nummer</asp:TableHeaderCell></asp:TableHeaderRow>
|
<asp:TableHeaderRow ID="headrow1" runat="server" style="background-color:#043381;color:#fff;height:10px"><asp:TableHeaderCell ID="tblhc_SDLNr">SDL-Nr</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Bez">Bezeichnung</asp:TableHeaderCell><asp:TableHeaderCell ID="tbl_gueltig">Gültig Bis</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_KarteNr">Karten-Nummer</asp:TableHeaderCell></asp:TableHeaderRow>
|
||||||
</asp:Table>-->
|
</asp:Table>-->
|
||||||
<table runat="server" id="tablemain" class="col-12">
|
<table runat="server" id="tablemain" class="col-12">
|
||||||
<thead>
|
|
||||||
<tr style="background-color: #043381; color: #fff">
|
|
||||||
<th style="text-align: center">
|
|
||||||
<td style="font-weight: 600; color: white; text-align: center">SDL
|
|
||||||
</td>
|
|
||||||
</th>
|
|
||||||
<th style="text-align: center">
|
|
||||||
<td style="font-weight: 600; color: white; text-align: center">Bezeichnung
|
|
||||||
</td>
|
|
||||||
</th>
|
|
||||||
<th style="text-align: center">
|
|
||||||
<td style="font-weight: 600; color: white; text-align: center">Gültig bis
|
|
||||||
</td>
|
|
||||||
</th>
|
|
||||||
<th style="text-align: center">
|
|
||||||
<td style="font-weight: 600; color: white; text-align: center">Kartennummer
|
|
||||||
</td>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td>Bitte Daten auswählen durch klicken der Buttons</td>
|
<td>Bitte Daten auswählen durch klicken der Buttons</td>
|
||||||
</tr>
|
</tr>
|
||||||
</tbody>
|
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -134,8 +112,8 @@
|
|||||||
<div style="height: 0.75em /*12px*/"></div>
|
<div style="height: 0.75em /*12px*/"></div>
|
||||||
<div style="height: 1.063em/*17px*/"></div>
|
<div style="height: 1.063em/*17px*/"></div>
|
||||||
<div class="col-12-flex">
|
<div class="col-12-flex">
|
||||||
<asp:Table ID="tbl_2" runat="server" ClientIDMode="Static">
|
<asp:Table ID="tbl_2" runat="server" ClientIDMode="Static" Style="width: 382.5px">
|
||||||
<asp:TableHeaderRow style="background-color:#043381;color:#fff" runat="server"><asp:TableHeaderCell ID="tbhc_KFZKennz_M">KFZ_Kennzeichen</asp:TableHeaderCell><asp:TableHeaderCell ID="tbhc_Nat_M">Nat.</asp:TableHeaderCell><asp:TableHeaderCell ID="tbhc_Verk_M">Verk.</asp:TableHeaderCell><asp:TableHeaderCell ID="tbhc_KZ_An_M">KZ-An</asp:TableHeaderCell><asp:TableHeaderCell ID="tbhc_Verm_M">Vermerke</asp:TableHeaderCell></asp:TableHeaderRow>
|
<asp:TableHeaderRow Style="background-color: #043381; color: #fff; width: 382.5px" runat="server"><asp:TableHeaderCell ID="tbhc_KFZKennz_M">KFZ_Kennzeichen</asp:TableHeaderCell><asp:TableHeaderCell ID="tbhc_Nat_M">Nat.</asp:TableHeaderCell><asp:TableHeaderCell ID="tbhc_Verk_M">Verk.</asp:TableHeaderCell><asp:TableHeaderCell ID="tbhc_KZ_An_M">KZ-An</asp:TableHeaderCell><asp:TableHeaderCell ID="tbhc_Verm_M">Vermerke</asp:TableHeaderCell></asp:TableHeaderRow>
|
||||||
</asp:Table>
|
</asp:Table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -156,36 +134,10 @@
|
|||||||
<!-- <asp:Table ID="tbl_mainpage_M" ClientIDMode="Static" runat="server" Width="100%" CssClass="table table-striped col-12">
|
<!-- <asp:Table ID="tbl_mainpage_M" ClientIDMode="Static" runat="server" Width="100%" CssClass="table table-striped col-12">
|
||||||
<asp:TableHeaderRow runat="server" ID="headrow_M" style="background-color:#043381;color:#fff"><asp:TableHeaderCell ID="tblhc_SDLNr_M">SDL_Nr</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Bez_M">Bezeichnung</asp:TableHeaderCell><asp:TableHeaderCell ID="tbl_gueltig_M">Gültig Bis</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_KarteNr_M">Karten-Nummer</asp:TableHeaderCell></asp:TableHeaderRow>
|
<asp:TableHeaderRow runat="server" ID="headrow_M" style="background-color:#043381;color:#fff"><asp:TableHeaderCell ID="tblhc_SDLNr_M">SDL_Nr</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_Bez_M">Bezeichnung</asp:TableHeaderCell><asp:TableHeaderCell ID="tbl_gueltig_M">Gültig Bis</asp:TableHeaderCell><asp:TableHeaderCell ID="tblhc_KarteNr_M">Karten-Nummer</asp:TableHeaderCell></asp:TableHeaderRow>
|
||||||
</asp:Table>-->
|
</asp:Table>-->
|
||||||
<table runat="server" id="tablemain_m" class="col-12">
|
<table runat="server" id="tablemain_m" class="col-12" style="width: 385.5px">
|
||||||
<thead>
|
<tr style="width: 385.5px">
|
||||||
<tr style="background-color:#043381;color:#fff">
|
<td>Bitte Daten auswählen durch Klicken der Buttons</td>
|
||||||
<th style="text-align:center">
|
</tr>
|
||||||
<td style="font-weight: 600;color:white">
|
|
||||||
SDL
|
|
||||||
</td>
|
|
||||||
</th>
|
|
||||||
<th style="text-align: center">
|
|
||||||
<td style="font-weight: 600; color: white; text-align: center">
|
|
||||||
Bezeichnung
|
|
||||||
</td>
|
|
||||||
</th>
|
|
||||||
<th style="text-align: center">
|
|
||||||
<td style="font-weight: 600; color: white; text-align: center">
|
|
||||||
Gültig bis
|
|
||||||
</td>
|
|
||||||
</th>
|
|
||||||
<th style="text-align: center">
|
|
||||||
<td style="font-weight: 600; color: white; text-align: center">
|
|
||||||
Kartennummer
|
|
||||||
</td>
|
|
||||||
</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
<tr>
|
|
||||||
<td>Bitte Daten auswählen durch klicken der Buttons</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -480,7 +432,13 @@
|
|||||||
// alert(data.d.AaData)
|
// alert(data.d.AaData)
|
||||||
result = data.d.AaData;
|
result = data.d.AaData;
|
||||||
// addheader();
|
// addheader();
|
||||||
//let strHTML = '<tr style="background-color:#043381;color:#fff"><th><td style="font-weight:600; color:white">SDL-Nr</td></th><th><td style="font-weight:600; color:white">Bezeichnung</td></th><th><td style="font-weight:600; color:white">Gueltig bis</td></th><th><td style="font-weight:600; color:white">Karten-Nummer</td></th></tr>';
|
var rowCount = table.rows.length;
|
||||||
|
|
||||||
|
for (let i = rowCount-1; i >= 0; i--) {
|
||||||
|
table.deleteRow(i);
|
||||||
|
}
|
||||||
|
let strheader = '<tr style="background-color:#043381;color:#fff"><th><td style="font-weight:600; color:white">SDL-Nr</td></th><th><td style="font-weight:600; color:white">Bezeichnung</td></th><th><td style="font-weight:600; color:white">Gueltig bis</td></th><th><td style="font-weight:600; color:white">Karten-Nummer</td></th></tr>';
|
||||||
|
$('#<%=tablemain.ClientID%>').append(strheader);
|
||||||
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]);
|
||||||
@@ -504,11 +462,7 @@
|
|||||||
let natplaceholder = document.getElementById('<%=lbl_Placeholder_M.ClientID%>');
|
let natplaceholder = document.getElementById('<%=lbl_Placeholder_M.ClientID%>');
|
||||||
// alert(id_M)
|
// alert(id_M)
|
||||||
let table_M = document.getElementById('<%=tablemain_m.ClientID%>');
|
let table_M = document.getElementById('<%=tablemain_m.ClientID%>');
|
||||||
let rowCount = table_M.rows.length;
|
|
||||||
|
|
||||||
for (let i = rowCount - 1; i > 0; i--) {
|
|
||||||
table_M.deleteRow(i);
|
|
||||||
}
|
|
||||||
Speditionslabel.textContent = id_M.split(',')[0];
|
Speditionslabel.textContent = id_M.split(',')[0];
|
||||||
natplaceholder.textContent = id_M.split(',')[1];
|
natplaceholder.textContent = id_M.split(',')[1];
|
||||||
|
|
||||||
@@ -533,22 +487,27 @@
|
|||||||
async: "true",
|
async: "true",
|
||||||
data: JSON.stringify(data_m),
|
data: JSON.stringify(data_m),
|
||||||
success: function (data_m) {
|
success: function (data_m) {
|
||||||
result_M = data_m.d.AaData;
|
// alert(data.d.AaData)
|
||||||
// addheader();
|
result = data_m.d.AaData;
|
||||||
// let strHeader_M = '<tr style="background-color:#043381;color:#fff"><th><td style="font-weight:600; color:white">SDL-Nr</td></th><th><td style="font-weight:600; color:white">Bezeichnung</td></th><th><td style="font-weight:600; color:white">Gueltig bis</td></th><th><td style="font-weight:600; color:white">Karten-Nummer</td></th></tr>';
|
// addheader();
|
||||||
// let strHTML = ''
|
var rowCount = table_M.rows.length;
|
||||||
// alert('Horray! 200 status code!');
|
|
||||||
for (var i = 0; i < result_M.length; i++) {
|
for (let i = rowCount - 1; i >= 0; i--) {
|
||||||
|
table_M.deleteRow(i);
|
||||||
|
}
|
||||||
|
let strheader_M = '<tr style="background-color:#043381;color:#fff;width:385.5px"><th><td style="font-weight:600; color:white">SDL-Nr</td></th><th><td style="font-weight:600; color:white">Bezeichnung</td></th><th><td style="font-weight:600; color:white">Gueltig bis</td></th><th><td style="font-weight:600; color:white">Karten-Nummer</td></th></tr>';
|
||||||
|
$('#<%=tablemain_m.ClientID%>').append(strheader_M);
|
||||||
|
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]);
|
||||||
// alert(result.rows.length)
|
// alert(result.rows.length)
|
||||||
let strHTML4 = '<tr><td>' + result_M[i]["0"] + '</td><td>' + result_M[i]["1"] + '</td><td>' + result_M[i]["2"] + '</td><td>' + result_M[i]["3"] + '</td></tr>'
|
let strHTML4 = '<tr style="width:385.5px"><td>' + result[i]["0"] + '</td><td>' + result[i]["1"] + '</td><td>' + result[i]["2"] + '</td><td>' + result[i]["3"] + '</td></tr>'
|
||||||
//alert(strHTML4)
|
//alert(strHTML4)
|
||||||
$('#<%=tablemain_m.ClientID%>').append(strHTML4);
|
$('#<%=tablemain_m.ClientID%>').append(strHTML4);
|
||||||
}
|
}
|
||||||
//alert(strHTML)
|
//renderTable(data.d);
|
||||||
//$('#<%'=tablemain_m.ClientID%>').append(strHeader_M);
|
//alert(strHTML);
|
||||||
// $('#<%'=tablemain_m.ClientID%>').append(strHTML);
|
//$('#<%'=tablemain.ClientID%>').append(strheaderL);
|
||||||
},
|
},
|
||||||
error: function (jqXHR, textStatus, errorThrown) {
|
error: function (jqXHR, textStatus, errorThrown) {
|
||||||
alert("Status:" + jqXHR.status + "\nStatusText: " + textStatus + "\nError:" + errorThrown);
|
alert("Status:" + jqXHR.status + "\nStatusText: " + textStatus + "\nError:" + errorThrown);
|
||||||
|
|||||||
@@ -571,9 +571,9 @@ Partial Class LKWS
|
|||||||
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(Kdnrtext), finalstr)
|
||||||
Dim container As New List(Of List(Of String))
|
Dim container As New List(Of List(Of String))
|
||||||
For Each l2 In list2
|
For Each l2 In list2
|
||||||
Dim strtempKat As String = String.Empty
|
Dim strtempKat As String = ""
|
||||||
Dim strtempKartenNr As String = String.Empty
|
Dim strtempKartenNr As String = ""
|
||||||
Dim strtempGueltigBis As String = String.Empty
|
Dim strtempGueltigBis As String = ""
|
||||||
|
|
||||||
If IsNothing(l2.Kategorie) = False Then
|
If IsNothing(l2.Kategorie) = False Then
|
||||||
strtempKat = l2.Kategorie.ToString
|
strtempKat = l2.Kategorie.ToString
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -72,4 +72,7 @@
|
|||||||
margin-right: 5px;
|
margin-right: 5px;
|
||||||
width: 322px;
|
width: 322px;
|
||||||
}
|
}
|
||||||
|
#tbl_2{
|
||||||
|
width:380.5px
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user