edv/VERAG_Homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Änderung Design + Funktion Mobil auch erfolgreich gefixed.

Browse Source
This commit is contained in:
ja
2021-11-11 09:45:35 +01:00
parent d10a4b8208
commit 3d32fd49b2
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Customers/CustomsAviso.aspx.vb
View File

@@ -14,6 +14,7 @@ Partial Class CustomsAviso
Dim dt As DataTable Dim dt As DataTable
Dim Art As String = "" Dim Art As String = ""
Dim ckd As Integer = -1 Dim ckd As Integer = -1
Dim wasmobile As Boolean = True
Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load Protected Sub Page_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms Page.UnobtrusiveValidationMode = UnobtrusiveValidationMode.WebForms
@@ -392,7 +393,6 @@ Partial Class CustomsAviso
Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs) Protected Sub btn_Auftraege_Click(sender As Object, e As EventArgs)
dt = Nothing dt = Nothing
Session.Add("mytable", Nothing) Session.Add("mytable", Nothing)
If Session.Item("mytable") = Nothing Then If Session.Item("mytable") = Nothing Then
If txt_Absender.Text IsNot "" Then If txt_Absender.Text IsNot "" Then
@@ -415,6 +415,7 @@ Partial Class CustomsAviso
regexval_txt_Empfaenger.Validate() regexval_txt_Empfaenger.Validate()
If regexval_txt_Empfaenger.IsValid Then If regexval_txt_Empfaenger.IsValid Then
Try Try
wasmobile = False
Empfaenger = txt_Empfaenger.Text Empfaenger = txt_Empfaenger.Text
Catch ex As FormatException Catch ex As FormatException
MsgBox("Diese Daten können nicht validiert werden", MsgBoxStyle.Critical) MsgBox("Diese Daten können nicht validiert werden", MsgBoxStyle.Critical)
@@ -457,6 +458,7 @@ Partial Class CustomsAviso
regval_txt_Absender_M.Validate() regval_txt_Absender_M.Validate()
If regval_txt_Absender_M.IsValid Then If regval_txt_Absender_M.IsValid Then
Try Try
wasmobile = True
Absender = txt_Absender_M.Text Absender = txt_Absender_M.Text
Catch ex As FormatException Catch ex As FormatException
MsgBox("Diese Daten können nicht validiert werden", MsgBoxStyle.Critical) MsgBox("Diese Daten können nicht validiert werden", MsgBoxStyle.Critical)

14
Customers/Invoices.aspx
View File

@@ -102,14 +102,7 @@
<asp:TextBox ID="pickdate1" Type="Date" CssClass="classTarget" runat="server" ClientIDMode="Predictable"></asp:TextBox> <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: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="Fehler in Von-Feld" 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>
<!-- Desktop/Tablet --> <asp:Label ID="lbl_bis" runat="server">Bis:</asp:Label>
<div class="d-none d-md-block">
<asp:Label ID="lbl_bis" runat="server">Zu:</asp:Label>
</div>
<!-- Mobil -->
<div class="d-md-none">
<asp:Label ID="Label1" runat="server" style="margin-left:6px">Zu:</asp:Label>
</div>
<asp:Textbox ID="pickdate2" Type="Date" CssClass="classTarget" runat="server"></asp:Textbox> <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: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="Fehler in Bis-Feld" 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>
@@ -156,7 +149,8 @@
<div class="container" style="margin-left:-10px"> <div class="container" style="margin-left:-10px">
<div class="row"> <div class="row">
<div id="rowcols4" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;"> <div id="rowcols4" class="row-cols-1" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:TextBox ID="txt_LKW_M" runat="server" PlaceHolder="truck license plate" style="width:155px;"></asp:TextBox> <asp:Label ID="lbl_LKW_M" runat="server" style="color:#043381" Font-Size="1em">LKW Kennzeichen:</asp:Label>
<asp:TextBox ID="txt_LKW_M" runat="server" PlaceHolder="truck license plate" style="width:155px;margin-left:5px"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_LKW_M" runat="server" ID="regval_txt_LKW_M" Enabled="false"></asp:RequiredFieldValidator> <asp:RequiredFieldValidator ControlToValidate="txt_LKW_M" runat="server" ID="regval_txt_LKW_M" Enabled="false"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_LKW_M" runat="server" ForeColor="Red" ID="regex_txt_LKW_M" ValidationExpression="[A-Z0-9]{4,30}\d" Display="Dynamic" ErrorMessage="Wrong plate format!" SetFocusOnError="true" Enabled="false"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ControlToValidate="txt_LKW_M" runat="server" ForeColor="Red" ID="regex_txt_LKW_M" ValidationExpression="[A-Z0-9]{4,30}\d" Display="Dynamic" ErrorMessage="Wrong plate format!" SetFocusOnError="true" Enabled="false"></asp:RegularExpressionValidator>
<asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" PlaceHolder="Customer Order Nr" style="width:155px;margin-left:28px"></asp:TextBox> <asp:TextBox ID="txt_KdNrAuftrag_M" runat="server" PlaceHolder="Customer Order Nr" style="width:155px;margin-left:28px"></asp:TextBox>
@@ -167,7 +161,7 @@
<asp:TextBox ID="txt_Absender_M" runat="server" PlaceHolder="Sender" style="width:155px;"></asp:TextBox> <asp:TextBox ID="txt_Absender_M" runat="server" PlaceHolder="Sender" style="width:155px;"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_Absender_M" runat="server" style="width:155px;margin-left:18px" Enabled="false" ID="req_txt_Absender_M" ErrorMessage="*" ForeColor="Red"></asp:RequiredFieldValidator> <asp:RequiredFieldValidator ControlToValidate="txt_Absender_M" runat="server" style="width:155px;margin-left:18px" Enabled="false" ID="req_txt_Absender_M" ErrorMessage="*" ForeColor="Red"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regex_txt_Absender_M" Enabled="false" ValidationExpression="[^!,]{2,90}" ForeColor="Red" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ControlToValidate="txt_Absender_M" runat="server" ID="regex_txt_Absender_M" Enabled="false" ValidationExpression="[^!,]{2,90}" ForeColor="Red" SetFocusOnError="true" Display="Dynamic" ErrorMessage="Wrong Input! Try again!"></asp:RegularExpressionValidator>
<asp:TextBox ID="txt_Empfaenger_M" runat="server" PlaceHolder="Receiver" style="width:155px;margin-left:4px"></asp:TextBox> <asp:TextBox ID="txt_Empfaenger_M" runat="server" PlaceHolder="Receiver" style="width:155px"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="reqval_txt_Empfaenger_M" ForeColor="Red" Enabled="false" Display="Dynamic"></asp:RequiredFieldValidator> <asp:RequiredFieldValidator ControlToValidate="txt_Empfaenger_M" runat="server" ID="reqval_txt_Empfaenger_M" ForeColor="Red" Enabled="false" Display="Dynamic"></asp:RequiredFieldValidator>
<asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" ID="regex_txt_Empaenger_M" runat="server" ForeColor="Red" Enabled="false" ValidationExpression="[^!,]{2,90}" Display="Dynamic" style="width:105px;margin-left:13px" SetFocusOnError="true" ErrorMessage="Error! Try again!"></asp:RegularExpressionValidator> <asp:RegularExpressionValidator ControlToValidate="txt_Empfaenger_M" ID="regex_txt_Empaenger_M" runat="server" ForeColor="Red" Enabled="false" ValidationExpression="[^!,]{2,90}" Display="Dynamic" style="width:105px;margin-left:13px" SetFocusOnError="true" ErrorMessage="Error! Try again!"></asp:RegularExpressionValidator>
</div> </div>

