Fixed den Bug der alle Status-Kategorien anzeigen ließ, egal welche Kategorie ausgewählt war.
This commit is contained in:
ja
@@ -165,21 +165,16 @@
|
||||
<asp:TableHeaderCell ID="tbl_HeaderCell_KundAuftNr" runat="server">KundenAuftrags_Nr</asp:TableHeaderCell>
|
||||
<asp:TableHeaderCell ID="tbl_HeaderCell_Info" runat="server">Info</asp:TableHeaderCell>
|
||||
</asp:TableHeaderRow>
|
||||
</asp:Table>
|
||||
|
||||
</asp:Table>
|
||||
<!--<thead style="height:/*20px;*/ 1.56128024980484vh; /*background-color:#043381;*/ background-image: linear-gradient(to right, #003680 , #0055cc); color:#fff; font-weight:900;">
|
||||
<tr><th>Index</th><th>ART</th><th>KundenNr</th><th>Status</th><th>von</th><th>bis</th><th>Absender</th><th>Empfänger</th><th>LKW_Nr</th><th>Kunden-AuftragsNr</th></tr>
|
||||
</thead> -->
|
||||
|
||||
</thead>-->
|
||||
<!-- <table runat="server" border="0" cellspacing="0" style="width:1300px" >
|
||||
<thead style="height:/*20px;*/ 1.56128024980484vh; /*background-color:#043381;*/ background-image: linear-gradient(to right, #003680 , #0055cc); color:#fff; font-weight:900;">
|
||||
<tr><th>Index</th><th>ART</th><th>KundenNr</th><th>Status</th><th>von</th><th>bis</th><th>Absender</th><th>Empfänger</th><th>LKW_Nr</th><th>Kunden-AuftragsNr</th></tr>
|
||||
</thead>
|
||||
|
||||
</table>-->
|
||||
|
||||
</thead>
|
||||
</table>-->
|
||||
</div>
|
||||
|
||||
</div></div></div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -9,46 +9,33 @@ Partial Class Kundenbereich_Default
|
||||
tbl_Header_row.TableSection = TableRowSection.TableHeader
|
||||
|
||||
DataBind()
|
||||
|
||||
If (Page.IsPostBack And normaltable.EnableViewState = False) Then
|
||||
|
||||
normaltable.EnableViewState = True
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Protected Sub LogOutBtn1_Click(sender As Object, e As EventArgs)
|
||||
|
||||
FormsAuthentication.SignOut()
|
||||
Session.Abandon()
|
||||
Response.Redirect("../newpageJulius_Sidebar.aspx", True)
|
||||
Response.Redirect("../login/Logout.aspx", True)
|
||||
End Sub
|
||||
Protected Sub LogOutBtn2_Click(sender As Object, e As EventArgs)
|
||||
|
||||
FormsAuthentication.SignOut()
|
||||
Session.Abandon()
|
||||
Response.Redirect("../newpageJulius_Sidebar.aspx", True)
|
||||
Response.Redirect("../login/Logout.aspx", True)
|
||||
End Sub
|
||||
|
||||
Dim datevon As DateTime
|
||||
Dim datebis As DateTime
|
||||
Dim Kdnrtext As String
|
||||
Dim dt
|
||||
Dim dt As DataTable
|
||||
|
||||
Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs)
|
||||
'MsgBox(Session.Item("test").ToString)
|
||||
'MsgBox(Session.Item("CustomerID").ToString)
|
||||
'MsgBox(Session.Item("PW").ToString)
|
||||
Kdnrtext = Session.Item("CustomerID").ToString
|
||||
|
||||
|
||||
|
||||
dt = Nothing
|
||||
|
||||
|
||||
'Dim tr
|
||||
If rbt_Erf.Checked = True Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0})
|
||||
|
||||
ElseIf rbt_Freig.Checked = True Then
|
||||
If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
|
||||
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
|
||||
@@ -64,26 +51,19 @@ Partial Class Kundenbereich_Default
|
||||
Else
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.Parse("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now)
|
||||
End If
|
||||
|
||||
ElseIf rbt_Ankunft.Checked = True Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3})
|
||||
|
||||
ElseIf rbt_Vorb.Checked = True Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4})
|
||||
|
||||
ElseIf rbt_Vorg.Checked = True Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5})
|
||||
|
||||
ElseIf rbt_Erf.Checked = False And rbt_Freig.Checked = False And rbt_Ankunft.Checked = False And rbt_Vorb.Checked = False And rbt_Vorg.Checked = False Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3})
|
||||
ElseIf rbt_Vorb.Checked = True Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4})
|
||||
ElseIf rbt_Vorg.Checked = True Then
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5})
|
||||
ElseIf rbt_Erf.Checked = False And rbt_Freig.Checked = False And rbt_Ankunft.Checked = False And rbt_Vorb.Checked = False And rbt_Vorg.Checked = False Then
|
||||
If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
|
||||
MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
|
||||
pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
|
||||
pickdate2.Text = Date.Now.ParseExact(Date.Now.Day.ToString + "-" + 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)
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
|
||||
|
||||
Else
|
||||
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
|
||||
Try
|
||||
datevon = Date.Parse(pickdate1.Text)
|
||||
@@ -91,16 +71,25 @@ Partial Class Kundenbereich_Default
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
|
||||
End Try
|
||||
Else
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
|
||||
End If
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
|
||||
End If
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
|
||||
Else
|
||||
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
|
||||
Try
|
||||
datevon = Date.Parse(pickdate1.Text)
|
||||
datebis = Date.Parse(pickdate2.Text)
|
||||
Catch ex As Exception
|
||||
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
|
||||
End Try
|
||||
Else
|
||||
End If
|
||||
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
|
||||
End If
|
||||
|
||||
If dt IsNot Nothing Then
|
||||
Dim i As Integer = 0
|
||||
|
||||
|
||||
'Dim sb As StringBuilder = New StringBuilder()
|
||||
|
||||
'Table start.
|
||||
@@ -125,7 +114,6 @@ Partial Class Kundenbereich_Default
|
||||
'sb.Append("</table>")
|
||||
' ltTable.Text = sb.ToString
|
||||
|
||||
|
||||
For Each d In dt.Rows
|
||||
Dim Cell = New TableCell
|
||||
Dim tbl_CellIndex = New TableCell
|
||||
@@ -147,7 +135,6 @@ Partial Class Kundenbereich_Default
|
||||
tr.Cells.Add(tbl_CellArt)
|
||||
tbl_CellKundenNr.Text = d("Auftraggeber_KdNr").ToString
|
||||
tr.Cells.Add(tbl_CellKundenNr)
|
||||
|
||||
Select Case d("Status")
|
||||
Case 1
|
||||
tbl_CellStatus.Text = "Erfasst"
|
||||
@@ -164,7 +151,11 @@ Partial Class Kundenbereich_Default
|
||||
Case 5
|
||||
tbl_CellStatus.Text = "Vorgeschrieben"
|
||||
tr.Cells.Add(tbl_CellStatus)
|
||||
Case Else
|
||||
tbl_CellStatus.Text = "Undefiniert"
|
||||
tr.Cells.Add(tbl_CellStatus)
|
||||
End Select
|
||||
|
||||
tbl_Cellvon.Text = d("AvisoEingang").ToString
|
||||
tr.Cells.Add(tbl_Cellvon)
|
||||
tbl_Cellbis.Text = d("AvisoEingang").ToString
|
||||
@@ -177,18 +168,31 @@ Partial Class Kundenbereich_Default
|
||||
tr.Cells.Add(tbl_CellLKWs)
|
||||
tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString
|
||||
tr.Cells.Add(tbl_CellKundAuftNr)
|
||||
If rbt_Ankunft.Checked = True And tbl_CellStatus.Text = "Ankunft" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
ElseIf rbt_Erf.Checked = True And tbl_CellStatus.Text = "Erfasst" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
ElseIf rbt_Freig.Checked = True And tbl_CellStatus.Text = "Freigegeben" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
ElseIf rbt_Vorb.Checked = True And tbl_CellStatus.Text = "Vorbereitet" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
ElseIf rbt_Vorg.Checked = True And tbl_CellStatus.Text = "Vorgeschrieben" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
ElseIf rbt_Vorg.Checked = False And rbt_Ankunft.Checked = False And rbt_Erf.Checked = False And rbt_Freig.Checked = False And rbt_Vorb.Checked = False And tbl_CellStatus.Text = "Undefiniert" Then
|
||||
normaltable.Rows.Add(tr)
|
||||
End If
|
||||
|
||||
normaltable.Rows.Add(tr)
|
||||
i += 1
|
||||
Next
|
||||
End If
|
||||
|
||||
End Sub
|
||||
|
||||
Protected Sub rbt_Freig_Click(sender As Object, e As EventArgs)
|
||||
MsgBox("Es funzt!")
|
||||
' datepicker1.Visible = True
|
||||
' datepicker2.Visible = True
|
||||
End Sub
|
||||
|
||||
Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
|
||||
rbt_Ankunft.Checked = False
|
||||
rbt_Ankunft.Enabled = True
|
||||
@@ -205,7 +209,7 @@ Partial Class Kundenbereich_Default
|
||||
pickdate2.Text = ""
|
||||
datevon = Nothing
|
||||
datebis = Nothing
|
||||
dt = Nothing
|
||||
dt = New DataTable
|
||||
Kdnrtext = ""
|
||||
'txt_KdNr.Focus()
|
||||
End Sub
|
||||
|
||||
Reference in New Issue
Block a user