edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Änderungen

Browse Source
This commit is contained in:
ja
2021-11-29 16:28:58 +01:00
parent a6b5b576ee
commit a150983076
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Customers/CustomsAviso.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Title="Aufträge VERAG" Language="VB" MasterPageFile="~/Customers/Customers.master" ViewStateMode="Enabled" AutoEventWireup="false" CodeFile="CustomsAviso.aspx.vb" Inherits="CustomsAviso" UnobtrusiveValidationMode="None"%> <%@ Page Title="Aufträge VERAG" Language="VB" MasterPageFile="~/Customers/Customers.master" ViewStateMode="Enabled" AutoEventWireup="true" CodeFile="CustomsAviso.aspx.vb" Inherits="CustomsAviso" UnobtrusiveValidationMode="None"%>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server"> <asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<!-- Bootstrap --> <!-- Bootstrap -->
@@ -112,7 +112,9 @@
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server" EnableViewState="true"> <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server" EnableViewState="true">
<asp:ScriptManager ID="script1" runat="server"></asp:ScriptManager> <asp:ScriptManager ID="script1" runat="server"></asp:ScriptManager>
<asp:UpdatePanel ID="panelupdate1" runat="server"><ContentTemplate>
<asp:UpdatePanel ID="panelupdate1" runat="server" UpdateMode="Conditional"><ContentTemplate>
<!-- Webiste-Content--> <!-- Webiste-Content-->
<div id="containerseiterand" style="margin-left:auto;margin-right:auto"> <div id="containerseiterand" style="margin-left:auto;margin-right:auto">
<div id="contmn"> <div id="contmn">
@@ -270,22 +272,22 @@
<div id="rowcol3" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;"> <div id="rowcol3" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<div class="row"> <div class="row">
<asp:Label ID="lbl_LKWNr_M" runat="server" Text="LKW Nr"></asp:Label> <asp:Label ID="lbl_LKWNr_M" runat="server" Text="LKW Nr"></asp:Label>
<asp:TextBox ID="txt_LKWNr_M" AutoCompleteType="Search" runat="server" style="width:117px; margin-left:25px;" OnTextChanged="txt_LKWNr_M_TextChanged"></asp:TextBox> <asp:TextBox ID="txt_LKWNr_M" AutoCompleteType="Search" AutoPostBack="false" runat="server" style="width:117px; margin-left:25px;" OnTextChanged="txt_LKWNr_M_TextChanged"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_LKWNr" runat="server" ID="regexval_txt_LKWNr_M" ValidationGroup="additional_TXTs" ForeColor="Red" ValidationExpression="^([A-Z0-9]{30})\d$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ControlToValidate="txt_LKWNr" runat="server" ID="regexval_txt_LKWNr_M" ValidationGroup="additional_TXTs" ForeColor="Red" ValidationExpression="^([A-Z0-9]{30})\d$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
</div> </div>
<div id="rowcol4" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;"> <div id="rowcol4" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_KdNrAuftrag_M" runat="server" Text="Kunden Auftrags Nr" style="margin-left:45px"></asp:Label> <asp:Label ID="lbl_KdNrAuftrag_M" runat="server" Text="Kunden Auftrags Nr" style="margin-left:45px"></asp:Label>
<asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" AutoCompleteType="Search" style="width:117px; margin-left:6px;" OnTextChanged="txt_KdNrAuftrag_M_TextChanged"></asp:TextBox> <asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" AutoPostBack="false" AutoCompleteType="Search" style="width:117px; margin-left:6px;" OnTextChanged="txt_KdNrAuftrag_M_TextChanged"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_KdNrAuftrag_M" runat="server" ID="regval_txt_KdNrAuftrag_M" ValidationGroup="additional_TXTs" ValidationExpression="^[0-9]{7}$" Display="Dynamic" ForeColor="Red" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ControlToValidate="txt_KdNrAuftrag_M" runat="server" ID="regval_txt_KdNrAuftrag_M" ValidationGroup="additional_TXTs" ValidationExpression="^[0-9]{7}$" Display="Dynamic" ForeColor="Red" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
</div> </div>
<div id="rowcol5" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;"> <div id="rowcol5" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_Absender_M" runat="server" Text="Absender"></asp:Label> <asp:Label ID="lbl_Absender_M" runat="server" Text="Absender"></asp:Label>
<asp:TextBox ID="txt_Absender_M" runat="server" AutoCompleteType="DisplayName" style="width:155px; margin-left:8px;" OnTextChanged="txt_Absender_M_TextChanged"></asp:TextBox> <asp:TextBox ID="txt_Absender_M" runat="server" AutoPostBack="false" AutoCompleteType="DisplayName" style="width:155px; margin-left:8px;" OnTextChanged="txt_Absender_M_TextChanged"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regval_txt_Absender_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic" ForeColor="Red" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regval_txt_Absender_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic" ForeColor="Red" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
</div> </div>
<div id="rowcol6" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;"> <div id="rowcol6" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_Empfaenger_M" runat="server" Text="Empfänger" style="margin-left:9px"></asp:Label> <asp:Label ID="lbl_Empfaenger_M" runat="server" Text="Empfänger" style="margin-left:9px"></asp:Label>
<asp:TextBox ID="txt_Empfaenger_M" runat="server" AutoCompleteType="DisplayName" style="width:155px; margin-left:52px;" OnTextChanged="txt_Empfaenger_M_TextChanged"></asp:TextBox> <asp:TextBox ID="txt_Empfaenger_M" runat="server" AutoPostBack="false" AutoCompleteType="DisplayName" style="width:155px; margin-left:52px;" OnTextChanged="txt_Empfaenger_M_TextChanged"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="regval_txt_Empfaenger_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" ForeColor="Red" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="regval_txt_Empfaenger_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" ForeColor="Red" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
</div> </div>
</div> </div>
@@ -297,7 +299,7 @@
<div id="Abstand_laenger" style="height: /*24px*/ 1.873536299765808vh;"></div> <div id="Abstand_laenger" style="height: /*24px*/ 1.873536299765808vh;"></div>
</div></div> </div></div>
</div> </div>
<asp:Button ID="btn_Auftraege" class="btn-primary" runat="server" Text="Erhalte Aufträge" OnClick="btn_Auftraege_Click" style="background-color:#fff;color:#043381;height:30px;width:221px;font-size:1.33em;" /> <asp:Button ID="btn_Auftraege" class="btn btn-primary" runat="server" Text="Erhalte Aufträge" 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" style="overflow-x:auto;margin-left:-7px"> <div id="conovertab" style="overflow-x:auto;margin-left:-7px">
@@ -325,7 +327,7 @@
Response.Write(ex.Message & ex.StackTrace) Response.Write(ex.Message & ex.StackTrace)
End Try %> End Try %>
<div></div></div> <div></div></div>
</ContentTemplate></asp:UpdatePanel> </ContentTemplate><Triggers><asp:AsyncPostBackTrigger ControlID="btn_Auftraege" EventName="Click"/></Triggers></asp:UpdatePanel>
<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script> <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
<script src="http://code.jquery.com/jquery-migrate-1.2.1.min.js"></script> <script src="http://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>

