From 34795608f3b05d717e05518fca854dbcabf2ff1b Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 10 Nov 2021 11:25:21 +0100
Subject: [PATCH] Default Datum voreingestellt beim Laden der Seite.

---
 Customers/CustomsAviso.aspx.vb | 55 ++++++++++++++--------------------
 Customers/Invoices.aspx        | 14 +++++----
 Customers/Invoices.aspx.vb     | 19 ++++++------
 3 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index e95dd45..96f74b9 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -215,6 +215,7 @@ Partial Class CustomsAviso
                     End If
 
                 Else
+
                     Page.MaintainScrollPositionOnPostBack = False
                     rbt_Alle.Checked = True
                     normaltable.EnableViewState = True
@@ -225,14 +226,7 @@ Partial Class CustomsAviso
                     valDateRange_2.Enabled = True
                     pickdate1.Visible = True
                     pickdate2.Visible = True
-                    Dim erster = New Date(Now().Year, Now().Month, 1)
-                    Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
-                    pickdate1.Text = 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
-                    pickdate2.Text = Now().ToShortDateString()
-                    pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
+
                     If String.IsNullOrEmpty(txt_LKWNr.Text) Then
                         regexval_txt_LKW.Enabled = False
                     Else
@@ -278,8 +272,12 @@ Partial Class CustomsAviso
             Else
                 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
+            Dim erster = New Date(Now().Year, Now().Month, 1)
+            datevon = erster
+            datebis = Date.Parse(Now.ToShortDateString)
+            pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd")
+            pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd")
         Else
             FormsAuthentication.RedirectToLoginPage()
         End If
@@ -518,12 +516,10 @@ Partial Class CustomsAviso
                 If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
                     Try
                         Dim erster = New Date(Now().Year, Now().Month, 1)
-                        Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
-                        ' MsgBox(ersterdat)
-                        datevon = ersterdat
-                        pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
-                        datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
-                        pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
+                        datevon = erster
+                        datebis = Date.Parse(Now.ToShortDateString)
+                        pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd")
+                        pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd")
                         dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Integer.Parse(Kdnrtext), {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
                     Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year
                         MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation)
@@ -549,11 +545,10 @@ Partial Class CustomsAviso
                 pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
                     Dim erster = New Date(Now().Year, Now().Month, 1)
