From 5db3122469952f5b8d651d8126b286e60d2ae12a Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Wed, 10 Nov 2021 15:14:29 +0100
Subject: [PATCH] Anpassungen GUI Desktop

---
 Customers/CustomsAviso.aspx | 17 +++++++++++------
 Customers/Invoices.aspx     | 35 ++++++++++++++++++++---------------
 Customers/Invoices.aspx.vb  |  1 +
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 788a44b..addea73 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -27,12 +27,17 @@
     <link rel="stylesheet" type="text/css" href="../css/Customers/CustomsAVISO.css"/>   
     
         <script language='javascript'>
-            window.addEventListener('beforeunload', (event) => {
-                // Cancel the event as stated by the standard.
-                event.preventDefault();
-                // Chrome requires returnValue to be set.
-                event.returnValue = '';
+            var warnMessage = "Save your unsaved changes before leaving this page!";
+            $("input").change(function () {
+                window.onbeforeunload = function () {
+                    return 'You have unsaved changes on this page!';
+                }
             });
+            $(function () {
+                $('<%=btn_Auftraege.ID%>').click(function (e) {
+                    window.onbeforeunload = null;
+                });
+            });            
         </script>
 </asp:Content> 
 
@@ -185,7 +190,7 @@
                                                                     <asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label>                              
                                                                     <asp:TextBox ID="txt_Absender" runat="server" AutoCompleteType="DisplayName" style="width:155px; margin-left:8px;" OnTextChanged="txt_Absender_TextChanged"></asp:TextBox>             
                                                                     <asp:RegularExpressionValidator ControlToValidate="txt_Absender" runat="server" ID="regexval_txt_Absender" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic"  ForeColor="Red" ErrorMessage="Absender: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
-                                                                    <asp:Label ID="lbl_Empfaenger" runat="server" AutoCompleteType="DisplayName" Text="Empfänger" style="margin-left:9px"></asp:Label>                                         
+                                                                    <asp:Label ID="lbl_Empfaenger" runat="server" AutoCompleteType="DisplayName"  style="margin-left:9px">Empfänger</asp:Label>                                         
                                                                     <asp:TextBox ID="txt_Empfaenger" runat="server" style="width:155px; margin-left:52px;" OnTextChanged="txt_Empfaenger_TextChanged"></asp:TextBox>
                                                                     <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger" runat="server" ID="regexval_txt_Empfaenger" ValidationGroup="additional_TXTs" ValidationExpression="^([A-Z0-9]{90})\d$" Display="Dynamic"  ForeColor="Red" ErrorMessage="Empfänger: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                                             </div>                                                             
diff --git a/Customers/Invoices.aspx b/Customers/Invoices.aspx
index a0b681e..ba639b2 100644
--- a/Customers/Invoices.aspx
+++ b/Customers/Invoices.aspx
@@ -75,7 +75,7 @@
                                 </div>
                                 <div style="margin-left:6px">
                                     <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>
+                                        <asp:LinkButton ID="btn_resetForm" runat="server" OnClick="btn_resetForm_Click"><%=Server.HtmlEncode("Formular zurücksetzen") %></asp:LinkButton>
                                     </div>
                                     <div style="height:20px">
                                          <asp:Label ID="lbl_status" runat="server" Font-Size="1em" ForeColor="Black" Text=""></asp:Label>
@@ -94,18 +94,18 @@
                                 </div>
                                 </div>
                             <div style="height:0.936768149882904vh"></div> <div style="height:0.936768149882904vh"></div>
-                            <asp:Label ID="lbl_dates" runat="server" style="color:#043381;font-size:1.025em" data-bs-toggle="tooltip" title="You have to fill out all required fields with *!" ><asp:Image ClientIDMode="AutoID" data-bs-toggle="tooltip" title="* = You have to fill out all required fields with *!" ID="img_infoimg" runat="server" ImageUrl="../images/Icons/service/hilfe_small.png" AlternateText="A help symol. i for information." />* = Required Fields:</asp:Label>
+                           
                             <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_von" runat="server" ClientIDMode="Predictable">Von:</asp:Label>                                   
+                                    <asp:TextBox ID="pickdate1" Type="Date" CssClass="classTarget" runat="server" ClientIDMode="Predictable"></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:CustomValidator runat="server" ID="valdaterage_1" OnServerValidate="valdaterage_1_ServerValidate" ControlToValidate="pickdate1" ForeColor="Red" Display="Dynamic" ErrorMessage="Fehler in Von-Feld" 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: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>
+                                    <asp:CustomValidator ControlToValidate="pickdate2" runat="server" Display="Dynamic" ID="valdaterange_2" OnServerValidate="valdaterange_2_ServerValidate" ErrorMessage="Fehler in Bis-Feld" SetFocusOnError="true"></asp:CustomValidator>
                                 </div>
                                 <div id="Abstand"></div>
                             </div>
@@ -117,24 +117,29 @@
                                         
                                 <div class="container">
                                         <div class="row">
-                                            <div id="rowcol1" class="row-cols-1">                                                
-                                                <asp:TextBox ID="txt_LKW" runat="server" PlaceHolder="truck license plate" style="width:145px;"></asp:TextBox>
+                                            <div id="rowcol1" class="row-cols-1">    
+                                                <asp:Label ID="lbl_LKWs" style="color:#043381;font-size:1em" runat="server">LKW-Kennzeichen</asp:Label>
+                                                <asp:TextBox ID="txt_LKW" runat="server" style="width:145px;margin-left:16px" ClientIDMode="Predictable"></asp:TextBox>
                                                 <asp:RequiredFieldValidator runat="server" ControlToValidate="txt_LKW" ID="reqval_txt_LKW" Enabled="false" ForeColor="Red"></asp:RequiredFieldValidator>
-                                                <asp:RegularExpressionValidator ControlToValidate="txt_LKW" runat="server" ID="regex_txt_LKW" ValidationExpression="[A-Z0-9]{4,30}\d" ForeColor="Red" Display="Dynamic" ErrorMessage="Wrong Plate-Format!" SetFocusOnError="true"></asp:RegularExpressionValidator>
-                                                <asp:TextBox ID="txt_KdNrAuftrag" runat="server" PlaceHolder="Customer Order Nr" style="width:145px;margin-left:16px"></asp:TextBox>
+                                                <asp:RegularExpressionValidator ControlToValidate="txt_LKW" runat="server" ID="regex_txt_LKW" ValidationExpression="[A-Z0-9]{4,30}\d" ForeColor="Red" Display="Dynamic" ErrorMessage="Falsches Kennzeichen-Format!" SetFocusOnError="true"></asp:RegularExpressionValidator>
+                                                <asp:Label ID="lbl_KdNrAuftrsg" runat="server" style="color:#043381;margin-left:10px" Font-Size="1em">Kunden-Auftragsnummer</asp:Label>
+                                                <asp:TextBox ID="txt_KdNrAuftrag" runat="server" style="width:145px;margin-left:16px"></asp:TextBox>
                                                 <asp:RequiredFieldValidator ControlToValidate="txt_KdNrAuftrag" runat="server" Display="Dynamic" ForeColor="Red" ID="reqval_txt_KdNrAuftrag" Enabled="false"></asp:RequiredFieldValidator>
                                                 <asp:RegularExpressionValidator ControlToValidate="txt_KdNrAuftrag" ID="regex_txt_KdNrAuftrag" Enabled="false" runat="server" Display="Dynamic" ForeColor="Red" ValidationExpression="[0-9]{2,8}" ErrorMessage="Wrong Input!"></asp:RegularExpressionValidator>
                                             </div>
-                                            <div id="rowcol2" class="row-cols-1">
-                                                <asp:TextBox ID="txt_Absender" runat="server" PlaceHolder="Sender" style="width:145px;"></asp:TextBox>
+                                            <div id="rowcol2" class="row-cols-1" style="margin-top:6px">
+                                                <asp:Label ClientIDMode="Predictable" style="color:#043381; font-size:1em;" ID="lbl_Absender" runat="server">Absender:</asp:Label>
+                                                <asp:TextBox ID="txt_Absender" runat="server" style="width:145px;margin-left:63px"></asp:TextBox>
                                                 <asp:RequiredFieldValidator ControlToValidate="txt_Absender" runat="server" ForeColor="Red" Enabled="false"></asp:RequiredFieldValidator>
                                                 <asp:RegularExpressionValidator ControlToValidate="txt_Absender" runat="server" ID="regex_txt_Absender" ForeColor="Red" ValidationExpression="[^!,]{2,90}" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
-                                                <asp:TextBox ID="txt_Empfaenger" runat="server" PlaceHolder="Receiver" style="width:145px;margin-left:16px"></asp:TextBox>
+                                                <asp:Label ID="lbl_Empaenger" ClientIDMode="Predictable" Font-Size="1em" runat="server" style="color:#043381;margin-left:11px">Empfänger:</asp:Label>
+                                                <asp:TextBox ID="txt_Empfaenger" runat="server" style="width:145px;margin-left:102px"></asp:TextBox>
                                                 <asp:RequiredFieldValidator ControlToValidate="txt_Empfaenger" runat="server" Enabled="false" ForeColor="Red" ID="reqval_txt_Empfaenger"></asp:RequiredFieldValidator>
                                                 <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger" runat="server" ID="regex_txt_Empfaenger" ValidationExpression="[^!,]{2,90}" Display="Dynamic" ForeColor="Red" ErrorMessage="Empfänger: Falsche Eingabe!" SetFocusOnError="true"></asp:RegularExpressionValidator>
                                            </div>
-                                            <div id="rowcol3" class="row-row-cols-1">
-                                                <asp:TextBox ID="txt_ReNr" runat="server" PlaceHolder="invoice number" style="width:145px;" AutoCompleteType="Notes"></asp:TextBox>
+                                            <div id="rowcol3" class="row-row-cols-1" style="margin-top:6px">
+                                                <asp:Label ID="lbl_ReNr" ClientIDMode="Predictable" style="font-size:1em;color:#043381" runat="server">Rechnungs-Nr:</asp:Label>
+                                                <asp:TextBox ID="txt_ReNr" runat="server" style="width:145px;margin-left:34px" AutoCompleteType="Notes"></asp:TextBox>
                                                 <asp:RequiredFieldValidator ControlToValidate="txt_ReNr" runat="server" ID="reqval_txt_ReNr" Display="Dynamic" ForeColor="Red" Enabled="false" ></asp:RequiredFieldValidator>
                                                 <asp:RegularExpressionValidator ControlToValidate="txt_ReNr" runat="server" ID="regex_txt_ReNr" ForeColor="Red" ValidationExpression="[0-9]{1,8}" Display="Dynamic" ErrorMessage="Please stay in the range of 8 numbers!"></asp:RegularExpressionValidator>
                                             </div>                                   
diff --git a/Customers/Invoices.aspx.vb b/Customers/Invoices.aspx.vb
index a3afe25..753a20d 100644
--- a/Customers/Invoices.aspx.vb
+++ b/Customers/Invoices.aspx.vb
@@ -32,6 +32,7 @@ Partial Class Customers_Default3
             'Script für Schließen wirklich verlassen Meldung auf der Masterseite für diese Seite zu registrieren und nicht ueberall
             Dim csm1 As ClientScriptManager = Page.ClientScript
             Dim cstype As Type = Page.GetType
+
             If Not csm1.IsStartupScriptRegistered(cstype, "Startup") Then
                 Dim string1 As String = "<script language=\""JavaScript\"">"
                 string1 += "</"