From 6edd778e6b48b66554022334eee6e4cec239b2ae Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Thu, 4 Nov 2021 14:08:21 +0100
Subject: [PATCH] =?UTF-8?q?Zus=C3=A4tzliche=20=C3=84nderungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Customers/CustomsAviso.aspx    |  77 ++++++++++++-----------
 Customers/CustomsAviso.aspx.vb | 108 +++++++++++++++++++++------------
 Customers/Invoices.aspx        |   1 +
 Customers/Welcome.aspx         |  41 ++++++++++++-
 4 files changed, 146 insertions(+), 81 deletions(-)

diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index c3087e7..f5c0b4b 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -77,25 +77,25 @@
                                 <div class="d-none d-md-block">                                  
                                 <div  style=" width:780px; margin-left:8px">            
                                       <fieldset>
-                                         <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>                                       
-                                        <label><input id="rbt_Alle" onselect="GetSelectedVal(this)" type="radio" name="art" value="Alle" data-bs-toggle="tooltip" style="margin-right:4px" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." runat="server"/>Alle</label>
-                                        <label style="margin-right:4px;"><input id="rbt_Erf" onclick="GetSelectedVal(this)" aria-selected="true" type="radio" name="art" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</label>
-                                        <label style="margin-right:4px;"><input id="rbt_Vorb" onclick="GetSelectedVal(this)" type="radio" name="art" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
-                                        <label style="margin-right:4px;"><input id="rbt_Vorg" onclick="GetSelectedVal(this)" type="radio" name="art" value="Vorgeschrieben"  style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
-                                        <label style="margin-right:4px;"><input id="rbt_Ankunft" onclick="GetSelectedVal(this)" type="radio" name="art" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
-                                        <label style="margin-right:4px;"><input id="rbt_Freig" onclick="GetSelectedVal(this)" type="radio" name="art" value="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="margin-right:4px" runat="server">Freigabe</label>                                                                               
+                                        <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>                                       
+                                        <label style="margin-right:4px;"><input id="rbt_Alle" onchange="changeval(this.value)" type="radio" name="art" value="Alle" aria-selected="true" data-bs-toggle="tooltip" style="margin-right:4px" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." runat="server"/>Alle</label>
+                                        <label style="margin-right:4px;"><input id="rbt_Erf" onchange="changeval(this.value)" type="radio" name="art" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</label>
+                                        <label style="margin-right:4px;"><input id="rbt_Vorb" onchange="changeval(this.value)" type="radio" name="art" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
+                                        <label style="margin-right:4px;"><input id="rbt_Vorg" onchange="changeval(this.value)" type="radio" name="art" value="Vorgeschrieben"  style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
+                                        <label style="margin-right:4px;"><input id="rbt_Ankunft" onchange="changeval(this.value)" type="radio" name="art" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
+                                        <label style="margin-right:4px;"><input id="rbt_Freig" onchange="changeval(this.value)" type="radio" name="art" value="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="margin-right:4px" runat="server">Freigabe</label>                                                                         
                                      </fieldset>                                                                    
                                  </div>                                    
                                   </div>
                                    <div class="d-md-none"> 
                                        <div class="col-8" style="margin-left:8px">
                                         <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>                                        
