diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx index 45ad7f9..08f34b2 100644 --- a/Customers/CustomsAviso.aspx +++ b/Customers/CustomsAviso.aspx @@ -230,7 +230,7 @@ + \ No newline at end of file diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb index 71d12ff..91744f6 100644 --- a/Customers/CustomsAviso.aspx.vb +++ b/Customers/CustomsAviso.aspx.vb @@ -4,28 +4,6 @@ Imports System.Web.UI.HtmlControls Partial Class Kundenbereich_Default Inherits System.Web.UI.Page - - Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load - Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms - - tbl_Header_row.TableSection = TableRowSection.TableHeader - DataBind() - - If (Page.IsPostBack And normaltable.EnableViewState = False) Then - normaltable.EnableViewState = True - End If - - rbt_Alle.Selected = True - rbt_Alle_M.Selected = True - End Sub - - Protected Sub LogOutBtn1_Click(sender As Object, e As EventArgs) - Response.Redirect("../login/Logout.aspx", True) - End Sub - Protected Sub LogOutBtn2_Click(sender As Object, e As EventArgs) - Response.Redirect("../login/Logout.aspx", True) - End Sub - Dim datevon As DateTime Dim datebis As DateTime Dim Kdnrtext As String @@ -34,6 +12,34 @@ Partial Class Kundenbereich_Default Dim LKWNR As String = "" Dim KDNAFNR As String = "" Dim dt As DataTable + Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load + Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms + DataBind() + tbl_Header_row.TableSection = TableRowSection.TableHeader + + ' MsgBox(datebis) + + If (Page.IsPostBack And normaltable.EnableViewState = False) Then + Dim erster = New Date(Now().Year, Now().Month, 1) + Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString + ' MsgBox(ersterdat) + datevon = ersterdat + datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString + Else + datevon = Nothing + datebis = Nothing + normaltable.EnableViewState = True + End If + + + End Sub + + Protected Sub LogOutBtn1_Click(sender As Object, e As EventArgs) + Response.Redirect("../login/Logout.aspx", True) + End Sub + Protected Sub LogOutBtn2_Click(sender As Object, e As EventArgs) + Response.Redirect("../login/Logout.aspx", True) + End Sub Enum ART Frächter @@ -181,41 +187,37 @@ Partial Class Kundenbereich_Default End If If rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True Then - If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then - Try + + Try datevon = Date.Parse(pickdate1.Text) datebis = Date.Parse(pickdate2.Text) Catch ex As Exception MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) End Try - End If - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) + + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) ElseIf rbt_Erf.Selected = True Or rbt_Erf_M.Selected Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) ElseIf rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True Then - If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then - Try - pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled - datevon = Date.Parse(pickdate1.Text) - pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled - datebis = Date.Parse(pickdate2.Text) - Catch ex As Exception - MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) - End Try - ElseIf pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then - MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!") - Else - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.ParseExact("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now) - End If + Try + pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled + datevon = Date.Parse(pickdate1.Text) + pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled + datebis = Date.Parse(pickdate2.Text) + Catch ex As Exception + MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) + End Try + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR) + ElseIf rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3},,, Absender, Empfaenger, LKWNR, KDNAFNR) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) ElseIf rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4},,, Absender, Empfaenger, LKWNR, KDNAFNR) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) ElseIf rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True Then - dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5},,, Absender, Empfaenger, LKWNR, KDNAFNR) + dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR) End If If dt IsNot Nothing Then @@ -345,8 +347,9 @@ Partial Class Kundenbereich_Default txt_KdNrAuftrag.Text = "" txt_LKWNr.Text = "" - pickdate1.Text = "" - pickdate2.Text = "" + pickdate1.Text = Now.ToString("dd.MM.yyyy") + Dim erster = New Date(Now().Year, Now().Month, 1) + pickdate2.Text = Date.Parse(erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString datevon = Nothing datebis = Nothing dt = Nothing diff --git a/VERAG_Homepage.sln b/VERAG_Homepage.sln index 39bbca4..11b9ab9 100644 --- a/VERAG_Homepage.sln +++ b/VERAG_Homepage.sln @@ -1,13 +1,13 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.31410.357 +# Visual Studio Version 17 +VisualStudioVersion = 17.0.31710.8 MinimumVisualStudioVersion = 10.0.40219.1 Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "VERAG_Homepage", "http://localhost:56551", "{11EF0CDA-BC19-40FB-91C4-25C81F3A27AC}" ProjectSection(WebsiteProperties) = preProject UseIISExpress = "true" TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.7" - ProjectReferences = "{a3b497bd-842c-4a2b-b398-ed1976849df1}|VERAG_PROG_ALLGEMEIN.dll;" + ProjectReferences = "" Debug.AspNetCompiler.VirtualPath = "/localhost_56551" Debug.AspNetCompiler.PhysicalPath = "..\VERAG_Homepage\" Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_56551\" @@ -52,12 +52,12 @@ Global {11EF0CDA-BC19-40FB-91C4-25C81F3A27AC}.Release|x64.Build.0 = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64 - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64 + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|Any CPU + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.Build.0 = Release|Any CPU - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|x64 - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.Build.0 = Release|x64 + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.ActiveCfg = Release|Any CPU + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE