+
-
-
-
+
<% End If
@@ -201,46 +202,29 @@
End Try %>
-
+
+
-
+
+
+
-
-
-
+
\ No newline at end of file
diff --git a/Customers/CustomsAviso.aspx.vb b/Customers/CustomsAviso.aspx.vb
index b5f4d8f..6215f87 100644
--- a/Customers/CustomsAviso.aspx.vb
+++ b/Customers/CustomsAviso.aspx.vb
@@ -22,11 +22,19 @@ Partial Class Kundenbereich_Default
normaltable.EnableViewState = True
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
+
Else
normaltable.EnableViewState = True
+ Dim erster = New Date(Now().Year, Now().Month, 1)
+ Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
+ pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
+ ' MsgBox(ersterdat)
+ datevon = ersterdat
+ datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
+ pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
- rbt_Alle.Selected = True
- rbt_Alle_M.Selected = True
+ rbt_Alle.Checked = True
+ rbt_Alle_M.Checked = True
End If
End Sub
@@ -213,27 +221,19 @@ Partial Class Kundenbereich_Default
End Try
End If
- If rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True Then
+ If rbt_Alle.Checked = True Or rbt_Alle_M.Checked = True Then
pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
- dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB(Art, Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
+ 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))
If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
Try
- pickdate1.BorderColor = Drawing.Color.Red
- pickdate1.BorderStyle = BorderStyle.Double
- pickdate1.BorderWidth = Unit.Pixel(2)
- pickdate2.BorderColor = Drawing.Color.Red
- pickdate2.BorderStyle = BorderStyle.Double
- pickdate2.BorderWidth = Unit.Pixel(2)
- lbl_ErrorCal.Visible = True
- lbl_ErrorCal.Style.Add("ForeColor", "red")
- lbl_ErrorCal.Text = "Kein Datum ausgewählt. Bitte auswählen!"
-
-
-
-
-
-
+ Dim erster = New Date(Now().Year, Now().Month, 1)
+ Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
+ ' MsgBox(ersterdat)
+ datevon = ersterdat
+ pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
+ datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
+ pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
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)
End Try
@@ -241,17 +241,13 @@ Partial Class Kundenbereich_Default
Try
datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text)
- pickdate1.BorderWidth = Unit.Pixel(0)
- pickdate2.BorderWidth = Unit.Pixel(0)
- lbl_ErrorCal.Visible = False
- lbl_ErrorCal.Text = ""
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)
End Try
End If
- ElseIf rbt_Erf.Selected = True Or rbt_Erf_M.Selected = 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))
- ElseIf rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True Then
+ ElseIf rbt_Freig.Checked = True Or rbt_Freig_M.Checked = True Then
pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
@@ -273,11 +269,11 @@ Partial Class Kundenbereich_Default
MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation)
End Try
End If
- ElseIf rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = 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))
- ElseIf rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = 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))
- ElseIf rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = 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))
End If
@@ -353,17 +349,17 @@ Partial Class Kundenbereich_Default
tbl_CellInfo.Controls.Add(btn)
tr.Cells.Add(tbl_CellInfo)
- If (rbt_Alle.Selected = True Or rbt_Alle_M.Selected = True) Then
+ If (rbt_Alle.Checked = True Or rbt_Alle_M.Checked = True) Then
normaltable.Rows.Add(tr)
- ElseIf (rbt_Ankunft.Selected = True Or rbt_Ankunft_M.Selected = True) AndAlso tbl_CellStatus.Text = "Ankunft" Then
+ ElseIf (rbt_Ankunft.Checked = True Or rbt_Ankunft_M.Checked = True) AndAlso tbl_CellStatus.Text = "Ankunft" Then
normaltable.Rows.Add(tr)
- ElseIf (rbt_Erf.Selected = True Or rbt_Erf_M.Selected = True) AndAlso tbl_CellStatus.Text = "Erfasst" Then
+ ElseIf (rbt_Erf.Checked = True Or rbt_Erf_M.Checked = True) AndAlso tbl_CellStatus.Text = "Erfasst" Then
normaltable.Rows.Add(tr)
- ElseIf (rbt_Freig.Selected = True Or rbt_Freig_M.Selected = True) AndAlso tbl_CellStatus.Text = "Freigegeben" Then
+ ElseIf (rbt_Freig.Checked = True Or rbt_Freig_M.Checked = True) AndAlso tbl_CellStatus.Text = "Freigegeben" Then
normaltable.Rows.Add(tr)
- ElseIf (rbt_Vorb.Selected = True Or rbt_Vorb_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorbereitet" Then
+ ElseIf (rbt_Vorb.Checked = True Or rbt_Vorb_M.Checked = True) AndAlso tbl_CellStatus.Text = "Vorbereitet" Then
normaltable.Rows.Add(tr)
- ElseIf (rbt_Vorg.Selected = True Or rbt_Vorg_M.Selected = True) AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
+ ElseIf (rbt_Vorg.Checked = True Or rbt_Vorg_M.Checked = True) AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
normaltable.Rows.Add(tr)
End If
@@ -383,35 +379,35 @@ Partial Class Kundenbereich_Default
Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
'Mobil
- rbt_Alle_M.Selected = False
- rbt_Alle_M.Enabled = True
- rbt_Ankunft_M.Selected = False
- rbt_Ankunft_M.Enabled = True
- rbt_Erf_M.Selected = False
- rbt_Erf_M.Enabled = True
- rbt_Freig_M.Selected = False
- rbt_Freig_M.Enabled = True
- rbt_Vorg_M.Selected = False
- rbt_Vorg_M.Enabled = True
- rbt_Vorb_M.Selected = False
- rbt_Vorb_M.Enabled = True
+ rbt_Alle_M.Checked = True
+ rbt_Alle_M.Disabled = False
+ rbt_Ankunft_M.Checked = False
+ rbt_Ankunft_M.Disabled = False
+ rbt_Erf_M.Checked = False
+ rbt_Erf_M.Disabled = False
+ rbt_Freig_M.Checked = False
+ rbt_Freig_M.Disabled = False
+ rbt_Vorg_M.Checked = False
+ rbt_Vorg_M.Disabled = False
+ rbt_Vorb_M.Checked = False
+ rbt_Vorb_M.Disabled = False
txt_Absender_M.Text = ""
txt_Empfaenger_M.Text = ""
txt_KdNrAuftrag_M.Text = ""
txt_LKWNr_M.Text = ""
'Desktop
- rbt_Alle.Selected = False
- rbt_Alle.Enabled = True
- rbt_Ankunft.Selected = False
- rbt_Ankunft.Enabled = True
- rbt_Erf.Selected = False
- rbt_Erf.Enabled = True
- rbt_Freig.Selected = False
- rbt_Freig.Enabled = True
- rbt_Vorg.Selected = False
- rbt_Vorg.Enabled = True
- rbt_Vorb.Selected = False
- rbt_Vorb.Enabled = True
+ rbt_Alle.Checked = True
+ rbt_Alle.Disabled = False
+ rbt_Ankunft.Checked = False
+ rbt_Ankunft.Disabled = False
+ rbt_Erf.Checked = False
+ rbt_Erf.Disabled = False
+ rbt_Freig.Checked = False
+ rbt_Freig.Disabled = False
+ rbt_Vorg.Checked = False
+ rbt_Vorg.Disabled = False
+ rbt_Vorb.Checked = False
+ rbt_Vorb.Disabled = False
txt_Absender.Text = ""
txt_Empfaenger.Text = ""
txt_KdNrAuftrag.Text = ""
diff --git a/Web.config b/Web.config
index 3848068..1596581 100644
--- a/Web.config
+++ b/Web.config
@@ -1,4 +1,4 @@
-
+
-
+
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/admin/addHp.aspx.vb b/admin/addHp.aspx.vb
index 6d97b19..ac124fa 100644
--- a/admin/addHp.aspx.vb
+++ b/admin/addHp.aspx.vb
@@ -1,6 +1,4 @@
-Imports Ganss.XSS
-
Partial Class admin_InputBox
Inherits System.Web.UI.Page
Public laenderkuerzel As String = "de"
@@ -9,7 +7,7 @@ Partial Class admin_InputBox
Dim hp_content As hp_content = Nothing
-
+
Public Overrides Sub VerifyRenderingInServerForm(control As Control)
@@ -28,21 +26,6 @@ Partial Class admin_InputBox
laenderkuerzel = "de"
End If
- ' Dim arrayoftags(5) As String
- 'arrayoftags(0) = "a"
- 'arrayoftags(1) = "div"
- 'arrayoftags(2) = "iframe"
- 'Dim arrayofattrs(20) As String
- 'arrayofattrs(0) = "a"
- 'Dim uriattributes(5) As String
- 'uriattributes(0) = "Par1"
- 'Dim allowedcssprops(15) As String
- 'allowedcssprops(0) = ""
-
- 'Dim sanitizer = New HtmlSanitizer(arrayoftags, Nothing, arrayofattrs, uriattributes, allowedcssprops)
-
- 'Dim cleanHtml As String
- 'sanitizer.AllowDataAttributes = True
If Not Request.QueryString("menuID") Is Nothing Then
@@ -52,7 +35,7 @@ Partial Class admin_InputBox
End If
hp_content = DB.qry_contentNew(menueId, laenderkuerzel)
- 'cleanHtml = sanitizer.Sanitize(hp_content.ToString)
+
Page.Session("hp_content") = hp_content
@@ -61,19 +44,19 @@ Partial Class admin_InputBox
Protected Sub addPage_Click(sender As Object, e As EventArgs) Handles addPage.Click
-
+
Dim hp_content As hp_content = Nothing
hp_content = Page.Session("hp_content") 'sonst gehs ned, weil werte nicht geladen sind
' Dim title = InputBox("Bitte geben Sie den deutschen Menü-Titel an:")
' System.Web.HttpContext.Current.Response.Write("")
Dim title As String = input.Text
-
+
If title <> "" Then
'Request.QueryString("menuID")
Dim menueId As Integer = -1
menueId = DB.insert_HPContentNew(hp_content, laenderkuerzel, title, hp_content.hp_id, hp_content.hp_instance)
'Page.Parent.Page.Response.Redirect("admin.aspx?menuId=" & menueId & "&lan=" & laenderkuerzel)
-
+
Page.Session("parentReload") = "admin.aspx?menuID=" & menueId & "&lan=" & laenderkuerzel
Else
diff --git a/css/Customers/CustomerAVISO.css b/css/Customers/CustomerAVISO.css
index 16412f4..711905c 100644
--- a/css/Customers/CustomerAVISO.css
+++ b/css/Customers/CustomerAVISO.css
@@ -42,7 +42,7 @@ hr{
border: none;
border-radius: 0;
transition: color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,border-radius .15s ease;
- height:5px;
+ height:6px;
}
.accordion #accordionExample #collapseOne .card card-body #cont3 .container {
margin-left: 2px;
@@ -72,6 +72,10 @@ hr{
#normaltable{
width:100%;
}
+.CSS_Input {
+ font-size:/*17px*/1.063em;
+ margin-left:4px;
+}
@media (prefers-reduced-motion:reduce) {
.accordion-button {
transition: none
diff --git a/packages.config b/packages.config
index 737427f..2a45739 100644
--- a/packages.config
+++ b/packages.config
@@ -1,12 +1,8 @@
-
-
-
-
@@ -22,14 +18,10 @@
-
-
-
-
-
+
\ No newline at end of file
diff --git a/sendFeedback.aspx b/sendFeedback.aspx
index 213de5d..a713174 100644
--- a/sendFeedback.aspx
+++ b/sendFeedback.aspx
@@ -16,7 +16,7 @@
-
+
Verag Feedback Panel
@@ -31,15 +31,15 @@