Änderungen Invoices

This commit is contained in:
ja
2021-11-03 15:36:54 +01:00
parent 33523ec7a3
commit 4923c6f304
5 changed files with 116 additions and 113 deletions

View File

@@ -1,88 +1,67 @@
<%@ Page Language="VB" AutoEventWireup="false" CodeFile="Default2.aspx.vb" Inherits="Customers_Default2" %>
<%@ Page Title="" Language="VB" MasterPageFile="~/Customers/Customers.master" AutoEventWireup="false" CodeFile="Default2.aspx.vb" Inherits="Customers_Default2" %>
<!DOCTYPE html>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder2" Runat="Server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="head" Runat="Server">
<!-- Bootstrap -->
<html lang="en"></html>
<!-- Required meta tags -->
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1" title="Verag Spedition AG AvisoTV Flex"/>
<link rel="shortcut icon" href="../images/Icons/favicon/favicon.ico"/>
<link rel="stylesheet" type="text/css" href="../css/main.css"/>
<link rel="stylesheet" type="text/css" href="../css/style.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 rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
<link rel="stylesheet" type="text/css" href="../css/Dropdown.css"/>
<!-- <link rel="stylesheet" type="text/css" href="../css/style.css"/>-->
<link rel="stylesheet" type="text/css" href="../css/Customers/MasterpageCustomers.css"/>
<link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/>
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<asp:ScriptManager ID="script2" runat="server"></asp:ScriptManager>
<asp:UpdatePanel ID="panelupdate2" runat="server"><ContentTemplate>
<table contenteditable="false">
<tr>
<td>
<h1>Dies ist eine Testseite!</h1>
</td>
</tr>
<tr>
<td>
<h2>Sie dient nur zu Debugzwecken!</h2>
</td>
</tr>
<tr>
<td>
<asp:Label ID="Label1" runat="server" Text="Gib eibe Zahl ein in Dezimal"></asp:Label>
</td>
<td>
<asp:TextBox ID="TextBox1" runat="server"></asp:TextBox>
</td>
</tr>
<tr>
<td>
<asp:Label ID="Label4" runat="server" Text="Bis Dezimal"></asp:Label>
</td>
<td>
<asp:TextBox ID="TextBox2" runat="server"></asp:TextBox>
</td>
</tr>
<tr><td>
<asp:Label ID="Label3" runat="server" Text="Zahl in Fehlercode von:"></asp:Label>
</td></tr>
<tr><td>
<asp:Label ID="Label2" runat="server" Text="Hier erscheint die Zahl"></asp:Label>
</td></tr>
<tr><td>
<tr><td><asp:Button ID="Button1" runat="server" Text="Button" OnClick="Button1_Click" /></td></tr>
</table>
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
<table cellpadding="0">
<tr style="color:#003680; height:30px;">
<td align="left" style="color:#fff;font-kerning:auto;">
<asp:Label ID="lbl_login" runat="server" style="color:#003680; font-size:20px;font-weight:700;" Text="Login"></asp:Label>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<td align="left">
<asp:Label ID="CustomerIDLabel" runat="server" AssociatedControlID="CustomerID" CssClass="txt_design2">Kundennummer:</asp:Label>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<td align="left">
<asp:TextBox ID="CustomerID" runat="server" required="true" Width = "220" ValidationGroup="txt_checkUID" Font-Size="1.125em"></asp:TextBox>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<td align="left">
<asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" SetFocusOnError="true" ValidationGroup="txt_checkUID">Die Kundennummer ist erforderlich.</asp:RequiredFieldValidator>
</td>
</tr>
<tr><td align="left">
<asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="CustomerID" ValidationGroup="txt_checkUID" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression=""></asp:RegularExpressionValidator>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<td align="left" colspan="2">
<asp:Label ID="UserNameLabel" runat="server" AssociatedControlID="UserName" CssClass="txt_design2">Benutzername:</asp:Label>
</td>
<td align="left">
<asp:TextBox ID="UserName" runat="server" TextMode="SingleLine" Width = "220" ValidationGroup="txt_Username" required="true" Font-Size="1.125em"></asp:TextBox>
<asp:RequiredFieldValidator ID="UserNamerequired" runat="server" ControlToValidate="UserName" ErrorMessage="Der Benutzername ist erforderlich." ToolTip="Der Benutzername ist erforderlich." ValidationGroup="txt_Username">Der Benutzername ist erforderlich.</asp:RequiredFieldValidator>
</td>
</tr>
<tr style="color:#003680; height:46px;">
<td align="left" colspan="2">
<asp:Label ID="PasswordLabel" runat="server" AssociatedControlID="Password" CssClass="txt_design2">Kennwort:</asp:Label>
</td>
<td align="left" colspan="2">
<asp:TextBox ID="Password" runat="server" TextMode="Password" required="true" Width = "220" Font-Size="1.125em" ValidationGroup="chk_PWField" MaxLength="30"></asp:TextBox>
<asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ErrorMessage="Das Kennwort ist erforderlich." ToolTip="Das Kennwort ist erforderlich." ValidationGroup="chk_PWField">Bitte Passwort angeben.</asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ID="checkpwdREGEX" ControlToValidate="Password" ValidationGroup="chk_PWField" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression=""></asp:RegularExpressionValidator>
</td>
</tr>
<tr style="color:#003680; height:23px;">
<td align="left" colspan="2">
<asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()" Width="97px" Font-Size="18px"/>
</td>
</tr>
<tr style="color:#003680; height:23px;">
<td align="left" colspan="2">
<asp:CheckBox ID="RememberMe" runat="server" Text="Anmeldedaten speichern." />
</td>
</tr>
<tr style="color:#003680; height:23px">
<td align="center" style="color:Red;" colspan="2">
<asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
</td>
</tr>
<tr>
<td align="left" colspan="2">
<asp:LinkButton ID="LinkButton1" runat="server" target="_top" OnClientClick="bust2()">Admin-Login</asp:LinkButton>
</td>
</tr>
<tr style="color:#003680; height:23px;">
<td align="left" colspan="4">
<%'Dim url As String = Session.Keys.Item("urltochangepw") %>
<a ID="LinkButton2" runat="server" target="_top" href="ForgotPW.aspx?urlofchangepwpage=<">Passwort Vergessen</a>
</td>
</tr>
</table>
</div>
</form>
</body>
</html>