-                    Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
-                    pickdate1.Text = 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
+                    datevon = erster
+                    datebis = Date.Parse(Now.ToShortDateString)
+                    pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd")
+                    pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd")
                     pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
                     dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Integer.Parse(Kdnrtext), {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
                 Else
@@ -585,12 +580,10 @@ Partial Class CustomsAviso
                 If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
                     Try
                         Dim erster = New Date(Now().Year, Now().Month, 1)
-                        Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
-                        'MsgBox(ersterdat)
-                        datevon = ersterdat
-                        pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
-                        datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
-                        pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
+                        datevon = erster
+                        datebis = Date.Parse(Now.ToShortDateString)
+                        pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd")
+                        pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd")
                         dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
                     Catch ex As ValidationException When Date.ParseExact(pickdate1.Text, "dd.MM.yyyy", Nothing).Year < Date.ParseExact("2001", "yyyy", Nothing).Year And Date.ParseExact(pickdate2.Text, "dd.MM.yyyy", Nothing).Year > Date.ParseExact(Today, "dd.MM.yyyy", Nothing).Year
                         MsgBox("Time ranges are not valid!", MsgBoxStyle.Exclamation)
@@ -614,12 +607,10 @@ Partial Class CustomsAviso
                 pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
                 If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
                     Dim erster = New Date(Now().Year, Now().Month, 1)
-                    Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
-                    pickdate1.Text = 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
-                    pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
+                    datevon = erster
+                    datebis = Date.Parse(Now.ToShortDateString)
+                    pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd")
+                    pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd")
                     dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Integer.Parse(Kdnrtext), {1}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
                 Else
                     Try
diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx
index 091cc93..a0b681e 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -30,8 +30,7 @@
     
  <link href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/themes/base/jquery-ui.css" rel="stylesheet" type="text/css"/>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-    <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/jquery-ui.min.js"></script>
-    
+    <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.1/jquery-ui.min.js"></script>    
 </asp:Content>
 
 <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
@@ -78,6 +77,9 @@
                                     <div class="col-12" style="text-align:end">
                                         <asp:LinkButton ID="btn_resetForm" runat="server" OnClick="btn_resetForm_Click"><%=Server.HtmlEncode("Reset Formular") %></asp:LinkButton>
                                     </div>
+                                    <div style="height:20px">
+                                         <asp:Label ID="lbl_status" runat="server" Font-Size="1em" ForeColor="Black" Text=""></asp:Label>
+                                    </div>
                                     <div class="d-none d-md-block">
                                         <div style="width:780px;margin-left:8px">
                                              <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>       
@@ -96,12 +98,12 @@
                             <div style="height:0.936768149882904vh"></div>
                             <div class="col-12" id="con4">
                                 <div class="col-12" id="container2" style="margin-left:2px">
-                                    <asp:Label ID="lbl_von" runat="server" Text="From:"></asp:Label>
-                                    <asp:TextBox ID="pickdate1" Type="Date" CssClass="classTarget" runat="server"></asp:TextBox><asp:Label ID="lbl_pickdate1_req" runat="server" style="font-size:1em;color:#043381" Text="*"></asp:Label>
+                                    <asp:Label ID="lbl_von" runat="server" Text="From:"></asp:Label>                                   
+                                    <asp:TextBox ID="pickdate1" Type="Date" CssClass="classTarget" runat="server"></asp:TextBox>
                                     <asp:RequiredFieldValidator ControlToValidate="pickdate1" Display="Dynamic" ID="valreq_pickdate1" runat="server" ErrorMessage=""></asp:RequiredFieldValidator>
                                     <asp:CustomValidator runat="server" ID="valdaterage_1" OnServerValidate="valdaterage_1_ServerValidate" ControlToValidate="pickdate1" ForeColor="Red" Display="Dynamic" ErrorMessage="Error in From" SetFocusOnError="true"></asp:CustomValidator> 
                                     <asp:Label ID="lbl_bis" runat="server" Text="To:"></asp:Label>
-                                    <asp:Textbox ID="pickdate2" Type="Date" CssClass="classTarget" runat="server"></asp:Textbox><asp:Label ID="lbl_pickdate2_req" runat="server" style="font-size:1em;color:#043381" Text="*"></asp:Label>
+                                    <asp:Textbox ID="pickdate2" Type="Date" CssClass="classTarget" runat="server"></asp:Textbox>
                                     <asp:RequiredFieldValidator ControlToValidate="pickdate2" Display="Dynamic" ID="valreq_pickdate2" runat="server" ErrorMessage=""></asp:RequiredFieldValidator>
                                     <asp:CustomValidator ControlToValidate="pickdate2" runat="server" Display="Dynamic" ID="valdaterange_2" OnServerValidate="valdaterange_2_ServerValidate" ErrorMessage="Error in To" SetFocusOnError="true"></asp:CustomValidator>
                                 </div>
@@ -205,7 +207,7 @@
                                 </asp:Table>
                             </div>
                         </div>
-                    <asp:Label ID="lbl_status" runat="server" Font-Size="1em" ForeColor="Black" Text=""></asp:Label>
+                   
 
         <%                 End If
                     End If
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb
index b123844..a3afe25 100644
--- a/Customers/Invoices.aspx.vb
+++ b/Customers/Invoices.aspx.vb
@@ -17,7 +17,7 @@ Partial Class Customers_Default3
     Dim reNr As String = "-1"
     Dim provider As CultureInfo = CultureInfo.InvariantCulture
 
-    Protected Sub Page_Load(ByVal sender As Object, ByVal e As EventArgs)
+    Protected Sub Page_Load(ByVal sender As Object, ByVal e As EventArgs) Handles Me.Load
         If Not Me.Page.User.Identity.IsAuthenticated Then
             FormsAuthentication.RedirectToLoginPage()
         Else
@@ -45,20 +45,19 @@ Partial Class Customers_Default3
             DataBind()
             tbl_Header_row.TableSection = TableRowSection.TableHeader
 
-            If (Page.IsPostBack And normaltable.EnableViewState = False) Then
+            If (Page.IsPostBack) Then
                 Page.MaintainScrollPositionOnPostBack = True
-                normaltable.EnableViewState = True
-                If valreq_pickdate1.IsValid And valreq_pickdate2.IsValid Then
+
+                If valreq_pickdate1.IsValid Or valreq_pickdate2.IsValid Then
                     datevon = Date.Parse(pickdate1.Text)
                     datebis = Date.Parse(pickdate2.Text)
-                Else
-                    Dim erster = New Date(Now().Year, Now().Month, 1)
-                    datevon = erster
-                    datebis = Date.Parse(Now.ToShortDateString)
-                    pickdate1.Text = erster.ToShortDateString()
-                    pickdate2.Text = Date.Now.ToShortDateString()
                 End If
             End If
+            Dim erster = New Date(Now().Year, Now().Month, 1)
+            datevon = erster
+            datebis = Date.Parse(Now.ToShortDateString)
+            pickdate1.Text = erster.ToUniversalTime.ToString("yyyy-MM-dd")
+            pickdate2.Text = Date.Now.ToUniversalTime.ToString("yyyy-MM-dd")
         End If
     End Sub