diff --git a/Customers/Cards_Boxes.aspx b/Customers/Cards_Boxes.aspx index 8dd902a..01b8bc6 100644 --- a/Customers/Cards_Boxes.aspx +++ b/Customers/Cards_Boxes.aspx @@ -14,7 +14,10 @@ - + + + + diff --git a/Customers/Customers.master b/Customers/Customers.master index c71bf3c..2550cab 100644 --- a/Customers/Customers.master +++ b/Customers/Customers.master @@ -624,8 +624,10 @@ - - + + + + diff --git a/Customers/Default2.aspx b/Customers/Default2.aspx index a63bd6b..eec5745 100644 --- a/Customers/Default2.aspx +++ b/Customers/Default2.aspx @@ -88,6 +88,9 @@ var slider = document.getElementById('<%=sld_getbenchmarkheat.ClientID%>'); $('<%=lbl_valslider.ClientID%>').change(function () { slider.value = parseInt(this.value) }); - + + + + diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx index 6083d3a..268835e 100644 --- a/Customers/Invoices.aspx +++ b/Customers/Invoices.aspx @@ -249,6 +249,10 @@ + + + + diff --git a/Customers/LKWs.aspx b/Customers/LKWs.aspx index ac45753..d54eecb 100644 --- a/Customers/LKWs.aspx +++ b/Customers/LKWs.aspx @@ -339,11 +339,11 @@ let Speditionslabel = document.getElementById('<%=lbl_sped_Placeholder_M.ClientID%>'); let natplaceholder = document.getElementById('<%=lbl_Placeholder_M.ClientID%>'); alert(id) - let table = document.getElementById('<%=tbl_mainpage_M.ClientID%>'); - var rowCount = table.rows.length; + let table_M = document.getElementById('<%=tbl_mainpage_M.ClientID%>'); + var rowCount = table_M.rows.length; for (let i = rowCount - 1; i > 0; i--) { - table.deleteRow(i); + table_M.deleteRow(i); } Speditionslabel.textContent = id.split(',')[0]; natplaceholder.textContent = id.split(',')[1]; diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb index 9d9fb27..51b8440 100644 --- a/Customers/LKWs.aspx.vb +++ b/Customers/LKWs.aspx.vb @@ -399,7 +399,7 @@ Partial Class LKWS End Sub - + Public Sub filltable2(Kennzeichen As String) Dim tbl As Table = New Table Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, Kennzeichen) @@ -423,7 +423,7 @@ Partial Class LKWS Next End Sub - + Public Sub filltable_M(Kennzeichen As String) Dim list2 As List(Of VERAG_PROG_ALLGEMEIN.cSDL) = VERAG_PROG_ALLGEMEIN.cSDL.GET_LIST_WEB_LKW(401940, Kennzeichen) Dim Tbl As New Table diff --git a/Customers/Welcome.aspx b/Customers/Welcome.aspx index 200dc95..c022918 100644 --- a/Customers/Welcome.aspx +++ b/Customers/Welcome.aspx @@ -11,7 +11,10 @@ - + + + + diff --git a/login/Change_PW.aspx b/login/Change_PW.aspx index d433123..563d1b4 100644 --- a/login/Change_PW.aspx +++ b/login/Change_PW.aspx @@ -14,9 +14,7 @@ - - - + @@ -400,5 +398,9 @@ + + + + diff --git a/login/CreateUser.aspx b/login/CreateUser.aspx index 22cc0d8..d0f4e71 100644 --- a/login/CreateUser.aspx +++ b/login/CreateUser.aspx @@ -16,12 +16,13 @@ - - - + - + + + + VERAG Spedition AG Login diff --git a/login/Logout.aspx b/login/Logout.aspx index a2db7ca..0060c39 100644 --- a/login/Logout.aspx +++ b/login/Logout.aspx @@ -21,7 +21,7 @@

Du wurdest erfolgreich ausgeloggt.

- +
diff --git a/login/Logout.aspx.vb b/login/Logout.aspx.vb index 7d47257..26bd301 100644 --- a/login/Logout.aspx.vb +++ b/login/Logout.aspx.vb @@ -1,11 +1,12 @@  Imports System.Web.Configuration +Imports System.Security.Cryptography Partial Class login_Logout Inherits System.Web.UI.Page - Dim sessionname - Sub Page_Load() Handles Me.Load + + Function Page_Load() As Threading.Tasks.Task Handles Me.Load FormsAuthentication.SignOut() Session.Clear() Session.Abandon() @@ -21,14 +22,10 @@ Partial Class login_Logout 'cookie2.Expires = DateTime.Now.AddYears(-1) 'Response.Cookies.Add(cookie2) Response.BufferOutput = True + End Function + + + Protected Sub btn_backtostart_Click(sender As Object, e As EventArgs) Handles btn_backtostart.ServerClick Response.Redirect("../login/login_FLEX.aspx") - - - End Sub - - - Protected Sub btn_backtostart_Click(sender As Object, e As EventArgs) - Response.Redirect("../login/login_FLEX.aspx") - End Sub End Class diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index 490da37..ca5c58e 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -19,7 +19,7 @@ Partial Class login_FLEX Else Try Dim teststr = String.Empty - intzahliterats = 4 + intzahliterats = VERAG_VARIABLES.RandomInteger(2, Math.Pow(2, 3)) teststr = Await TestPerformance.TestHashrateServerAsync(VERAG_VARIABLES.RandomInteger(2, Math.Pow(2, 2))) If String.Equals(teststr, String.Empty) = False Then intzahliterats = VERAG_VARIABLES.getiterationnumber