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

Änderungen invoices.aspx und andere seiten im Prozess optimiert.

Browse Source
This commit is contained in:
ja
2021-10-28 16:08:50 +02:00
parent 49f60b976d
commit 4afe321459
4 changed files with 214 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Customers/Invoices.aspx
View File

@@ -91,13 +91,11 @@
<div class="col-12" id="cont4">
<div class="col-12" id="container2" style="margin-left:2px">
<asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label>
<%Dim erster = New Date(Now().Year, Now().Month, 1) %>
<asp:TextBox ID="pickdate1" Type="Date" CssClass="classTarget" requiered="true" OnTextChanged="pickdate1_TextChanged" minDate="<%=erster %>" runat="server"></asp:TextBox>
<asp:TextBox ID="pickdate1" Type="Date" CssClass="classTarget" requiered="true" OnTextChanged="pickdate1_TextChanged" minDate="<%=New Date(Now().Year, Now().Month, 1) %>" runat="server"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="pickdate1" Display="Dynamic" ID="valreq_pickdate1" runat="server" ErrorMessage=""></asp:RequiredFieldValidator>
<asp:CustomValidator runat="server" ID="valDateRange_1" ControlToValidate="pickdate1" Display="Dynamic" OnServerValidate="valDateRange_1_ServerValidate" ErrorMessage="" SetFocusOnError="true" ValidationGroup="Datevalid"></asp:CustomValidator>
<asp:Label ID="lbl_bis" runat="server" Text="Bis:"></asp:Label>
<%Dim jetzt = DateTime.Now.Date %>
<asp:TextBox ID="pickdate2" Type="Date" CssClass="classTarget" OnTextChanged="pickdate2_TextChanged" required="true" runat="server" minDate="<%=jetzt %>"></asp:TextBox>
<asp:TextBox ID="pickdate2" Type="Date" CssClass="classTarget" OnTextChanged="pickdate2_TextChanged" required="true" runat="server" minDate="<%= DateTime.Now.Date %>"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="pickdate2" Display="Dynamic" ID="valreq_pickdate2" runat="server" ErrorMessage=""></asp:RequiredFieldValidator>
<asp:CustomValidator runat="server" ID="valDateRange_2" ControlToValidate="pickdate2" Display="Dynamic" OnServerValidate="valDateRange_2_ServerValidate" ErrorMessage="" SetFocusOnError="true" ValidationGroup="Datevalid"></asp:CustomValidator>
</div>
@@ -142,30 +140,30 @@
<!-- Smartphone-->
<div class="d-md-none">
<div class="row">
<div id="rowcol4" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<div id="rowcol4" class="col-12 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<form class="myform_M" id="commentform_4">
<asp:Label ID="lbl_LKWNr_M" runat="server" Text="LKW Kennzeichen"></asp:Label>
<asp:TextBox ID="txt_LKWNr_M" runat="server" style="width:117px;margin-left:25px" OnTextChanged="txt_LKWNr_M_TextChanged"></asp:TextBox>
<asp:TextBox ID="txt_LKWNr_M" runat="server" style="width:105px;margin-left:29px" OnTextChanged="txt_LKWNr_M_TextChanged"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_LKWNr_M" runat="server" ID="regexval_txt_LKW_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{30})\d$" Display="Dynamic" ErrorMessage="LKW Kennzeichen: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
<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" style="width:117px;margin-left:25px" OnTextChanged="txt_KdNrAuftrag_M_TextChanged"></asp:TextBox>
<asp:Label ID="lbl_KdNrAuftrag_M" runat="server" Text="Kunden Auftrags Nr" ></asp:Label>
<asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" style="width:105px;margin-left:13px" OnTextChanged="txt_KdNrAuftrag_M_TextChanged"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_KdNrAuftrag_M" runat="server" ID="regexval_txt_KdNrAuftrag_M" ValidationGroup="additional_TXTs" ValidationExpression="^([0-9]{7})$" Display="Dynamic" ErrorMessage="Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
</form>
</div>
<div id="rowcol5" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<div id="rowcol5" class="col-12 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<form class="myform_M" id="commentform_5">
<asp:Label ID="lbl_Absender_M" runat="server" Text="Absender"></asp:Label>
<asp:TextBox ID="txt_Absender_M" runat="server" style="width:117px;margin-left:25px" OnTextChanged="txt_Absender_TextChanged"></asp:TextBox>
<asp:TextBox ID="txt_Absender_M" runat="server" style="width:105px;margin-left:85px" OnTextChanged="txt_Absender_M_TextChanged"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regexval_txt_Absender_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic" ErrorMessage="Absender: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
<asp:Label ID="lbl_Empfaenger_M" runat="server" Text="Empfaenger"></asp:Label>
<asp:TextBox id="txt_Empfaenger_M" runat="server" style="width:117px;margin-left:25px" OnTextChanged="txt_Empfaenger_TextChanged"></asp:TextBox>
<asp:TextBox id="txt_Empfaenger_M" runat="server" style="width:105px;margin-left:65px" OnTextChanged="txt_Empfaenger_M_TextChanged"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="regexval_txt_Empfaenger_M" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic" ErrorMessage="Empfänger: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
</form>
</div>
<div id="rowcol6" class="col-10 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<div id="rowcol6" class="col-12 row" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<form class="myform_M" id="commentform_6">
<asp:Label ID="lbl_ReNr_M" runat="server" Text="Rechnungs-Nummer:"></asp:Label>
<asp:TextBox ID="txt_ReNr_M" runat="server" style="width:155px;margin-left:8px" OnTextChanged="txt_ReNr_TextChanged"></asp:TextBox>
<asp:Label ID="lbl_ReNr_M" runat="server" Text="Rechnungs-Nummer"></asp:Label>
<asp:TextBox ID="txt_ReNr_M" runat="server" style="width:105px;margin-left:0px" OnTextChanged="txt_ReNr_M_TextChanged"></asp:TextBox>
<asp:RegularExpressionValidator ControlToValidate="txt_ReNr_M" runat="server" ID="regexval_txt_ReNr_M" ValidationGroup="additional_TXTs" ValidationExpression="^([1-9]{8})$" Display="Dynamic" ErrorMessage="Rechnungsnummer: Falsches Format" SetFocusOnError="true"></asp:RegularExpressionValidator>
</form>
</div>
@@ -188,7 +186,7 @@
</div>
</div>
<div id="Abstand_laenger" style="height: /*24px*/ 1.873536299765808vh;"></div>
<asp:Button ID="btn_Rechnungen" CssClass="btn btn-primary" runat="server" Text="Erhalte Rechnungen" style="background-color:#fff;color:#043381;height:30px;width:18%;font-size:1.33em;" OnClientClick="return verify()" OnClick="btn_Rechnungen_Click" />
<asp:Button ID="Send_Data" CssClass=" btn-primary" runat="server" Text="Erhalte Rechnungen" style="font-size:1.33em;width:18%;height:30px;color:#fff" OnClick="Send_Data_Click" />
<div id="Abstand_lang" style="height: /*32px*/ 2.498048399687744vh;"></div>
<div class="g-3">
<div id="conovertab" style="overflow-x:auto;margin-left:-2px">