View File

@@ -1,21 +1,22 @@

Partial Class Customers_Default2
Inherits System.Web.UI.Page
Dim Kdnrtext As String = String.Empty
Protected Sub Page_Load(sender As Object, e As EventArgs)
If Me.Page.User.Identity.IsAuthenticated Then
Try
Kdnrtext = Session.Item("CustomerID")
Catch A As UnauthorizedAccessException When String.IsNullOrEmpty(Kdnrtext)
MsgBox("Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!", MsgBoxStyle.Information, "Error in User Area!")
End Try
Else
FormsAuthentication.RedirectToLoginPage()
End If
If Page.IsPostBack = True Then
Page.MaintainScrollPositionOnPostBack = True
Else
Page.MaintainScrollPositionOnPostBack = False
Protected Sub Button1_Click(sender As Object, e As EventArgs)
If String.IsNullOrEmpty(TextBox1.Text) = False Then
Dim vals As New List(Of String)
Dim finalstr As String = ""
For i As Integer = Integer.Parse(TextBox1.Text) To Integer.Parse(TextBox2.Text)
Dim strtemp As String = ""
VERAG_VARIABLES.seterrorcount(Integer.Parse(i))
vals.Add(i.ToString + Space(3) + ":" + Space(3) + VERAG_VARIABLES.geterrornumb)
Next
For Each val As String In vals
finalstr = finalstr + Environment.NewLine + val + Environment.NewLine
Next
Label2.Text = finalstr
End If
End Sub
End Class

View File

