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

Änderungen GUI sowie Anpassungen an Mobilansicht

Browse Source
This commit is contained in:
ja
2021-11-17 11:39:34 +01:00
parent a902f66b93
commit 133c8a02c8
12 changed files with 356 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Customers/CustomsAviso.aspx
View File

@@ -16,7 +16,26 @@
}
@media (max-width: 558.98px) {
body {
max-width: 390px;
max-width: 558.98px;
}
h1 {
color: #043381;
font-size: 22px;
}
h2 {
color: #043381;
font-size: 28px;
}
#tableSearch {
width: 53%;
border: 1px solid grey;
}
@media (max-width: 349.98px) {
body {
max-width: 349.98px;
}
h1 {

24
Customers/Invoices.aspx
View File

@@ -151,26 +151,34 @@
<!-- Mobil -->
<div class="d-md-none">
<div class="container" style="margin-left:-10px">
<div class="row">
<div class="row" style="height:166px">
<div id="rowcols4" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_LKW_M" runat="server" style="color:#043381" Font-Size="1em">LKW Kennzeichen:</asp:Label>
<asp:TextBox ID="txt_LKW_M" runat="server" PlaceHolder="truck license plate" style="width:155px;margin-left:5px"></asp:TextBox>
<asp:TextBox ID="txt_LKW_M" runat="server" style="width:155px;margin-left:30px" ClientIDMode="Predictable"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_LKW_M" runat="server" ID="regval_txt_LKW_M" Enabled="false"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_LKW_M" runat="server" ForeColor="Red" ID="regex_txt_LKW_M" ValidationExpression="[A-Z0-9]{4,30}\d" Display="Dynamic" ErrorMessage="Wrong plate format!" SetFocusOnError="true" Enabled="false"></asp:RegularExpressionValidator>
<asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" PlaceHolder="Customer Order Nr" style="width:155px;margin-left:28px"></asp:TextBox>
</div>
<div id="rowcols7" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_KdnNrAuftrag_M" runat="server" style="color:#043381;font-size:1em">KundenNr-Auftrag:</asp:Label>
<asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" style="width:155px;margin-left:20px" ClientIDMode="Predictable"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_KdNrAuftrag_M" runat="server" ForeColor="Red" Enabled="false" ID="reqval_txt_KdNrAuftrag_M"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator runat="server" ID="regex_txt_KdNrAuftrag_M" ControlToValidate="txt_KdNrAuftrag_M" ForeColor="Red" Display="Dynamic" ValidationExpression="[A-Z0-9]{5,30}/d" Enabled="false" ErrorMessage="No valid input found!"></asp:RegularExpressionValidator>
</div>
<div id="rowcols5" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:TextBox ID="txt_Absender_M" runat="server" PlaceHolder="Sender" style="width:155px;"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_Absender_M" runat="server" style="width:155px;margin-left:18px" Enabled="false" ID="req_txt_Absender_M" ErrorMessage="*" ForeColor="Red"></asp:RequiredFieldValidator>
<asp:Label ID="lbl_absender_M" runat="server" style="color:#043381" Font-Size="1em">Absender:</asp:Label>
<asp:TextBox ID="txt_Absender_M" runat="server" style="width:155px;margin-left:86px"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_Absender_M" runat="server" style="width:155px;margin-left:18px" Enabled="false" ID="req_txt_Absender_M" ErrorMessage="" ForeColor="Red"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regex_txt_Absender_M" Enabled="false" ValidationExpression="[^!,]{2,90}" ForeColor="Red" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
<asp:TextBox ID="txt_Empfaenger_M" runat="server" PlaceHolder="Receiver" style="width:155px"></asp:TextBox>
</div>
<div id="rowcols8" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_Empfaenger_M" runat="server" style="color:#043381" Font-Size="1em">Empfänger</asp:Label>
<asp:TextBox ID="txt_Empfaenger_M" runat="server" style="width:155px;margin-left:77px"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="reqval_txt_Empfaenger_M" ForeColor="Red" Enabled="false" Display="Dynamic"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" ID="regex_txt_Empaenger_M" runat="server" ForeColor="Red" Enabled="false" ValidationExpression="[^!,]{2,90}" Display="Dynamic" style="width:105px;margin-left:13px" SetFocusOnError="true" ErrorMessage="Error! Try again!"></asp:RegularExpressionValidator>
</div>
<div id="rowcol6" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:TextBox ID="txt_ReNr_M" runat="server" PlaceHolder="invoice number" style="width:155px;"></asp:TextBox>
<asp:Label ID="lbl_ReNr_M" runat="server" style="color:#043381" Font-Size="1em">Rechnungs-Nummer:</asp:Label>
<asp:TextBox ID="txt_ReNr_M" runat="server" style="width:155px;"></asp:TextBox>
<asp:RequiredFieldValidator Enabled="false" ControlToValidate="txt_ReNr_M" runat="server" Display="Dynamic" ForeColor="Red" ErrorMessage="*"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_ReNr_M" runat="server" ID="regex_txt_ReNr_M" ForeColor="Red" Display="Dynamic" ValidationExpression="[0-9]{1,8}" Enabled="false" ErrorMessage="Please stay in the range of 8 numbers!"></asp:RegularExpressionValidator>
</div>
@@ -211,7 +219,7 @@
<asp:TableHeaderCell ID="tbl_HeaderCell_KundenAuftrNummer" runat="server" AbbreviatedText="Cust. Order Num">Customer Order Number</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_Absender" runat="server" AbbreviatedText="Sender">Sender</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_Empfaenger" runat="server" AbbreviatedText="Reciev">Reciever</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_Info" runat="server" Width="73.7px" Height="23.975576662143826" AbbreviatedText="Info">Information</asp:TableHeaderCell>
<asp:TableHeaderCell ID="tbl_HeaderCell_Info" runat="server" AbbreviatedText="Info">Information</asp:TableHeaderCell>
</asp:TableHeaderRow>
</asp:Table>
</div>

31
Customers/Invoices.aspx.vb
View File

@@ -1,7 +1,10 @@
Imports System.Data
Imports System.Data.SqlClient
Imports System.Globalization
Imports System.IO
Imports System.Web.Services
Imports iTextSharp.text
Imports iTextSharp.text.pdf
Partial Class Customers_Default3
Inherits System.Web.UI.Page
@@ -120,14 +123,15 @@ Partial Class Customers_Default3
End If
If String.IsNullOrEmpty(t8.Text) Then
t8.BackColor = white
t8.BackColor = schwarz
t8.Width = Unit.Percentage(100)
t8.Height = Unit.Percentage(100)
Else
t8.BackColor = white
t8.ForeColor = veragblue
End If
t8.Width = Unit.Pixel(22)
t8.Height = Unit.Pixel(26)
th1.Font.Bold = True
th2.Font.Bold = True
th3.Font.Bold = True
@@ -152,7 +156,7 @@ Partial Class Customers_Default3
th6.ForeColor = white
th7.ForeColor = white
th8.ForeColor = white
th8.Width = Unit.Pixel(22)
th8.Width = Unit.Percentage(100)
End Sub
Protected Sub btn_b_Click(sender As Object, e As EventArgs)
@@ -448,16 +452,22 @@ Partial Class Customers_Default3
Dim btn As New ImageButton
btn.ViewStateMode = ViewStateMode.Enabled
btn.CssClass = "btn btn-primary"
btn.ImageUrl = "../images/Icons/main/833px-PDF_file_icon_small.gif"
btn.ImageAlign = ImageAlign.Middle
btn.ImageUrl = "../images/Icons/main/833px-PDF_file_icon_small_more.png"
btn.BackColor = Drawing.Color.FromArgb(0, Drawing.Color.GhostWhite)
btn.BorderStyle = BorderStyle.None
'Hier PDF-File creation einfügen
btn.Style.Add("Display", "table-cell")
btn.Style.Add("Vertical-align", "middle")
btn.Style.Add("margin", "2px 2px 8px 4px")
btn.ControlStyle.Width = Unit.Percentage(100)
btn.Height = Unit.Percentage(100)
'btn.Attributes.Add("href", "pdfviewer.aspx?P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.FilialenNr).ToString() + "&P2=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.AbfertigungsNr).ToString + "&P3=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.RK_ID).ToString)
btn.Attributes.Add("onclick", "window.open('../pdf/Bonizertifikat.pdf')")
btn.Width = Unit.Pixel(72)
btn.Height = Unit.Pixel(56)
'btn.PostBackUrl = "pdfviewer.aspx?P1=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.FilialenNr).ToString + "&P2=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.AbfertigungsNr).ToString + "&P3=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d.RK_ID).ToString
tbl_Cell_Info.ValidateRequestMode = UI.ValidateRequestMode.Enabled
tbl_Cell_Info.Width = Unit.Pixel(22)
tbl_Cell_Info.Height = Unit.Pixel(26)
tbl_Cell_Info.Width = Unit.Percentage(80)
tbl_Cell_Info.Height = Unit.Percentage(100)
tbl_Cell_Info.Controls.Add(btn)
tr.Cells.Add(tbl_Cell_Info)
initcells(tr, tbl_Cell_Index, tbl_Cell_ReNr, tbl_Cell_LKWs, tbl_Cell_Auftragsdat, tbl_Cell_KundAuftrNr, tbl_Cell_Absender, tbl_Cell_Empfaenger, tbl_Cell_Info,
@@ -528,7 +538,6 @@ Partial Class Customers_Default3
End Sub
Protected Sub valdaterange_2_ServerValidate(source As Object, args As ServerValidateEventArgs)
If Date.Parse(pickdate2.Text) > Date.ParseExact(Date.Now.ToShortDateString, "dd.MM.yyyy", provider) Then
VERAG_VARIABLES.seterrorcount(10)
lbl_status.ForeColor = Drawing.Color.Red

14
Customers/Welcome.aspx
View File

@@ -35,6 +35,20 @@
font-size: 22px;
}
h2 {
color: #043381;
font-size: 28px;
}
@media (max-width: 349.98px) {
body {
max-width: 349.98px;
}
h1 {
color: #043381;
font-size: 22px;
}
h2 {
color: #043381;
font-size: 28px;

45
css/Customers/CustomerAVISO.css
View File

@@ -170,7 +170,7 @@ hr{
}
@media (max-width: 558.98px) {
body{
max-width:390px;
max-width:558px;
}
h1 {
color: #043381;
@@ -205,22 +205,22 @@ hr{
padding-left: 60px;
}
.container-fluid {
width: 700px;
width: 558px;
}
#cont1 {
width: 700px;
width: 558px;
}
#containerseiterand {
min-width: 700px;
}
.flex-fill {
width: 700px;
width: 558px;
}
#cont3 {
width: 700px;
width: 558px;
}
#cont4 {
min-width: 750px;
min-width: 550px;
}
tbody {
font-size: 3.303964757709251vw;
@@ -277,47 +277,64 @@ hr{
background-color: lightcoral;
}
}
@media (min-width: 558.98px) {
@media (min-width: 322.98px) {
body {
width: 322.98px;
}
#txt_Absender {
width: 850px;
width: 279.98px;
}
#txt_Empfaenger {
width: 850px;
width: 279.98px;
}
#txt_LKWNr {
width: 850px;
width: 279.98px;
}
#txt_KdNrAuftrag {
width: 850px;
width: 279.98px;
}
#normaltable {
width: 100%;
width: 322.98px;
}
#txt_LKWNr:valid {
color: black;
}
#txt_LKWNr:invalid {
border: 1px solid red;
background-color: lightcoral;
}
#txt_KdNrAuftrag:valid {
color: black;
}
#txt_KdNrAuftrag:invalid {
border: 1px solid red;
background-color: lightcoral;
}
#txt_Absender:valid {
color: black;
}
#txt_Absender:invalid {
border: 1px solid red;
background-color: lightcoral;
} #txt_Empfaenger:valid {
}
#txt_Empfaenger:valid {
color: black;
}
#txt_Empfaenger:invalid {
border: 1px solid red;
background-color: lightcoral;
}
}
}

