diff --git a/Customers/CustomsAviso.aspx b/Customers/CustomsAviso.aspx
index 95d9b26..a0263ad 100644
--- a/Customers/CustomsAviso.aspx
+++ b/Customers/CustomsAviso.aspx
@@ -68,8 +68,7 @@
-
Filter zurücksetzen
-
+
Filter zurücksetzen
@@ -78,28 +77,25 @@
- Erfasst
- Vorbereitet
- Vorgeschrieben
- Ankunft
- Freigabe
+ Erfasst
+ Vorbereitet
+ Vorgeschrieben
+ Ankunft
+ Freigabe
-
+
-
+
@@ -189,15 +185,7 @@
--%>
-
+
-
+
\ No newline at end of file
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index 3e0ae83..7dac6f6 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -42,14 +42,19 @@ Partial Class Kundenbereich_Default
'MsgBox(Session.Item("CustomerID").ToString)
'MsgBox(Session.Item("PW").ToString)
Kdnrtext = Session.Item("CustomerID").ToString
+
dt = Nothing
If txt_Absender.Text IsNot "" Then
+ txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Absender = txt_Absender.Text
ElseIf txt_Empfaenger.Text IsNot "" Then
+ txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Empfaenger = txt_Empfaenger.Text
ElseIf txt_KdNrAuftrag.Text IsNot "" Then
+ txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
KDNAFNR = txt_KdNrAuftrag.Text
ElseIf txt_LKWNr.Text IsNot "" Then
+ txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
LKWNR = txt_LKWNr.Text
End If
@@ -60,7 +65,9 @@ Partial Class Kundenbereich_Default
If pickdate1.Text = Not "TT.MM.JJJJ" And pickdate2.Text = Not "TT.MM.JJJJ" Then
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
Try
+ pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
datevon = Date.Parse(pickdate1.Text)
+ pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
datebis = Date.Parse(pickdate2.Text)
Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
@@ -79,7 +86,7 @@ Partial Class Kundenbereich_Default
ElseIf rbt_Erf.Selected = False And rbt_Freig.Selected = False And rbt_Ankunft.Selected = False And rbt_Vorb.Selected = False And rbt_Vorg.Selected = False Then
If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
-
+ ElseIf pickdate1.Text = Not "TT.MM.JJJJ" And pickdate2.Text = Not "TT.MM.JJJJ" Then
pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
pickdate2.Text = Date.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing)
@@ -182,16 +189,6 @@ Partial Class Kundenbereich_Default
tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString
tr.Cells.Add(tbl_CellKundAuftNr)
-
- Dim btn2 As New ImageButton
- btn2.ViewStateMode = ViewStateMode.Disabled
- btn2.ImageUrl = "../images/Icons/service/hilfe_small.png"
- 'btn2.CssClass = "btn btn-primary"
-
- btn2.Attributes.Add("href", "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString)
- btn2.Attributes.Add("target", "_blank")
- btn2.PostBackUrl = "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString
-
Dim btn As New LinkButton
btn.ViewStateMode = ViewStateMode.Disabled
'btn.Text = "Text"
@@ -201,7 +198,8 @@ Partial Class Kundenbereich_Default
btn.Attributes.Add("target", "_blank")
btn.PostBackUrl = "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString
- tbl_CellInfo.Controls.Add(btn2)
+ tbl_CellInfo.Controls.Add(btn)
+ tbl_CellInfo.ValidateRequestMode = UI.ValidateRequestMode.Enabled
tr.Cells.Add(tbl_CellInfo)
If rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then
@@ -218,8 +216,6 @@ Partial Class Kundenbereich_Default
normaltable.Rows.Add(tr)
End If
-
-
i += 1
Next
End If
diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css
index e6de855..8b56001 100644
--- a/css/Customers/CustomerAVISO.css
+++ b/css/Customers/CustomerAVISO.css
@@ -67,13 +67,11 @@ hr{
box-shadow: inset 0 -1px 0 rgba(4, 51, 129,.125);
border:none;
}
-
- .accordion-button:not(.collapsed)::after {
- background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230c63e4'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
- border: none;
- transform: rotate(-180deg)
- }
-
+.accordion-button:not(.collapsed)::after {
+ background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230c63e4'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
+ border: none;
+ transform: rotate(-180deg)
+}
.accordion-button::after {
flex-shrink: 0;
width: 1.25rem;
@@ -90,11 +88,9 @@ hr{
transition: none
}
}
-
.accordion-button:hover {
z-index: 2
}
-
.accordion-button:focus {
z-index: 3;
border-color: #043381;
@@ -112,70 +108,56 @@ hr{
color: #043381;
font-size: 22px;
}
-
#tableSearch {
width: 50%;
}
-
#txt_Absender {
width: 250px;
padding-right: -2px;
padding-left: 60px;
}
-
#txt_Empfaenger {
width: 250px;
padding-right: -2px;
padding-left: 60px;
}
-
#txt_LKWNr {
width: 250px;
padding-right: -2px;
padding-left: 60px;
}
-
#txt_KdNrAuftrag {
width: 250px;
padding-right: -2px;
padding-left: 60px;
}
-
.container-fluid {
width: 700px;
- }
-
+ }
#cont1 {
width: 700px;
}
-
#containerseiterand {
min-width: 700px;
}
-
.flex-fill {
width: 700px;
}
-
#cont3 {
width: 700px;
}
-
#cont4 {
min-width: 750px;
}
-
tbody {
font-size: 3.303964757709251vw;
height: auto;
flex-wrap: wrap;
width: fit-content;
}
-
#normaltable {
width: 100%;
}
-
#conovertab {
/* max-width:width:150px 11.25em;*/
margin-left: /*14px*/ 3.0837004405286343vw;
diff --git a/status_Julius.aspx b/status_Julius.aspx
index 9f4e0c0..89c8860 100644
--- a/status_Julius.aspx
+++ b/status_Julius.aspx
@@ -430,6 +430,7 @@
txtCluster = "" & s.tblSnd_FremdspeditionText & ""
trBg = " class=""fremdspedition"""
Else
+ VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_FILIALEN()
If s.FilialenNr > 0 Then txtCluster = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(s.FilialenNr, False)
If txtCluster <> "" Then
txtCluster = "" & txtCluster & "
"