-                                        <label><input id="rbt_Alle_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Alle" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." class="CSS_input" runat="server"/>Alle</label>
-                                        <label style="margin-right:144px;"><input id="rbt_Erf_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</label>
-                                        <label><input id="rbt_Vorb_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
-                                        <label><input id="rbt_Vorg_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Vorgeschrieben" style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
-                                        <label style="margin-right:22px"><input id="rbt_Ankunft_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
-                                        <label style="margin-right:52px"><input id="rbt_Freig_M" onclick="GetSelectedVal(this)" type="radio" name="art2" value="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="margin-right:4px" runat="server">Freigabe</label>                                                                              
+                                        <label><input id="rbt_Alle_M" type="radio" name="art2" onchange="changeval(this.value)" value="Alle" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." class="CSS_input" runat="server"/>Alle</label>
+                                        <label style="margin-right:144px;"><input id="rbt_Erf_M" onchange="changeval(this.value)"  value="Erfasst" type="radio" name="art2" style="margin-right:4px" runat="server"/>Erfasst</label>
+                                        <label><input id="rbt_Vorb_M" type="radio" name="art2" onchange="changeval(this.value)" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
+                                        <label><input id="rbt_Vorg_M" type="radio" name="art2" onchange="changeval(this.value)" value="Vorgeschrieben" style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
+                                        <label style="margin-right:22px"><input id="rbt_Ankunft_M" onchange="changeval(this.value)" type="radio" name="art2" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
+                                        <label style="margin-right:52px"><input id="rbt_Freig_M" onchange="changeval(this.value)" type="radio" name="art2" value="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="margin-right:4px" runat="server">Freigabe</label>                                                                              
                                        </div>                                  
                                   </div> 
                                 </div>
@@ -104,15 +104,17 @@
                             <div class="col-12" id="container2" style="margin-left:2px;">                                                                     
                                             <asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label>         
                                 <%Dim erster = New Date(Now().Year, Now().Month, 1) %>
-                                            <asp:TextBox id="pickdate1" Type="Date" CssClass="classTarget" minDate="<%=erster %>" requiered="true" OnTextChanged="pickdate1_TextChanged" runat="server"></asp:TextBox>  
+                                            <asp:TextBox id="pickdate1" Type="Date" CssClass="classTarget" minDate="<%=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" 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>              
                                             <asp:CustomValidator ValidateEmptyText="false" ClientValidationFunction="instantValidation"></asp:CustomValidator>            -->
                                 <asp:Label ID="lbl_bis" runat="server" Text="Bis:"></asp:Label> 
                                            <!-- <asp:RequiredFieldValidator ID="RequiredFieldValidatorbis" ClientValidationFunction="validate" runat="server" ErrorMessage="Field required" ControlToValidate="pickdate2" Text="Required" ForeColor="White" Font-Strikeout="False" Font-Underline="False" Font-Overline="False" Font-Bold="True" BackColor="Red"></asp:RequiredFieldValidator>              -->
                                 <%Dim jetzt = DateTime.Now.Date %>            
-                                <asp:TextBox id="pickdate2" Type="Date" CssClass="classTarget"  minDate="<%=jetzt %>" OnTextChanged="pickdate2_TextChanged" required="true" runat="server"></asp:TextBox>
-                                            <asp:CustomValidator runat="server" ID="valDateRange_2" ControlToValidate="pickdate2" Display="Dynamic" onservervalidate="valDateRange_2_ServerValidate" ErrorMessage="" SetFocusOnError="true" ValidationGroup="DateValid"/>             
+                                <asp:TextBox id="pickdate2" Type="Date" CssClass="classTarget"  minDate="<%=jetzt %>" OnTextChanged="pickdate2_TextChanged" runat="server"></asp:TextBox>
+                                 <asp:RequiredFieldValidator ControlToValidate="pickdate2" ID="valreqpickdate2" Display="Dynamic" runat="server" Enabled ="true" Visible ="true"></asp:RequiredFieldValidator>            
+                                <asp:CustomValidator runat="server" ID="valDateRange_2" ControlToValidate="pickdate2" Display="Dynamic" onservervalidate="valDateRange_2_ServerValidate" ErrorMessage="" SetFocusOnError="true" ValidationGroup="DateValid"/>             
                             </div>                                      
                              <div id="Abstand"></div>  
                               <hr>
@@ -228,30 +230,27 @@
    
     <script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/jquery.validate.min.js"></script>
     <script src="https://cdn.jsdelivr.net/jquery.validation/1.16.0/additional-methods.min.js"></script>
