edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Änderung dass es etwas anzeigt fix des vorherigen commit bugs

Browse Source
This commit is contained in:
ja
2021-11-03 11:57:08 +01:00
parent b4006aa491
commit 2a4d657856
5 changed files with 57 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Customers/Customers.master
View File

@@ -224,6 +224,7 @@
createdUserDate = dr("CreatedDate").ToString() createdUserDate = dr("CreatedDate").ToString()
emailuser = dr("Email").ToString() emailuser = dr("Email").ToString()
CustomerID = dr("KundenNr").ToString CustomerID = dr("KundenNr").ToString
Session.Add("CustomerID", CustomerID)
End If End If
End Using End Using
con.Close() con.Close()
@@ -276,7 +277,7 @@
<%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>
<%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" 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=<%=CustomerID %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
<%End If %> <%End If %>
<!-- </ul>--> <!-- </ul>-->
</li> </li>
@@ -302,11 +303,11 @@
<%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" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li> <li><a href="Invoices.aspx?P1=<%=CustomerID %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</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>
<%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" 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=<%=CustomerID %>" style="background-color:#fff;color:#043381;text-align:left;border:none">Rechnungen</a></li>
<%End If %> <%End If %>
<!-- </ul>--> <!-- </ul>-->
</li> </li>
@@ -458,9 +459,9 @@
<%If Me.Page.User.Identity.Name = "test" Then %> <%If Me.Page.User.Identity.Name = "test" Then %>
<a type="button" class="btn btn-primary" href="CustomsAviso.aspx">Aufträge</a> <a type="button" class="btn btn-primary" href="CustomsAviso.aspx">Aufträge</a>
<%ElseIf Me.Page.User.Identity.Name = "test2" Then%> <%ElseIf Me.Page.User.Identity.Name = "test2" Then%>
<a type="button" class="btn btn-primary" href="Invoices.aspx">Rechnungen</a> <a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%=CustomerID %>">Rechnungen</a>
<%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%> <%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%>
<a type="button" class="btn btn-primary" href="Invoices.aspx">Rechnungen</a> <a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%=CustomerID %>">Rechnungen</a>
<%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%> <%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
<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> <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>
<% End If %> <% End If %>
@@ -477,13 +478,13 @@
</div> </div>
<div class="btn-group"> <div class="btn-group">
<%If Me.Page.User.Identity.Name = "test" Then %> <%If Me.Page.User.Identity.Name = "test" Then %>
<a type="button" class="btn btn-primary" href="Invoices.aspx">Rechnungen</a> <a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%=CustomerID %>">Rechnungen</a>
<%ElseIf Me.Page.User.Identity.Name = "test2" Then%> <%ElseIf Me.Page.User.Identity.Name = "test2" Then%>
<a type="button" class="btn btn-primary" href="Cards_Boxes.aspx">Karten_Boxen</a> <a type="button" class="btn btn-primary" href="Cards_Boxes.aspx">Karten_Boxen</a>
<%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%> <%ElseIf Me.Page.User.Identity.Name = "userwithlongername" Then%>
<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> <a type="button" class="btn btn-primary" href="CustomsAviso.aspx?P1=<%=CustomerID %>" 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>
<%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%> <%ElseIf Me.Page.User.Identity.Name = "Userwithlongername" Then%>
<a type="button" class="btn btn-primary" href="Invoices.aspx">Rechnungen</a> <a type="button" class="btn btn-primary" href="Invoices.aspx?P1=<%=CustomerID %>">Rechnungen</a>
<% End If %> <% End If %>
<!-- <button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="background-color:#fff; color:#043381;border:hidden;"> <!-- <button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="background-color:#fff; color:#043381;border:hidden;">
<span class="visually-hidden">Toggle Dropdown</span> <span class="visually-hidden">Toggle Dropdown</span>

34
Customers/Invoices.aspx.vb
View File

