Änderunegn an Tabllengeneration und ButtonsLogik sowie der Logik beim Laden-event der Seite Invoices.aspx, da kurzes erscheinen der Tabelle jetzt möglich ist.

This commit is contained in:
ja
2021-11-26 13:53:29 +01:00
parent 45079f71b7
commit e0e962f5cc
5 changed files with 35 additions and 30 deletions

View File

@@ -581,7 +581,7 @@
</div> </div>
<div class="dropdown" id="dropdownbtnmain" style="position: absolute; top:5px; right:197px; width:210px;z-index:1032; margin-right:-2px;"> <div class="dropdown" id="dropdownbtnmain" style="position: absolute; top:5px; right:197px; width:210px;z-index:1032; margin-right:-2px;">
<button class="dropbtn" class="btn btn-primary" id="dropbtnbtnbtn" style="height:50px; width:205px;right:-194px;white-space:nowrap" <button class="dropbtn btn btn-primary" id="dropbtnbtnbtn" style="height:50px; width:205px;right:-194px;white-space:nowrap">
<button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381; width:30px;height:50px;white-space:nowrap"><img src="../images/samples/default-avatar.jpg"; width="15"; /><a data-bs-toggle="modal" data-bs-target="#exampleModal"><asp:LoginName class="pointer" ID="LoginName2" runat="server" style="margin-left:6px"/></a></button> <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal" style="background-color:#fff;color:#043381; width:30px;height:50px;white-space:nowrap"><img src="../images/samples/default-avatar.jpg"; width="15"; /><a data-bs-toggle="modal" data-bs-target="#exampleModal"><asp:LoginName class="pointer" ID="LoginName2" runat="server" style="margin-left:6px"/></a></button>
</button> </button>
<ul class="dropdown-content" id="dropdownmenuecont" style="width:210px;right:-198px;top:-1px;z-index:1032;margin-right:-2px;position:absolute;padding-top:-15px"> <ul class="dropdown-content" id="dropdownmenuecont" style="width:210px;right:-198px;top:-1px;z-index:1032;margin-right:-2px;position:absolute;padding-top:-15px">

View File

@@ -82,7 +82,6 @@
outline: 0 outline: 0
} }
} }
}
</style> </style>
<!-- Bootstrap CSS --> <!-- Bootstrap CSS -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
@@ -108,7 +107,7 @@
}); });
}); });
</script> </script>
</html> </html>
</asp:Content> </asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server" EnableViewState="true"> <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server" EnableViewState="true">

View File

@@ -277,8 +277,9 @@ Partial Class CustomsAviso
pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd") pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd")
pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd") pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd")
Else Else
VERAG_VARIABLES.seterrorcount(20) 'VERAG_VARIABLES.seterrorcount(20)
Console.WriteLine(VERAG_VARIABLES.geterrornumb() + "The User is not authenticated to this page. Please login again!", vbAbort, "Error User") 'Console.WriteLine(VERAG_VARIABLES.geterrornumb() + "The User is not authenticated to this page. Please login again!", vbAbort, "Error User")
FormsAuthentication.RedirectToLoginPage()
End If End If
End Sub End Sub

View File

@@ -221,7 +221,7 @@
</div> </div>
</div> </div>
<div id="Abstand_laenger" style="height:/*24px*/ 1.873536299765808vh;"></div> <div id="Abstand_laenger" style="height:/*24px*/ 1.873536299765808vh;"></div>
<asp:Button ID="btn_b" CssClass="btn btn-primary" runat="server" CausesValidation="false" Text="Erhalte Rechnungen" /> <asp:Button ID="btn_b" CssClass="btn-primary" runat="server" CausesValidation="false" Text="Erhalte Rechnungen" OnClick="btn_b_Click" style="background-color:#fff;color:#043381;height:30px;width:221px;font-size:1.33em;"/>
<div id="Abstand_lang" style="height: /*32px*/ 2.498048399687744vh;"></div> <div id="Abstand_lang" style="height: /*32px*/ 2.498048399687744vh;"></div>
<div class="g-3"> <div class="g-3">
<div id="conovertab"> <div id="conovertab">

View File

