Änderungen zu funktionierenden aber falsch positionierten Abfragen

This commit is contained in:
ja
2021-09-09 16:01:14 +02:00
parent b31a7d8ac1
commit 09c9d75dd8
2 changed files with 111 additions and 101 deletions

View File

@@ -37,8 +37,18 @@ Partial Class Kundenbereich_Default
End Try
Dim tr
Dim th
th = New HtmlTableRow()
th.Cells.Add(New HtmlTableCell("Index"))
th.Cells.Add(New HtmlTableCell("Art"))
th.Cells.Add(New HtmlTableCell("Status"))
th.Cells.Add(New HtmlTableCell("Von"))
th.Cells.Add(New HtmlTableCell("Bis"))
th.Cells.Add(New HtmlTableCell("Absender"))
th.Cells.Add(New HtmlTableCell("Empfaenger"))
th.Cells.Add(New HtmlTableCell("LKW_Nr"))
th.Cells.Add(New HtmlTableCell("Auftraggeber_KdNr"))
normaltable.Rows.Add(th)
If rbt_Erf.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0})
@@ -46,27 +56,26 @@ Partial Class Kundenbereich_Default
'Dim Cell = New TableCell
For Each d In dt.Rows
'Dim tr = New TableRow
tr = New HtmlTableRow()
Do
If i <= dt.Rows.Count Then
'Dim tr = New TableRow
tr = New HtmlTableRow()
'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(d("Status")))
tr.Cells.Add(New HtmlTableCell(d("AvisoEingang")))
tr.Cells.Add(New HtmlTableCell(d("AvisoEingang")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(<button type="button" class="btn btn-primary" data-bstoggle="collapse" data-bs-target="#demo" id="togglecollapsesub1"><img src="../images/Icons/service/hilfe.png" width="15" height="15"/></button>))
trContent.Rows.Add(tr)
normaltable.Rows.Add(tr)
i = i + 1
Loop
While i <= dt.Rows.Count
End While
End If
Next
ElseIf rbt_Freig.Checked = True Then
@@ -74,58 +83,54 @@ Partial Class Kundenbereich_Default
Dim i As Integer = 0
'Dim Cell = New TableCell
tr = New HtmlTableRow()
For Each d In dt.Rows
'Dim tr = New TableRow
Do
For Each d In dt.Rows
If i <= dt.Rows.Count Then
'Dim tr = New TableRow
tr = New HtmlTableRow()
'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(d("Status")))
tr.Cells.Add(New HtmlTableCell(d("AvisoEingang")))
tr.Cells.Add(New HtmlTableCell(d("AvisoEingang")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(<button type="button" class="btn btn-primary" data-bstoggle="collapse" data-bs-target="#demo" id="togglecollapsesub1"><img src="../images/Icons/service/hilfe.png" width="15" height="15"/></button>))
trContent.Rows.Add(tr)
normaltable.Rows.Add(tr)
i = i + 1
Loop
While i <= dt.Rows.Count
End While
End If
Next
ElseIf rbt_Ankunft.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3})
Dim i As Integer = 0
'Dim Cell = New TableCell
tr = New HtmlTableRow()
For Each d In dt.Rows
'Dim tr = New TableRow
Do
For Each d In dt.Rows
If i <= dt.Rows.Count Then
'Dim tr = New TableRow
tr = New HtmlTableRow()
'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(d("Status")))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(<button type="button" class="btn btn-primary" data-bstoggle="collapse" data-bs-target="#demo" id="togglecollapsesub1"><img src="../images/Icons/service/hilfe.png" width="15" height="15"/></button>))
trContent.Rows.Add(tr)
normaltable.Rows.Add(tr)
i = i + 1
Loop
While i <= dt.Rows.Count
End While
End If
Next
ElseIf rbt_Vorb.Checked = True Then
@@ -133,28 +138,26 @@ Partial Class Kundenbereich_Default
Dim i As Integer = 0
'Dim Cell = New TableCell
tr = New HtmlTableRow()
For Each d In dt.Rows
'Dim tr = New TableRow
Do
For Each d In dt.Rows
If i <= dt.Rows.Count Then
'Dim tr = New TableRow
tr = New HtmlTableRow()
'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(d("Status")))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(<button type="button" class="btn btn-primary" data-bstoggle="collapse" data-bs-target="#demo" id="togglecollapsesub1"><img src="../images/Icons/service/hilfe.png" width="15" height="15"/></button>))
trContent.Rows.Add(tr)
normaltable.Rows.Add(tr)
i = i + 1
Loop
While i <= dt.Rows.Count
End While
End If
Next
ElseIf rbt_Vorg.Checked = True Then
@@ -162,60 +165,58 @@ Partial Class Kundenbereich_Default
Dim i As Integer = 0
'Dim Cell = New TableCell
tr = New HtmlTableRow()
For Each d In dt.Rows
'Dim tr = New TableRow
Do
For Each d In dt.Rows
If i <= dt.Rows.Count Then
tr = New HtmlTableRow()
'Dim tr = New TableRow
'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(d("Status")))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(<button type="button" class="btn btn-primary" data-bstoggle="collapse" data-bs-target="#demo" id="togglecollapsesub1"><img src="../images/Icons/service/hilfe.png" width="15" height="15"/></button>))
trContent.Rows.Add(tr)
normaltable.Rows.Add(tr)
i = i + 1
Loop
While i <= dt.Rows.Count
End While
End If
Next
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,, datevon, datebis)
Dim i As Integer = 0
'Dim Cell = New TableCell
tr = New HtmlTableRow()
For Each d In dt.Rows
'Dim tr = New TableRow
Dim i As Integer = 0
'Dim Cell = New TableCell
Do
'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(d("AvisoEingang")))
tr.Cells.Add(New HtmlTableCell(d("AvisoEingang")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(<button type="button" class="btn btn-primary" data-bstoggle="collapse" data-bs-target="#demo" id="togglecollapsesub1"><img src="../images/Icons/service/hilfe.png" width="15" height="15"/></button>))
trContent.Rows.Add(tr)
For Each d In dt.Rows
'Dim tr = New TableRow
If i <= dt.Rows.Count Then
tr = New HtmlTableRow()
'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell("nA"))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
tr.Cells.Add(New HtmlTableCell(d("Status")))
tr.Cells.Add(New HtmlTableCell(d("AvisoEingang")))
tr.Cells.Add(New HtmlTableCell(d("AvisoEingang")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr")))
normaltable.Rows.Add(tr)
i = i + 1
Loop
While i <= dt.Rows.Count
End While
Next
End If
i = i + 1
End If
Next
End If
End Sub
@@ -239,3 +240,16 @@ Partial Class Kundenbereich_Default
' TableHeaderRow1.TableSection = TableRowSection.TableHeader
'End Sub
End Class