109
css/Customers/Invoices.css
View File

@@ -161,5 +161,110 @@ ContentPlaceHolder1_Send_Data {
border: 1px solid #000000;
margin-left: 15px;
}
}
@media (max-width: 349.98px) {
body {
width: 349.98px;
max-width: 349.98px;
}
tbody {
font-size: 3.303964757709251vw;
height: auto;
flex-wrap: wrap;
width: 349.98px;
max-width: 350px;
}
#normaltable {
width: 10%;
}
#conovertab {
/* max-width:width:150px 11.25em;*/
margin-left: /*14px*/ 3.0837004405286343vw;
max-width: /*390px;*/ 85.90308370044053vw;
overflow-x: auto;
}
h1 {
color: #043381;
font-size: 22px;
}
h2 {
color: #043381;
font-size: 30px;
}
#containerseiterand {
margin-left: 5px;
margin-right: 5px;
width: 349.98px;
max-width: 349.98px;
}
.flex-fill {
width: 349px;
}
#cont3 {
width: 349.98px;
}
#cont4 {
min-width: 349.98px;
}
#pickdate1 {
border: 1px solid #000000;
}
#pickdate1 {
border: 1px solid #000000;
}
.flex-fill {
width: 349.98px;
}
#cont3 {
width: 349.98px;
}
#cont4 {
min-width: 349.98px;
}
tbody {
font-size: 3.303964757709251vw;
height: auto;
flex-wrap: wrap;
width: fit-content;
}
#normaltable {
width: 100%;
}
#ContentPlaceHolder1_conovertab {
/* max-width:width:150px 11.25em;*/
margin-left: /*14px*/ 3.0837004405286343vw;
max-width: /*390px;*/ 85.90308370044053vw;
overflow-x: auto;
}
#ContentPlaceHolder1_Send_Data {
height: 15px;
width: 349.98px;
}
#ContentPlaceHolder1_lbl_bis {
border: 1px solid #000000;
margin-left: 15px;
}
#ContentPlaceHolder1_pickdate1 {
border: 1px solid #000000;
margin-left: 15px;
}
}