@@ -21,18 +21,20 @@ Partial Class Customers_Default3
Dim provider As CultureInfo = CultureInfo.InvariantCulture Dim provider As CultureInfo = CultureInfo.InvariantCulture
Protected Sub Page_Load(ByVal sender As Object, ByVal e As EventArgs) Protected Sub Page_Load(ByVal sender As Object, ByVal e As EventArgs)
Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms
VERAG_VARIABLES.initerrorcount() VERAG_VARIABLES.initerrorcount()
If Not Me.Page.User.Identity.IsAuthenticated Then If Not Me.Page.User.Identity.IsAuthenticated Then
FormsAuthentication.RedirectToLoginPage() FormsAuthentication.RedirectToLoginPage()
Else Else
If String.IsNullOrEmpty(Request.QueryString("P1")) = False Then Try
Kdnrtext = Request.QueryString("P1") Kdnrtext = Session.Item("CustomerID")
ElseIf String.IsNullOrEmpty(Session.Item("CustomerID")) = False Then Catch
Kdnrtext = Session.Item("CustomerID").ToString Response.Redirect("Error.aspx&P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt("Invoices.aspx"))
Else End Try
lbl_status.Text = "Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!"
End If DataBind()
Dim confirmValue As String = hidField.Value Dim confirmValue As String = hidField.Value
'Script für Schließen wirklich verlassen Meldung auf der Masterseite für diese Seite zu registrieren und nicht ueberall 'Script für Schließen wirklich verlassen Meldung auf der Masterseite für diese Seite zu registrieren und nicht ueberall
Dim csm1 As ClientScriptManager = Page.ClientScript Dim csm1 As ClientScriptManager = Page.ClientScript
@@ -48,13 +50,12 @@ Partial Class Customers_Default3
csm1.RegisterClientScriptBlock(cstype, "Startup", string1) csm1.RegisterClientScriptBlock(cstype, "Startup", string1)
End If End If
DataBind()
tbl_Header_row.TableSection = TableRowSection.TableHeader tbl_Header_row.TableSection = TableRowSection.TableHeader
If (Page.IsPostBack) Then If (Page.IsPostBack) Then
Page.MaintainScrollPositionOnPostBack = True Page.MaintainScrollPositionOnPostBack = True
If valreq_pickdate1.IsValid Or valreq_pickdate2.IsValid Then If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid Then
datevon = Date.Parse(pickdate1.Text) datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text) datebis = Date.Parse(pickdate2.Text)
End If End If
@@ -82,10 +83,14 @@ Partial Class Customers_Default3
End Sub End Sub
Private Sub addrows() Private Sub addrows()
dt = Session.Item("datatbl") If Not IsNothing(Session.Item("datatbl")) Then
dt = Session.Item("datatbl")
Else
End If
Session.Item("mytable") = Nothing Session.Item("mytable") = Nothing
normaltable.Rows.Clear() normaltable.Rows.Clear()
If Session.Item("mytable") = Nothing Then If Not dt Is Nothing Then
Dim header As TableHeaderRow = New TableHeaderRow() Dim header As TableHeaderRow = New TableHeaderRow()
header.Cells.Add(tbl_HeaderCellIndex) header.Cells.Add(tbl_HeaderCellIndex)
header.Cells.Add(tbl_HeaderCell_ReNr) header.Cells.Add(tbl_HeaderCell_ReNr)
@@ -297,7 +302,7 @@ Partial Class Customers_Default3
dt = Nothing dt = Nothing
Session.Add("mytable", Nothing) Session.Add("mytable", Nothing)
If Session.Item("mytable") = Nothing Then If Session.Item("mytable") = Nothing Then
If Not String.IsNullOrEmpty(txt_Absender.Text) Then If txt_Absender.Text IsNot "" Then
txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_Absender.Enabled = True regex_txt_Absender.Enabled = True
regex_txt_Absender.Validate() regex_txt_Absender.Validate()
@@ -315,7 +320,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation"
End Try End Try
End If End If
If String.IsNullOrEmpty(txt_Empfaenger.Text) = False Then If txt_Empfaenger.Text IsNot "" Then
txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_Empfaenger.Enabled = True regex_txt_Empfaenger.Enabled = True
regex_txt_Empfaenger.Validate() regex_txt_Empfaenger.Validate()
@@ -333,7 +338,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation"
End Try End Try
End If End If
If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Then If txt_KdNrAuftrag.Text IsNot "" Then
txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_KdNrAuftrag.Enabled = True regex_txt_KdNrAuftrag.Enabled = True
regex_txt_KdNrAuftrag.Validate() regex_txt_KdNrAuftrag.Validate()
@@ -351,7 +356,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation"
End Try End Try
End If End If
If String.IsNullOrEmpty(txt_LKW.Text) = False Then If txt_LKW.Text IsNot "" Then
txt_LKW.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_LKW.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_LKW.Enabled = True regex_txt_LKW.Enabled = True
regex_txt_LKW.Validate() regex_txt_LKW.Validate()
@@ -369,7 +374,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation"
End Try End Try
End If End If
If String.IsNullOrEmpty(txt_ReNr.Text) = False Then If txt_ReNr.Text IsNot "" Then
txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_ReNr.Enabled = True regex_txt_ReNr.Enabled = True
regex_txt_ReNr.Validate() regex_txt_ReNr.Validate()
@@ -388,7 +393,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error invoice number validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error invoice number validation"
End Try End Try
End If End If
If String.IsNullOrEmpty(txt_Absender_M.Text) = False Then If txt_Absender_M.Text IsNot "" Then
txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_Absender_M.Enabled = True regex_txt_Absender_M.Enabled = True
regex_txt_Absender_M.Validate() regex_txt_Absender_M.Validate()
@@ -406,7 +411,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + ": Error Sender Validation"
End Try End Try
End If End If
If String.IsNullOrEmpty(txt_Empfaenger_M.Text) = False Then If txt_Empfaenger_M.Text IsNot "" Then
txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_Empaenger_M.Enabled = True regex_txt_Empaenger_M.Enabled = True
regex_txt_Empaenger_M.Validate() regex_txt_Empaenger_M.Validate()
@@ -424,7 +429,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Reciever Validation"
End Try End Try
End If End If
If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = False Then If txt_KdNrAuftrag_M.Text IsNot "" Then
txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_KdNrAuftrag_M.Enabled = True regex_txt_KdNrAuftrag_M.Enabled = True
regex_txt_KdNrAuftrag_M.Validate() regex_txt_KdNrAuftrag_M.Validate()
@@ -442,7 +447,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error Customer Order number Validation"
End Try End Try
End If End If
If String.IsNullOrEmpty(txt_LKW_M.Text) = False Then If txt_LKW_M.Text IsNot "" Then
txt_LKW_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_LKW_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_LKW_M.Enabled = True regex_txt_LKW_M.Enabled = True
regex_txt_LKW_M.Validate() regex_txt_LKW_M.Validate()
@@ -460,7 +465,7 @@ Partial Class Customers_Default3
lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation" lbl_status.Text = VERAG_VARIABLES.geterrornumb() + "Error LKW Number plate Validation"
End Try End Try
End If End If
If String.IsNullOrEmpty(txt_ReNr_M.Text) = False Then If txt_ReNr_M.Text IsNot "" Then
txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_ReNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
regex_txt_ReNr_M.Enabled = True regex_txt_ReNr_M.Enabled = True
regex_txt_ReNr_M.Validate() regex_txt_ReNr_M.Validate()
@@ -485,8 +490,8 @@ Partial Class Customers_Default3
Dim erster = New Date(Now().Year, Now.Month, 1) Dim erster = New Date(Now().Year, Now.Month, 1)
datevon = erster datevon = erster
datebis = Date.Parse(Now.ToShortDateString) datebis = Date.Parse(Now.ToShortDateString)
pickdate1.Text = datevon.ToShortDateString pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd")
pickdate2.Text = datebis.ToShortDateString pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd")
Catch ex As Exception Catch ex As Exception
VERAG_VARIABLES.seterrorcount(14) VERAG_VARIABLES.seterrorcount(14)
lbl_status.ForeColor = Drawing.Color.Red lbl_status.ForeColor = Drawing.Color.Red