11
Customers/CustomsAviso.aspx.vb
View File

@@ -44,7 +44,7 @@ Partial Class CustomsAviso
tbl_Header_row.TableSection = TableRowSection.TableHeader tbl_Header_row.TableSection = TableRowSection.TableHeader
' MsgBox(datebis) ' MsgBox(datebis)
btn_Auftraege.Enabled = True
If (Page.IsPostBack) Then If (Page.IsPostBack) Then
Page.MaintainScrollPositionOnPostBack = True Page.MaintainScrollPositionOnPostBack = True
@@ -211,11 +211,12 @@ Partial Class CustomsAviso
datevon = Nothing datevon = Nothing
datebis = Nothing datebis = Nothing
End If End If
addrows()
Else Else
Page.MaintainScrollPositionOnPostBack = False Page.MaintainScrollPositionOnPostBack = False
rbt_Alle.Checked = True rbt_Alle.Checked = True
normaltable.EnableViewState = True
lbl_von.Visible = True lbl_von.Visible = True
lbl_bis.Visible = True lbl_bis.Visible = True
@@ -276,9 +277,7 @@ Partial Class CustomsAviso
'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() FormsAuthentication.RedirectToLoginPage()
End If End If
If Not IsNothing(Session.Item("mytable")) Then
addrows()
End If
End Sub 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) 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)
@@ -388,7 +387,7 @@ Partial Class CustomsAviso
th8.ForeColor = white th8.ForeColor = white
End Sub End Sub
Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs) Protected Sub btn_Auftraege_Click(ByVal sender As Object, e As EventArgs) Handles btn_Auftraege.Click
dt = Nothing dt = Nothing
Session.Add("mytable", Nothing) Session.Add("mytable", Nothing)
If Session.Item("mytable") = Nothing Then If Session.Item("mytable") = Nothing Then

