diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 7fd08b4..2525c32 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -77,6 +77,7 @@
+ Alle
Erfasst
Vorbereitet
Vorgeschrieben
@@ -185,7 +186,8 @@
--%>
-
+
+
-
-
\ No newline at end of file
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 7dac6f6..48639be 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -59,60 +59,52 @@ Partial Class Kundenbereich_Default
End If
'Dim tr
- If rbt_Erf.Selected = True Then
- dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR)
- ElseIf rbt_Freig.Selected = True Then
- If pickdate1.Text = Not "TT.MM.JJJJ" And pickdate2.Text = Not "TT.MM.JJJJ" Then
- If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
+ If rbt_Alle.Selected = True Then
+ If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
+ MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
+ pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
+ pickdate2.Text = Date.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
+ End If
+
+
+ If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
Try
- pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
datevon = Date.Parse(pickdate1.Text)
- pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
datebis = Date.Parse(pickdate2.Text)
Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
End Try
End If
- dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
+
+ dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
+
+ ElseIf rbt_Erf.Selected = True Then
+ dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR)
+ ElseIf rbt_Freig.Selected = True Then
+
+ If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
+ Try
+ pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+ datevon = Date.Parse(pickdate1.Text)
+ pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
+ datebis = Date.Parse(pickdate2.Text)
+ Catch ex As Exception
+ MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
+ End Try
Else
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.ParseExact("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now)
End If
+ dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
+ ElseIf pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
+ MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
+
+
ElseIf rbt_Ankunft.Selected = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3},,, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Vorb.Selected = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4},,, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Vorg.Selected = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5},,, Absender, Empfaenger, LKWNR, KDNAFNR)
- ElseIf rbt_Erf.Selected = False And rbt_Freig.Selected = False And rbt_Ankunft.Selected = False And rbt_Vorb.Selected = False And rbt_Vorg.Selected = False Then
- If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
- MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
- ElseIf pickdate1.Text = Not "TT.MM.JJJJ" And pickdate2.Text = Not "TT.MM.JJJJ" Then
- pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
- pickdate2.Text = Date.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
- datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing)
- datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing)
-
- If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
- Try
- datevon = Date.Parse(pickdate1.Text)
- datebis = Date.Parse(pickdate2.Text)
- Catch ex As Exception
- MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
- End Try
- dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
- End If
- Else
- If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
- Try
- datevon = Date.Parse(pickdate1.Text)
- datebis = Date.Parse(pickdate2.Text)
- Catch ex As Exception
- MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
- End Try
- Else
- End If
- dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
- End If
End If
If dt IsNot Nothing Then
@@ -202,7 +194,9 @@ Partial Class Kundenbereich_Default
tbl_CellInfo.ValidateRequestMode = UI.ValidateRequestMode.Enabled
tr.Cells.Add(tbl_CellInfo)
- If rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then
+ If rbt_Alle.Selected = True Then
+ normaltable.Rows.Add(tr)
+ ElseIf rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then
normaltable.Rows.Add(tr)
ElseIf rbt_Erf.Selected = True AndAlso tbl_CellStatus.Text = "Erfasst" Then
normaltable.Rows.Add(tr)
@@ -212,8 +206,6 @@ Partial Class Kundenbereich_Default
normaltable.Rows.Add(tr)
ElseIf rbt_Vorg.Selected = True AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
normaltable.Rows.Add(tr)
- ElseIf rbt_Erf.Selected = False And rbt_Ankunft.Selected = False And rbt_Vorg.Selected = False And rbt_Freig.Selected = False And rbt_Vorb.Selected = False Then
- normaltable.Rows.Add(tr)
End If
i += 1
@@ -224,7 +216,8 @@ Partial Class Kundenbereich_Default
End Sub
Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
-
+ rbt_Alle.Selected = False
+ rbt_Alle.Enabled = True
rbt_Ankunft.Selected = False
rbt_Ankunft.Enabled = True
rbt_Erf.Selected = False