From 0553c9e74b883b5192d6ac02e286a06a3c7564a5 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 14 Sep 2021 16:53:29 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20Datum?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/CustomsAviso.aspx    |  3 +--
 Customers/CustomsAviso.aspx.vb | 14 ++++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 6ac49bd..7f82d3d 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -147,8 +147,7 @@
                                                    <asp:Table id="normaltable" runat="server" Width="100%" EnableViewState="false" >
                                                     <asp:TableHeaderRow ID="tbl_Header_row" runat="server">                                                        
                                                             <asp:TableHeaderCell ID="tbl_HeaderCellIndexNr" runat="server">Index-Nr</asp:TableHeaderCell>
-                                                            <asp:TableHeaderCell ID="tbl_HeaderCell_ART" runat="server">ART</asp:TableHeaderCell>
-                                                            
+                                                            <asp:TableHeaderCell ID="tbl_HeaderCell_ART" runat="server">ART</asp:TableHeaderCell>                                                            
                                                             <asp:TableHeaderCell ID="tbl_HeaderCell_Status" runat="server">Status</asp:TableHeaderCell>
                                                             <asp:TableHeaderCell ID="tbl_HeaderCell_von" runat="server">von</asp:TableHeaderCell>
                                                             <asp:TableHeaderCell ID="tbl_HeaderCell_bis" runat="server">bis</asp:TableHeaderCell>
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 601569c..493db3b 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -44,18 +44,13 @@ Partial Class Kundenbereich_Default
             KDNAFNR = txt_KdNrAuftrag.Text
         ElseIf txt_LKWNr.Text IsNot "" Then
             LKWNR = txt_LKWNr.Text
-        Else
-            Absender = ""
-            Empfaenger = ""
-            KDNAFNR = ""
-            LKWNR = ""
         End If
 
         'Dim tr
         If rbt_Erf.Checked = True Then
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Freig.Checked = True Then
-            If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" 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
                     Try
                         datevon = Date.Parse(pickdate1.Text)
@@ -63,7 +58,6 @@ Partial Class Kundenbereich_Default
                     Catch ex As Exception
                         MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
                     End Try
-                Else
                 End If
                 dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
             Else
@@ -82,8 +76,9 @@ Partial Class Kundenbereich_Default
             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
+            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)
@@ -153,7 +148,6 @@ Partial Class Kundenbereich_Default
                 tbl_CellArt.Text = ""
                 tr.Cells.Add(tbl_CellArt)
 
-
                 Select Case d("Status")
                     Case 1
                         tbl_CellStatus.Text = "Erfasst"