-    <script>       
-       function GetSelectedVal(ele) {        
-           var el = $(ele).closest('label').text();
-
-           var date1 = document.getElementById('<%=pickdate1.ClientID%>');
-           var date2 = document.getElementById('<%=pickdate2.ClientID%>');
-           $("#container2").hide();
-           if (el == "Alle") {           
-               date1.required = true;
-               date2.required = true;
-               $("#container2").show();              
-            } else if (el == "Freigabe") {           
-               date1.required = true;
-               date2.required = true;
-               $("#container2").show();                        
-            } else {            
-               date1.required = false;
-               date2.required = false;
-               date1.text() = null;                                
-               date2.text() = null;
-               $("#container2").hide();               
+    
+    <script>
+        function changeval(value) {
+            if (value == "Alle") {                
+                date1.required = true;
+                date2.required = true;
+                $("#container2").show();               
+            } else if (value == "Freigabe") {
+                date1.required = true;
+                date2.required = true;
+                $("#container2").show();
+            } else {
+                date1.required = false;
+                date2.required = false;
+                date1.text() = null;
+                date2.text() = null;
+                $("#container2").hide();
             }
-        }        
-    </script>    
+        }
+    </script>
+  
     <script type="text/javascript">
         $(document).ready(function () {
             Sys.WebForms.PageRequestManager.getInstance().add_endRequest(EndRequestHandler);
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index b58e044..5311e0d 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -34,11 +34,19 @@ Partial Class CustomsAviso
                     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
                 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
@@ -46,6 +54,8 @@ Partial Class CustomsAviso
                 Else
                     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
@@ -55,6 +65,10 @@ Partial Class CustomsAviso
                 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
@@ -62,6 +76,10 @@ Partial Class CustomsAviso
                 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
@@ -69,16 +87,22 @@ Partial Class CustomsAviso
                 Else
                     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
                 End If
-
-                datevon = Date.Parse(pickdate1.Text)
-                datebis = Date.Parse(pickdate2.Text)
+                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
             Else
-                Page.MaintainScrollPositionOnPostBack = False
+                    Page.MaintainScrollPositionOnPostBack = False
                 rbt_Alle.Checked = True
                 normaltable.EnableViewState = True
                 lbl_von.Visible = True
@@ -312,7 +336,7 @@ Partial Class CustomsAviso
         If rbt_Alle.Checked = True Or rbt_Alle_M.Checked = True Then
             pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
             pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
-            dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
+
             If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
                 Try
                     Dim erster = New Date(Now().Year, Now().Month, 1)
@@ -322,6 +346,7 @@ Partial Class CustomsAviso
                     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
+                    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("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation)
                 End Try
@@ -329,6 +354,7 @@ Partial Class CustomsAviso
                 Try
                     datevon = Date.Parse(pickdate1.Text)
                     datebis = Date.Parse(pickdate2.Text)
+                    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("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation)
                 End Try
@@ -359,6 +385,8 @@ Partial Class CustomsAviso
                 End Try
             End If
         ElseIf rbt_Ankunft.Checked = True Or rbt_Ankunft_M.Checked = True Then
+            pickdate1.Visible = False
+            pickdate2.Visible = False
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {3}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
         ElseIf rbt_Vorb.Checked = True Or rbt_Vorb_M.Checked = True Then
             dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {4}, Nothing, Nothing, Absender, Empfaenger, LKWNR, KDNAFNR)
@@ -468,40 +496,42 @@ Partial Class CustomsAviso
 
     Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
         'Mobil
-        rbt_Alle_M.Checked = True
-        rbt_Alle_M.Disabled = False
-        rbt_Ankunft_M.Checked = False
-        rbt_Ankunft_M.Disabled = False
-        rbt_Erf_M.Checked = False
-        rbt_Erf_M.Disabled = False
-        rbt_Freig_M.Checked = False
-        rbt_Freig_M.Disabled = False
-        rbt_Vorg_M.Checked = False
-        rbt_Vorg_M.Disabled = False
-        rbt_Vorb_M.Checked = False
-        rbt_Vorb_M.Disabled = False
-        txt_Absender_M.Text = ""
-        txt_Empfaenger_M.Text = ""
-        txt_KdNrAuftrag_M.Text = ""
-        txt_LKWNr_M.Text = ""
-        'Desktop
-        rbt_Alle.Checked = True
-        rbt_Alle.Disabled = False
-        rbt_Ankunft.Checked = False
-        rbt_Ankunft.Disabled = False
-        rbt_Erf.Checked = False
-        rbt_Erf.Disabled = False
-        rbt_Freig.Checked = False
-        rbt_Freig.Disabled = False
-        rbt_Vorg.Checked = False
-        rbt_Vorg.Disabled = False
-        rbt_Vorb.Checked = False
-        rbt_Vorb.Disabled = False
-        txt_Absender.Text = ""
-        txt_Empfaenger.Text = ""
-        txt_KdNrAuftrag.Text = ""
-        txt_LKWNr.Text = ""
-
+        If String.IsNullOrEmpty(txt_Absender_M.Text) = False Or String.IsNullOrEmpty(txt_Empfaenger_M.Text) = False Or String.IsNullOrEmpty(txt_KdNrAuftrag_M.Text) = False Or String.IsNullOrEmpty(txt_LKWNr_M.Text) = False Or rbt_Alle_M.Checked = True Or rbt_Ankunft_M.Checked = True Or rbt_Erf_M.Checked = True Or rbt_Freig_M.Checked = True Or rbt_Vorb_M.Checked = True Or rbt_Vorg_M.Checked = True Then
+            rbt_Alle_M.Checked = True
+            rbt_Alle_M.Disabled = False
+            rbt_Ankunft_M.Checked = False
+            rbt_Ankunft_M.Disabled = False
+            rbt_Erf_M.Checked = False
+            rbt_Erf_M.Disabled = False
+            rbt_Freig_M.Checked = False
+            rbt_Freig_M.Disabled = False
+            rbt_Vorg_M.Checked = False
+            rbt_Vorg_M.Disabled = False
+            rbt_Vorb_M.Checked = False
+            rbt_Vorb_M.Disabled = False
+            txt_Absender_M.Text = ""
+            txt_Empfaenger_M.Text = ""
+            txt_KdNrAuftrag_M.Text = ""
+            txt_LKWNr_M.Text = ""
+        ElseIf String.IsNullOrEmpty(txt_Absender.Text) = False Or String.IsNullOrEmpty(txt_Empfaenger.Text) = False Or String.IsNullOrEmpty(txt_KdNrAuftrag.Text) = False Or String.IsNullOrEmpty(txt_LKWNr.Text) = False Or rbt_Alle.Checked = True Or rbt_Ankunft.Checked = True Or rbt_Erf.Checked = True Or rbt_Freig.Checked = True Or rbt_Vorb.Checked = True Or rbt_Vorg.Checked = True Then
+            'Desktop
+            rbt_Alle.Checked = True
+            rbt_Alle.Disabled = False
+            rbt_Ankunft.Checked = False
+            rbt_Ankunft.Disabled = False
+            rbt_Erf.Checked = False
+            rbt_Erf.Disabled = False
+            rbt_Freig.Checked = False
+            rbt_Freig.Disabled = False
+            rbt_Vorg.Checked = False
+            rbt_Vorg.Disabled = False
+            rbt_Vorb.Checked = False
+            rbt_Vorb.Disabled = False
+            txt_Absender.Text = ""
+            txt_Empfaenger.Text = ""
+            txt_KdNrAuftrag.Text = ""
+            txt_LKWNr.Text = ""
+        End If
         Dim erster = New Date(Now().Year, Now().Month, 1)
         pickdate1.Text = erster.Day.ToString + "." + erster.Month.ToString + "." + erster.Year.ToString
         pickdate2.Text = Date.Parse(erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx
index f87432c..9a818d6 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -33,6 +33,7 @@
      <asp:ScriptManager ID="script1" runat="server"></asp:ScriptManager>
     <asp:UpdatePanel ID="panelupdate1" runat="server"><ContentTemplate>
         <!-- Webiste-Content-->  
+
         <div id="containerseiterand" style="margin-left:auto;margin-right:auto">
             <div class="container-fluid">
                 <div id="cont1">
diff --git a/Customers/Welcome.aspx b/Customers/Welcome.aspx
index 16a7045..fd11f9a 100644
--- a/Customers/Welcome.aspx
+++ b/Customers/Welcome.aspx
@@ -41,8 +41,43 @@
             <h2 style="font-style:italic"><%=Page.User.Identity.Name %></h2>
         </div></h1> 
    </div>
+        <%@ import Namespace="MySql.Data.MySqlClient"%>
+    <%@import Namespace="System.Data.SqlClient" %>
+        <%
+            Dim Connectionstring As String = String.Empty
+            Dim username As String = Me.Page.User.Identity.Name
+            Dim lastloggedin As String = String.Empty
+            Dim createdUserDate As String = String.Empty
+            Dim emailuser As String = String.Empty
+            Dim CustomerID As String = String.Empty
+
+            If HttpContext.Current.Request.ServerVariables("SERVER_NAME") = "localhost" Then
+                'ConnectionString = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=sa;Pwd=BmWr501956"
+                Connectionstring = "Server=DEVELOPER\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
+            Else
+                Connectionstring = "Server=DEVELOPER.verag.ost.dmn\DEVSQL;Database=VERAG_HOMEPAGE;Uid=AppUser;Pwd=yp/THDd?xM+pZ$;"
+                'ConnectionString = "Server=db593295684.db.1and1.com;Database=db593295684;Uid=dbo593295684;Pwd=atilla#2;"
+            End If
+            ' Dim constr As String = ConfigurationManager.ConnectionStrings("constr").ConnectionString
+            Using con As New SqlConnection(Connectionstring)
+                ' Using cmd As New SqlCommand("Validate_User")
+                Using cmd As New SqlCommand("SELECT Username,Email,LastLoginDate,CreatedDate,KundenNr FROM [VERAG_HOMEPAGE].[dbo].[Users] WHERE Username=@Username")
+                    ' cmd.CommandType = CommandType.StoredProcedure
+                    cmd.Parameters.AddWithValue("@Username", username)
+                    cmd.Connection = con
+                    con.Open()
+                    'userId = Convert.ToInt32(cmd.ExecuteScalar())
+                    Dim dr As SqlDataReader = cmd.ExecuteReader()
+                    If dr.Read() Then
+                        username = dr("Username").ToString()
+                        CustomerID = dr("KundenNr").ToString
+                    End If
+                End Using
+                con.Close()
+            End Using
+%>
     <h3>Hier findest Du alle deine Daten zusammengefasst auf einer Seite.</h3>
-        <asp:Label ID="Label3" runat="server" Text="Kundennr.: 045112"></asp:Label>
+        <h5 style="font-size:1.1225em">Kundennr.: <%=CustomerID %></h5>
         <asp:Label ID="Label2" runat="server" Text="Bereich: "></asp:Label>
         <asp:Label ID="Label1" runat="server" Text="Mitarbeiter "></asp:Label>
         <div style="height:25px;padding:7.5px 0;">
@@ -64,8 +99,8 @@
                                                         <div class="carousel-item active">
                                                       <a href="Invoices.aspx"> <img src="../images/pics/pexels-kampus-production-7477713.jpg" id="imgcar" style="width: 100%" alt="First slide"></a>
                                                             <div class="carousel-caption d-block d-md-block" style="background:linear-gradient(to right, #003680 , #0055cc);opacity:80%;height:auto">
-                                                       <a href="Invoices.aspx"><h5 style="opacity:100%">Rechnungen</h5></a>
-                                                       <a href="Invoices.aspx"> <p style="color:#fff;opacity:100%">Hier erfahren sie alles über Ihre Rechnungen.</p></a>
+                                                       <a href="Invoices.aspx?P1=<%=CustomerID %>"><h5 style="opacity:100%">Rechnungen</h5></a>
+                                                       <a href="Invoices.aspx?P1=<%=CustomerID %>"><p style="color:#fff;opacity:100%">Hier erfahren sie alles über Ihre Rechnungen.</p></a>
                                                       </div>
                                                         </div>
                                                         <div class="carousel-item">