Fixen des Accordion Schließen Bugs sowie das lösen des RadioButton Design und Work-Problems
This commit is contained in:
@@ -22,11 +22,19 @@ Partial Class Kundenbereich_Default
|
||||
normaltable.EnableViewState = True
|
||||
datevon = Date.Parse(pickdate1.Text)
|
||||
datebis = Date.Parse(pickdate2.Text)
|
||||
|
||||
Else
|
||||
normaltable.EnableViewState = True
|
||||
Dim erster = New Date(Now().Year, Now().Month, 1)
|
||||
Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
|
||||
pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
|
||||
' MsgBox(ersterdat)
|
||||
datevon = ersterdat
|
||||
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
|
||||
|
||||
rbt_Alle.Selected = True
|
||||
rbt_Alle_M.Selected = True
|
||||
rbt_Alle.Checked = True
|
||||
rbt_Alle_M.Checked = True
|
||||
|
||||
End If
|
||||
End Sub
|
||||
@@ -213,27 +221,19 @@ Partial Class Kundenbereich_Default
|
||||
End Try
|
||||
End If
|
||||
|
||||
If rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True Then
|
||||
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)
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {0, 1, 2, 3, 4, 5}, datevon, datebis, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR))
|
||||
If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
|
||||
Try
|
||||
pickdate1.BorderColor = Drawing.Color.Red
|
||||
pickdate1.BorderStyle = BorderStyle.Double
|
||||
pickdate1.BorderWidth = Unit.Pixel(2)
|
||||
pickdate2.BorderColor = Drawing.Color.Red
|
||||
pickdate2.BorderStyle = BorderStyle.Double
|
||||
pickdate2.BorderWidth = Unit.Pixel(2)
|
||||
lbl_ErrorCal.Visible = True
|
||||
lbl_ErrorCal.Style.Add("ForeColor", "red")
|
||||
lbl_ErrorCal.Text = "Kein Datum ausgewählt. Bitte auswählen!"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Dim erster = New Date(Now().Year, Now().Month, 1)
|
||||
Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
|
||||
' MsgBox(ersterdat)
|
||||
datevon = ersterdat
|
||||
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
|
||||
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
|
||||
@@ -241,17 +241,13 @@ Partial Class Kundenbereich_Default
|
||||
Try
|
||||
datevon = Date.Parse(pickdate1.Text)
|
||||
datebis = Date.Parse(pickdate2.Text)
|
||||
pickdate1.BorderWidth = Unit.Pixel(0)
|
||||
pickdate2.BorderWidth = Unit.Pixel(0)
|
||||
lbl_ErrorCal.Visible = False
|
||||
lbl_ErrorCal.Text = ""
|
||||
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
|
||||
End If
|
||||
ElseIf rbt_Erf.Selected = True Or rbt_Erf_M.Selected = True Then
|
||||
ElseIf rbt_Erf.Checked = True Or rbt_Erf_M.Checked = True Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {0}, Nothing, Nothing, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR))
|
||||
ElseIf rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True Then
|
||||
ElseIf rbt_Freig.Checked = True Or rbt_Freig_M.Checked = True Then
|
||||
pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
|
||||
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
|
||||
If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
|
||||
@@ -273,11 +269,11 @@ Partial Class Kundenbereich_Default
|
||||
MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation)
|
||||
End Try
|
||||
End If
|
||||
ElseIf rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True Then
|
||||
ElseIf rbt_Ankunft.Checked = True Or rbt_Ankunft_M.Checked = True Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {3}, Nothing, Nothing, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR))
|
||||
ElseIf rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True Then
|
||||
ElseIf rbt_Vorb.Checked = True Or rbt_Vorb_M.Checked = True Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {4}, Nothing, Nothing, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR))
|
||||
ElseIf rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True Then
|
||||
ElseIf rbt_Vorg.Checked = True Or rbt_Vorg_M.Checked = True Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {5}, Nothing, Nothing, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR))
|
||||
End If
|
||||
|
||||
@@ -353,17 +349,17 @@ Partial Class Kundenbereich_Default
|
||||
tbl_CellInfo.Controls.Add(btn)
|
||||
tr.Cells.Add(tbl_CellInfo)
|
||||
|
||||
If (rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True) Then
|
||||
If (rbt_Alle.Checked = True Or rbt_Alle_M.Checked = True) Then
|
||||
normaltable.Rows.Add(tr)
|
||||
ElseIf (rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True) AndAlso tbl_CellStatus.Text = "Ankunft" Then
|
||||
ElseIf (rbt_Ankunft.Checked = True Or rbt_Ankunft_M.Checked = True) AndAlso tbl_CellStatus.Text = "Ankunft" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
ElseIf (rbt_Erf.Selected = True Or rbt_Erf_M.Selected = True) AndAlso tbl_CellStatus.Text = "Erfasst" Then
|
||||
ElseIf (rbt_Erf.Checked = True Or rbt_Erf_M.Checked = True) AndAlso tbl_CellStatus.Text = "Erfasst" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
ElseIf (rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True) AndAlso tbl_CellStatus.Text = "Freigegeben" Then
|
||||
ElseIf (rbt_Freig.Checked = True Or rbt_Freig_M.Checked = True) AndAlso tbl_CellStatus.Text = "Freigegeben" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
ElseIf (rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorbereitet" Then
|
||||
ElseIf (rbt_Vorb.Checked = True Or rbt_Vorb_M.Checked = True) AndAlso tbl_CellStatus.Text = "Vorbereitet" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
ElseIf (rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
|
||||
ElseIf (rbt_Vorg.Checked = True Or rbt_Vorg_M.Checked = True) AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
End If
|
||||
|
||||
@@ -383,35 +379,35 @@ Partial Class Kundenbereich_Default
|
||||
|
||||
Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
|
||||
'Mobil
|
||||
rbt_Alle_M.Selected = False
|
||||
rbt_Alle_M.Enabled = True
|
||||
rbt_Ankunft_M.Selected = False
|
||||
rbt_Ankunft_M.Enabled = True
|
||||
rbt_Erf_M.Selected = False
|
||||
rbt_Erf_M.Enabled = True
|
||||
rbt_Freig_M.Selected = False
|
||||
rbt_Freig_M.Enabled = True
|
||||
rbt_Vorg_M.Selected = False
|
||||
rbt_Vorg_M.Enabled = True
|
||||
rbt_Vorb_M.Selected = False
|
||||
rbt_Vorb_M.Enabled = True
|
||||
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.Selected = False
|
||||
rbt_Alle.Enabled = True
|
||||
rbt_Ankunft.Selected = False
|
||||
rbt_Ankunft.Enabled = True
|
||||
rbt_Erf.Selected = False
|
||||
rbt_Erf.Enabled = True
|
||||
rbt_Freig.Selected = False
|
||||
rbt_Freig.Enabled = True
|
||||
rbt_Vorg.Selected = False
|
||||
rbt_Vorg.Enabled = True
|
||||
rbt_Vorb.Selected = False
|
||||
rbt_Vorb.Enabled = True
|
||||
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 = ""
|
||||
|
||||
Reference in New Issue
Block a user