@@ -351,17 +351,18 @@ Partial Class Customers_Default3
If String.IsNullOrEmpty(Kdnrtext) = False AndAlso String.IsNullOrEmpty(datevon.ToShortDateString) = False AndAlso String.IsNullOrEmpty(datebis.ToShortDateString) = False Then
dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR)
Else
ElseIf String.IsNullOrEmpty(Kdnrtext) = False AndAlso String.IsNullOrEmpty(datevon.ToShortDateString) = False AndAlso String.IsNullOrEmpty(datebis.ToShortDateString) = False And reNr = "" Then
dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
valreq_pickdate1.Validate()
valreq_pickdate2.Validate()
If valreq_pickdate1.IsValid AndAlso valreq_pickdate2.IsValid Then
If valreq_pickdate1.IsValid = False AndAlso valreq_pickdate2.IsValid = False Then
VERAG_VARIABLES.seterrorcount(15)
lbl_status.ForeColor = Drawing.Color.Red
lbl_status.Text = VERAG_VARIABLES.geterrornumb + "Error in form validation. Please fill in all fields"
End If
End If
If Not dt.Count = 0 Then
If dt.Count > 0 Then
Dim i As Integer = 0
For Each d In dt
Dim tr As TableRow = New TableRow
@@ -380,24 +381,48 @@ Partial Class Customers_Default3
tbl_Cell_Index.Text = zahl.ToString
tr.Cells.Add(tbl_Cell_Index)
tbl_Cell_ReNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
tbl_Cell_ReNr.Text = d.RechnungsNr.ToString
If d.RechnungsNr = Nothing Then
tbl_Cell_ReNr.Text = String.Empty
Else
tbl_Cell_ReNr.Text = d.RechnungsNr.ToString
End If
tr.Cells.Add(tbl_Cell_ReNr)
tbl_Cell_LKWs.ValidateRequestMode = UI.ValidateRequestMode.Enabled
tbl_Cell_LKWs.Text = d.LKW_Kennzeichen.ToString
If d.LKW_Kennzeichen = Nothing Then
tbl_Cell_LKWs.Text = String.Empty
Else
tbl_Cell_LKWs.Text = d.LKW_Kennzeichen.ToString
End If
tr.Cells.Add(tbl_Cell_LKWs)
tbl_Cell_Auftragsdat.ValidateRequestMode = UI.ValidateRequestMode.Enabled
tbl_Cell_Auftragsdat.Text = d.RechnungsDatum.ToString
If d.RechnungsDatum = Nothing Then
tbl_Cell_Auftragsdat.Text = String.Empty
Else
tbl_Cell_Auftragsdat.Text = d.RechnungsDatum.ToString
End If
tr.Cells.Add(tbl_Cell_Auftragsdat)
tbl_Cell_KundAuftrNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
tbl_Cell_KundAuftrNr.Text = d.KdAuftragsNr.ToString
If d.KdAuftragsNr = Nothing Then
tbl_Cell_KundAuftrNr.Text = String.Empty
Else
tbl_Cell_KundAuftrNr.Text = d.KdAuftragsNr.ToString
End If
tr.Cells.Add(tbl_Cell_KundAuftrNr)
tbl_Cell_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
tbl_Cell_Absender.Text = d.AbsenderName_1.ToString
If d.AbsenderName_1 = Nothing Then
tbl_Cell_Absender.Text = String.Empty
Else
tbl_Cell_Absender.Text = d.AbsenderName_1.ToString
End If
tr.Cells.Add(tbl_Cell_Absender)
tbl_Cell_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
tbl_Cell_Empfaenger.Text = d.EmpfängerName_1.ToString
If d.EmpfängerName_1 = Nothing Then
tbl_Cell_Empfaenger.Text = String.Empty
Else
tbl_Cell_Empfaenger.Text = d.EmpfängerName_1.ToString
End If
tr.Cells.Add(tbl_Cell_Empfaenger)
Dim btn As New ImageButton
Dim btn As New ImageButton
btn.ViewStateMode = ViewStateMode.Enabled
btn.CssClass = "btn btn-primary"
btn.ImageUrl = "../images/pdficon.gif"