Zusätzliche Änderungen

This commit is contained in:
ja
2021-11-04 14:08:21 +01:00
parent e3283a452a
commit 6edd778e6b
4 changed files with 146 additions and 81 deletions

View File

@@ -34,11 +34,19 @@ Partial Class CustomsAviso
lbl_bis.Visible = True
valDateRange_1.Enabled = True
valDateRange_2.Enabled = True
valreqpickdate1.Enabled = True
valreqpickdate2.Enabled = True
valreqpickdate1.Validate()
valreqpickdate2.Validate()
pickdate1.Visible = True
pickdate2.Visible = True
ElseIf rbt_Freig.Checked = True Then
lbl_von.Visible = True
lbl_bis.Visible = True
valreqpickdate1.Enabled = True
valreqpickdate2.Enabled = True
valreqpickdate1.Validate()
valreqpickdate2.Validate()
valDateRange_1.Enabled = True
valDateRange_2.Enabled = True
pickdate1.Visible = True
@@ -46,6 +54,8 @@ Partial Class CustomsAviso
Else
lbl_von.Visible = False
lbl_bis.Visible = False
valreqpickdate1.Enabled = False
valreqpickdate2.Enabled = False
valDateRange_1.Enabled = False
valDateRange_2.Enabled = False
pickdate1.Visible = False
@@ -55,6 +65,10 @@ Partial Class CustomsAviso
If rbt_Alle_M.Checked = True Then
lbl_von.Visible = True
lbl_bis.Visible = True
valreqpickdate1.Enabled = True
valreqpickdate2.Enabled = True
valreqpickdate1.Validate()
valreqpickdate2.Validate()
valDateRange_1.Enabled = True
valDateRange_2.Enabled = True
pickdate1.Visible = True
@@ -62,6 +76,10 @@ Partial Class CustomsAviso
ElseIf rbt_Freig_M.Checked = True Then
lbl_von.Visible = True
lbl_bis.Visible = True
valreqpickdate1.Enabled = True
valreqpickdate2.Enabled = True
valreqpickdate1.Validate()
valreqpickdate2.Validate()
valDateRange_1.Enabled = True
valDateRange_2.Enabled = True
pickdate1.Visible = True
@@ -69,16 +87,22 @@ Partial Class CustomsAviso
Else
lbl_von.Visible = False
lbl_bis.Visible = False
valreqpickdate1.Enabled = False
valreqpickdate2.Enabled = False
valDateRange_1.Enabled = False
valDateRange_2.Enabled = False
pickdate1.Visible = False
pickdate2.Visible = False
End If
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
If valreqpickdate1.IsValid = True And valreqpickdate2.IsValid = True Then
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
ElseIf pickdate1.Text = String.Empty And pickdate2.Text = String.Empty Then
datevon = Nothing
datebis = Nothing
End If
Else
Page.MaintainScrollPositionOnPostBack = False
Page.MaintainScrollPositionOnPostBack = False
rbt_Alle.Checked = True
normaltable.EnableViewState = True
lbl_von.Visible = True
@@ -312,7 +336,7 @@ Partial Class CustomsAviso
If rbt_Alle.Checked = True Or rbt_Alle_M.Checked = True Then
pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
Try
Dim erster = New Date(Now().Year, Now().Month, 1)
@@ -322,6 +346,7 @@ Partial Class CustomsAviso
pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
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)
End Try
@@ -329,6 +354,7 @@ Partial Class CustomsAviso
Try
datevon = Date.Parse(pickdate1.Text)
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)
End Try
@@ -359,6 +385,8 @@ Partial Class CustomsAviso
End Try
End If
ElseIf rbt_Ankunft.Checked = True Or rbt_Ankunft_M.Checked = True Then
pickdate1.Visible = False
pickdate2.Visible = False
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {3}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Vorb.Checked = True Or rbt_Vorb_M.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {4}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
@@ -468,40 +496,42 @@ Partial Class CustomsAviso
Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
'Mobil
rbt_Alle_M.Checked = True
rbt_Alle_M.Disabled = False
rbt_Ankunft_M.Checked = False
rbt_Ankunft_M.Disabled = False
rbt_Erf_M.Checked = False
rbt_Erf_M.Disabled = False
rbt_Freig_M.Checked = False
rbt_Freig_M.Disabled = False
rbt_Vorg_M.Checked = False
rbt_Vorg_M.Disabled = False
rbt_Vorb_M.Checked = False
rbt_Vorb_M.Disabled = False
txt_Absender_M.Text = ""
txt_Empfaenger_M.Text = ""
txt_KdNrAuftrag_M.Text = ""
txt_LKWNr_M.Text = ""
'Desktop
rbt_Alle.Checked = True
rbt_Alle.Disabled = False
rbt_Ankunft.Checked = False
rbt_Ankunft.Disabled = False
rbt_Erf.Checked = False
rbt_Erf.Disabled = False
rbt_Freig.Checked = False
rbt_Freig.Disabled = False
rbt_Vorg.Checked = False
rbt_Vorg.Disabled = False
rbt_Vorb.Checked = False
rbt_Vorb.Disabled = False
txt_Absender.Text = ""
txt_Empfaenger.Text = ""
txt_KdNrAuftrag.Text = ""
txt_LKWNr.Text = ""
If String.IsNullOrEmpty(txt_Absender_M.Text) = False Or String.IsNullOrEmpty(txt_Empfaenger_M.Text) = False Or String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = False Or String.IsNullOrEmpty(txt_LKWNr_M.Text) = False Or rbt_Alle_M.Checked = True Or rbt_Ankunft_M.Checked = True Or rbt_Erf_M.Checked = True Or rbt_Freig_M.Checked = True Or rbt_Vorb_M.Checked = True Or rbt_Vorg_M.Checked = True Then
rbt_Alle_M.Checked = True
rbt_Alle_M.Disabled = False
rbt_Ankunft_M.Checked = False
rbt_Ankunft_M.Disabled = False
rbt_Erf_M.Checked = False
rbt_Erf_M.Disabled = False
rbt_Freig_M.Checked = False
rbt_Freig_M.Disabled = False
rbt_Vorg_M.Checked = False
rbt_Vorg_M.Disabled = False
rbt_Vorb_M.Checked = False
rbt_Vorb_M.Disabled = False
txt_Absender_M.Text = ""
txt_Empfaenger_M.Text = ""
txt_KdNrAuftrag_M.Text = ""
txt_LKWNr_M.Text = ""
ElseIf String.IsNullOrEmpty(txt_Absender.Text) = False Or String.IsNullOrEmpty(txt_Empfaenger.Text) = False Or String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Or String.IsNullOrEmpty(txt_LKWNr.Text) = False Or rbt_Alle.Checked = True Or rbt_Ankunft.Checked = True Or rbt_Erf.Checked = True Or rbt_Freig.Checked = True Or rbt_Vorb.Checked = True Or rbt_Vorg.Checked = True Then
'Desktop
rbt_Alle.Checked = True
rbt_Alle.Disabled = False
rbt_Ankunft.Checked = False
rbt_Ankunft.Disabled = False
rbt_Erf.Checked = False
rbt_Erf.Disabled = False
rbt_Freig.Checked = False
rbt_Freig.Disabled = False
rbt_Vorg.Checked = False
rbt_Vorg.Disabled = False
rbt_Vorb.Checked = False
rbt_Vorb.Disabled = False
txt_Absender.Text = ""
txt_Empfaenger.Text = ""
txt_KdNrAuftrag.Text = ""
txt_LKWNr.Text = ""
End If
Dim erster = New Date(Now().Year, Now().Month, 1)
pickdate1.Text = erster.Day.ToString + "." + erster.Month.ToString + "." + erster.Year.ToString
pickdate2.Text = Date.Parse(erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString