Änderungen an Tabellengenerierungsableuf

Customers/CustomsAviso.aspx

@@ -53,7 +53,7 @@
                              VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW
                              'Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(799124)
                              Dim VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL
-                             ' MsgBox(VERAGSQL.GetADMINConnectionString())
+                             'MsgBox(VERAGSQL.GetADMINConnectionString())
                              'Response.Write(AD.Ordnungsbegriff)
                              Dim STANDORT = "SUB"
                              If (Request.QueryString.Count > 0) AndAlso (Request.QueryString("STANDORT") IsNot Nothing) Then
@@ -202,7 +202,7 @@
                               <div id="Abstand_lang" style="height: /*32px*/ 2.498048399687744vh;"></div>                                     
                             <div class="g-3">                                            
                                              <div id="conovertab" style="overflow-x:auto;"margin-left="-2px"> 
-                                                   <asp:Table class="table table-responsive table-striped table-borderless" id="normaltable" runat="server" ViewStateMode="Inherit" EnableViewState="true" BorderWidth="2px">
+                                                   <asp:Table class="table table-responsive table-striped table-borderless" id="normaltable" runat="server" BorderWidth="2px">
                                                         <asp:TableHeaderRow id="tbl_Header_row" runat="server" style="background-color:#043381;color:#fff">                                                        
                                                             <asp:TableHeaderCell ID="tbl_HeaderCellIndexNr" runat="server" AbbreviatedText="Index">Index-Nr</asp:TableHeaderCell>   
                                                             <asp:TableHeaderCell ID="tbl_HeaderCell_LKWs" runat="server" AbbreviatedText="LKWNr">LKW-Nr</asp:TableHeaderCell>

Customers/CustomsAviso.aspx.vb

@@ -18,6 +18,7 @@ Partial Class CustomsAviso
         Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms
 
         If Me.Page.User.Identity.IsAuthenticated Then
+            If Me.Page.User.Identity.Name = "userwithlongername" Or Me.Page.User.Identity.Name = "test" Then
                 Try
                     Kdnrtext = Session.Item("CustomerID")
                 Catch A As UnauthorizedAccessException When String.IsNullOrEmpty(Kdnrtext)
@@ -212,6 +213,7 @@ Partial Class CustomsAviso
                     If Not IsNothing(Session.Item("mytable")) Then
                         addrows()
                     End If
+
                 Else
                     Page.MaintainScrollPositionOnPostBack = False
                     rbt_Alle.Checked = True
@@ -273,10 +275,14 @@ Partial Class CustomsAviso
                         regval_txt_Absender_M.Enabled = True
                     End If
                 End If
+            Else
+                VERAG_VARIABLES.seterrorcount(20)
+                Console.WriteLine(VERAG_VARIABLES.geterrornumb() + "The User is not authenticated to this page. Please login again!", vbAbort, "Error User")
+
+            End If
         Else
             FormsAuthentication.RedirectToLoginPage()
         End If
-
     End Sub
 
     Protected Sub initcells(tr As TableRow, t1 As TableCell, t2 As TableCell, t3 As TableCell, t4 As TableCell, t5 As TableCell, t6 As TableCell, t7 As TableCell, t8 As TableCell, th1 As TableHeaderCell, th2 As TableHeaderCell, th3 As TableHeaderCell, th4 As TableHeaderCell, th5 As TableHeaderCell, th6 As TableHeaderCell, th7 As TableHeaderCell, th8 As TableHeaderCell)
@@ -489,7 +495,7 @@ Partial Class CustomsAviso
                     regval_txt_KdNrAuftrag_M.ForeColor = Drawing.Color.Red
                     regval_txt_KdNrAuftrag_M.ErrorMessage = "Die Kundennummer ist nicht richtig formatiert."
                 End If
-            ElseIf txt_LKWNr_M.Text IsNot "" Then
+            ElseIf String.IsNullOrEmpty(txt_LKWNr_M.Text) = False Then
                 txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 regexval_txt_LKWNr_M.Enabled = True
                 regexval_txt_LKWNr_M.Validate()
