diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb
index b979a15..1ff6d05 100644
--- a/Customers/Invoices.aspx.vb
+++ b/Customers/Invoices.aspx.vb
@@ -164,7 +164,13 @@ Partial Class Customers_Invoices
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)
@@ -172,101 +178,106 @@ Partial Class Customers_Invoices
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)
-
- End Sub
-
- Protected Sub txt_Empfaenger_TextChanged(sender As Object, e As EventArgs)
-
- End Sub
-
- Protected Sub txt_Absender_TextChanged(sender As Object, e As EventArgs)
- End Sub
-
- Protected Sub txt_ReNr_TextChanged(sender As Object, e As EventArgs)
-
- End Sub
-
- Protected Sub txt_KdNrAuftrag_TextChanged(sender As Object, e As EventArgs)
-
- End Sub
-
- Protected Sub txt_LKWNr_M_TextChanged(sender As Object, e As EventArgs)
-
- End Sub
-
- Protected Sub TextBox2_TextChanged(sender As Object, e As EventArgs)
-
- End Sub
-
- Protected Sub txt_KdNrAuftrag_M_TextChanged(sender As Object, e As EventArgs)
-
- End Sub
-
-
- Protected Sub txt_KundenNr_TextChanged(sender As Object, e As EventArgs)
-
- End Sub
-
- Protected Sub btn_Rechnungen_Click(sender As Object, e As EventArgs)
- dt = Nothing
- If String.IsNullOrEmpty(txt_Absender.Text) Then
- regexval_txt_Absender.Enabled = False
- Else
- regexval_txt_Absender.Enabled = True
- End If
- If String.IsNullOrEmpty(txt_Empfaenger.Text) Then
- regexval_txt_Empfaenger.Enabled = False
- Else
- regexval_txt_Empfaenger.Enabled = True
- End If
- If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) Then
- regexval_txt_KdNrAuftrag.Enabled = False
- Else
- regexval_txt_KdNrAuftrag.Enabled = True
- End If
If String.IsNullOrEmpty(txt_LKWNr.Text) Then
regexval_txt_LKW.Enabled = False
Else
regexval_txt_LKW.Enabled = True
End If
- If String.IsNullOrEmpty(txt_ReNr.Text) Then
- regexval_txt_ReNr.Enabled = False
+ 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_ReNr.Enabled = False
+ regexval_txt_Empfaenger.Enabled = True
End If
- 'Mobile
- If String.IsNullOrEmpty(txt_Absender_M.Text) Then
- regexval_txt_Absender_M.Enabled = False
+ 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_M.Enabled = True
- End If
- If String.IsNullOrEmpty(txt_Empfaenger_M.Text) Then
- regexval_txt_Empfaenger_M.Enabled = False
- Else
- regexval_txt_Empfaenger_M.Enabled = True
- End If
- If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) Then
- regexval_txt_KdNrAuftrag_M.Enabled = False
- Else
- regexval_txt_KdNrAuftrag_M.Enabled = True
- End If
- If String.IsNullOrEmpty(txt_LKWNr_M.Text) Then
- regexval_txt_LKW_M.Enabled = False
- Else
- regexval_txt_LKW_M.Enabled = True
+ 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
+
+ 'Mobile
+
+
+
+
valreq_pickdate1.Validate()
valreq_pickdate2.Validate()
- If valreq_pickdate1.IsValid AndAlso valreq_pickdate2.IsValid Then
+ If valreq_pickdate1.IsValid AndAlso valreq_pickdate2.IsValid AndAlso Kdnrtext = Not "" Then
If txt_Absender.Text IsNot "" Then
regexval_txt_Absender.Enabled = True
regexval_txt_Absender.Validate()
@@ -402,7 +413,7 @@ Partial Class Customers_Invoices
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
@@ -480,4 +491,8 @@ Partial Class Customers_Invoices
End If
End Sub
+
+
+
+
End Class
diff --git a/css/Customers/Invoices.css b/css/Customers/Invoices.css
index 4ab16e1..5848636 100644
--- a/css/Customers/Invoices.css
+++ b/css/Customers/Invoices.css
@@ -23,6 +23,47 @@ h1 {
color:#043381;
font-size: 32px;
}
+hr {
+ color: #043381;
+}
+#btn_resetForm {
+ padding-right: -800px;
+}
+.accordion-button {
+ position: relative;
+ display: flex;
+ align-items: center;
+ width: 100%;
+ padding: 1rem 1.25rem;
+ font-size: 1rem;
+ color: #043381;
+ text-align: left;
+ background-color: #fff;
+ border: none;
+ border-radius: 0;
+ transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,border-radius .15s ease;
+ height: 5px;
+}
+
+.accordion #accordionExample #collapseOne .card card-body #cont3 .container {
+ margin-left: 2px;
+}
+
+ .accordion #accordionExample #collapseOne .card card-body #cont3 .container .d-none d-md-block .row .col-12 {
+ margin-right: /*1.52px;*/ 0.33480176211453744vw;
+ }
+
+#RadioButtonList1 {
+ border: none;
+}
+
+#btn_resetForm {
+ margin-right: 2px;
+}
+#Send_Data {
+ height: 15px;
+ width: 120%;
+}
@media (max-width: 558.98px) {
#conovertab {
width: 325px;
@@ -44,28 +85,79 @@ h1 {
width: 350px;
}
-
- #tableSearch {
- width: 315px;
+ .flex-fill {
+ width: 700px;
}
-
-
- #tableSearch {
- width: 325px;
+ #cont3 {
+ width: 700px;
}
-
- #conovertab {
- margin-left: 10px;
- width: 315px;
+ #cont4 {
+ min-width: 750px;
}
-
- .align-self-xl-start {
+ tbody {
+ font-size: 3.303964757709251vw;
+ height: auto;
+ flex-wrap: wrap;
+ width: fit-content;
+ }
+ #normaltable {
width: 100%;
}
+ #conovertab {
+ /* max-width:width:150px 11.25em;*/
+ margin-left: /*14px*/ 3.0837004405286343vw;
+ max-width: /*390px;*/ 85.90308370044053vw;
+ overflow-x: auto;
+ }
+
+ #pickdate1{
+ border: 1px solid #000000;
+ }
+ #pickdate1 {
+ border: 1px solid #000000;
+ }
+ .flex-fill {
+ width: 700px;
+ }
+
+ #cont3 {
+ width: 700px;
+ }
+
+ #cont4 {
+ min-width: 750px;
+ }
+
+ tbody {
+ font-size: 3.303964757709251vw;
+ height: auto;
+ flex-wrap: wrap;
+ width: fit-content;
+ }
#normaltable {
width: 100%;
}
+
+ #conovertab {
+ /* max-width:width:150px 11.25em;*/
+ margin-left: /*14px*/ 3.0837004405286343vw;
+ max-width: /*390px;*/ 85.90308370044053vw;
+ overflow-x: auto;
+ }
+
+ #Send_Data {
+ height: 15px;
+ width: 120%;
+ }
+
+ #pickdate1 {
+ border: 1px solid #000000;
+ }
+
+ #pickdate1 {
+ border: 1px solid #000000;
+ }
}
\ No newline at end of file
diff --git a/login/Logout.aspx.vb b/login/Logout.aspx.vb
index 44ec222..7d47257 100644
--- a/login/Logout.aspx.vb
+++ b/login/Logout.aspx.vb
@@ -20,6 +20,7 @@ Partial Class login_Logout
'Dim cookie2 As HttpCookie = New HttpCookie(sessionStateSection.CookieName, "")
'cookie2.Expires = DateTime.Now.AddYears(-1)
'Response.Cookies.Add(cookie2)
+ Response.BufferOutput = True
Response.Redirect("../login/login_FLEX.aspx")