30
css/Customers/LKWs.css
View File

@@ -43,3 +43,33 @@
width: 350px;
}
}
@media (max-width: 349.98px) {
#conovertab {
width: 348px;
overflow-x: auto;
}
body {
width: 348px;
}
h1 {
color: #043381;
font-size: 22px;
}
h2 {
color: #043381;
font-size: 30px;
}
#tableSearch {
max-width: 348px;
}
#containerseiterand {
margin-left: 5px;
margin-right: 5px;
width: 348px;
}
}

51
css/Customers/Welcome.css
View File

@@ -42,9 +42,6 @@ h1 {
width: 1200px;
height: 333px;
}
body{
width:
}
@media (max-width: 558.98px) {
#conovertab {
width: 350px;
@@ -83,10 +80,10 @@ body{
height: 72px;
}
.carousel-item active {
width: 360px;
height: 72px;
}
.carousel-item active {
width: 360px;
height: 72px;
}
#imgcar.d-block w-100 {
width: 360px;
@@ -104,4 +101,44 @@ body{
.modal-content{
width:400px;
}
}
@media (max-width: 323px) {
#conovertab{
width: 320px;
overflow-x: auto;
}
body {
width: 320px;
}
h1 {
color: #043381;
font-size: 21px;
}
#tableSearch {
max-width: 315px;
}
#containerseiterand {
margin-left: 5px;
margin-right: 5px;
width: 315px;
}
#imgcar {
width: 310px;
height: auto;
}
.carousel-inner {
width: 320px;
height: 72px;
}
.carousel-item {
width: 320px;
height: 72px;
}
}

