diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb
index f42ba5b..f9af514 100644
--- a/Customers/Invoices.aspx.vb
+++ b/Customers/Invoices.aspx.vb
@@ -14,34 +14,40 @@ Partial Class Customers_Invoices
Dim reNr As String = ""
Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
- Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms
- DataBind()
- tbl_Header_row.TableSection = TableRowSection.TableHeader
- If (Page.IsPostBack) Then
- valreq_pickdate1.Validate()
- valreq_pickdate2.Validate()
- If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid Then
- valDateRange_1.Validate()
- valDateRange_2.Validate()
- If valDateRange_1.IsValid AndAlso valDateRange_2.IsValid Then
- datevon = Date.Parse(pickdate1.Text)
- datebis = Date.Parse(pickdate2.Text)
- End If
- End If
- Else
+ If Me.Page.User.Identity.IsAuthenticated Then
+ Try
+ Kdnrtext = Session.Item("CustomerID")
+ Catch A As UnauthorizedAccessException When String.IsNullOrEmpty(Kdnrtext)
+ MsgBox("Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!", MsgBoxStyle.Information, "Error in User Area!")
+ End Try
+ Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms
+ DataBind()
+ tbl_Header_row.TableSection = TableRowSection.TableHeader
+ If (Page.IsPostBack And normaltable.EnableViewState = False) Then
+ Page.MaintainScrollPositionOnPostBack = True
normaltable.EnableViewState = True
- lbl_von.Visible = True
- lbl_bis.Visible = True
- valDateRange_1.Enabled = True
- valDateRange_2.Enabled = True
- Dim erster = New Date(Now().Year, Now().Month, 1)
- Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
- pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
- ' MsgBox(ersterdat)
- datevon = ersterdat
- datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
- pickdate2.Text = Now().ToShortDateString()
- pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
+
+ datevon = Date.Parse(pickdate1.Text)
+ datebis = Date.Parse(pickdate2.Text)
+
+ Else
+ Page.MaintainScrollPositionOnPostBack = False
+ normaltable.EnableViewState = True
+ lbl_von.Visible = True
+ lbl_bis.Visible = True
+ valDateRange_1.Enabled = True
+ valDateRange_2.Enabled = True
+ Dim erster = New Date(Now().Year, Now().Month, 1)
+ Dim ersterdat = "1." + Now().Month.ToString + "." + Now().Year.ToString
+ pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
+ ' MsgBox(ersterdat)
+ datevon = ersterdat
+ datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
+ pickdate2.Text = Now().ToShortDateString()
+ pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
+ End If
+ Else
+ FormsAuthentication.RedirectToLoginPage()
End If
End Sub
@@ -158,122 +164,17 @@ Partial Class Customers_Invoices
reNr = ""
End Sub
- Protected Sub pickdate1_TextChanged(sender As Object, e As EventArgs)
- End Sub
-
- Protected Sub valDateRange_1_ServerValidate(source As Object, args As ServerValidateEventArgs)
- Dim minDate As DateTime = DateTime.Parse("01.04.2001")
- Dim maxDate As DateTime = DateTime.Parse(DateTime.Now.ToShortDateString)
- Dim dt As DateTime
-
- args.IsValid = (DateTime.TryParse(args.Value, dt) AndAlso
- dt <= maxDate AndAlso
- dt >= minDate)
- End Sub
-
- Protected Sub pickdate2_TextChanged(sender As Object, e As EventArgs)
-
- End Sub
-
- Protected Sub valDateRange_2_ServerValidate(source As Object, args As ServerValidateEventArgs)
- Dim minDate As DateTime = DateTime.Parse("01." + Date.Now.Month.ToString + ".2001")
- Dim maxDate As DateTime = DateTime.Parse(DateTime.Now.ToShortDateString)
- Dim dt As DateTime
-
- args.IsValid = (DateTime.TryParse(args.Value, dt) AndAlso
- dt <= maxDate AndAlso
- dt >= minDate) And dt < Date.Now.AddDays(-1)
- End Sub
-
- Protected Sub txt_LKWNr_TextChanged(sender As Object, e As EventArgs)
- If String.IsNullOrEmpty(txt_LKWNr.Text) Then
- regexval_txt_LKW.Enabled = False
- Else
- regexval_txt_LKW.Enabled = True
- End If
- End Sub
-
- Protected Sub txt_Empfaenger_TextChanged(sender As Object, e As EventArgs)
- If String.IsNullOrEmpty(txt_Empfaenger.Text) Then
- regexval_txt_Empfaenger.Enabled = False
- Else
- regexval_txt_Empfaenger.Enabled = True
- End If
- End Sub
-
- Protected Sub txt_Absender_TextChanged(sender As Object, e As EventArgs)
- If String.IsNullOrEmpty(txt_Absender.Text) Then
- regexval_txt_Absender.Enabled = False
- Else
- regexval_txt_Absender.Enabled = True
- End If
- End Sub
-
- Protected Sub txt_ReNr_TextChanged(sender As Object, e As EventArgs)
- If String.IsNullOrEmpty(txt_ReNr_M.Text) Then
- regexval_txt_ReNr_M.Enabled = False
- Else
- regexval_txt_ReNr_M.Enabled = True
- End If
- End Sub
-
- Protected Sub txt_KdNrAuftrag_TextChanged(sender As Object, e As EventArgs)
- If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) Then
- regexval_txt_KdNrAuftrag.Enabled = False
- Else
- regexval_txt_KdNrAuftrag.Enabled = True
- End If
- End Sub
-
- Protected Sub txt_LKWNr_M_TextChanged(sender As Object, e As EventArgs)
- If String.IsNullOrEmpty(txt_LKWNr_M.Text) Then
- regexval_txt_LKW_M.Enabled = False
- Else
- regexval_txt_LKW_M.Enabled = True
- End If
- End Sub
-
- Protected Sub txt_KdNrAuftrag_M_TextChanged(sender As Object, e As EventArgs)
- If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) Then
- regexval_txt_KdNrAuftrag_M.Enabled = False
- Else
- regexval_txt_KdNrAuftrag_M.Enabled = True
- End If
- End Sub
-
- Protected Sub txt_Absender_M_TextChanged(sender As Object, e As EventArgs)
- If String.IsNullOrEmpty(txt_Absender_M.Text) Then
- regexval_txt_Absender_M.Enabled = False
- Else
- regexval_txt_Absender_M.Enabled = True
- End If
- End Sub
-
- Protected Sub txt_ReNr_M_TextChanged(sender As Object, e As EventArgs)
- If String.IsNullOrEmpty(txt_ReNr_M.Text) Then
- regexval_txt_ReNr_M.Enabled = False
- Else
- regexval_txt_ReNr_M.Enabled = False
- End If
- End Sub
-
- Protected Sub txt_Empfaenger_M_TextChanged(sender As Object, e As EventArgs)
- If String.IsNullOrEmpty(txt_Empfaenger_M.Text) Then
- regexval_txt_Empfaenger_M.Enabled = False
- Else
- regexval_txt_Empfaenger_M.Enabled = True
- End If
- End Sub
Protected Sub Send_Data_Click(sender As Object, e As EventArgs)
dt = Nothing
- pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
- pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+
valreq_pickdate1.Validate()
valreq_pickdate2.Validate()
If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid And Kdnrtext = Not "" Then
- If txt_Absender.Text IsNot "" Then
+ valDateRange_1.Validate()
+ valDateRange_2.Validate()
+ If Not String.IsNullOrEmpty(txt_Absender.Text) And valDateRange_1.IsValid And valDateRange_2.IsValid Then
regexval_txt_Absender.Enabled = True
regexval_txt_Absender.Validate()
txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
@@ -287,7 +188,7 @@ Partial Class Customers_Invoices
MsgBox(ex.Message)
End Try
End If
- If txt_Empfaenger.Text IsNot "" Then
+ If Not String.IsNullOrEmpty(txt_Empfaenger.Text) Then
regexval_txt_Empfaenger.Enabled = True
regexval_txt_Empfaenger.Validate()
txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
@@ -301,7 +202,7 @@ Partial Class Customers_Invoices
MsgBox(ex.Message)
End Try
End If
- If txt_KdNrAuftrag.Text IsNot "" Then
+ If Not String.IsNullOrEmpty(txt_KdNrAuftrag.Text) Then
regexval_txt_KdNrAuftrag.Enabled = True
regexval_txt_KdNrAuftrag.Validate()
txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
@@ -315,7 +216,7 @@ Partial Class Customers_Invoices
MsgBox(ex.Message)
End Try
End If
- If txt_LKWNr.Text IsNot "" Then
+ If Not String.IsNullOrEmpty(txt_LKWNr.Text) Then
regexval_txt_LKW.Enabled = True
regexval_txt_LKW.Validate()
txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
@@ -329,7 +230,7 @@ Partial Class Customers_Invoices
MsgBox(ex.Message)
End Try
End If
- If txt_ReNr.Text IsNot "" Then
+ If Not String.IsNullOrEmpty(txt_ReNr.Text) Then
regexval_txt_ReNr.Enabled = True
regexval_txt_ReNr.Validate()
txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
@@ -344,7 +245,7 @@ Partial Class Customers_Invoices
End Try
End If
- If txt_Absender_M.Text IsNot "" Then
+ If Not String.IsNullOrEmpty(txt_Absender_M.Text) Then
txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try
Absender = txt_Absender_M.Text
@@ -352,7 +253,7 @@ Partial Class Customers_Invoices
MsgBox(ex.Message)
End Try
End If
- If txt_Empfaenger_M.Text IsNot "" Then
+ If Not String.IsNullOrEmpty(txt_Empfaenger_M.Text) Then
txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try
Empfaenger = txt_Empfaenger_M.Text
@@ -360,7 +261,7 @@ Partial Class Customers_Invoices
MsgBox(ex.Message)
End Try
End If
- If txt_KdNrAuftrag_M.Text IsNot "" Then
+ If Not String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) Then
txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try
KDNAFNR = txt_KdNrAuftrag_M.Text
@@ -368,7 +269,7 @@ Partial Class Customers_Invoices
MsgBox(ex.Message)
End Try
End If
- If txt_LKWNr_M.Text IsNot "" Then
+ If Not String.IsNullOrEmpty(txt_LKWNr_M.Text) Then
txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try
LKWNR = txt_LKWNr_M.Text
@@ -376,7 +277,8 @@ Partial Class Customers_Invoices
MsgBox(ex.Message)
End Try
End If
- If txt_ReNr_M.Text IsNot "" Then
+
+ If Not String.IsNullOrEmpty(txt_ReNr_M.Text) Then
txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try
reNr = txt_ReNr_M.Text
@@ -406,12 +308,11 @@ Partial Class Customers_Invoices
End Try
End If
- Kdnrtext = VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Request.QueryString("P4"))
'MsgBox(Kdnrtext)
If String.IsNullOrEmpty(Kdnrtext) = False And String.IsNullOrEmpty(datevon.ToString) = False And String.IsNullOrEmpty(datebis.ToString) = False Then
dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf String.IsNullOrEmpty(Kdnrtext) = True Or String.IsNullOrEmpty(datevon.ToString) = True And String.IsNullOrEmpty(datebis.ToString) = True And String.IsNullOrEmpty(reNr) = True And String.IsNullOrEmpty(Absender) = False And String.IsNullOrEmpty(LKWNR) = False And String.IsNullOrEmpty(Empfaenger) = False And String.IsNullOrEmpty(KDNAFNR) = False Then
- dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR)
+
valreq_pickdate1.Validate()
valreq_pickdate2.Validate()
End If
diff --git a/Customers/LKWs.aspx.vb b/Customers/LKWs.aspx.vb
index bd091f7..ca11f56 100644
--- a/Customers/LKWs.aspx.vb
+++ b/Customers/LKWs.aspx.vb
@@ -1,5 +1,22 @@
Partial Class LKWS
Inherits System.Web.UI.Page
+ Dim Kdnrtext As String = String.Empty
+ Protected Sub Page_Load(sender As Object, ByVal e As System.EventArgs) Handles Me.Load
+ If Me.Page.User.Identity.IsAuthenticated Then
+ Try
+ Kdnrtext = Session.Item("CustomerID")
+ Catch A As UnauthorizedAccessException When String.IsNullOrEmpty(Kdnrtext)
+ MsgBox("Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!", MsgBoxStyle.Information, "Error in User Area!")
+ End Try
+ Else
+ FormsAuthentication.RedirectToLoginPage()
+ End If
+ If Page.IsPostBack = True Then
+ Page.MaintainScrollPositionOnPostBack = True
+ Else
+ Page.MaintainScrollPositionOnPostBack = False
+ End If
+ End Sub
End Class
diff --git a/Customers/Welcome.aspx.vb b/Customers/Welcome.aspx.vb
index b3611f5..a00aea5 100644
--- a/Customers/Welcome.aspx.vb
+++ b/Customers/Welcome.aspx.vb
@@ -1,5 +1,14 @@
Partial Class Welcome
Inherits System.Web.UI.Page
-
+ Dim Kdnrtext As String = String.Empty
+ Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
+ If Me.Page.User.Identity.IsAuthenticated Then
+ Try
+ Kdnrtext = Session.Item("CustomerID")
+ Catch A As UnauthorizedAccessException When String.IsNullOrEmpty(Kdnrtext)
+ MsgBox("Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!", MsgBoxStyle.Information, "Error in User Area!")
+ End Try
+ End If
+ End Sub
End Class
diff --git a/Customers/pdfviewer.aspx.vb b/Customers/pdfviewer.aspx.vb
index 9ceeeac..1bdba69 100644
--- a/Customers/pdfviewer.aspx.vb
+++ b/Customers/pdfviewer.aspx.vb
@@ -1,5 +1,21 @@
Partial Class Customers_Default3
Inherits System.Web.UI.Page
-
+ Dim Kdnrtext As String = String.Empty
+ Protected Sub Page_Load(sender As Object, ByVal e As System.EventArgs) Handles Me.Load
+ If Me.Page.User.Identity.IsAuthenticated Then
+ Try
+ Kdnrtext = Session.Item("CustomerID")
+ Catch A As UnauthorizedAccessException When String.IsNullOrEmpty(Kdnrtext)
+ MsgBox("Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!", MsgBoxStyle.Information, "Error in User Area!")
+ End Try
+ Else
+ FormsAuthentication.RedirectToLoginPage()
+ End If
+ If Page.IsPostBack = True Then
+ Page.MaintainScrollPositionOnPostBack = True
+ Else
+ Page.MaintainScrollPositionOnPostBack = False
+ End If
+ End Sub
End Class
diff --git a/Web.config b/Web.config
index d3e4846..c5e1547 100644
--- a/Web.config
+++ b/Web.config
@@ -1,4 +1,4 @@
-
+
-
+
-
-
-
+
+
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/css/Customers/Invoices.css b/css/Customers/Invoices.css
index c34ecc2..9c5a4cc 100644
--- a/css/Customers/Invoices.css
+++ b/css/Customers/Invoices.css
@@ -1,6 +1,7 @@
.btn btn-primary {
color: #043381;
background-color: #fff;
+
}
#tableSearch {
@@ -60,9 +61,9 @@ hr {
#btn_resetForm {
margin-right: 2px;
}
-#Send_Data {
+ContentPlaceHolder1_Send_Data {
height: 15px;
- width: 120%;
+ width: 240px;
}
@media (max-width: 558.98px) {
#conovertab {
@@ -139,9 +140,9 @@ hr {
max-width: /*390px;*/ 85.90308370044053vw;
overflow-x: auto;
}
- #Send_Data {
+ #ContentPlaceHolder1_Send_Data {
height: 15px;
- width: 120%;
+ width: 300px;
}
#pickdate1 {
border: 1px solid #000000;
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 828dbe3..dbd92e0 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -125,7 +125,7 @@ Partial Class login_FLEX
' Dim constr As String = ConfigurationManager.ConnectionStrings("constr").ConnectionString
Using con As New SqlConnection(ConnectionString)
' Using cmd As New SqlCommand("Validate_User")
- Using cmd As New SqlCommand("SELECT UserId,Username,Password FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username AND Password=@Password AND UserId=@KundenNr")
+ Using cmd As New SqlCommand("SELECT KundenNr,Username,Password FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username AND Password=@Password AND KundenNr=@KundenNr")
' cmd.CommandType = CommandType.StoredProcedure
cmd.Parameters.AddWithValue("@Username", UserNaMe)
cmd.Parameters.AddWithValue("@KundenNr", Customer_ID)
@@ -145,8 +145,8 @@ Partial Class login_FLEX
Login1.FailureText = "Account ist nicht freigeschaltet."
Exit Select
Case Else
- If tb.Text = dr("UserId") Then
- Customer_ID = dr("UserId").ToString
+ If tb.Text = dr("KundenNr") Then
+ Customer_ID = dr("KundenNr").ToString
Else
Login1.FailureText = "ID cannot be found in the database!"
End If
@@ -156,7 +156,7 @@ Partial Class login_FLEX
Login1.FailureText = "Username is not in the database!"
End If
If tb3.Text = dr("Password") Then
- passw = dr("Password").ToString
+ passw = VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(dr("Password").ToString)
Else
Login1.FailureText = "Password is not in the database!"
End If
diff --git a/login/login_TEST.aspx.vb b/login/login_TEST.aspx.vb
index 728c606..4c5a5a7 100644
--- a/login/login_TEST.aspx.vb
+++ b/login/login_TEST.aspx.vb
@@ -22,7 +22,7 @@ Partial Class login_TEST
Using cmd As New SqlCommand("SELECT COUNT(*) FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username AND Password=@Password")
' cmd.CommandType = CommandType.StoredProcedure
cmd.Parameters.AddWithValue("@Username", Login1.UserName)
- cmd.Parameters.AddWithValue("@Password", Login1.Password)
+ cmd.Parameters.AddWithValue("@Password", VERAG_PROG_ALLGEMEIN.cCryptography.Encrypt(Login1.Password))
cmd.Connection = con
con.Open()
' userId = Convert.ToInt32(cmd.ExecuteScalar())
diff --git a/packages.config b/packages.config
index 427c5d8..a83ab9a 100644
--- a/packages.config
+++ b/packages.config
@@ -10,6 +10,7 @@
+