From a0b6a7c108f1f39075042f65cd91906a70e6920f Mon Sep 17 00:00:00 2001 From: ja Date: Mon, 13 Sep 2021 15:23:47 +0200 Subject: [PATCH] =?UTF-8?q?Css=20Datei=20angepasst=20und=20=C3=84nderungen?= =?UTF-8?q?=20in=20Layout=20vorgenommen:=20Grid=20system=20eingef=C3=BCgt?= =?UTF-8?q?=20(responsive)=20und=20Login=20angepasst=20mit=20Session=20Vri?= =?UTF-8?q?ablen=20an=20CustomsAviso=20=C3=BCbergeben=20bzw=20an=20gesamte?= =?UTF-8?q?=20Session=20f=C3=BCr=20den=20jeweiligen=20Benutzer=20setzen=20?= =?UTF-8?q?Hinweise:=20siehe=20https://docs.microsoft.com/en-us/previous-v?= =?UTF-8?q?ersions/aspnet/ms178581(v=3Dvs.100)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Customers/CustomsAviso.aspx | 203 ++++++++++++++++++++++---------- Customers/CustomsAviso.aspx.vb | 197 ++++++++----------------------- css/Customers/CustomerAVISO.css | 64 ++++++++++ css/Customers/CustomerIndex.css | 37 ------ login/login_FLEX.aspx | 6 +- login/login_FLEX.aspx.vb | 8 +- 6 files changed, 267 insertions(+), 248 deletions(-) create mode 100644 css/Customers/CustomerAVISO.css delete mode 100644 css/Customers/CustomerIndex.css diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 2ee3165..ec4a8f8 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -19,7 +19,61 @@ visibility: hidden; color: #043381; } - + @media (min-width: 558.98px) { + #txt_Absender { + width: 850px; + } + #txt_Empfaenger { + width: 850px; + } + #txt_LKWNr { + width: 850px; + } + #txt_KdNrAuftrag { + width: 850px; + } + } +} + @media (max-width: 558.98px) { + #txt_Absender { + width: 250px; + padding-right:-2px; + padding-left:60px; + } + #txt_Empfaenger { + width: 250px; + padding-right:-2px; + padding-left:60px; + } + #txt_LKWNr { + width: 250px; + padding-right:-2px; + padding-left:60px; + } + #txt_KdNrAuftrag { + width: 250px; + padding-right:-2px; + padding-left:60px; + } + .container-fluid{ + width:700px; + } + #cont1{ + width:700px; + } + #containerseiterand{ + min-width:700px; + } + .flex-fill{ + width:700px; + } + #cont3{ + width:700px; + } + #cont4{ + min-width: 750px; + } + } @@ -32,18 +86,21 @@ - + -
+
+
+

Kundencenter:


Hier finden Sie Informationen zu den aktuellen Aufträgen.

+
<%Try VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW 'Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(799124) @@ -63,74 +120,98 @@ If AVISO_dt IsNot Nothing Then If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%> -

<%=STANDORT %>

+
+
+ +
+

<%=STANDORT %>

+
+
+
- - +
+
+ +
+
+
+ +
+
- - - - - -
-
-
- -
-
-
- -
-
- - -
-
-
-
+ +
+
+
+
+
+
+
+ +
+
+
+ + + - - - -
-
-
- -
-
-
- -
-
- - - -
-
-
-
+ +
+
+
+
+
+
+ +
+
+
- - +
+
+ +
+
+
+
+
- - +
+
+ +
+
+
+
+
- - +
+
+ +
+
+
+
+
- - - +
+
+ +
+
+
+
+ +
+
-
+
Index-Nr @@ -158,9 +239,11 @@ --> -
+
-
+
+
+