@@ -662,12 +668,27 @@ Partial Class CustomsAviso
             txt_Empfaenger_M.Text = ""
             txt_KdNrAuftrag_M.Text = ""
             txt_LKWNr_M.Text = ""
+            'Desktop
+            rbt_Alle.Checked = False
+            rbt_Alle.Disabled = False
+            rbt_Ankunft.Checked = False
+            rbt_Ankunft.Disabled = False
+            rbt_Erf.Checked = False
+            rbt_Erf.Disabled = False
+            rbt_Freig.Checked = False
+            rbt_Freig.Disabled = False
+            rbt_Vorg.Checked = False
+            rbt_Vorg.Disabled = False
+            rbt_Vorb.Checked = False
+            rbt_Vorb.Disabled = False
             Dim erster = New Date(Now().Year, Now().Month, 1)
             pickdate1.Text = erster.Day.ToString + "." + erster.Month.ToString + "." + erster.Year.ToString
             pickdate2.Text = Date.Parse(erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
             datevon = Nothing
             datebis = Nothing
             dt = Nothing
+            normaltable.Rows.Clear()
+            Response.Redirect(Request.RawUrl)
             Return
         ElseIf String.IsNullOrEmpty(txt_Absender.Text) = False Or String.IsNullOrEmpty(txt_Empfaenger.Text) = False Or String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Or String.IsNullOrEmpty(txt_LKWNr.Text) = False Or rbt_Alle.Checked = True Or rbt_Ankunft.Checked = True Or rbt_Erf.Checked = True Or rbt_Freig.Checked = True Or rbt_Vorb.Checked = True Or rbt_Vorg.Checked = True Then
             'Desktop
@@ -683,6 +704,24 @@ Partial Class CustomsAviso
             rbt_Vorg.Disabled = False
             rbt_Vorb.Checked = False
             rbt_Vorb.Disabled = False
+
+            rbt_Alle_M.Checked = False
+            rbt_Alle_M.Disabled = False
+            rbt_Ankunft_M.Checked = False
+            rbt_Ankunft_M.Disabled = False
+            rbt_Erf_M.Checked = False
+            rbt_Erf_M.Disabled = False
+            rbt_Freig_M.Checked = False
+            rbt_Freig_M.Disabled = False
+            rbt_Vorg_M.Checked = False
+            rbt_Vorg_M.Disabled = False
+            rbt_Vorb_M.Checked = False
+            rbt_Vorb_M.Disabled = False
+            txt_Absender_M.Text = ""
+            txt_Empfaenger_M.Text = ""
+            txt_KdNrAuftrag_M.Text = ""
+            txt_LKWNr_M.Text = ""
+
             txt_Absender.Text = ""
             txt_Empfaenger.Text = ""
             txt_KdNrAuftrag.Text = ""
@@ -693,6 +732,8 @@ Partial Class CustomsAviso
             datevon = Nothing
             datebis = Nothing
             dt = Nothing
+            normaltable.Rows.Clear()
+            Response.Redirect(Request.RawUrl)
             Return
         End If
     End Sub
@@ -700,7 +741,6 @@ Partial Class CustomsAviso
     Protected Sub addrows()
         Session.Item("mytable") = Nothing
         normaltable.Rows.Clear()
-
         Dim header As TableHeaderRow = New TableHeaderRow()
         header.Cells.Add(tbl_HeaderCellIndexNr)
         header.Cells.Add(tbl_HeaderCell_LKWs)
@@ -710,6 +750,9 @@ Partial Class CustomsAviso
         header.Cells.Add(tbl_HeaderCell_Empfaenger)
         header.Cells.Add(tbl_HeaderCell_KundAuftNr)
         header.Cells.Add(tbl_HeaderCell_Info)
+
+
+
         normaltable.Rows.Add(header)
         If dt IsNot Nothing AndAlso Not dt.Rows.Count = 0 Then
             Dim i As Integer = 0