@@ -19,11 +19,11 @@ Partial Class Customers_Default3
If Not Me.Page.User.Identity.IsAuthenticated Then If Not Me.Page.User.Identity.IsAuthenticated Then
FormsAuthentication.RedirectToLoginPage() FormsAuthentication.RedirectToLoginPage()
Else Else
Try If String.IsNullOrEmpty(Request.QueryString("P1")) = False Then
Kdnrtext = Session.Item("CustomerID") Kdnrtext = Request.QueryString("P1")
Catch ex As UnauthorizedAccessException When String.IsNullOrEmpty(Session.Item("CustomerID")) Else
lbl_status.Text = "Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!" lbl_status.Text = "Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!"
End Try End If
DataBind() DataBind()
tbl_Header_row.TableSection = TableRowSection.TableHeader tbl_Header_row.TableSection = TableRowSection.TableHeader
@@ -136,11 +136,11 @@ Partial Class Customers_Default3
Protected Sub btn_b_Click(sender As Object, e As EventArgs) Protected Sub btn_b_Click(sender As Object, e As EventArgs)
dt = Nothing dt = Nothing
Try If String.IsNullOrEmpty(Request.QueryString("P1")) = False Then
Kdnrtext = Session.Item("CustomerID") Kdnrtext = Request.QueryString("P1")
Catch ex As UnauthorizedAccessException When String.IsNullOrEmpty(Session.Item("CustomerID")) Else
lbl_status.Text = "Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!" lbl_status.Text = "Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!"
End Try End If
If valdaterage_1.IsValid And valdaterange_2.IsValid Then If valdaterage_1.IsValid And valdaterange_2.IsValid Then
If String.IsNullOrEmpty(Kdnrtext) = False Then If String.IsNullOrEmpty(Kdnrtext) = False Then
If Not String.IsNullOrEmpty(txt_Absender.Text) Then If Not String.IsNullOrEmpty(txt_Absender.Text) Then
@@ -159,7 +159,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation"
End Try End Try
End If End If
If Not String.IsNullOrEmpty(txt_Empfaenger.Text) = True Then If String.IsNullOrEmpty(txt_Empfaenger.Text) = False Then
txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_Empfaenger.Enabled = True regex_txt_Empfaenger.Enabled = True
regex_txt_Empfaenger.Validate() regex_txt_Empfaenger.Validate()
@@ -175,7 +175,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation"
End Try End Try
End If End If
If Not String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = True Then If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Then
txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_KdNrAuftrag.Enabled = True regex_txt_KdNrAuftrag.Enabled = True
regex_txt_KdNrAuftrag.Validate() regex_txt_KdNrAuftrag.Validate()
@@ -191,7 +191,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation"
End Try End Try
End If End If
If Not String.IsNullOrEmpty(txt_LKW.Text) = True Then If String.IsNullOrEmpty(txt_LKW.Text) = False Then
txt_LKW.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_LKW.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_LKW.Enabled = True regex_txt_LKW.Enabled = True
regex_txt_LKW.Validate() regex_txt_LKW.Validate()
@@ -207,7 +207,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation"
End Try End Try
End If End If
If Not String.IsNullOrEmpty(txt_ReNr.Text) = True Then If String.IsNullOrEmpty(txt_ReNr.Text) = False Then
txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_ReNr.Enabled = True regex_txt_ReNr.Enabled = True
regex_txt_ReNr.Validate() regex_txt_ReNr.Validate()
@@ -224,7 +224,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error invoice number validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error invoice number validation"
End Try End Try
End If End If
If Not String.IsNullOrEmpty(txt_Absender_M.Text) = True Then If String.IsNullOrEmpty(txt_Absender_M.Text) = False Then
txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_Absender_M.Enabled = True regex_txt_Absender_M.Enabled = True
regex_txt_Absender_M.Validate() regex_txt_Absender_M.Validate()
@@ -240,7 +240,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation"
End Try End Try
End If End If
If Not String.IsNullOrEmpty(txt_Empfaenger_M.Text) = True Then If String.IsNullOrEmpty(txt_Empfaenger_M.Text) = False Then
txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_Empaenger_M.Enabled = True regex_txt_Empaenger_M.Enabled = True
regex_txt_Empaenger_M.Validate() regex_txt_Empaenger_M.Validate()
@@ -256,7 +256,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation"
End Try End Try
End If End If
If Not String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = True Then If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = False Then
txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_KdNrAuftrag_M.Enabled = True regex_txt_KdNrAuftrag_M.Enabled = True
regex_txt_KdNrAuftrag_M.Validate() regex_txt_KdNrAuftrag_M.Validate()
@@ -272,7 +272,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation"
End Try End Try
End If End If
If Not String.IsNullOrEmpty(txt_LKW_M.Text) Then If String.IsNullOrEmpty(txt_LKW_M.Text) = False Then
txt_LKW_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_LKW_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_LKW_M.Enabled = True regex_txt_LKW_M.Enabled = True
regex_txt_LKW_M.Validate() regex_txt_LKW_M.Validate()
@@ -288,7 +288,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation"
End Try End Try
End If End If
If Not String.IsNullOrEmpty(txt_ReNr_M.Text) Then If String.IsNullOrEmpty(txt_ReNr_M.Text) = False Then
txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_ReNr_M.Enabled = True regex_txt_ReNr_M.Enabled = True
regex_txt_ReNr_M.Validate() regex_txt_ReNr_M.Validate()

