From e071af28158f9ba95c08324c0c2587603f5f121d Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Mon, 29 Nov 2021 09:52:22 +0100
Subject: [PATCH] =?UTF-8?q?=C3=84nderungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/CustomsAviso.aspx    | 6 +++---
 Customers/CustomsAviso.aspx.vb | 8 +++-----
 Customers/Invoices.aspx        | 2 +-
 Customers/Invoices.aspx.vb     | 5 +----
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 756b069..30f8c69 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="Aufträge VERAG" Language="VB" MasterPageFile="~/Customers/Customers.master" ViewStateMode="Enabled" AutoEventWireup="true" CodeFile="CustomsAviso.aspx.vb" Inherits="CustomsAviso" UnobtrusiveValidationMode="None"%>
+<%@ Page Title="Aufträge VERAG" Language="VB" MasterPageFile="~/Customers/Customers.master" ViewStateMode="Enabled" AutoEventWireup="false" CodeFile="CustomsAviso.aspx.vb" Inherits="CustomsAviso" UnobtrusiveValidationMode="None"%>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">  
         <!-- Bootstrap -->
@@ -189,7 +189,7 @@
                             <div class="col-12" id="container2" style="margin-left:2px;">                                                                     
                                             <asp:Label ID="lbl_von" runat="server" Text="From:"></asp:Label>         
                                 <%Dim erster = New Date(Now().Year, Now().Month, 1) %>
-                                            <asp:TextBox id="pickdate1" Type="Date" CssClass="classTarget" AutoPostBack="false" minDate="<%Response.Write(erster%>" OnTextChanged="pickdate1_TextChanged" runat="server"></asp:TextBox>  
+                                            <asp:TextBox id="pickdate1" Type="Date" CssClass="classTarget" AutoPostBack="false" minDate="<%Response.Write(erster)%>" OnTextChanged="pickdate1_TextChanged" runat="server"></asp:TextBox>  
                                 <asp:RequiredFieldValidator ControlToValidate="pickdate1" ID="valreqpickdate1" Display="Dynamic" runat="server" Enabled ="true" Visible ="true"></asp:RequiredFieldValidator>
                                             <asp:CustomValidator runat="server" ID="valDateRange_1" ValidateEmptyText="true" ControlToValidate="pickdate1"  Display="Dynamic" onservervalidate="valDateRange_1_ServerValidate" ErrorMessage="" SetFocusOnError="true" ValidationGroup="DateValid" />   
                                 <!--<asp:RequiredFieldValidator ID="RequiredFieldValidatorvon" runat="server" ErrorMessage="Field required" ControlToValidate="pickdate1" Text="Required" ForeColor="White" Font-Strikeout="False" Font-Underline="False" Font-Overline="False" Font-Bold="True" BackColor="Red"></asp:RequiredFieldValidator>              
@@ -297,7 +297,7 @@
                                 <div id="Abstand_laenger" style="height: /*24px*/ 1.873536299765808vh;"></div>     
                                        </div></div>
                        </div>                  
-                                    <asp:Button ID="btn_Auftraege" class="btn-primary" runat="server" Text="Erhalte Aufträge" OnClick="btn_Auftraege_Click" CausesValidation="false" style="background-color:#fff;color:#043381;height:30px;width:221px;font-size:1.33em;" />
+                                    <asp:Button ID="btn_Auftraege" class="btn-primary" runat="server" Text="Erhalte Aufträge" OnClick="btn_Auftraege_Click"  style="background-color:#fff;color:#043381;height:30px;width:221px;font-size:1.33em;" />
                               <div id="Abstand_lang" style="height: /*32px*/ 2.498048399687744vh;"></div>                                     
                             <div class="g-3">                                            
                                              <div id="conovertab" style="overflow-x:auto;margin-left:-7px"> 
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 39377ff..cc491be 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -211,11 +211,6 @@ Partial Class CustomsAviso
                     datevon = Nothing
                     datebis = Nothing
                 End If
-
-                If Not IsNothing(Session.Item("mytable")) Then
-                    addrows()
-                End If
-
             Else
 
                 Page.MaintainScrollPositionOnPostBack = False
@@ -281,6 +276,9 @@ Partial Class CustomsAviso
             'Console.WriteLine(VERAG_VARIABLES.geterrornumb() + "The User is not authenticated to this page. Please login again!", vbAbort, "Error User")
             FormsAuthentication.RedirectToLoginPage()
         End If
+        If Not IsNothing(Session.Item("mytable")) Then
+            addrows()
+        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/Customers/Invoices.aspx b/Customers/Invoices.aspx
index a7c2bc8..6c0e7eb 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -221,7 +221,7 @@
                         </div>
                     </div>
                     <div id="Abstand_laenger" style="height:/*24px*/ 1.873536299765808vh;"></div>
-                                <asp:Button ID="btn_b" CssClass="btn-primary" runat="server" CausesValidation="false" Text="Erhalte Rechnungen" OnClick="btn_b_Click" style="background-color:#fff;color:#043381;height:30px;width:221px;font-size:1.33em;"/>
+                                <asp:LinkButton ID="btn_b" CssClass="btn-primary" runat="server" CausesValidation="false" Text="Erhalte Rechnungen" OnClick="btn_b_Click" style="background-color:#fff;color:#043381;height:30px;width:221px;font-size:1.33em;">a</asp:LinkButton>
                            <div id="Abstand_lang" style="height: /*32px*/ 2.498048399687744vh;"></div> 
                        <div class="g-3">        
                             <div id="conovertab">
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb
index c127d81..cad1488 100644
--- a/Customers/Invoices.aspx.vb
+++ b/Customers/Invoices.aspx.vb
@@ -68,16 +68,13 @@ Partial Class Customers_Default3
                     VERAG_VARIABLES.seterrorcount(512)
                     lbl_status.Text = VERAG_VARIABLES.geterrornumb + "This Page is due to an Error in Page validation unavailable. Try again later or contact an Admin!"
                 End If
-                If Not IsNothing(Session.Item("mytable")) Then
-                    normaltable = Session.Item("mytable")
-                    addrows()
-                End If
             Else
                 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 If