<% End If End If @@ -171,7 +254,7 @@ -
+
<%--
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index ee50300..4b8c493 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -19,15 +19,16 @@ Partial Class Kundenbereich_Default Response.Redirect("../newpageJulius_Sidebar.aspx", True) End Sub - Dim datevon As Date - Dim datebis As Date + Dim datevon As DateTime + Dim datebis As DateTime Dim Kdnrtext As String Dim dt - Dim hrv, hrb, minv, minb, secv, secb As DateAndTime - Dim setuhrzeit1bool As Boolean = False - Dim setuhrzeit2bool As Boolean = False + Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs) - Kdnrtext = txt_KdNr.Text + 'MsgBox(Session.Item("test").ToString) + 'MsgBox(Session.Item("CustomerID").ToString) + 'MsgBox(Session.Item("PW").ToString) + Kdnrtext = Session.Item("CustomerID").ToString Dim tbl_CellIndex = New TableCell Dim tbl_CellArt = New TableCell @@ -43,76 +44,15 @@ Partial Class Kundenbereich_Default dt = Nothing - If txt_pickdate1.Text = "" AndAlso txt_pickdate2.Text = "" AndAlso setuhrzeit1bool = False And setuhrzeit2bool = False Then + If datebis > datevon Then Try - datevon = Date.Parse(pickdate1.SelectedDate.Day.ToString + "-" + pickdate1.SelectedDate.Month.ToString + "-" + pickdate1.SelectedDate.Year.ToString) - txt_pickdate1.Text = Date.Parse(pickdate1.SelectedDate.Month.ToString + "-" + pickdate1.SelectedDate.Month.ToString + "-" + pickdate1.SelectedDate.Year.ToString) - datebis = Date.Parse(pickdate2.SelectedDate.Day.ToString + "-" + pickdate2.SelectedDate.Month.ToString + "-" + pickdate2.SelectedDate.Year.ToString) - txt_pickdate2.Text = Date.Parse(pickdate2.SelectedDate.Month.ToString + "-" + pickdate2.SelectedDate.Month.ToString + "-" + pickdate2.SelectedDate.Year.ToString) - - Catch ex As Exception When datebis < datevon - Dim dttemp As Date - - dttemp = datebis - datebis = datevon - datevon = datebis - - End Try - ElseIf txt_pickdate1.Text = "" AndAlso txt_pickdate2.Text = "" AndAlso setuhrzeit1bool = False And setuhrzeit2bool = False Then - Try - - Dim splitArray1 As String() = txt_Uhrzeit1_von.Text.Split(New Char() {":"}) - Dim splitArray2 As String() = txt_Uhrzeit2_bis.Text.Split(New Char() {":"}) - - - Dim hrv, hrb, m1, m2 As Integer - If ((Integer.TryParse(splitArray1(0), hrv)) AndAlso - ((Integer.TryParse(splitArray1(1), m1)) AndAlso - ((Integer.TryParse(splitArray1(1), m1)) AndAlso - (Integer.TryParse(splitArray2(0), hrb)) AndAlso - (Integer.TryParse(splitArray2(1), m2))) Then - - - - - Else - - // invalid format HHMM - - End If - End Try - temp2 = DateAndTime.Minute(txt_Uhrzeit2_bis.Text) - - datevon = Date.Parse(pickdate1.SelectedDate.Day.ToString + "-" + pickdate1.SelectedDate.Month.ToString + "-" + pickdate1.SelectedDate.Year.ToString + temp1.ToString) - txt_pickdate1.Text = datevon - datebis = Date.Parse(pickdate2.SelectedDate.Day.ToString + "-" + pickdate2.SelectedDate.Month.ToString + "-" + pickdate2.SelectedDate.Year.ToString + hrb.ToString) - txt_pickdate2.Text = Date.Parse(pickdate2.SelectedDate.Month.ToString + "-" + pickdate2.SelectedDate.Month.ToString + "-" + pickdate2.SelectedDate.Year.ToString) - - Catch ex As Exception When datebis < datevon - Dim dttemp As Date - - dttemp = datebis - datebis = datevon - datevon = datebis - - End Try - Else - Try - datevon = Date.Parse(txt_pickdate1.Text) - pickdate1.SelectedDate = datevon - datebis = Date.Parse(txt_pickdate2.Text) - pickdate2.SelectedDate = datebis - Catch ex As Exception When datevon < Date.Parse("01-01-2001") Or datebis > Date.Now - datevon = DateValue(Date.Now.ToString("01-MM-yyyy")) - txt_pickdate1.Text = datevon.ToString - datebis = DateValue(Date.Now) - txt_pickdate2.Text = datebis.ToString + datevon = Date.Parse(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + Catch ex As Exception + MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) End Try End If 'Dim tr - - - If rbt_Erf.Checked = True Then dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0}) @@ -125,16 +65,23 @@ Partial Class Kundenbereich_Default ElseIf rbt_Vorb.Checked = True Then dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4}) - ElseIf rbt_Vorg.Checked = True Then dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5}) ElseIf rbt_Erf.Checked = False And rbt_Freig.Checked = False And rbt_Ankunft.Checked = False And rbt_Vorb.Checked = False And rbt_Vorg.Checked = False Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis) - + If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then + MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!") + pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString + pickdate2.Text = Date.Now.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString + datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing) + datebis = Date.ParseExact(pickdate2.Text, "dd-MM-yyyy", Nothing) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis) + Else + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis) + End If End If - If dt IsNot Nothing Then + If dt IsNot Nothing Then Dim i As Integer = 0 @@ -142,35 +89,32 @@ Partial Class Kundenbereich_Default 'Table start. 'sb.Append("
") - 'Adding HeaderRow. - 'sb.Append("") - 'For Each column As DataColumn In dt.Columns - ' sb.Append((""))) - 'Next - 'sb.Append("") - 'Adding DataRow. - 'For Each row As DataRow In dt.Rows - 'sb.Append("") - 'For Each column As DataColumn In dt.Columns - ' sb.Append((""))) - ' Next - ' sb.Append("") - 'Next - 'Table end. - 'sb.Append("
" _ - ' + (column.ColumnName + "
" _ - ' + (row(column.ColumnName).ToString + "
") - ' ltTable.Text = sb.ToString + 'Adding HeaderRow. + 'sb.Append("") + 'For Each column As DataColumn In dt.Columns + ' sb.Append(("" _ + ' + (column.ColumnName + ""))) + 'Next + 'sb.Append("") + 'Adding DataRow. + 'For Each row As DataRow In dt.Rows + 'sb.Append("") + 'For Each column As DataColumn In dt.Columns + ' sb.Append(("" _ + ' + (row(column.ColumnName).ToString + ""))) + ' Next + ' sb.Append("") + 'Next + 'Table end. + 'sb.Append("") + ' ltTable.Text = sb.ToString - Dim Cell = New TableCell + Dim Cell = New TableCell 'tr = New HtmlTableRow() Dim tr = New TableRow For Each d In dt.Rows - If i <= dt.Rows.Count Then - - - tbl_CellIndex.Text = i + tbl_CellIndex.Text = i tr.Controls.Add(tbl_CellIndex) tbl_CellArt.Text = "" tr.Controls.Add(tbl_CellArt) @@ -192,11 +136,8 @@ Partial Class Kundenbereich_Default tr.Controls.Add(tbl_CellStatus) Case 5 tbl_CellStatus.Text = "Vorgeschrieben" - tr.Controls.Add(tbl_CellStatus) - Case Else - tbl_CellStatus.Text = "Undefiend" - tr.Controls.Add(tbl_CellStatus) - End Select + tr.Controls.Add(tbl_CellStatus) + End Select tbl_Cellvon.Text = d("AvisoEingang").ToString tr.Controls.Add(tbl_Cellvon) tbl_Cellbis.Text = d("AvisoEingang").ToString @@ -210,11 +151,8 @@ Partial Class Kundenbereich_Default tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString tr.Controls.Add(tbl_CellKundAuftNr) - - normaltable.Rows.Add(tr) - End If i = i + 1 Next End If @@ -236,14 +174,14 @@ Partial Class Kundenbereich_Default rbt_Vorg.Enabled = True rbt_Vorb.Checked = False rbt_Vorb.Enabled = True - txt_KdNr.Text = "" - txt_pickdate1.Text = "" - txt_pickdate2.Text = "" + 'txt_KdNr.Text = "" + pickdate1.Text = "" + pickdate2.Text = "" datevon = Nothing datebis = Nothing dt = Nothing Kdnrtext = "" - txt_KdNr.Focus() + 'txt_KdNr.Focus() @@ -252,41 +190,6 @@ Partial Class Kundenbereich_Default Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load tbl_Header_row.TableSection = TableRowSection.TableHeader End Sub - - Protected Sub ckb_Uhrzeit1_CheckedChanged(sender As Object, e As EventArgs) - If ckb_Uhrzeit1.Checked = False Then - lbl_Uhrzeit1_von.ForeColor = Drawing.Color.LightGray - txt_Uhrzeit1_von.ReadOnly = True - lbl_Uhrzeit1_bis.ForeColor = Drawing.Color.LightGray - txt_Uhrzeit1_bis.Enabled = True - lbl_Uhrzeit2_von.ForeColor = Drawing.Color.LightGray - txt_Uhrzeit2_von.Enabled = True - lbl_Uhrzeit2_bis.ForeColor = Drawing.Color.LightGray - txt_Uhrzeit2_bis.Enabled = True - setuhrzeit1bool = True - ElseIf ckb_Uhrzeit2.Checked = False Then - lbl_Uhrzeit1_von.ForeColor = Drawing.Color.LightGray - txt_Uhrzeit1_von.ReadOnly = True - lbl_Uhrzeit1_bis.ForeColor = Drawing.Color.LightGray - txt_Uhrzeit1_bis.Enabled = True - lbl_Uhrzeit2_von.ForeColor = Drawing.Color.LightGray - txt_Uhrzeit2_von.Enabled = True - lbl_Uhrzeit2_bis.ForeColor = Drawing.Color.LightGray - txt_Uhrzeit2_bis.Enabled = True - setuhrzeit2bool = True - Else - lbl_Uhrzeit1_von.ForeColor = Drawing.Color.FromArgb(452129) - txt_Uhrzeit1_von.ReadOnly = False - lbl_Uhrzeit1_bis.ForeColor = Drawing.Color.FromArgb(452129) - txt_Uhrzeit1_bis.ReadOnly = False - lbl_Uhrzeit2_von.ForeColor = Drawing.Color.FromArgb(452129) - txt_Uhrzeit2_von.ReadOnly = False - lbl_Uhrzeit2_bis.ForeColor = Drawing.Color.FromArgb(452129) - txt_Uhrzeit2_bis.ReadOnly = False - setuhrzeit1bool = False - setuhrzeit2bool = False - End If - End Sub End Class diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css new file mode 100644 index 0000000..cb7df9c --- /dev/null +++ b/css/Customers/CustomerAVISO.css @@ -0,0 +1,64 @@ +#tableSearch { + width: 1250px; +} + +h1 { + color: #043381; + font-size: 32px; +} + +#normaltable { + width: 1500px; +} + +#conovertab { + margin-left: 0px; + width: 1700px; +} +#cont1{ + width:100% +} + +@media (max-width: 558.98px) { + #conovertab { + margin-left: 0px; + width: 315px; + overflow-x: auto; + } + h1 { + color: #043381; + font-size: 22px; + } + #tableSearch { + width: 50%; + } + #containerseiterand { + width: 50%; + } + #txt_Absender { + width: 50%; + } + #txt_Empfaenger { + width: 50%; + } + #txt_LKWNr { + width: 50%; + } + #txt_KdNrAuftrag { + width: 50%; + } +} +@media (min-width: 558.98px) { + #txt_Absender { + width: 550px; + } + #txt_Empfaenger { + width: 550px; + } + #txt_LKWNr { + width: 550px; + } + #txt_KdNrAuftrag { + width: 550px; + } +} diff --git a/css/Customers/CustomerIndex.css b/css/Customers/CustomerIndex.css deleted file mode 100644 index 6f7b62e..0000000 --- a/css/Customers/CustomerIndex.css +++ /dev/null @@ -1,37 +0,0 @@ -#tableSearch { - width: 1250px; -} - -h1 { - color: #043381; - font-size: 32px; -} - -#normaltable { - width: 1500px; -} - -#conovertab { - margin-left: 0px; - width: 1700px; -} - -@media (max-width: 558.98px) { - #conovertab { - margin-left: 0px; - width: 315px; - overflow-x: auto; - } - h1 { - color: #043381; - font-size: 22px; - } - #tableSearch { - width: 315px; - } - - #containerseiterand { - - width: 352px; - } -} diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx index c9c5229..b7aa508 100644 --- a/login/login_FLEX.aspx +++ b/login/login_FLEX.aspx @@ -93,11 +93,11 @@ - Kundennummer: + Kundennummer: - - * + + * diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb index 8791881..af48b94 100644 --- a/login/login_FLEX.aspx.vb +++ b/login/login_FLEX.aspx.vb @@ -3,7 +3,7 @@ Imports System.Data Partial Class login_login_TEST Inherits System.Web.UI.Page - + Dim CustomerIDTextBox As TextBox Protected Sub ValidateUser(sender As Object, e As EventArgs) Dim userId As Integer = 0 ' cDBFunctions.GetNewOpenConnection() @@ -39,6 +39,12 @@ Partial Class login_login_TEST Login1.FailureText = "Account has not been activated." Exit Select Case Else + Session.Add("test", Login1.UserName) + CustomerIDTextBox = Login1.FindControl("CustomerID") + Session.Add("CustomerID", CustomerIDTextBox.Text) + Session.Add("PW", Login1.Password) + + FormsAuthentication.RedirectFromLoginPage(Login1.UserName, Login1.RememberMeSet) 'FormsAuthentication.SetAuthCookie(Login1.UserName, True) 'Response.Redirect("mypage.aspx")