diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index cfc54b1..6f9641d 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -20,8 +20,8 @@ Partial Class CustomsAviso VERAG_VARIABLES.initerrorcount() If Me.Page.User.Identity.IsAuthenticated Then - If Me.Page.User.Identity.Name = "userwithlongername" Or Me.Page.User.Identity.Name = "test" Then - Try + + Try Kdnrtext = Session.Item("CustomerID") Catch A As UnauthorizedAccessException When String.IsNullOrEmpty(Kdnrtext) MsgBox("Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!", MsgBoxStyle.Information, "Error in User Area!") @@ -44,237 +44,233 @@ Partial Class CustomsAviso End If tbl_Header_row.TableSection = TableRowSection.TableHeader - ' MsgBox(datebis) + ' MsgBox(datebis) - If (Page.IsPostBack) Then - Page.MaintainScrollPositionOnPostBack = True - - If rbt_Alle.Checked = True Then - lbl_von.Visible = True - lbl_bis.Visible = True - valDateRange_1.Enabled = True - valDateRange_2.Enabled = True - valreqpickdate1.Enabled = True - valreqpickdate2.Enabled = True - valreqpickdate1.Validate() - valreqpickdate2.Validate() - pickdate1.Visible = True - pickdate2.Visible = True - If valreqpickdate1.IsValid = True And valreqpickdate2.IsValid = True Then - datevon = Date.Parse(pickdate1.Text) - datebis = Date.Parse(pickdate2.Text) - ElseIf pickdate1.Text = String.Empty And pickdate2.Text = String.Empty Then - datevon = Nothing - datebis = Nothing - End If - ElseIf rbt_Freig.Checked = True Then - lbl_von.Visible = True - lbl_bis.Visible = True - valreqpickdate1.Enabled = True - valreqpickdate2.Enabled = True - valreqpickdate1.Validate() - valreqpickdate2.Validate() - valDateRange_1.Enabled = True - valDateRange_2.Enabled = True - pickdate1.Visible = True - pickdate2.Visible = True - If valreqpickdate1.IsValid = True And valreqpickdate2.IsValid = True Then - datevon = Date.Parse(pickdate1.Text) - datebis = Date.Parse(pickdate2.Text) - ElseIf pickdate1.Text = String.Empty And pickdate2.Text = String.Empty Then - datevon = Nothing - datebis = Nothing - End If - ElseIf rbt_Ankunft.Checked = True Then - lbl_von.Visible = False - lbl_bis.Visible = False - valreqpickdate1.Enabled = False - valreqpickdate2.Enabled = False - valDateRange_1.Enabled = False - valDateRange_2.Enabled = False - pickdate1.Visible = False - pickdate2.Visible = False - datevon = Nothing - datebis = Nothing - ElseIf rbt_Erf.Checked = True Then - lbl_von.Visible = False - lbl_bis.Visible = False - valreqpickdate1.Enabled = False - valreqpickdate2.Enabled = False - valDateRange_1.Enabled = False - valDateRange_2.Enabled = False - pickdate1.Visible = False - pickdate2.Visible = False - datevon = Nothing - datebis = Nothing - ElseIf rbt_Vorb.Checked = True Then - lbl_von.Visible = False - lbl_bis.Visible = False - valreqpickdate1.Enabled = False - valreqpickdate2.Enabled = False - valDateRange_1.Enabled = False - valDateRange_2.Enabled = False - pickdate1.Visible = False - pickdate2.Visible = False - datevon = Nothing - datebis = Nothing - ElseIf rbt_Vorg.Checked = True Then - lbl_von.Visible = False - lbl_bis.Visible = False - valreqpickdate1.Enabled = False - valreqpickdate2.Enabled = False - valDateRange_1.Enabled = False - valDateRange_2.Enabled = False - pickdate1.Visible = False - pickdate2.Visible = False - datevon = Nothing - datebis = Nothing - End If - 'Mobil - If rbt_Alle_M.Checked = True Then - lbl_von.Visible = True - lbl_bis.Visible = True - valreqpickdate1.Enabled = True - valreqpickdate2.Enabled = True - valreqpickdate1.Validate() - valreqpickdate2.Validate() - valDateRange_1.Enabled = True - valDateRange_2.Enabled = True - pickdate1.Visible = True - pickdate2.Visible = True - If valreqpickdate1.IsValid = True And valreqpickdate2.IsValid = True Then - datevon = Date.Parse(pickdate1.Text) - datebis = Date.Parse(pickdate2.Text) - ElseIf pickdate1.Text = String.Empty And pickdate2.Text = String.Empty Then - datevon = Nothing - datebis = Nothing - End If - ElseIf rbt_Freig_M.Checked = True Then - lbl_von.Visible = True - lbl_bis.Visible = True - valreqpickdate1.Enabled = True - valreqpickdate2.Enabled = True - valreqpickdate1.Validate() - valreqpickdate2.Validate() - valDateRange_1.Enabled = True - valDateRange_2.Enabled = True - pickdate1.Visible = True - pickdate2.Visible = True - If valreqpickdate1.IsValid = True And valreqpickdate2.IsValid = True Then - datevon = Date.Parse(pickdate1.Text) - datebis = Date.Parse(pickdate2.Text) - ElseIf pickdate1.Text = String.Empty And pickdate2.Text = String.Empty Then - datevon = Nothing - datebis = Nothing - End If - ElseIf rbt_Ankunft_M.Checked = True Then - lbl_von.Visible = False - lbl_bis.Visible = False - valreqpickdate1.Enabled = False - valreqpickdate2.Enabled = False - valDateRange_1.Enabled = False - valDateRange_2.Enabled = False - pickdate1.Visible = False - pickdate2.Visible = False - datevon = Nothing - datebis = Nothing - ElseIf rbt_Erf_M.Checked = True Then - lbl_von.Visible = False - lbl_bis.Visible = False - valreqpickdate1.Enabled = False - valreqpickdate2.Enabled = False - valDateRange_1.Enabled = False - valDateRange_2.Enabled = False - pickdate1.Visible = False - pickdate2.Visible = False - datevon = Nothing - datebis = Nothing - ElseIf rbt_Vorb_M.Checked = True Then - lbl_von.Visible = False - lbl_bis.Visible = False - valreqpickdate1.Enabled = False - valreqpickdate2.Enabled = False - valDateRange_1.Enabled = False - valDateRange_2.Enabled = False - pickdate1.Visible = False - pickdate2.Visible = False - datevon = Nothing - datebis = Nothing - ElseIf rbt_Vorg_M.Checked = True Then - lbl_von.Visible = False - lbl_bis.Visible = False - valreqpickdate1.Enabled = False - valreqpickdate2.Enabled = False - valDateRange_1.Enabled = False - valDateRange_2.Enabled = False - pickdate1.Visible = False - pickdate2.Visible = False - datevon = Nothing - datebis = Nothing - End If - - If Not IsNothing(Session.Item("mytable")) Then - addrows() - End If - - Else - - Page.MaintainScrollPositionOnPostBack = False - rbt_Alle.Checked = True - normaltable.EnableViewState = True + If (Page.IsPostBack) Then + Page.MaintainScrollPositionOnPostBack = True + If rbt_Alle.Checked = True Then lbl_von.Visible = True lbl_bis.Visible = True valDateRange_1.Enabled = True valDateRange_2.Enabled = True + valreqpickdate1.Enabled = True + valreqpickdate2.Enabled = True + valreqpickdate1.Validate() + valreqpickdate2.Validate() pickdate1.Visible = True pickdate2.Visible = True - - If String.IsNullOrEmpty(txt_LKWNr.Text) Then - regexval_txt_LKW.Enabled = False - Else - regexval_txt_LKW.Enabled = True + If valreqpickdate1.IsValid = True And valreqpickdate2.IsValid = True Then + datevon = Date.Parse(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + ElseIf pickdate1.Text = String.Empty And pickdate2.Text = String.Empty Then + datevon = Nothing + datebis = Nothing End If - If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = True Then - regexval_txt_KdNrAuftrag.Enabled = False - Else - regexval_txt_KdNrAuftrag.Enabled = True - End If - If String.IsNullOrEmpty(txt_Empfaenger.Text) = True Then - regexval_txt_Empfaenger.Enabled = False - Else - regexval_txt_Empfaenger.Enabled = True - End If - If String.IsNullOrEmpty(txt_Absender.Text) = True Then - regexval_txt_Absender.Enabled = False - Else - regexval_txt_Absender.Enabled = True - End If - 'Mobile - If String.IsNullOrEmpty(txt_LKWNr_M.Text) Then - regexval_txt_LKWNr_M.Enabled = False - Else - regexval_txt_LKWNr_M.Enabled = True - End If - If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = True Then - regval_txt_KdNrAuftrag_M.Enabled = False - Else - regval_txt_KdNrAuftrag_M.Enabled = True - End If - If String.IsNullOrEmpty(txt_Empfaenger_M.Text) = True Then - regval_txt_Empfaenger_M.Enabled = False - Else - regval_txt_Empfaenger_M.Enabled = True - End If - If String.IsNullOrEmpty(txt_Absender_M.Text) = True Then - regval_txt_Absender_M.Enabled = False - Else - regval_txt_Absender_M.Enabled = True + ElseIf rbt_Freig.Checked = True Then + lbl_von.Visible = True + lbl_bis.Visible = True + valreqpickdate1.Enabled = True + valreqpickdate2.Enabled = True + valreqpickdate1.Validate() + valreqpickdate2.Validate() + valDateRange_1.Enabled = True + valDateRange_2.Enabled = True + pickdate1.Visible = True + pickdate2.Visible = True + If valreqpickdate1.IsValid = True And valreqpickdate2.IsValid = True Then + datevon = Date.Parse(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + ElseIf pickdate1.Text = String.Empty And pickdate2.Text = String.Empty Then + datevon = Nothing + datebis = Nothing End If + ElseIf rbt_Ankunft.Checked = True Then + lbl_von.Visible = False + lbl_bis.Visible = False + valreqpickdate1.Enabled = False + valreqpickdate2.Enabled = False + valDateRange_1.Enabled = False + valDateRange_2.Enabled = False + pickdate1.Visible = False + pickdate2.Visible = False + datevon = Nothing + datebis = Nothing + ElseIf rbt_Erf.Checked = True Then + lbl_von.Visible = False + lbl_bis.Visible = False + valreqpickdate1.Enabled = False + valreqpickdate2.Enabled = False + valDateRange_1.Enabled = False + valDateRange_2.Enabled = False + pickdate1.Visible = False + pickdate2.Visible = False + datevon = Nothing + datebis = Nothing + ElseIf rbt_Vorb.Checked = True Then + lbl_von.Visible = False + lbl_bis.Visible = False + valreqpickdate1.Enabled = False + valreqpickdate2.Enabled = False + valDateRange_1.Enabled = False + valDateRange_2.Enabled = False + pickdate1.Visible = False + pickdate2.Visible = False + datevon = Nothing + datebis = Nothing + ElseIf rbt_Vorg.Checked = True Then + lbl_von.Visible = False + lbl_bis.Visible = False + valreqpickdate1.Enabled = False + valreqpickdate2.Enabled = False + valDateRange_1.Enabled = False + valDateRange_2.Enabled = False + pickdate1.Visible = False + pickdate2.Visible = False + datevon = Nothing + datebis = Nothing End If + 'Mobil + If rbt_Alle_M.Checked = True Then + lbl_von.Visible = True + lbl_bis.Visible = True + valreqpickdate1.Enabled = True + valreqpickdate2.Enabled = True + valreqpickdate1.Validate() + valreqpickdate2.Validate() + valDateRange_1.Enabled = True + valDateRange_2.Enabled = True + pickdate1.Visible = True + pickdate2.Visible = True + If valreqpickdate1.IsValid = True And valreqpickdate2.IsValid = True Then + datevon = Date.Parse(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + ElseIf pickdate1.Text = String.Empty And pickdate2.Text = String.Empty Then + datevon = Nothing + datebis = Nothing + End If + ElseIf rbt_Freig_M.Checked = True Then + lbl_von.Visible = True + lbl_bis.Visible = True + valreqpickdate1.Enabled = True + valreqpickdate2.Enabled = True + valreqpickdate1.Validate() + valreqpickdate2.Validate() + valDateRange_1.Enabled = True + valDateRange_2.Enabled = True + pickdate1.Visible = True + pickdate2.Visible = True + If valreqpickdate1.IsValid = True And valreqpickdate2.IsValid = True Then + datevon = Date.Parse(pickdate1.Text) + datebis = Date.Parse(pickdate2.Text) + ElseIf pickdate1.Text = String.Empty And pickdate2.Text = String.Empty Then + datevon = Nothing + datebis = Nothing + End If + ElseIf rbt_Ankunft_M.Checked = True Then + lbl_von.Visible = False + lbl_bis.Visible = False + valreqpickdate1.Enabled = False + valreqpickdate2.Enabled = False + valDateRange_1.Enabled = False + valDateRange_2.Enabled = False + pickdate1.Visible = False + pickdate2.Visible = False + datevon = Nothing + datebis = Nothing + ElseIf rbt_Erf_M.Checked = True Then + lbl_von.Visible = False + lbl_bis.Visible = False + valreqpickdate1.Enabled = False + valreqpickdate2.Enabled = False + valDateRange_1.Enabled = False + valDateRange_2.Enabled = False + pickdate1.Visible = False + pickdate2.Visible = False + datevon = Nothing + datebis = Nothing + ElseIf rbt_Vorb_M.Checked = True Then + lbl_von.Visible = False + lbl_bis.Visible = False + valreqpickdate1.Enabled = False + valreqpickdate2.Enabled = False + valDateRange_1.Enabled = False + valDateRange_2.Enabled = False + pickdate1.Visible = False + pickdate2.Visible = False + datevon = Nothing + datebis = Nothing + ElseIf rbt_Vorg_M.Checked = True Then + lbl_von.Visible = False + lbl_bis.Visible = False + valreqpickdate1.Enabled = False + valreqpickdate2.Enabled = False + valDateRange_1.Enabled = False + valDateRange_2.Enabled = False + pickdate1.Visible = False + pickdate2.Visible = False + datevon = Nothing + datebis = Nothing + End If + + If Not IsNothing(Session.Item("mytable")) Then + addrows() + End If + Else - VERAG_VARIABLES.seterrorcount(20) - Console.WriteLine(VERAG_VARIABLES.geterrornumb() + "The User is not authenticated to this page. Please login again!", vbAbort, "Error User") + + Page.MaintainScrollPositionOnPostBack = False + rbt_Alle.Checked = True + normaltable.EnableViewState = True + + lbl_von.Visible = True + lbl_bis.Visible = True + valDateRange_1.Enabled = True + valDateRange_2.Enabled = True + pickdate1.Visible = True + pickdate2.Visible = True + + If String.IsNullOrEmpty(txt_LKWNr.Text) Then + regexval_txt_LKW.Enabled = False + Else + regexval_txt_LKW.Enabled = True + End If + If String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = True Then + regexval_txt_KdNrAuftrag.Enabled = False + Else + regexval_txt_KdNrAuftrag.Enabled = True + End If + If String.IsNullOrEmpty(txt_Empfaenger.Text) = True Then + regexval_txt_Empfaenger.Enabled = False + Else + regexval_txt_Empfaenger.Enabled = True + End If + If String.IsNullOrEmpty(txt_Absender.Text) = True Then + regexval_txt_Absender.Enabled = False + Else + regexval_txt_Absender.Enabled = True + End If + 'Mobile + If String.IsNullOrEmpty(txt_LKWNr_M.Text) Then + regexval_txt_LKWNr_M.Enabled = False + Else + regexval_txt_LKWNr_M.Enabled = True + End If + If String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = True Then + regval_txt_KdNrAuftrag_M.Enabled = False + Else + regval_txt_KdNrAuftrag_M.Enabled = True + End If + If String.IsNullOrEmpty(txt_Empfaenger_M.Text) = True Then + regval_txt_Empfaenger_M.Enabled = False + Else + regval_txt_Empfaenger_M.Enabled = True + End If + If String.IsNullOrEmpty(txt_Absender_M.Text) = True Then + regval_txt_Absender_M.Enabled = False + Else + regval_txt_Absender_M.Enabled = True + End If End If Dim erster = New Date(Now().Year, Now().Month, 1) datevon = erster @@ -282,8 +278,10 @@ Partial Class CustomsAviso pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd") pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd") Else - FormsAuthentication.RedirectToLoginPage() - End If + VERAG_VARIABLES.seterrorcount(20) + Console.WriteLine(VERAG_VARIABLES.geterrornumb() + "The User is not authenticated to this page. Please login again!", vbAbort, "Error User") + End If + 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) diff --git a/css/AVISOTV_Flex.css b/css/AVISOTV_Flex.css index 20edcf7..4faae18 100644 --- a/css/AVISOTV_Flex.css +++ b/css/AVISOTV_Flex.css @@ -165,7 +165,18 @@ li { font-size: 3.3769100169779285vw; } } - +@media (max-width: 322.98px) { + table { + border-collapse: collapse; + border-spacing: 0.125em; + width: /*575px;*/ 126.65198237885463vw; + border: /*1px*/ 2.1744791666666665vw solid #ddd; + background-color: white; + color: #043381; + overflow-x: auto; + font-size: 3.3769100169779285vw; + } +} @media (min-width: 575px) { #offcanvasWithBothOptions { min-width: 17.692852087756545vw; diff --git a/css/Customers/LKWs.css b/css/Customers/LKWs.css index 8c37d17..f2dcf15 100644 --- a/css/Customers/LKWs.css +++ b/css/Customers/LKWs.css @@ -43,14 +43,14 @@ width: 350px; } } -@media (max-width: 349.98px) { +@media (max-width: 322.98px) { #conovertab { - width: 348px; + width: 322px; overflow-x: auto; } body { - width: 348px; + width: 322px; } h1 { @@ -70,6 +70,6 @@ #containerseiterand { margin-left: 5px; margin-right: 5px; - width: 348px; + width: 322px; } } diff --git a/css/Customers/Welcome.css b/css/Customers/Welcome.css index 87d11a3..afe5b2d 100644 --- a/css/Customers/Welcome.css +++ b/css/Customers/Welcome.css @@ -102,8 +102,8 @@ h1 { width:400px; } } -@media (max-width: 323px) { - #conovertab{ +@media (max-width: 322.98px) { + #conovertab { width: 320px; overflow-x: auto; }