From 55a47bd45f36dd05682c3d772fceea4c0a471621 Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 8 Nov 2021 14:48:17 +0100 Subject: [PATCH] Verbesserungen GUI Logik --- Customers/CustomsAviso.aspx.vb | 82 +++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 2 deletions(-) diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index c08d395..8878c3c 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -82,7 +82,40 @@ Partial Class CustomsAviso datevon = Nothing datebis = Nothing End If - Else + ElseIf rbt_Ankunft.Checked = True Then + 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 + datevon = Nothing + datebis = Nothing + ElseIf rbt_Erf.Checked = True Then + 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 + datevon = Nothing + datebis = Nothing + ElseIf rbt_Vorb.Checked = True Then + 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 + datevon = Nothing + datebis = Nothing + ElseIf rbt_Vorg.Checked = True Then lbl_von.Visible = False lbl_bis.Visible = False valreqpickdate1.Enabled = False @@ -131,6 +164,50 @@ Partial Class CustomsAviso datevon = Nothing datebis = Nothing End If + ElseIf rbt_Ankunft_M.Checked = True Then + 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 + datevon = Nothing + datebis = Nothing + ElseIf rbt_Erf_M.Checked = True Then + 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 + datevon = Nothing + datebis = Nothing + ElseIf rbt_Vorb_M.Checked = True Then + 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 + datevon = Nothing + datebis = Nothing + ElseIf rbt_Vorg_M.Checked = True Then + 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 + datevon = Nothing + datebis = Nothing End If Else Page.MaintainScrollPositionOnPostBack = False @@ -680,6 +757,7 @@ Partial Class CustomsAviso datevon = Nothing datebis = Nothing dt = Nothing + Return 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 @@ -704,8 +782,8 @@ Partial Class CustomsAviso datevon = Nothing datebis = Nothing dt = Nothing + Return End If - End Sub Protected Sub pickdate1_TextChanged(sender As Object, e As EventArgs)