From 133c8a02c89ee34c22aa0dc02b33b3649b26e43f Mon Sep 17 00:00:00 2001 From: ja Date: Wed, 17 Nov 2021 11:39:34 +0100 Subject: [PATCH] =?UTF-8?q?=C3=84nderungen=20GUI=20sowie=20Anpassungen=20a?= =?UTF-8?q?n=20Mobilansicht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Customers/CustomsAviso.aspx | 21 +++- Customers/Invoices.aspx | 24 ++-- Customers/Invoices.aspx.vb | 31 +++-- Customers/Welcome.aspx | 14 +++ css/Customers/CustomerAVISO.css | 45 +++++--- css/Customers/Invoices.css | 109 +++++++++++++++++- css/Customers/LKWs.css | 30 +++++ css/Customers/Welcome.css | 51 ++++++-- .../main/833px-PDF_file_icon_small_more.png | Bin 0 -> 9264 bytes login/Change_PW.aspx | 72 +++++++++++- login/login_FLEX.aspx.vb | 10 +- login/login_TEST.aspx | 4 +- 12 files changed, 356 insertions(+), 55 deletions(-) create mode 100644 images/Icons/main/833px-PDF_file_icon_small_more.png diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 910a47c..a1f126d 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -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 { diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx index 14edc3a..3a8e59f 100644 --- a/Customers/Invoices.aspx +++ b/Customers/Invoices.aspx @@ -151,26 +151,34 @@
-
+
LKW Kennzeichen: - + - +
+
+ KundenNr-Auftrag: +
- - + Absender: + + - +
+
+ Empfänger +
- + Rechnungs-Nummer: +
@@ -211,7 +219,7 @@ Customer Order Number Sender Reciever - Information + Information
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb index f8e1572..f14a658 100644 --- a/Customers/Invoices.aspx.vb +++ b/Customers/Invoices.aspx.vb @@ -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 diff --git a/Customers/Welcome.aspx b/Customers/Welcome.aspx index 3a8fad7..1f0b905 100644 --- a/Customers/Welcome.aspx +++ b/Customers/Welcome.aspx @@ -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; diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css index f0f61c8..02df258 100644 --- a/css/Customers/CustomerAVISO.css +++ b/css/Customers/CustomerAVISO.css @@ -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; - } + } } diff --git a/css/Customers/Invoices.css b/css/Customers/Invoices.css index ebea666..c526698 100644 --- a/css/Customers/Invoices.css +++ b/css/Customers/Invoices.css @@ -161,5 +161,110 @@ ContentPlaceHolder1_Send_Data { border: 1px solid #000000; margin-left: 15px; } - -} \ No newline at end of file + @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; + } + } \ No newline at end of file diff --git a/css/Customers/LKWs.css b/css/Customers/LKWs.css index adf99b5..8c37d17 100644 --- a/css/Customers/LKWs.css +++ b/css/Customers/LKWs.css @@ -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; + } +} diff --git a/css/Customers/Welcome.css b/css/Customers/Welcome.css index 37153ed..87d11a3 100644 --- a/css/Customers/Welcome.css +++ b/css/Customers/Welcome.css @@ -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; + } } \ No newline at end of file diff --git a/images/Icons/main/833px-PDF_file_icon_small_more.png b/images/Icons/main/833px-PDF_file_icon_small_more.png new file mode 100644 index 0000000000000000000000000000000000000000..cade5a5f224f7d9afac147bb64539b5249e3768e GIT binary patch literal 9264 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 diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index cb6ea0e..53ee040 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -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) diff --git a/login/login_TEST.aspx b/login/login_TEST.aspx index af5c4aa..d4bfb8a 100644 --- a/login/login_TEST.aspx +++ b/login/login_TEST.aspx @@ -84,7 +84,7 @@ - * + * @@ -93,7 +93,7 @@ - * + *