4
Customers/Default.aspx.vb
View File

@@ -16,6 +16,7 @@ Partial Class Customers_Default
If Page.IsPostBack = True Then If Page.IsPostBack = True Then
Page.MaintainScrollPositionOnPostBack = True Page.MaintainScrollPositionOnPostBack = True
VERAG_VARIABLES.initerrorcount() VERAG_VARIABLES.initerrorcount()
tbl_main = ViewState("Message")
Else Else
Page.MaintainScrollPositionOnPostBack = False Page.MaintainScrollPositionOnPostBack = False
VERAG_VARIABLES.initerrorcount() VERAG_VARIABLES.initerrorcount()
@@ -23,6 +24,8 @@ Partial Class Customers_Default
End Sub End Sub
Protected Sub Btn_btn_Click(sender As Object, e As EventArgs) Protected Sub Btn_btn_Click(sender As Object, e As EventArgs)
Dim tbl_id As TableCell = New TableCell Dim tbl_id As TableCell = New TableCell
Dim tbl_name As TableCell = New TableCell Dim tbl_name As TableCell = New TableCell
@@ -35,5 +38,6 @@ Partial Class Customers_Default
tbl_main.Rows.Add(tr) tbl_main.Rows.Add(tr)
ViewState("Message") = tbl_main
End Sub End Sub
End Class End Class

4
Customers/Invoices.aspx
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:LinkButton 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;">a</asp:LinkButton> <asp:LinkButton 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;">Erhalte Rechnungen</asp:LinkButton>
<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">
@@ -245,7 +245,7 @@
Catch ex As Exception Catch ex As Exception
'Response.Write(ex.Message & ex.StackTrace) 'Response.Write(ex.Message & ex.StackTrace)
Response.Write("Fehler bei den SQL-Einstellungen. Bitte den Admin kontaktieren.") Response.Write("Fehler bei den SQL-Einstellungen. Bitte den Admin kontaktieren.")
End Try %> End Try%>
</div> </div>
</div> </div>
</div> </div>

5
Customers/Invoices.aspx.vb
View File

@@ -506,7 +506,7 @@ Partial Class Customers_Default3
End Try End Try
End If End If
If valdaterage_1.IsValid AndAlso valdaterange_2.IsValid Then If valdaterage_1.IsValid = True AndAlso valdaterange_2.IsValid = True Then
If String.IsNullOrEmpty(Kdnrtext) = False Then If String.IsNullOrEmpty(Kdnrtext) = False Then
If String.IsNullOrEmpty(Kdnrtext) = False AndAlso String.IsNullOrEmpty(datevon.ToShortDateString) = False AndAlso String.IsNullOrEmpty(datebis.ToShortDateString) = False Then 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) dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR)
@@ -556,8 +556,7 @@ Partial Class Customers_Default3
txt_LKW.Text = String.Empty txt_LKW.Text = String.Empty
txt_ReNr.Text = String.Empty txt_ReNr.Text = String.Empty
valdaterage_1.Enabled = True valdaterage_1.Enabled = valdaterange_2.Enabled = True
valdaterange_2.Enabled = True
valreq_pickdate1.Enabled = True valreq_pickdate1.Enabled = True
valreq_pickdate2.Enabled = True valreq_pickdate2.Enabled = True
regex_txt_Absender_M.Enabled = True regex_txt_Absender_M.Enabled = True