11
css/Customers/Invoices.css
View File

@@ -139,7 +139,7 @@ ContentPlaceHolder1_Send_Data {
#normaltable { #normaltable {
width: 100%; width: 100%;
} }
#conovertab { #ContentPlaceHolder1_conovertab {
/* max-width:width:150px 11.25em;*/ /* max-width:width:150px 11.25em;*/
margin-left: /*14px*/ 3.0837004405286343vw; margin-left: /*14px*/ 3.0837004405286343vw;
max-width: /*390px;*/ 85.90308370044053vw; max-width: /*390px;*/ 85.90308370044053vw;
@@ -148,12 +148,15 @@ ContentPlaceHolder1_Send_Data {
#ContentPlaceHolder1_Send_Data { #ContentPlaceHolder1_Send_Data {
height: 15px; height: 15px;
width: 300px; width: 300px;
} }
#pickdate1 { #ContentPlaceHolder1_lbl_bis {
border: 1px solid #000000; border: 1px solid #000000;
margin-left: 15px;
} }
#pickdate1 { #ContentPlaceHolder1_pickdate1 {
border: 1px solid #000000; border: 1px solid #000000;
margin-left: 15px;
} }
} }

6
login/ForgotPW.aspx.vb
View File

@@ -345,9 +345,9 @@ Partial Class ForgotPW
username = dr("Username").ToString() username = dr("Username").ToString()
password = dr("Password").ToString() password = dr("Password").ToString()
email = dr("Email").ToString() email = dr("Email").ToString()
customerID = dr("UserId").ToString() customerID = dr("KundenNr").ToString()
Try Try
If (txt_CustomerID_M.Text = dr("userId").ToString() AndAlso String.IsNullOrEmpty(txt_CustomerID.Text) = True) And String.IsNullOrEmpty(customerID) = True Then If (txt_CustomerID_M.Text = dr("KundenNr").ToString() AndAlso String.IsNullOrEmpty(txt_CustomerID.Text) = True) And String.IsNullOrEmpty(customerID) = False Then
customerID = txt_CustomerID_M.Text customerID = txt_CustomerID_M.Text
lblMessage_M.ForeColor = Color.Green lblMessage_M.ForeColor = Color.Green
isuserIDright = True isuserIDright = True
@@ -383,7 +383,7 @@ Partial Class ForgotPW
Title = "Authentication error!" Title = "Authentication error!"
End Try End Try
Try Try
If (txt_Username_M.Text = dr("Username").ToString() AndAlso String.IsNullOrEmpty(txt_Username_M.Text) = True) And String.IsNullOrEmpty(customerID) = True Then If (txt_Username_M.Text = dr("Username").ToString() AndAlso String.IsNullOrEmpty(txt_Username.Text) = True) And String.IsNullOrEmpty(customerID) = False Then
username = txt_Username_M.Text username = txt_Username_M.Text
lblMessage_M.ForeColor = Color.Green lblMessage_M.ForeColor = Color.Green
isusernameright = True isusernameright = True