BIN
images/Icons/main/833px-PDF_file_icon_small_more.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

72
login/Change_PW.aspx
View File

@@ -92,14 +92,14 @@
display: flex;
justify-content: center;
align-items: center;
width: 400px;
width: 390px;
height: 613px;
margin: 0 auto;
margin-left:10%;
}
.container-fluid {
width: 400px;
width: 390px;
background-color: rgba(255,255,255,0.5);
height: 613px;
top:50%;
@@ -133,6 +133,74 @@
margin-left:15px;
}
}
@media (max-width: 323px) {
body {
font-family: 'Poppins', sans-serif;
background: #fafafa;
background-image: url(../../images/road.jpg);
background-position: center center;
background-repeat: no-repeat;
background-attachment: fixed;
background-size: cover;
background-color: #fff;
overflow-y: clip;
overflow-x: clip;
max-width:323px;
}
h1 {
color: #043381;
font-size: 24px;
}
h2 {
color: #043381;
font-size: 30px;
}
#content_container {
display: flex;
justify-content: center;
align-items: center;
width: 323px;
height: 613px;
margin: 0 auto;
margin-left:10%;
}
.container-fluid {
width: 325px;
background-color: rgba(255,255,255,0.5);
height: 613px;
top:50%;
bottom: -4px;
left: -195px;
right: 520px;
margin: 0 auto;
}
#tbl_main_M {
font-family: Arial;
font-size: 11px;
border: 1px solid gray;
width: 323px;
height: 613px;
margin-top:80px;
}
#btn_submitpw_M{
background-color: #003680;
color: #fff;
width: 315px;
height: 32px;
margin-bottom: 0px;
margin-left:-15px;
padding-inline: 2px 2px;
padding: -10px 0px 10px 1px;
font-weight:600;
font-size:14px;
}
#lbl_Ueberschrift_M{
font-size:26px;
margin-left:15px;
}
}
</style>
</head>

