Ä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

@@ -73,8 +73,9 @@
<asp:RadioButton ID="rbt_Vorg" runat="server" Text="Vorgeschrieben"/> <asp:RadioButton ID="rbt_Vorg" runat="server" Text="Vorgeschrieben"/>
<asp:RadioButton ID="rbt_Ankunft" runat="server" Text="Ankunft"/> <asp:RadioButton ID="rbt_Ankunft" runat="server" Text="Ankunft"/>
<asp:RadioButton ID="rbt_Freig" runat="server" Text="Freigabe" onclick="rbt_Freig_Click"/> <asp:RadioButton ID="rbt_Freig" runat="server" Text="Freigabe" onclick="rbt_Freig_Click"/>
<asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label>
<asp:Calendar id="pickdate1" runat="server"></asp:Calendar> <asp:Calendar id="pickdate1" runat="server"></asp:Calendar>
<asp:Label ID="lbl_bis" runat="server" Text="Bis:"></asp:Label>
<asp:Calendar id="pickdate2" runat="server"></asp:Calendar> <asp:Calendar id="pickdate2" runat="server"></asp:Calendar>
<!-- Optionale Suchparameter--> <!-- Optionale Suchparameter-->
<asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label> <asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label>
@@ -90,8 +91,8 @@
<asp:TextBox ID="txt_KdNrAuftrag" runat="server" ></asp:TextBox> <asp:TextBox ID="txt_KdNrAuftrag" runat="server" ></asp:TextBox>
<asp:Button ID="btn_Auftraege" runat="server" Text="Erhalte Aufträge" OnClick="btn_Auftraege_Click" /> <asp:Button ID="btn_Auftraege" runat="server" Text="Erhalte Aufträge" OnClick="btn_Auftraege_Click" />
<input class="form-control mb-4" id="tableSearch" type="text" <!-- <input class="form-control mb-4" id="tableSearch" type="text"
placeholder="Einen Begriff eingeben oder den Anfang davon ..."> placeholder="Einen Begriff eingeben oder den Anfang davon ...">-->
<div id="conovertab"> <div id="conovertab">
<!-- <asp:Table runat="server" > <!-- <asp:Table runat="server" >
<asp:TableHeaderRow ID="TableHeaderRow1" runat="server"> <asp:TableHeaderRow ID="TableHeaderRow1" runat="server">
@@ -108,25 +109,20 @@
<asp:TableHeaderCell ID="TableHeaderCell11" runat="server">Info</asp:TableHeaderCell> <asp:TableHeaderCell ID="TableHeaderCell11" runat="server">Info</asp:TableHeaderCell>
</asp:TableHeaderRow> </asp:TableHeaderRow>
</asp:Table>--> </asp:Table>-->
<table runat="server" id="trContent" border="0" cellspacing="0" contenteditable="false" style="width:1250px">
<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><th>Info</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 id="normaltable" runat="server" border="0" cellspacing="0" contenteditable="false" style="width:1300px" >
<!-- <th style="height:/*20px;*/ 1.56128024980484vh; /*background-color:#043381;*/ background-image: linear-gradient(to right, #003680 , #0055cc); color:#fff; font-weight:900;">
<tr><th>Auswahl</th><th>Index-Nr</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><th>Info</th></tr>
</th>-->
</table> </table>
<!-- <table class="table" id="normaltable" border="0" cellspacing="0" contenteditable="false" style="width:1250px" >
<tr style="height:/*20px;*/ 1.56128024980484vh; /*background-color:#043381;*/ background-image: linear-gradient(to right, #003680 , #0055cc); color:#fff; font-weight:900;">
<tr><th>Auswahl</th><th>Index-Nr</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><th>Info</th></tr>
</tr>
<!-- <tbody id="myTable">
<tr><td><asp:CheckBox ID="CheckBox9" runat="server" /></td><td>1</td><td>PAN WE 231</td><td>SUBEN</td><td>TESTFRÄCHTER</td><td>2 Pck Teer</td><td><center><button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo" id="togglecollapsesub1"><img src="../images/Icons/service/hilfe.png" width="15" height="15" /></button></center></td></tr>
<tr><td><asp:CheckBox ID="CheckBox10" runat="server" /></td><td>2</td><td>SME IE 889</td><td>SUBEN</td><td>TESTFRÄCHTER</td><td>2 Pck Kaugummis</td><td><center><button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo" id="togglecollapsesub2"><img src="../images/Icons/service/hilfe.png" width="15" height="15" /></button></center></td></tr>
</tbody>
</table>-->
</div>
</div> </div>
<br /><br /><br /> <br /><br /><br />

View File

