From 46f11a72ebcdfd825916011334b2260c998fe2f1 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Thu, 7 Oct 2021 11:26:11 +0200
Subject: [PATCH] =?UTF-8?q?=C3=84nderunge=20validierungen=20der=20login=20?=
 =?UTF-8?q?felder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/login/ForgotPW.css   |  2 +-
 css/login/loginFLEX.css  |  3 +++
 login/ForgotPW.aspx      | 24 ++++++++---------
 login/login_FLEX.aspx    | 58 +++++++++++++++++++++++++---------------
 login/login_FLEX.aspx.vb |  7 +++++
 5 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/css/login/ForgotPW.css b/css/login/ForgotPW.css
index 71978e6..662a7b2 100644
--- a/css/login/ForgotPW.css
+++ b/css/login/ForgotPW.css
@@ -24,7 +24,7 @@
 }
 .container-fluid {
     width: 400px;
-    height: 379px;
+    height: 464px;
     background-color: rgba(255,255,255,0.5);
     margin: 0 auto;
     margin-top: 220px;
diff --git a/css/login/loginFLEX.css b/css/login/loginFLEX.css
index 8871efb..93c8224 100644
--- a/css/login/loginFLEX.css
+++ b/css/login/loginFLEX.css
@@ -54,4 +54,7 @@
     color: #fff;
     width: 140px;
     height: 25px;
+}
+#Password{
+    margin-right:-20px;
 }
\ No newline at end of file
diff --git a/login/ForgotPW.aspx b/login/ForgotPW.aspx
index f602859..ddd4277 100644
--- a/login/ForgotPW.aspx
+++ b/login/ForgotPW.aspx
@@ -92,26 +92,24 @@
              <!--   <tr><td>
            <input type="email" runat="server" style="width:150px" placeholder="example@somehost.com" />
                     </td></tr> -->
-                <tr style="color:#003680; height:30px;">
-                    <td align="right" colspan="2">               
+                <tr style="color:#003680; height:30px;">  
+                     <td align="left" colspan="2">              
                         <asp:Label ID="lbl_Email" runat="server" Text="Email Address:" CssClass="txt_design"></asp:Label>
-                    </td></tr>
-                <tr style="color:#003680; height:30px;">
-                    <td align="right" colspan="2">
+                    </td>             
+                    <td align="left" colspan="2">  
                 <asp:TextBox ID="txtEmail" runat="server" Width = "250" OnTextChanged="txtEmail_TextChanged"/>
                     </td></tr>
                 <tr style="color:#003680; height:30px;">
-                    <td align="right" colspan="4">
+                     <td align="left" colspan="2">  
                         <asp:RegularExpressionValidator ID="regexval_txt_Email" ControlToValidate="txtEmail" runat="server" ValidationExpression="\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*" Display="Dynamic"></asp:RegularExpressionValidator>
                     </td></tr>
                 <tr style="color:#003680; height:30px;">
-                <td align="right" colspan="2">
-                                    <asp:Label ID="lbl_Username" runat="server" Text="Username:" CssClass="txt_design"></asp:Label>
-                    </td></tr>
-                <tr style="color:#003680; height:30px;">
-                <td align="right" colspan="2">
-                <asp:TextBox ID="txt_Username" runat="server" Width = "250" />
-                    </td></tr>
+                    <td align="left" colspan="2"> 
+                                        <asp:Label ID="lbl_Username" runat="server" Text="Username:" CssClass="txt_design"></asp:Label>
+                        </td>                
+                     <td align="left" colspan="2"> 
+                    <asp:TextBox ID="txt_Username" runat="server" Width = "250" />
+                        </td></tr>
                 <tr style="color:#003680; height:30px;">
                 <td align="right" colspan="2">                    
                 <asp:Label ID="lblMessage" runat="server" />
diff --git a/login/login_FLEX.aspx b/login/login_FLEX.aspx
index d79742e..527180a 100644
--- a/login/login_FLEX.aspx
+++ b/login/login_FLEX.aspx
@@ -75,38 +75,52 @@
                                    <!--  <tr style=" background-image: linear-gradient(to right, #003680 , #0055cc);color:#fff;height:30px;font-size:12px">
                                         <td align="center" colspan="2" style="color:#fff;font-kerning:auto;font-weight:700;">Bitte melden Sie sich an:</td>
                                     </tr>    -->                                
-                               <tr style="color:#003680; height:50px;">
+                               <tr style="color:#003680; height:40px;">
                                         <td align="center" colspan="2" style="color:#003680;font-kerning:auto;font-weight:700;">
                                             <asp:Label ID="lbl_login" runat="server" Text="Login" CssClass="txt_design" ></asp:Label></td>
                                </tr>
-                                    <tr style="color:#003680; height:50px;">
-                                         <td align="right">  
-                                             <asp:Label ID="CustomerIDLabel" runat="server" AssociatedControlID="CustomerID" CssClass="txt_design">Kundennummer:</asp:Label>                                            
+                                    <tr style="color:#003680; height:30px;">
+                                        <td align="left" colspan="2">  
+                                             <asp:Label ID="CustomerIDLabel" runat="server" AssociatedControlID="CustomerID" CssClass="txt_design">Kundennummer:</asp:Label>  
                                         </td>