BIN
Fehlermeldungen_Auflistung.xlsx
View File

Binary file not shown.

2
login/Change_PW.aspx.vb
View File

@@ -7,7 +7,7 @@ Partial Class login_Change_PW
Protected Sub Page_Load(sender As Object, e As EventArgs) Protected Sub Page_Load(sender As Object, e As EventArgs)
Dim url = Request.ServerVariables("URL") Dim url = Request.ServerVariables("URL")
Session.Add("urltochangepw", url) Session.Add("urltochangepw", url)
If VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = Not Nothing AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) = Not Nothing And VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("USerID").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par3") And VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Session.Item("test")) = VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Request.QueryString("Par2"))) Then If VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("TokenforEmail").ToString()) = Not Nothing AndAlso VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1")) = Not Nothing And VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Session.Item("CustomerID").ToString()) = VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par3") And VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Session.Item("test")) = VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Request.QueryString("Par2"))) Then
If getDateoftoken(VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1"))) = True Then If getDateoftoken(VERAG_PROG_ALLGEMEIN.cCryptography.Decrypt(Request.QueryString("Par1"))) = True Then
Try Try
txt_Pw_WH.Enabled = True txt_Pw_WH.Enabled = True

20
login/login_FLEX.aspx.vb
View File

@@ -3,6 +3,12 @@ Imports System.Data
Partial Class login_FLEX Partial Class login_FLEX
Inherits System.Web.UI.Page Inherits System.Web.UI.Page
Dim Customer_ID As String = String.Empty
Dim UserNaMe As String = String.Empty
Dim passw As String = String.Empty
Protected Sub Page_Load(sender As Object, e As EventArgs) Protected Sub Page_Load(sender As Object, e As EventArgs)
If Me.Page.User.Identity.IsAuthenticated Then If Me.Page.User.Identity.IsAuthenticated Then
Response.Redirect("../Customers/Welcome.aspx", False) Response.Redirect("../Customers/Welcome.aspx", False)
@@ -47,9 +53,7 @@ Partial Class login_FLEX
Dim cb As CheckBox = Login1.FindControl("RememberMe") Dim cb As CheckBox = Login1.FindControl("RememberMe")
Dim cb_M As CheckBox = Login2.FindControl("RememberMe_M") Dim cb_M As CheckBox = Login2.FindControl("RememberMe_M")
Dim Customer_ID As String = String.Empty
Dim UserNaMe As String = String.Empty
Dim passw As String = String.Empty
If String.IsNullOrEmpty(tb.Text) = False AndAlso String.IsNullOrEmpty(tb_M.Text) = True Then If String.IsNullOrEmpty(tb.Text) = False AndAlso String.IsNullOrEmpty(tb_M.Text) = True Then
reqfieldvaluserID.Enabled = True reqfieldvaluserID.Enabled = True
@@ -174,7 +178,7 @@ Partial Class login_FLEX
MsgBox("Erfolgreich validiert.") MsgBox("Erfolgreich validiert.")
Session.Add("test", UserNaMe) Session.Add("test", UserNaMe)
Session.Add("UserID", Customer_ID) Session.Add("CustomerID", Customer_ID)
Session.Add("PW", passw) Session.Add("PW", passw)
'FormsAuthentication.SetAuthCookie(Login1.UserName, True) 'FormsAuthentication.SetAuthCookie(Login1.UserName, True)
@@ -196,8 +200,16 @@ Partial Class login_FLEX
Protected Sub LoginButton_Click(sender As Object, e As EventArgs) Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
Validate("Login") Validate("Login")
Session.Add("test", UserNaMe)
Session.Add("CustomerID", Customer_ID)
Session.Add("PW", passw)
End Sub End Sub
Protected Sub LoginButton_M_Click(sender As Object, e As EventArgs) Protected Sub LoginButton_M_Click(sender As Object, e As EventArgs)
Validate("Login_M") Validate("Login_M")
Session.Add("test", UserNaMe)
Session.Add("CustomerID", Customer_ID)
Session.Add("PW", passw)
End Sub End Sub
End Class End Class