10
login/login_FLEX.aspx.vb
View File

@@ -8,14 +8,8 @@ Partial Class login_FLEX
Dim UserNaMe As String = String.Empty
Dim passw As String = String.Empty
Protected Sub Page_Load(sender As Object, e As EventArgs)
If Me.Page.User.Identity.IsAuthenticated Then
Response.Redirect("../Customers/Welcome.aspx", False)
End If
If Not Me.Page.User.Identity.IsAuthenticated Then
FormsAuthentication.RedirectToLoginPage()
Response.End()
End If
Protected Sub Page_Load(sender As Object, e As EventArgs) Handles Me.Load
End Sub
Protected Sub ValidateUser(sender As Object, e As EventArgs)

4
login/login_TEST.aspx
View File

@@ -84,7 +84,7 @@
</td>
<td>
<asp:TextBox ID="UserName" runat="server"></asp:TextBox>
<asp:RequiredFieldValidator ID="UserNameRequired" runat="server" ControlToValidate="UserName" ErrorMessage="Der Benutzername ist erforderlich." ToolTip="Der Benutzername ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator>
<asp:RequiredFieldValidator ID="UserNameRequired" runat="server" ControlToValidate="UserName" ErrorMessage="" ToolTip="Der Benutzername ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator>
</td>
</tr>
<tr>
@@ -93,7 +93,7 @@
</td>
<td>
<asp:TextBox ID="Password" runat="server" TextMode="Password"></asp:TextBox>
<asp:RequiredFieldValidator ID="PasswordRequired" runat="server" ControlToValidate="Password" ErrorMessage="Das Kennwort ist erforderlich." ToolTip="Das Kennwort ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator>
<asp:RequiredFieldValidator ID="PasswordRequired" runat="server" ControlToValidate="Password" ErrorMessage="" ToolTip="Das Kennwort ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator>
</td>
</tr>
<tr>