-                                        <td>                                
-                                            <asp:TextBox ID="CustomerID" runat="server" TextMode="Number" required="true"></asp:TextBox> 
-                                            <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" ErrorMessage="Die Kundennummer ist erforderlich." ToolTip="Die Kundennummer ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator> 
+                                        <td align="left" colspan="2">  
+                                            <asp:TextBox ID="CustomerID" runat="server" required="true" ValidationGroup="txt_check"></asp:TextBox>  
+                                        </td></tr>
+                                  <tr style="color:#003680; height:15px;">
+                                        <td align="right">
+                                            <asp:RequiredFieldValidator ID="CustomerIDrequired" runat="server" ControlToValidate="CustomerID" ToolTip="Die Kundennummer ist erforderlich." ValidationGroup="Login1">Die Kundennummer ist erforderlich.</asp:RequiredFieldValidator>
+                                            </td></tr>
+                               <tr style="color:#003680; height:15px;">
+                                        <td align="right">
+                                            <asp:RegularExpressionValidator ID="valid_getNumberInput" ControlToValidate="CustomerID" ValidationGroup="txt_check" runat="server" Display="Dynamic" SetFocusOnError="true" ValidationExpression="^[0-9]"></asp:RegularExpressionValidator>
                                         </td>
                                     </tr>  
-                                <tr style="color:#003680; height:50px;">
-                                   <td align="right">
-                                        <asp:Label ID="UserNameLabel" runat="server" AssociatedControlID="UserName" CssClass="txt_design">Benutzername:</asp:Label>
-                                    </td>
-                                    <td>                       
+                                 <tr style="color:#003680; height:30px;">  
+                                     <td align="left" colspan="2">
+                                        <asp:Label ID="UserNameLabel" runat="server" AssociatedControlID="UserName" CssClass="txt_design">Benutzername:</asp:Label>      
+                                         </td>
+                                     <td align="left" colspan="2">
                                         <asp:TextBox ID="UserName" runat="server" TextMode="SingleLine" required="true"></asp:TextBox>
-                                        <asp:RequiredFieldValidator ID="UserNamerequired" runat="server" ControlToValidate="UserName" ErrorMessage="Der Benutzername ist erforderlich." ToolTip="Der Benutzername ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator> 
+                                       </td>
+                                    </tr>
+                               <tr style="color:#003680; height:20px;">
+                                   <td align="right">             
+                               <asp:RequiredFieldValidator ID="UserNamerequired" runat="server" ControlToValidate="UserName" ErrorMessage="Der Benutzername ist erforderlich." ToolTip="Der Benutzername ist erforderlich." ValidationGroup="Login1">Der Benutzername ist erforderlich.</asp:RequiredFieldValidator> 
                                     </td>
                                     </tr>
-                                    <tr style="color:#003680; height:50px;">  
-                                     <td align="right">
+                                    <tr style="color:#003680; height:30px;">  
+                                     <td align="left" colspan="2">
                                            <asp:Label ID="PasswordLabel" runat="server" AssociatedControlID="Password" CssClass="txt_design">Kennwort:</asp:Label>
-                                        </td> 
-                                        <td>
-                                            <asp:TextBox ID="Password" runat="server" TextMode="Password" required="true"></asp:TextBox>
-                                            <asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ErrorMessage="Das Kennwort ist erforderlich." ToolTip="Das Kennwort ist erforderlich." ValidationGroup="Login1">*</asp:RequiredFieldValidator>                                                                    
+                                         </td>
+                                         <td align="left" colspan="2">
+                                           <asp:TextBox ID="Password" runat="server" TextMode="Password" required="true" ValidationGroup="Login2" MaxLength="30"></asp:TextBox>
+                                            </td></tr>
+                                            <tr style="color:#003680; height:20px;">
+                                   <td align="right">
+                                            <asp:RequiredFieldValidator ID="Passwordrequired" runat="server" ControlToValidate="Password" ErrorMessage="Das Kennwort ist erforderlich." ToolTip="Das Kennwort ist erforderlich." ValidationGroup="Login2">Bitte Passwort angeben.</asp:RequiredFieldValidator>                                                                    
                                         </td>
                                     </tr>
-                                    <tr style="color:#003680; height:50px;">
+                                    <tr style="color:#003680; height:30px;">
                                         <td>
                                             <asp:CheckBox ID="RememberMe" runat="server" Text="Anmeldedaten speichern." />
                                         </td>
@@ -116,11 +130,11 @@
                                             <asp:Literal ID="FailureText" runat="server" EnableViewState="False"></asp:Literal>
                                         </td>
                                     </tr>
-                                    <tr style="color:#003680; height:50px;">
+                                    <tr style="color:#003680; height:20px;">
                                         <td align="left" colspan="2">
                                            <br/> <asp:Button ID="LoginButton" runat="server" CommandName="Login" Text="Login" ValidationGroup="Login1" target="_top" OnClientClick="bust2()"/>
                                         </td>
-                                       <tr style="color:#003680; height:50px;"> 
+                                       <tr style="color:#003680; height:20px;"> 
                                          <td align="middle" colspan="2">                                  
                                        <asp:LinkButton ID="LinkButton1" runat="server" target="_top" OnClientClick="bust2()">Admin-Login</asp:LinkButton>
                                    </td>
diff --git a/login/login_FLEX.aspx.vb b/login/login_FLEX.aspx.vb
index 2352153..25b6375 100644
--- a/login/login_FLEX.aspx.vb
+++ b/login/login_FLEX.aspx.vb
@@ -4,6 +4,9 @@ Imports System.Data
 Partial Class login_login_TEST
     Inherits System.Web.UI.Page
     Dim CustomerIDTextBox As TextBox
+    Protected Sub Page_Load(sender As Object, e As EventArgs)
+
+    End Sub
     Protected Sub ValidateUser(sender As Object, e As EventArgs)
         Dim userId As Integer = 0
         ' cDBFunctions.GetNewOpenConnection()
@@ -58,4 +61,8 @@ Partial Class login_login_TEST
     Protected Sub LoginButton_Click(sender As Object, e As EventArgs)
 
     End Sub
+
+    Protected Sub CustomerID_TextChanged(sender As Object, e As EventArgs)
+
+    End Sub
 End Class