From 09c9d75dd8573469454423dde5f5799c45d8de86 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Thu, 9 Sep 2021 16:01:14 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20zu=20funktionierenden=20aber?=
 =?UTF-8?q?=20falsch=20positionierten=20Abfragen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/CustomsAviso.aspx    |  40 ++++----
 Customers/CustomsAviso.aspx.vb | 172 ++++++++++++++++++---------------
 2 files changed, 111 insertions(+), 101 deletions(-)

diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index bf77f11..26142d6 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -64,7 +64,7 @@
 
                                      If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%>    
                                                                  <h2><%=STANDORT %></h2>                                                             
-                                           <asp:Label ID="Label1" runat="server" Text="Bitte eine Auswahl treffen:"></asp:Label>                          
+                                            <asp:Label ID="Label1" runat="server" Text="Bitte eine Auswahl treffen:"></asp:Label>                          
                                             <asp:Button ID="btn_resetForm" runat="server" Text="Reset Filters" onclick="btn_resetForm_Click"/>
                                             <asp:Label ID="lbl_Kndnr" runat="server" Text="Die Kundennummer:"></asp:Label>   
                                             <asp:TextBox ID="txt_KdNr" runat="server"></asp:TextBox>
@@ -73,8 +73,9 @@
                                             <asp:RadioButton ID="rbt_Vorg" runat="server" Text="Vorgeschrieben"/>
                                             <asp:RadioButton ID="rbt_Ankunft" runat="server" Text="Ankunft"/>
                                             <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:Label ID="lbl_bis" runat="server" Text="Bis:"></asp:Label> 
                                             <asp:Calendar id="pickdate2" runat="server"></asp:Calendar>  
                                              <!-- Optionale Suchparameter-->
                                             <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:Button ID="btn_Auftraege" runat="server" Text="Erhalte Aufträge" OnClick="btn_Auftraege_Click" />
-                                              <input class="form-control mb-4" id="tableSearch" type="text"
-                                                placeholder="Einen Begriff eingeben oder den Anfang davon ...">
+                                             <!-- <input class="form-control mb-4" id="tableSearch" type="text"
+                                                placeholder="Einen Begriff eingeben oder den Anfang davon ...">-->
                                                 <div id="conovertab"> 
                                                    <!-- <asp:Table runat="server" >
                                                     <asp:TableHeaderRow ID="TableHeaderRow1" runat="server">                                                        
@@ -108,25 +109,20 @@
                                                             <asp:TableHeaderCell ID="TableHeaderCell11" runat="server">Info</asp:TableHeaderCell>
                                                         </asp:TableHeaderRow>
                                                         </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;">
-                                                       <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>
-                                                   </thead>  
-                                                      
-                                                </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>-->
                                                    
-                                           
+                                                  <!--<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 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>
+                                                   
+                                           </div>
 
                                               </div>  
                           <br /><br /><br />
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 8731674..536ca3a 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -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
+
+
+
+
+
+
+
+
+
+
+
+
+