167
Customers/Invoices.aspx.vb
View File

@@ -164,7 +164,13 @@ Partial Class Customers_Invoices
End Sub
Protected Sub valDateRange_1_ServerValidate(source As Object, args As ServerValidateEventArgs)
Dim minDate As DateTime = DateTime.Parse("01.04.2001")
Dim maxDate As DateTime = DateTime.Parse(DateTime.Now.ToShortDateString)
Dim dt As DateTime
args.IsValid = (DateTime.TryParse(args.Value, dt) AndAlso
dt <= maxDate AndAlso
dt >= minDate)
End Sub
Protected Sub pickdate2_TextChanged(sender As Object, e As EventArgs)
@@ -172,101 +178,106 @@ Partial Class Customers_Invoices
End Sub
Protected Sub valDateRange_2_ServerValidate(source As Object, args As ServerValidateEventArgs)
Dim minDate As DateTime = DateTime.Parse("01." + Date.Now.Month.ToString + ".2001")
Dim maxDate As DateTime = DateTime.Parse(DateTime.Now.ToShortDateString)
Dim dt As DateTime
args.IsValid = (DateTime.TryParse(args.Value, dt) AndAlso
dt <= maxDate AndAlso
dt >= minDate) And dt < Date.Now.AddDays(-1)
End Sub
Protected Sub txt_LKWNr_TextChanged(sender As Object, e As EventArgs)
End Sub
Protected Sub txt_Empfaenger_TextChanged(sender As Object, e As EventArgs)
End Sub
Protected Sub txt_Absender_TextChanged(sender As Object, e As EventArgs)
End Sub
Protected Sub txt_ReNr_TextChanged(sender As Object, e As EventArgs)
End Sub
Protected Sub txt_KdNrAuftrag_TextChanged(sender As Object, e As EventArgs)
End Sub
Protected Sub txt_LKWNr_M_TextChanged(sender As Object, e As EventArgs)
End Sub
Protected Sub TextBox2_TextChanged(sender As Object, e As EventArgs)
End Sub
Protected Sub txt_KdNrAuftrag_M_TextChanged(sender As Object, e As EventArgs)
End Sub
Protected Sub txt_KundenNr_TextChanged(sender As Object, e As EventArgs)
End Sub
Protected Sub btn_Rechnungen_Click(sender As Object, e As EventArgs)
dt = Nothing
If String.IsNullOrEmpty(txt_Absender.Text) Then
regexval_txt_Absender.Enabled = False
Else
regexval_txt_Absender.Enabled = True
End If
If String.IsNullOrEmpty(txt_Empfaenger.Text) Then
regexval_txt_Empfaenger.Enabled = False
Else
regexval_txt_Empfaenger.Enabled = True
End If
If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) Then
regexval_txt_KdNrAuftrag.Enabled = False
Else
regexval_txt_KdNrAuftrag.Enabled = True
End If
If String.IsNullOrEmpty(txt_LKWNr.Text) Then
regexval_txt_LKW.Enabled = False
Else
regexval_txt_LKW.Enabled = True
End If
If String.IsNullOrEmpty(txt_ReNr.Text) Then
regexval_txt_ReNr.Enabled = False
End Sub
Protected Sub txt_Empfaenger_TextChanged(sender As Object, e As EventArgs)
If String.IsNullOrEmpty(txt_Empfaenger.Text) Then
regexval_txt_Empfaenger.Enabled = False
Else
regexval_txt_ReNr.Enabled = False
regexval_txt_Empfaenger.Enabled = True
End If
'Mobile
If String.IsNullOrEmpty(txt_Absender_M.Text) Then
regexval_txt_Absender_M.Enabled = False
End Sub
Protected Sub txt_Absender_TextChanged(sender As Object, e As EventArgs)
If String.IsNullOrEmpty(txt_Absender.Text) Then
regexval_txt_Absender.Enabled = False
Else
regexval_txt_Absender_M.Enabled = True
End If
If String.IsNullOrEmpty(txt_Empfaenger_M.Text) Then
regexval_txt_Empfaenger_M.Enabled = False
Else
regexval_txt_Empfaenger_M.Enabled = True
End If
If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) Then
regexval_txt_KdNrAuftrag_M.Enabled = False
Else
regexval_txt_KdNrAuftrag_M.Enabled = True
End If
If String.IsNullOrEmpty(txt_LKWNr_M.Text) Then
regexval_txt_LKW_M.Enabled = False
Else
regexval_txt_LKW_M.Enabled = True
regexval_txt_Absender.Enabled = True
End If
End Sub
Protected Sub txt_ReNr_TextChanged(sender As Object, e As EventArgs)
If String.IsNullOrEmpty(txt_ReNr_M.Text) Then
regexval_txt_ReNr_M.Enabled = False
Else
regexval_txt_ReNr_M.Enabled = True
End If
End Sub
Protected Sub txt_KdNrAuftrag_TextChanged(sender As Object, e As EventArgs)
If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) Then
regexval_txt_KdNrAuftrag.Enabled = False
Else
regexval_txt_KdNrAuftrag.Enabled = True
End If
End Sub
Protected Sub txt_LKWNr_M_TextChanged(sender As Object, e As EventArgs)
If String.IsNullOrEmpty(txt_LKWNr_M.Text) Then
regexval_txt_LKW_M.Enabled = False
Else
regexval_txt_LKW_M.Enabled = True
End If
End Sub
Protected Sub txt_KdNrAuftrag_M_TextChanged(sender As Object, e As EventArgs)
If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) Then
regexval_txt_KdNrAuftrag_M.Enabled = False
Else
regexval_txt_KdNrAuftrag_M.Enabled = True
End If
End Sub
Protected Sub txt_Absender_M_TextChanged(sender As Object, e As EventArgs)
If String.IsNullOrEmpty(txt_Absender_M.Text) Then
regexval_txt_Absender_M.Enabled = False
Else
regexval_txt_Absender_M.Enabled = True
End If
End Sub
Protected Sub txt_ReNr_M_TextChanged(sender As Object, e As EventArgs)
If String.IsNullOrEmpty(txt_ReNr_M.Text) Then
regexval_txt_ReNr_M.Enabled = False
Else
regexval_txt_ReNr_M.Enabled = False
End If
End Sub
Protected Sub txt_Empfaenger_M_TextChanged(sender As Object, e As EventArgs)
If String.IsNullOrEmpty(txt_Empfaenger_M.Text) Then
regexval_txt_Empfaenger_M.Enabled = False
Else
regexval_txt_Empfaenger_M.Enabled = True
End If
End Sub
Protected Sub Send_Data_Click(sender As Object, e As EventArgs)
dt = Nothing
'Mobile
valreq_pickdate1.Validate()
valreq_pickdate2.Validate()
If valreq_pickdate1.IsValid AndAlso valreq_pickdate2.IsValid Then
If valreq_pickdate1.IsValid AndAlso valreq_pickdate2.IsValid AndAlso Kdnrtext = Not "" Then
If txt_Absender.Text IsNot "" Then
regexval_txt_Absender.Enabled = True
regexval_txt_Absender.Validate()
@@ -402,7 +413,7 @@ Partial Class Customers_Invoices
End If
Kdnrtext = VERAG_PROG_ALLGEMEIN.cCryptography2.Decrypt(Request.QueryString("P4"))
MsgBox(Kdnrtext)
If String.IsNullOrEmpty(Kdnrtext) = False And String.IsNullOrEmpty(datevon.ToString) = False And String.IsNullOrEmpty(datebis.ToString) = False Then
dt = VERAG_PROG_ALLGEMEIN.cRechnungsausgang.GET_LIST_WEB(Integer.Parse(Kdnrtext), datevon, datebis, Integer.Parse(reNr), Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf String.IsNullOrEmpty(Kdnrtext) = True Or String.IsNullOrEmpty(datevon.ToString) = True And String.IsNullOrEmpty(datebis.ToString) = True And String.IsNullOrEmpty(reNr) = True And String.IsNullOrEmpty(Absender) = False And String.IsNullOrEmpty(LKWNR) = False And String.IsNullOrEmpty(Empfaenger) = False And String.IsNullOrEmpty(KDNAFNR) = False Then
@@ -480,4 +491,8 @@ Partial Class Customers_Invoices
End If
End Sub
End Class

118
css/Customers/Invoices.css
View File

@@ -23,6 +23,47 @@ h1 {
color:#043381;
font-size: 32px;
}
hr {
color: #043381;
}
#btn_resetForm {
padding-right: -800px;
}
.accordion-button {
position: relative;
display: flex;
align-items: center;
width: 100%;
padding: 1rem 1.25rem;
font-size: 1rem;
color: #043381;
text-align: left;
background-color: #fff;
border: none;
border-radius: 0;
transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,border-radius .15s ease;
height: 5px;
}
.accordion #accordionExample #collapseOne .card card-body #cont3 .container {
margin-left: 2px;
}
.accordion #accordionExample #collapseOne .card card-body #cont3 .container .d-none d-md-block .row .col-12 {
margin-right: /*1.52px;*/ 0.33480176211453744vw;
}
#RadioButtonList1 {
border: none;
}
#btn_resetForm {
margin-right: 2px;
}
#Send_Data {
height: 15px;
width: 120%;
}
@media (max-width: 558.98px) {
#conovertab {
width: 325px;
@@ -44,28 +85,79 @@ h1 {
width: 350px;
}
#tableSearch {
width: 315px;
.flex-fill {
width: 700px;
}
#tableSearch {
width: 325px;
#cont3 {
width: 700px;
}
#conovertab {
margin-left: 10px;
width: 315px;
#cont4 {
min-width: 750px;
}
.align-self-xl-start {
tbody {
font-size: 3.303964757709251vw;
height: auto;
flex-wrap: wrap;
width: fit-content;
}
#normaltable {
width: 100%;
}
#conovertab {
/* max-width:width:150px 11.25em;*/
margin-left: /*14px*/ 3.0837004405286343vw;
max-width: /*390px;*/ 85.90308370044053vw;
overflow-x: auto;
}
#pickdate1{
border: 1px solid #000000;
}
#pickdate1 {
border: 1px solid #000000;
}
.flex-fill {
width: 700px;
}
#cont3 {
width: 700px;
}
#cont4 {
min-width: 750px;
}
tbody {
font-size: 3.303964757709251vw;
height: auto;
flex-wrap: wrap;
width: fit-content;
}
#normaltable {
width: 100%;
}
#conovertab {
/* max-width:width:150px 11.25em;*/
margin-left: /*14px*/ 3.0837004405286343vw;
max-width: /*390px;*/ 85.90308370044053vw;
overflow-x: auto;
}
#Send_Data {
height: 15px;
width: 120%;
}
#pickdate1 {
border: 1px solid #000000;
}
#pickdate1 {
border: 1px solid #000000;
}
}

1
login/Logout.aspx.vb
View File

@@ -20,6 +20,7 @@ Partial Class login_Logout
'Dim cookie2 As HttpCookie = New HttpCookie(sessionStateSection.CookieName, "")
'cookie2.Expires = DateTime.Now.AddYears(-1)
'Response.Cookies.Add(cookie2)
Response.BufferOutput = True
Response.Redirect("../login/login_FLEX.aspx")