@@ -37,8 +37,18 @@ Partial Class Kundenbereich_Default
End Try End Try
Dim tr 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 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})
@@ -46,27 +56,26 @@ Partial Class Kundenbereich_Default
'Dim Cell = New TableCell 'Dim Cell = New TableCell
For Each d In dt.Rows For Each d In dt.Rows
If i <= dt.Rows.Count Then
'Dim tr = New TableRow 'Dim tr = New TableRow
tr = New HtmlTableRow() tr = New HtmlTableRow()
Do
'Cell.Controls.Add(New HtmlTableCell(i)) 'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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("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("Auftraggeber"))) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr"))) tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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>)) normaltable.Rows.Add(tr)
trContent.Rows.Add(tr)
i = i + 1 i = i + 1
Loop End If
While i <= dt.Rows.Count
End While
Next Next
ElseIf rbt_Freig.Checked = True Then ElseIf rbt_Freig.Checked = True Then
@@ -74,58 +83,54 @@ Partial Class Kundenbereich_Default
Dim i As Integer = 0 Dim i As Integer = 0
'Dim Cell = New TableCell '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)) 'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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("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("Auftraggeber"))) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr"))) tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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>)) normaltable.Rows.Add(tr)
trContent.Rows.Add(tr)
i = i + 1 i = i + 1
Loop End If
While i <= dt.Rows.Count
End While
Next Next
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})
Dim i As Integer = 0 Dim i As Integer = 0
'Dim Cell = New TableCell '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)) 'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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("")) 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("Auftraggeber"))) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr"))) tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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>)) normaltable.Rows.Add(tr)
trContent.Rows.Add(tr)
i = i + 1 i = i + 1
Loop End If
While i <= dt.Rows.Count
End While
Next Next
ElseIf rbt_Vorb.Checked = True Then ElseIf rbt_Vorb.Checked = True Then
@@ -133,28 +138,26 @@ Partial Class Kundenbereich_Default
Dim i As Integer = 0 Dim i As Integer = 0
'Dim Cell = New TableCell '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)) 'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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("")) 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("Auftraggeber"))) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr"))) tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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>)) normaltable.Rows.Add(tr)
trContent.Rows.Add(tr)
i = i + 1 i = i + 1
Loop End If
While i <= dt.Rows.Count
End While
Next Next
ElseIf rbt_Vorg.Checked = True Then ElseIf rbt_Vorg.Checked = True Then
@@ -162,58 +165,56 @@ Partial Class Kundenbereich_Default
Dim i As Integer = 0 Dim i As Integer = 0
'Dim Cell = New TableCell 'Dim Cell = New TableCell
tr = New HtmlTableRow()
For Each d In dt.Rows For Each d In dt.Rows
If i <= dt.Rows.Count Then
tr = New HtmlTableRow()
'Dim tr = New TableRow 'Dim tr = New TableRow
Do
'Cell.Controls.Add(New HtmlTableCell(i)) 'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell(""))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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("")) 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("Auftraggeber"))) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr"))) tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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>)) normaltable.Rows.Add(tr)
trContent.Rows.Add(tr)
i = i + 1 i = i + 1
Loop End If
While i <= dt.Rows.Count
End While
Next 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 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) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis)
Dim i As Integer = 0 Dim i As Integer = 0
'Dim Cell = New TableCell 'Dim Cell = New TableCell
tr = New HtmlTableRow()
For Each d In dt.Rows For Each d In dt.Rows
'Dim tr = New TableRow 'Dim tr = New TableRow
If i <= dt.Rows.Count Then
Do tr = New HtmlTableRow()
'Cell.Controls.Add(New HtmlTableCell(i)) 'Cell.Controls.Add(New HtmlTableCell(i))
tr.Cells.Add(New HtmlTableCell("")) tr.Cells.Add(New HtmlTableCell("nA"))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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("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("Auftraggeber"))) tr.Cells.Add(New HtmlTableCell(d("Auftraggeber")))
tr.Cells.Add(New HtmlTableCell(d("LKW_Nr"))) tr.Cells.Add(New HtmlTableCell(d("LKW_Nr")))
tr.Cells.Add(New HtmlTableCell(d("Auftraggeber_KdNr"))) 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>)) normaltable.Rows.Add(tr)
trContent.Rows.Add(tr)
i = i + 1 i = i + 1
Loop End If
While i <= dt.Rows.Count
End While
Next Next
End If End If
@@ -239,3 +240,16 @@ Partial Class Kundenbereich_Default
' TableHeaderRow1.TableSection = TableRowSection.TableHeader ' TableHeaderRow1.TableSection = TableRowSection.TableHeader
'End Sub 'End Sub
End Class End Class