Fixed den Bug der alle Status-Kategorien anzeigen ließ, egal welche Kategorie ausgewählt war.

This commit is contained in:
ja
2021-09-14 14:36:27 +02:00
parent 6a7d54222c
commit 6e09744a8c
2 changed files with 47 additions and 48 deletions

View File

@@ -166,20 +166,15 @@
<asp:TableHeaderCell ID="tbl_HeaderCell_Info" runat="server">Info</asp:TableHeaderCell> <asp:TableHeaderCell ID="tbl_HeaderCell_Info" runat="server">Info</asp:TableHeaderCell>
</asp:TableHeaderRow> </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;"> <!--<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> <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" > <!-- <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;"> <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> <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>--> </table>-->
</div> </div>
</div></div></div> </div></div></div>
</div> </div>

View File

@@ -9,46 +9,33 @@ Partial Class Kundenbereich_Default
tbl_Header_row.TableSection = TableRowSection.TableHeader tbl_Header_row.TableSection = TableRowSection.TableHeader
DataBind() DataBind()
If (Page.IsPostBack And normaltable.EnableViewState = False) Then If (Page.IsPostBack And normaltable.EnableViewState = False) Then
normaltable.EnableViewState = True normaltable.EnableViewState = True
End If End If
End Sub End Sub
Protected Sub LogOutBtn1_Click(sender As Object, e As EventArgs) Protected Sub LogOutBtn1_Click(sender As Object, e As EventArgs)
Response.Redirect("../login/Logout.aspx", True)
FormsAuthentication.SignOut()
Session.Abandon()
Response.Redirect("../newpageJulius_Sidebar.aspx", True)
End Sub End Sub
Protected Sub LogOutBtn2_Click(sender As Object, e As EventArgs) Protected Sub LogOutBtn2_Click(sender As Object, e As EventArgs)
Response.Redirect("../login/Logout.aspx", True)
FormsAuthentication.SignOut()
Session.Abandon()
Response.Redirect("../newpageJulius_Sidebar.aspx", True)
End Sub End Sub
Dim datevon As DateTime Dim datevon As DateTime
Dim datebis As DateTime Dim datebis As DateTime
Dim Kdnrtext As String Dim Kdnrtext As String
Dim dt Dim dt As DataTable
Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs) Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs)
'MsgBox(Session.Item("test").ToString) 'MsgBox(Session.Item("test").ToString)
'MsgBox(Session.Item("CustomerID").ToString) 'MsgBox(Session.Item("CustomerID").ToString)
'MsgBox(Session.Item("PW").ToString) 'MsgBox(Session.Item("PW").ToString)
Kdnrtext = Session.Item("CustomerID").ToString Kdnrtext = Session.Item("CustomerID").ToString
dt = Nothing dt = Nothing
'Dim tr 'Dim tr
If rbt_Erf.Checked = True Then If rbt_Erf.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0}) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0})
ElseIf rbt_Freig.Checked = True Then ElseIf rbt_Freig.Checked = True Then
If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
@@ -64,25 +51,30 @@ Partial Class Kundenbereich_Default
Else Else
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.Parse("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.Parse("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now)
End If End If
ElseIf rbt_Ankunft.Checked = True Then ElseIf rbt_Ankunft.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3}) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3})
ElseIf rbt_Vorb.Checked = True Then ElseIf rbt_Vorb.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4}) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4})
ElseIf rbt_Vorg.Checked = True Then ElseIf rbt_Vorg.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5}) 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 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 If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!") 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 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) datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing)
datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing) datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing)
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
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
End If
End If
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
Else Else
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
Try Try
@@ -95,12 +87,9 @@ Partial Class Kundenbereich_Default
End If End If
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
End If End If
End If
If dt IsNot Nothing Then If dt IsNot Nothing Then
Dim i As Integer = 0 Dim i As Integer = 0
'Dim sb As StringBuilder = New StringBuilder() 'Dim sb As StringBuilder = New StringBuilder()
'Table start. 'Table start.
@@ -125,7 +114,6 @@ Partial Class Kundenbereich_Default
'sb.Append("</table>") 'sb.Append("</table>")
' ltTable.Text = sb.ToString ' ltTable.Text = sb.ToString
For Each d In dt.Rows For Each d In dt.Rows
Dim Cell = New TableCell Dim Cell = New TableCell
Dim tbl_CellIndex = New TableCell Dim tbl_CellIndex = New TableCell
@@ -147,7 +135,6 @@ Partial Class Kundenbereich_Default
tr.Cells.Add(tbl_CellArt) tr.Cells.Add(tbl_CellArt)
tbl_CellKundenNr.Text = d("Auftraggeber_KdNr").ToString tbl_CellKundenNr.Text = d("Auftraggeber_KdNr").ToString
tr.Cells.Add(tbl_CellKundenNr) tr.Cells.Add(tbl_CellKundenNr)
Select Case d("Status") Select Case d("Status")
Case 1 Case 1
tbl_CellStatus.Text = "Erfasst" tbl_CellStatus.Text = "Erfasst"
@@ -164,7 +151,11 @@ Partial Class Kundenbereich_Default
Case 5 Case 5
tbl_CellStatus.Text = "Vorgeschrieben" tbl_CellStatus.Text = "Vorgeschrieben"
tr.Cells.Add(tbl_CellStatus) tr.Cells.Add(tbl_CellStatus)
Case Else
tbl_CellStatus.Text = "Undefiniert"
tr.Cells.Add(tbl_CellStatus)
End Select End Select
tbl_Cellvon.Text = d("AvisoEingang").ToString tbl_Cellvon.Text = d("AvisoEingang").ToString
tr.Cells.Add(tbl_Cellvon) tr.Cells.Add(tbl_Cellvon)
tbl_Cellbis.Text = d("AvisoEingang").ToString tbl_Cellbis.Text = d("AvisoEingang").ToString
@@ -177,18 +168,31 @@ Partial Class Kundenbereich_Default
tr.Cells.Add(tbl_CellLKWs) tr.Cells.Add(tbl_CellLKWs)
tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString
tr.Cells.Add(tbl_CellKundAuftNr) tr.Cells.Add(tbl_CellKundAuftNr)
If rbt_Ankunft.Checked = True And tbl_CellStatus.Text = "Ankunft" Then
normaltable.Rows.Add(tr) 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
i += 1 i += 1
Next Next
End If End If
End Sub End Sub
Protected Sub rbt_Freig_Click(sender As Object, e As EventArgs) Protected Sub rbt_Freig_Click(sender As Object, e As EventArgs)
MsgBox("Es funzt!") MsgBox("Es funzt!")
' datepicker1.Visible = True ' datepicker1.Visible = True
' datepicker2.Visible = True ' datepicker2.Visible = True
End Sub End Sub
Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs) Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
rbt_Ankunft.Checked = False rbt_Ankunft.Checked = False
rbt_Ankunft.Enabled = True rbt_Ankunft.Enabled = True
@@ -205,7 +209,7 @@ Partial Class Kundenbereich_Default
pickdate2.Text = "" pickdate2.Text = ""
datevon = Nothing datevon = Nothing
datebis = Nothing datebis = Nothing
dt = Nothing dt = New DataTable
Kdnrtext = "" Kdnrtext = ""
'txt_KdNr.Focus() 'txt_KdNr.Focus()
End Sub End Sub