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

Änderungen

Browse Source
This commit is contained in:
ja
2021-09-28 10:32:42 +02:00
parent 05153dc09b
commit 90920cd91c
2 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Customers/CustomsAviso.aspx
View File

@@ -209,7 +209,7 @@
$('#accordion').on('shown.bs.collapse', function (e) { $('#accordion').on('shown.bs.collapse', function (e) {
$(e.target).data('bs.collapse').$trigger.attr('src', 'https://s22.postimg.org/hkrauaofx/Mathematic_Minus2.png'); $(e.target).data('bs.collapse').$trigger.attr('src', 'https://s22.postimg.org/hkrauaofx/Mathematic_Minus2.png');
}); });
$('#accordion').on('hidden.bs.collapse', function (e, f) { $('#accordion').on('hidden.bs.collapse', function (e,f) {
$(e.target).data('bs.collapse').$trigger.attr('src', 'https://s22.postimg.org/9takvqkal/Mathematic_Plus2.png'); $(e.target).data('bs.collapse').$trigger.attr('src', 'https://s22.postimg.org/9takvqkal/Mathematic_Plus2.png');
}); });
</script> </script>
@@ -222,29 +222,28 @@
var date1 = document.getElementById('<%=pickdate1.ClientID%>'); var date1 = document.getElementById('<%=pickdate1.ClientID%>');
var date2 = document.getElementById('<%=pickdate2.ClientID%>'); var date2 = document.getElementById('<%=pickdate2.ClientID%>');
if (el == "Alle") { if (el == "Alle") {
$("#container2").show(); $("#container2").show();
date1.required = true;
date1.attributes.required = true; date2.required = true;
date2.attributes.required = true;
dat
} else if (el == "Alle_M") { } else if (el == "Alle_M") {
$("#container2").show(); $("#container2").show();
date1.attributes.required = true; date1.required = true;
date2.attributes.required = true; date2.required = true;
} else if (el == "Freigabe") { } else if (el == "Freigabe") {
$("#container2").show(); $("#container2").show();
date1.required = true;
date1.attributes.required = true; date2.required = true;
date2.attributes.required = true; dat
dat } else if (el == "Freigabe_M") {
} else if (el == "Freigabe_M") { $("#container2").show();
$("#container2").show(); date1.required = true;
date1.attributes.required = true; date2.required = true;
date2.attributes.required = true;
} else { } else {
$("#container2").hide(); $("#container2").hide();
date1.attributes.required = false; date1.required = false;
date2.attributes.required = false; date2.required = false;
date1.text = "";
date2.text = "";
} }
} }
</script> </script>
@@ -256,9 +255,7 @@
$('.classTarget).datepicker({ dateFormat: 'dd.MM.yyyy' }); $('.classTarget).datepicker({ dateFormat: 'dd.MM.yyyy' });
} }
}); });
</script> </script>
</script>
<script type="text/javascript"> <script type="text/javascript">
function compareDate(str1, str2){ function compareDate(str1, str2){
// str1 format should be dd/mm/yyyy. Separator can be anything e.g. / or -. It wont effect // str1 format should be dd/mm/yyyy. Separator can be anything e.g. / or -. It wont effect

53
Customers/CustomsAviso.aspx.vb
View File

@@ -158,7 +158,7 @@ Partial Class Kundenbereich_Default
'MsgBox(Session.Item("CustomerID").ToString) 'MsgBox(Session.Item("CustomerID").ToString)
'MsgBox(Session.Item("PW").ToString) 'MsgBox(Session.Item("PW").ToString)
Try Try
Kdnrtext = Session.Item("CustomerID").ToString Kdnrtext = Session.Item("CustomerID")
Catch A As UnauthorizedAccessException When Kdnrtext = Nothing Catch A As UnauthorizedAccessException When Kdnrtext = Nothing
MsgBox("Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!", MsgBoxStyle.Information, "Error in User Area!") MsgBox("Dieser Bereich ist nicht gestattet! Ein Fehler ist bei der Validierung der ID aufgetreten! Bitte erneut versuchen!", MsgBoxStyle.Information, "Error in User Area!")
End Try End Try
@@ -166,56 +166,56 @@ Partial Class Kundenbereich_Default
If txt_Absender.Text IsNot "" Then If txt_Absender.Text IsNot "" Then
txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try Try
Absender = txt_Absender.Text Absender = Server.HtmlEncode(txt_Absender.Text)
Catch ex As FormatException Catch ex As FormatException
MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical) MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
End Try End Try
ElseIf txt_Empfaenger.Text IsNot "" Then ElseIf txt_Empfaenger.Text IsNot "" Then
txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try Try
Empfaenger = txt_Empfaenger.Text Empfaenger = Server.HtmlEncode(txt_Empfaenger.Text)
Catch ex As FormatException Catch ex As FormatException
MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical) MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
End Try End Try
ElseIf txt_KdNrAuftrag.Text IsNot "" Then ElseIf txt_KdNrAuftrag.Text IsNot "" Then
txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try Try
KDNAFNR = txt_KdNrAuftrag.Text KDNAFNR = Server.HtmlEncode(txt_KdNrAuftrag.Text)
Catch ex As FormatException Catch ex As FormatException
MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical) MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
End Try End Try
ElseIf txt_LKWNr.Text IsNot "" Then ElseIf txt_LKWNr.Text IsNot "" Then
txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try Try
LKWNR = txt_LKWNr.Text LKWNR = Server.HtmlEncode(txt_LKWNr.Text)
Catch ex As FormatException Catch ex As FormatException
MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical) MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
End Try End Try
ElseIf txt_Absender_M.Text IsNot "" Then ElseIf txt_Absender_M.Text IsNot "" Then
txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Absender_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try Try
Absender = txt_Absender_M.Text Absender = Server.HtmlEncode(txt_Absender_M.Text)
Catch ex As FormatException Catch ex As FormatException
MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical) MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
End Try End Try
ElseIf txt_Empfaenger_M.Text IsNot "" Then ElseIf txt_Empfaenger_M.Text IsNot "" Then
txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_Empfaenger_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try Try
Empfaenger = txt_Empfaenger_M.Text Empfaenger = Server.HtmlEncode(txt_Empfaenger_M.Text)
Catch ex As FormatException Catch ex As FormatException
MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical) MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
End Try End Try
ElseIf txt_KdNrAuftrag_M.Text IsNot "" Then ElseIf txt_KdNrAuftrag_M.Text IsNot "" Then
txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_KdNrAuftrag_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try Try
KDNAFNR = txt_KdNrAuftrag_M.Text KDNAFNR = Server.HtmlEncode(txt_KdNrAuftrag_M.Text)
Catch ex As FormatException Catch ex As FormatException
MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical) MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
End Try End Try
ElseIf txt_LKWNr_M.Text IsNot "" Then ElseIf txt_LKWNr_M.Text IsNot "" Then
txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled txt_LKWNr_M.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Try Try
LKWNR = txt_LKWNr_M.Text LKWNR = Server.HtmlEncode(txt_LKWNr_M.Text)
Catch ex As FormatException Catch ex As FormatException
MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical) MsgBox("Diese Daten sind nicht gültig!", MsgBoxStyle.Critical)
End Try End Try
@@ -224,7 +224,7 @@ Partial Class Kundenbereich_Default
If rbt_Alle.Checked = True Or rbt_Alle_M.Checked = True Then If rbt_Alle.Checked = True Or rbt_Alle_M.Checked = True Then
pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {0, 1, 2, 3, 4, 5}, datevon, datebis, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR)) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
Try Try
Dim erster = New Date(Now().Year, Now().Month, 1) Dim erster = New Date(Now().Year, Now().Month, 1)
@@ -246,7 +246,7 @@ Partial Class Kundenbereich_Default
End Try End Try
End If End If
ElseIf rbt_Erf.Checked = True Or rbt_Erf_M.Checked = True Then ElseIf rbt_Erf.Checked = True Or rbt_Erf_M.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {0}, Nothing, Nothing, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR)) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {0}, Nothing, Nothing, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
ElseIf rbt_Freig.Checked = True Or rbt_Freig_M.Checked = True Then ElseIf rbt_Freig.Checked = True Or rbt_Freig_M.Checked = True Then
pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
@@ -264,17 +264,17 @@ Partial Class Kundenbereich_Default
'MsgBox(pickdate1.Text) 'MsgBox(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text) datebis = Date.Parse(pickdate2.Text)
' MsgBox(pickdate2.Text) ' MsgBox(pickdate2.Text)
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {1}, datevon, datebis, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR)) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {1}, datevon, datebis, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(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 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) MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation)
End Try End Try
End If End If
ElseIf rbt_Ankunft.Checked = True Or rbt_Ankunft_M.Checked = True Then ElseIf rbt_Ankunft.Checked = True Or rbt_Ankunft_M.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {3}, Nothing, Nothing, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR)) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {3}, Nothing, Nothing, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
ElseIf rbt_Vorb.Checked = True Or rbt_Vorb_M.Checked = True Then ElseIf rbt_Vorb.Checked = True Or rbt_Vorb_M.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {4}, Nothing, Nothing, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR)) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {4}, Nothing, Nothing, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
ElseIf rbt_Vorg.Checked = True Or rbt_Vorg_M.Checked = True Then ElseIf rbt_Vorg.Checked = True Or rbt_Vorg_M.Checked = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlEncode(Art), Server.HtmlEncode(Kdnrtext), {5}, Nothing, Nothing, Server.HtmlEncode(Absender), Server.HtmlEncode(Empfaenger), Server.HtmlEncode(LKWNR), Server.HtmlEncode(KDNAFNR)) dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Server.HtmlDecode(Art), Kdnrtext, {5}, Nothing, Nothing, Server.HtmlDecode(Absender), Server.HtmlDecode(Empfaenger), Server.HtmlDecode(LKWNR), Server.HtmlDecode(KDNAFNR))
End If End If
If dt IsNot Nothing AndAlso Not dt.Rows.Count = 0 Then If dt IsNot Nothing AndAlso Not dt.Rows.Count = 0 Then
@@ -418,17 +418,19 @@ Partial Class Kundenbereich_Default
pickdate2.Text = Date.Parse(erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString pickdate2.Text = Date.Parse(erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
datevon = Nothing datevon = Nothing
datebis = Nothing datebis = Nothing
If pickdate1.Attributes.Item("required") = True Then
pickdate1.Attributes.Item("required") = False
End If
If pickdate2.Attributes.Item("required") = True Then
pickdate2.Attributes.Item("required") = False
End If
dt = Nothing dt = Nothing
'txt_KdNr.Focus() 'txt_KdNr.Focus()
End Sub End Sub
Protected Sub Dropdownlst_Selection_Change(sender As Object, e As EventArgs)
End Sub
Protected Sub pickdate1_TextChanged(sender As Object, e As EventArgs) Protected Sub pickdate1_TextChanged(sender As Object, e As EventArgs)
Dim TB As TextBox = pickdate1
If TB.Text = "" Then If pickdate1.Text = "" Then
pickdate1.BorderColor = Drawing.Color.Red pickdate1.BorderColor = Drawing.Color.Red
Else Else
pickdate1.BorderStyle = 1 pickdate1.BorderStyle = 1
@@ -436,11 +438,12 @@ Partial Class Kundenbereich_Default
End Sub End Sub
Protected Sub pickdate2_TextChanged(sender As Object, e As EventArgs) Protected Sub pickdate2_TextChanged(sender As Object, e As EventArgs)
Dim TB As TextBox = pickdate2
If TB.Text = "" Then If pickdate2.Text = "" Then
TB.Attributes.Add("Border", "2px solid red") pickdate2.Attributes.Add("Border", "2px solid red")
Else Else
TB.Attributes.Add("Border", "None") pickdate2.Attributes.Add("Border", "None")
End If End If
End Sub End Sub
End Class End Class