From e49ea0a57e8df0621adb554848bf6ece582ea160 Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 8 Nov 2021 09:03:43 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20werden=20g=C3=BCltig=20nach?= =?UTF-8?q?=20Vorstellungen=20ausgef=C3=BChrt.=20Auch=20bei=20Leerlassen.?= =?UTF-8?q?=20Bei=20IWederausw=C3=A4hlen=20Bug=20mit=20verschwindenden=20L?= =?UTF-8?q?abels=20und=20Pickdate-container2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Customers/CustomsAviso.aspx | 10 +++------- Customers/CustomsAviso.aspx.vb | 8 +++----- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 86a2374..0d5c771 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -332,8 +332,7 @@ $("#container2").hide(); } } - - + @@ -389,8 +388,5 @@ $("#" + last).addClass("in"); } }); - - - - + \ No newline at end of file diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index a9b8f08..3019fc9 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -46,8 +46,6 @@ Partial Class CustomsAviso Page.MaintainScrollPositionOnPostBack = True normaltable.EnableViewState = True - - If rbt_Alle.Checked = True Then lbl_von.Visible = True lbl_bis.Visible = True @@ -461,7 +459,7 @@ Partial Class CustomsAviso pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year - MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation) + MsgBox("Time ranges are not valid!", MsgBoxStyle.Exclamation) End Try Else Try @@ -469,7 +467,7 @@ Partial Class CustomsAviso datebis = Date.Parse(pickdate2.Text) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year - MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation) + MsgBox("The time ranges given are not valid!", MsgBoxStyle.Exclamation) End Try End If ElseIf rbt_Erf_M.Checked = True Then @@ -497,7 +495,7 @@ Partial Class CustomsAviso ' MsgBox(pickdate2.Text) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year - MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation) + MsgBox("The time ranges given are not valid!", MsgBoxStyle.Exclamation) End Try End If ElseIf rbt_Ankunft_M.Checked = True Then