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

Fixen des Accordion Schließen Bugs sowie das lösen des RadioButton Design und Work-Problems

Browse Source
This commit is contained in:
ja
2021-09-24 16:51:06 +02:00
parent 4d0444d40a
commit ca2d8dfc24
8 changed files with 168 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Customers/Customers.master
View File

@@ -31,11 +31,6 @@
Sub Page_Load() Handles Me.Load Sub Page_Load() Handles Me.Load
'Login-Validierung 'Login-Validierung
If Not Me.Page.User.Identity.IsAuthenticated Then If Not Me.Page.User.Identity.IsAuthenticated Then
Try
FormsAuthentication.RedirectFromLoginPage(Me.Page.User.Identity.Name, True)
Catch ex As Exception
End Try
FormsAuthentication.RedirectToLoginPage() FormsAuthentication.RedirectToLoginPage()
End If End If

127
Customers/CustomsAviso.aspx
View File

@@ -27,12 +27,14 @@
<link rel="stylesheet" type="text/css" href="../css/Customers/MasterpageCustomers.css"/> <link rel="stylesheet" type="text/css" href="../css/Customers/MasterpageCustomers.css"/>
<link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/> <link rel="stylesheet" type="text/css" href="../css/navbarsidebar2.css"/>
<link rel="stylesheet" type="text/css" href="../css/Customers/CustomsAVISO.css"/> <link rel="stylesheet" type="text/css" href="../css/Customers/CustomsAVISO.css"/>
</asp:Content> </asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server"> <asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<asp:ScriptManager ID="script1" runat="server"></asp:ScriptManager> <asp:ScriptManager ID="script1" runat="server"></asp:ScriptManager>
<asp:UpdatePanel ID="panelupdate1" runat="server" UpdateMode="Conditional"><ContentTemplate> <asp:UpdatePanel ID="panelupdate1" runat="server" UpdateMode="Conditional"><ContentTemplate>
<!-- Webiste-Content--> <!-- Webiste-Content-->
<div id="containerseiterand" style="margin-left:auto;margin-right:auto"> <div id="containerseiterand" style="margin-left:auto;margin-right:auto">
<div class="container-fluid"> <div class="container-fluid">
@@ -75,32 +77,33 @@
<div class="col-12" style="margin-left:8px" > <div class="col-12" style="margin-left:8px" >
<asp:Label ID="lbl_ArtderAuftraege" runat="server" Text="Auftrags-Status:" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn nichts angewählt ist, bitte das Datum eingrenzen."></asp:Label> <asp:Label ID="lbl_ArtderAuftraege" runat="server" Text="Auftrags-Status:" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn nichts angewählt ist, bitte das Datum eingrenzen."></asp:Label>
</div> </div>
<div class="d-none d-md-block"> <div class="d-none d-md-block">
<div style=" width:780px; margin-left:8px"> <div style=" width:780px; margin-left:8px">
<asp:RadioButtonList id="RadioButtonList1" runat="server" RepeatDirection="Horizontal" style="border-color:#fff"> <fieldset>
<asp:ListItem ID="rbt_Alle" name="radios" style="font-size:/*17px*/1.063em;margin-left:0px"><label id="lbl_rbt_Alle" for="rbt_Alle" style="margin-left:3px;">Alle</label></asp:ListItem> <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<asp:ListItem ID="rbt_Erf" name="radios" style="font-size:/*17px*/1.063em;margin-left:4px"><label id="lbl_rbt_Erf" for="rbt_Erf" style="margin-left:3px;">Erfasst</label></asp:ListItem> <label><input id="rbt_Alle" onchange="GetSelectedVal(this)" type="radio" name="art" value="Alle" data-bs-toggle="tooltip" style="margin-right:4px" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." runat="server"/>Alle</label>
<asp:ListItem ID="rbt_Vorb" name="radios" style="font-size:/*17px*/1.063em;margin-left:4px"><label id="lbl_rbt_Vorb" for="rbt_Vorb" style="margin-left:3px;">Vorbereitet</label></asp:ListItem> <label><input id="rbt_Erf" onchange="GetSelectedVal(this)" type="radio" name="art" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</label>
<asp:ListItem ID="rbt_Vorg" name="radios" style="font-size:/*17px*/1.063em;margin-left:4px"><label id="lbl_rbt_Vorg" for="rbt_Vorg" style="margin-left:3px;">Vorgeschrieben</label></asp:ListItem> <label><input id="rbt_Vorb" onchange="GetSelectedVal(this)" type="radio" name="art" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
<asp:ListItem ID="rbt_Ankunft" name="radios" style="font-size:/*17px*/1.063em;margin-left:4px"><label id="lbl_rbt_Ankunft" for="rbt_Ankunft" style="margin-left:3px;">Ankunft</label></asp:ListItem> <label><input id="rbt_Vorg" onchange="GetSelectedVal(this)" type="radio" name="art" value="Vorgeschrieben" style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
<asp:ListItem ID="rbt_Freig" name="radios" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="font-size:/*17px*/1.063em;margin-left:4px"><label id="lbl_rbt_Freig" for="rbt_Freig" style="margin-left:3px;">Freigabe</label></asp:ListItem> <label><input id="rbt_Ankunft" onchange="GetSelectedVal(this)" type="radio" name="art" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
</asp:RadioButtonList> <label><input id="rbt_Freig" onchange="GetSelectedVal(this)" type="radio" name="art" value="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="margin-right:4px" runat="server">Freigabe</label>
</fieldset>
</div> </div>
</div> </div>
<div class="d-md-none"> <div class="d-md-none">
<div class="col-8" style="margin-left:8px" > <div class="col-8" style="margin-left:8px">
<asp:RadioButtonList id="RadioButtonList2" runat="server" RepeatDirection="Vertical" style="border-color:#fff"> <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<asp:ListItem ID="rbt_Alle_M" name="radios" style="font-size:/*17px*/1.063em"><label id="lbl_rbt_Alle_M" for="rbt_Alle_M" style="margin-left:3px;">Alle</label></asp:ListItem> <label><input id="rbt_Alle_M" onchange="GetSelectedVal(this)" type="radio" name="art2" value="Alle" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." class="CSS_input" runat="server"/>Alle</label>
<asp:ListItem ID="rbt_Erf_M" name="radios" style="font-size:/*17px*/1.063em"><label id="lbl_rbt_Erf_M" for="rbt_Erf_M" style="margin-left:3px;">Erfasst</label></asp:ListItem> <label><input id="rbt_Erf_M" onchange="GetSelectedVal(this)" type="radio" name="art2" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</label>
<asp:ListItem ID="rbt_Vorb_M" name="radios" style="font-size:/*17px*/1.063em"><label id="lbl_rbt_Vorb_M" for="rbt_Vorb_M" style="margin-left:3px;">Vorbereitet</label></asp:ListItem> <label><input id="rbt_Vorb_M" onchange="GetSelectedVal(this)" type="radio" name="art2" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
<asp:ListItem ID="rbt_Vorg_M" name="radios" style="font-size:/*17px*/1.063em"><label id="lbl_rbt_Vorg_M" for="rbt_Vorg_M" style="margin-left:3px;">Vorgeschrieben</label></asp:ListItem> <label><input id="rbt_Vorg_M" onchange="GetSelectedVal(this)" type="radio" name="art2" value="Vorgeschrieben" style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
<asp:ListItem ID="rbt_Ankunft_M" name="radios" style="font-size:/*17px*/1.063em"><label id="lbl_rbt_Ankunft_M" for="rbt_Ankunft_M" style="margin-left:3px;">Ankunft</label></asp:ListItem> <label><input id="rbt_Ankunft_M" onchange="GetSelectedVal(this)" type="radio" name="art2" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
<asp:ListItem ID="rbt_Freig_M" name="radios" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="font-size:/*17px*/1.063em"><label id="lbl_rbt_Freig_M" for="rbt_Freig_M" style="margin-left:3px;">Freigabe</label></asp:ListItem> <label><input id="rbt_Freig_M" onchange="GetSelectedVal(this)" type="radio" name="art2" value="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen." style="margin-right:4px" runat="server">Freigabe</label>
</asp:RadioButtonList> </div>
</div>
</div> </div>
</div> </div>
<asp:HiddenField ID="hfAccordionIndex" runat="server" />
<div style="height:0.936768149882904vh"></div> <div style="height:0.936768149882904vh"></div>
<div class="col-12" id="cont4"> <div class="col-12" id="cont4">
<div class="col-12" id="container2" style="margin-left:2px"> <div class="col-12" id="container2" style="margin-left:2px">
@@ -109,12 +112,10 @@
<asp:Label ID="lbl_bis" runat="server" Text="Bis:"></asp:Label> <asp:Label ID="lbl_bis" runat="server" Text="Bis:"></asp:Label>
<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:Label ID="lbl_ErrorCal" runat="server" Text=""></asp:Label>
</div> </div>
<div id="Abstand"></div> <div id="Abstand"></div>
<hr> <hr>
<div id="accordion">
<div class="accordion" id="accordionExample"> <div class="accordion" id="accordionExample">
<div class="accordion-item"> <div class="accordion-item">
<h2 class="accordion-header" id="headingOne"> <h2 class="accordion-header" id="headingOne">
@@ -122,7 +123,7 @@
</h2> </h2>
</div> </div>
<div id="collapseOne" class="accordion-collapse" aria-labelledby="headingOne" data-bs-parent="#accordionExample"> <div id="collapseOne" class="accordion-collapse collapse hide" aria-labelledby="headingOne" data-bs-parent="#accordionExample">
<div class="card card-body"> <div class="card card-body">
<div class="col-12" id="cont3"> <div class="col-12" id="cont3">
<div class="container"> <div class="container">
@@ -190,7 +191,7 @@
</asp:Table> </asp:Table>
</div> </div>
</div></div> </div></div></div>
</div> </div>
<br /><br /><br /> <br /><br /><br />
<% End If <% End If
@@ -201,46 +202,29 @@
End Try %> End Try %>
<div></div></div> </ContentTemplate></asp:UpdatePanel> <div></div></div> </ContentTemplate></asp:UpdatePanel>
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
<script> <script>
$('#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>
<script type='text/javascript'> <script>
$(document).ready(function() { function GetSelectedVal(ele) {
/*$("#container2").hide();*/ var el = $(ele).closest('label').text();
$('#<%=RadioButtonList1.ClientID %> input[type="radio"]').change(function () { if (el == "Alle") {
var idVal = $(this).attr("id"); $("#container2").show();
/*alert($("label[for='" + idVal + "']").text());*/ } else if (el == "Freigabe") {
if ($("label[for='" + idVal + "']").text() == "Alle") { $("#container2").show();
$("#container2").show(); } else {
} else if ($("label[for='" + idVal + "']").text() == "Freigabe") { $("#container2").hide();
$("#container2").show(); }
} else { }
$("#container2").hide(); </script>
}
});
$('#<%=RadioButtonList2.ClientID %> input[type="radio"]').change(function () {
var idVal = $(this).attr("id");
/*alert($("label[for='" + idVal + "']").text());*/
if ($("label[for='" + idVal + "']").text() == "Alle") {
$("#container2").show();
} else if ($("label[for='" + idVal + "']").text() == "Freigabe") {
$("#container2").show();
} else {
$("#container2").hide();
}
});
});
</script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function () { $(document).ready(function () {
Sys.WebForms.PageRequestManager.getInstance().add_endRequest(EndRequestHandler); Sys.WebForms.PageRequestManager.getInstance().add_endRequest(EndRequestHandler);
@@ -248,39 +232,6 @@
function EndRequestHandler(sender, args) { function EndRequestHandler(sender, args) {
$('.classTarget).datepicker({ dateFormat: 'dd.MM.yyyy' }); $('.classTarget).datepicker({ dateFormat: 'dd.MM.yyyy' });
} }
}); });
</script> </script>
<script>
$(document).ready(function () {
$(".accordion .accordion-collapse").on('shown.bs.collapse', function () {
var active = $(this).attr('id');
var panels = localStorage.panels === undefined ? new Array() : JSON.parse(localStorage.panels);
if ($.inArray(active, panels) == -1) //check that the element is not in the array
panels.push(active);
localStorage.panels = JSON.stringify(panels);
});
$(".accordion .accordion-collapse").on('hidden.bs.collapse', function () {
var active = $(this).attr('id');
var panels = localStorage.panels === undefined ? new Array() : JSON.parse(localStorage.panels);
var elementIndex = $.inArray(active, panels);
if (elementIndex !== -1) //check the array
{
panels.splice(elementIndex, 1); //remove item from array
}
localStorage.panels = JSON.stringify(panels); //save array on localStorage
});
var panels = localStorage.panels === undefined ? new Array() : JSON.parse(localStorage.panels); //get all panels
for (var i in panels) { //<-- panel is the name of the cookie
if ($("#" + panels[i]).hasClass('accordion-collapse')) // check if this is a panel
{
$("#" + panels[i]).collapse("show");
}
}
});
</script>
</asp:Content> </asp:Content>

112
Customers/CustomsAviso.aspx.vb
View File

@@ -22,11 +22,19 @@ Partial Class Kundenbereich_Default
normaltable.EnableViewState = True normaltable.EnableViewState = True
datevon = Date.Parse(pickdate1.Text) datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.Text) datebis = Date.Parse(pickdate2.Text)
Else Else
normaltable.EnableViewState = True 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.Checked = True
rbt_Alle_M.Selected = True rbt_Alle_M.Checked = True
End If End If
End Sub End Sub
@@ -213,27 +221,19 @@ Partial Class Kundenbereich_Default
End Try End Try
End If 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 pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
pickdate2.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 If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then
Try Try
pickdate1.BorderColor = Drawing.Color.Red Dim erster = New Date(Now().Year, Now().Month, 1)
pickdate1.BorderStyle = BorderStyle.Double Dim ersterdat = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
pickdate1.BorderWidth = Unit.Pixel(2) ' MsgBox(ersterdat)
pickdate2.BorderColor = Drawing.Color.Red datevon = ersterdat
pickdate2.BorderStyle = BorderStyle.Double pickdate1.Text = erster.Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString
pickdate2.BorderWidth = Unit.Pixel(2) datebis = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
lbl_ErrorCal.Visible = True pickdate2.Text = Date.Parse(Now().Day.ToString + "." + Now().Month.ToString + "." + Now().Year.ToString).ToString
lbl_ErrorCal.Style.Add("ForeColor", "red")
lbl_ErrorCal.Text = "Kein Datum ausgewählt. Bitte auswählen!"
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
@@ -241,17 +241,13 @@ Partial Class Kundenbereich_Default
Try Try
datevon = Date.Parse(pickdate1.Text) datevon = Date.Parse(pickdate1.Text)
datebis = Date.Parse(pickdate2.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 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_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)) 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 pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
If pickdate1.Text = Nothing Or pickdate2.Text = Nothing Then 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) MsgBox("Die Zeitzonen sind nicht gültig!", MsgBoxStyle.Exclamation)
End Try End Try
End If 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)) 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)) 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)) 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 End If
@@ -353,17 +349,17 @@ Partial Class Kundenbereich_Default
tbl_CellInfo.Controls.Add(btn) tbl_CellInfo.Controls.Add(btn)
tr.Cells.Add(tbl_CellInfo) 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) 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) 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) 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) 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) 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) normaltable.Rows.Add(tr)
End If End If
@@ -383,35 +379,35 @@ Partial Class Kundenbereich_Default
Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs) Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
'Mobil 'Mobil
rbt_Alle_M.Selected = False rbt_Alle_M.Checked = True
rbt_Alle_M.Enabled = True rbt_Alle_M.Disabled = False
rbt_Ankunft_M.Selected = False rbt_Ankunft_M.Checked = False
rbt_Ankunft_M.Enabled = True rbt_Ankunft_M.Disabled = False
rbt_Erf_M.Selected = False rbt_Erf_M.Checked = False
rbt_Erf_M.Enabled = True rbt_Erf_M.Disabled = False
rbt_Freig_M.Selected = False rbt_Freig_M.Checked = False
rbt_Freig_M.Enabled = True rbt_Freig_M.Disabled = False
rbt_Vorg_M.Selected = False rbt_Vorg_M.Checked = False
rbt_Vorg_M.Enabled = True rbt_Vorg_M.Disabled = False
rbt_Vorb_M.Selected = False rbt_Vorb_M.Checked = False
rbt_Vorb_M.Enabled = True rbt_Vorb_M.Disabled = False
txt_Absender_M.Text = "" txt_Absender_M.Text = ""
txt_Empfaenger_M.Text = "" txt_Empfaenger_M.Text = ""
txt_KdNrAuftrag_M.Text = "" txt_KdNrAuftrag_M.Text = ""
txt_LKWNr_M.Text = "" txt_LKWNr_M.Text = ""
'Desktop 'Desktop
rbt_Alle.Selected = False rbt_Alle.Checked = True
rbt_Alle.Enabled = True rbt_Alle.Disabled = False
rbt_Ankunft.Selected = False rbt_Ankunft.Checked = False
rbt_Ankunft.Enabled = True rbt_Ankunft.Disabled = False
rbt_Erf.Selected = False rbt_Erf.Checked = False
rbt_Erf.Enabled = True rbt_Erf.Disabled = False
rbt_Freig.Selected = False rbt_Freig.Checked = False
rbt_Freig.Enabled = True rbt_Freig.Disabled = False
rbt_Vorg.Selected = False rbt_Vorg.Checked = False
rbt_Vorg.Enabled = True rbt_Vorg.Disabled = False
rbt_Vorb.Selected = False rbt_Vorb.Checked = False
rbt_Vorb.Enabled = True rbt_Vorb.Disabled = False
txt_Absender.Text = "" txt_Absender.Text = ""
txt_Empfaenger.Text = "" txt_Empfaenger.Text = ""
txt_KdNrAuftrag.Text = "" txt_KdNrAuftrag.Text = ""

89
Web.config
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0"?>
<!-- <!--
Weitere Informationen zum Konfigurieren der ASP.NET-Anwendung finden Sie unter Weitere Informationen zum Konfigurieren der ASP.NET-Anwendung finden Sie unter
http://go.microsoft.com/fwlink/?LinkId=169433 http://go.microsoft.com/fwlink/?LinkId=169433
@@ -25,16 +25,16 @@
--> -->
<system.web> <system.web>
<authentication mode="Forms"> <authentication mode="Forms">
<forms defaultUrl="admin/admin.aspx" loginUrl="login/Login_FLEX.aspx" slidingExpiration="true" timeout="2880" /> <forms defaultUrl="admin/admin.aspx" loginUrl="login/Login_FLEX.aspx" slidingExpiration="true" timeout="2880"/>
</authentication> </authentication>
<sessionState mode="InProc" timeout="2880" cookieless="AutoDetect" regenerateExpiredSessionId="true" compressionEnabled="true" /> <sessionState mode="InProc" timeout="2880" cookieless="true" regenerateExpiredSessionId="true" compressionEnabled="true"/>
<httpRuntime requestValidationMode="2.0" /> <httpRuntime requestValidationMode="2.0"/>
<pages validateRequest="false" controlRenderingCompatibilityVersion="4.0" /> <pages validateRequest="false" controlRenderingCompatibilityVersion="4.0"/>
<!--<securityPolicy> <!--<securityPolicy>
<trustLevel name="Full" policyFile="internal"/> <trustLevel name="Full" policyFile="internal"/>
</securityPolicy>--> </securityPolicy>-->
<customErrors mode="Off" /> <customErrors mode="Off"/>
<compilation debug="true" strict="false" explicit="true" targetFramework="4.7"> <compilation strict="false" explicit="true" targetFramework="4.7" debug="true">
<!-- <assemblies> <!-- <assemblies>
<add assembly="MySql.Data, Version=5.5, Culture=neutral, PublicKeyToken=C5687FC88969C44D"/> <add assembly="MySql.Data, Version=5.5, Culture=neutral, PublicKeyToken=C5687FC88969C44D"/>
</assemblies> </assemblies>
@@ -48,79 +48,70 @@
<add assembly="MySql.Web, Version=6.9.7.0, Culture=neutral, PublicKeyToken=C5687FC88969C44D" /> <add assembly="MySql.Web, Version=6.9.7.0, Culture=neutral, PublicKeyToken=C5687FC88969C44D" />
<add assembly="MySql.Data.Entity, Version=6.9.7.0, Culture=neutral, PublicKeyToken=C5687FC88969C44D" /> <add assembly="MySql.Data.Entity, Version=6.9.7.0, Culture=neutral, PublicKeyToken=C5687FC88969C44D" />
<add assembly="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30AD4FE6B2A6AEED" /> --> <add assembly="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30AD4FE6B2A6AEED" /> -->
<add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" /> <add assembly="System.Net.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A"/>
<add assembly="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" /> <add assembly="System.Numerics, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089"/>
<add assembly="System.Data.OracleClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
<add assembly="System.Net, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
<add assembly="System.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
<add assembly="System.ServiceProcess, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
<add assembly="System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
<add assembly="WindowsBase, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
</assemblies> </assemblies>
</compilation> </compilation>
<membership defaultProvider="MySqlMembershipProvider"> <membership defaultProvider="MySqlMembershipProvider">
<providers> <providers>
<clear /> <clear/>
<add name="MySqlMembershipProvider" type="MySql.Web.Security.MySQLMembershipProvider, MySql.Web, Version=6.6.5.0, PublicKeyToken=c5687fc88969c44d" autogenerateschema="true" connectionStringName="MyProviderDbConn" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" passwordFormat="Hashed" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" passwordStrengthRegularExpression="" applicationName="/" /> <add name="MySqlMembershipProvider" type="MySql.Web.Security.MySQLMembershipProvider, MySql.Web, Version=6.6.5.0, PublicKeyToken=c5687fc88969c44d" autogenerateschema="true" connectionStringName="MyProviderDbConn" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" passwordFormat="Hashed" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" passwordStrengthRegularExpression="" applicationName="/"/>
</providers> </providers>
</membership> </membership>
</system.web> </system.web>
<connectionStrings> <connectionStrings>
<add name="MyProviderDbConn" connectionString="Server=db593283095.db.1and1.com;Database=db593283095;Uid=dbo593283095;Pwd=atilla#2;Persist Security Info=True;Use Compression=True;port=3306" providerName="MySqlMembershipProvider" /> <add name="MyProviderDbConn" connectionString="Server=db593283095.db.1and1.com;Database=db593283095;Uid=dbo593283095;Pwd=atilla#2;Persist Security Info=True;Use Compression=True;port=3306" providerName="MySqlMembershipProvider"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLL_PRODConnectionString" connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLL_PRODConnectionString" connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=VERAG;Integrated Security=false;User ID=test;Password=BmWr501956;"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLASConnectionString" connectionString="Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLASConnectionString" connectionString="Data Source=192.168.0.95\SQLATLAS;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ADMINConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ADMINConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ADMIN;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDL_PRODConnectionString" connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDL_PRODConnectionString" connectionString="Data Source=192.168.0.91\SQLFMZOLL;Initial Catalog=SDL;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLLConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FMZOLLConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=VERAG;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionStringTEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionStringTEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=AVISO_new;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISOConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDLConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=sa;Password=BmWr501956;TrustServerCertificate=False" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.SDLConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=SDL;Integrated Security=False;Persist Security Info=True;User ID=sa;Password=BmWr501956;TrustServerCertificate=False"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.EZOLLConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.EZOLLConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=ezoll;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISO_ATILLAConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.AVISO_ATILLAConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=AVISO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLAS_SBGConnectionString" connectionString="Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.ATLAS_SBGConnectionString" connectionString="Data Source=192.168.133.98;Initial Catalog=atlas;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UIDConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User ID=sa;Password=BmWr501956" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UIDConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=UID;Persist Security Info=True;User ID=sa;Password=BmWr501956"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UID_PRODConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.UID_PRODConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=UID;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FDConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FDConnectionString" connectionString="Data Source=192.168.0.94\SQLEXPRESS;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FD_PRODConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.FD_PRODConnectionString" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=FD;Integrated Security=false;User ID=sa;Password=BmWr501956;"/>
<add name="VERAG_PROG_ALLGEMEIN.My.MySettings.DISPOConnectionStringTEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" providerName="" /> <add name="VERAG_PROG_ALLGEMEIN.My.MySettings.DISPOConnectionStringTEST" connectionString="Data Source=192.168.0.90\DEVSQL;Initial Catalog=DISPO;Integrated Security=false;User ID=sa;Password=BmWr501956;Pooling=true;Min Pool Size=5;Max Pool Size=200" providerName=""/>
</connectionStrings> </connectionStrings>
<system.webServer> <system.webServer>
<rewrite> <rewrite>
<rules> <rules>
<rule name="HTTP to HTTPS redirect" enabled="false" stopProcessing="true"> <rule name="HTTP to HTTPS redirect" enabled="false" stopProcessing="true">
<match url="(.*)" /> <match url="(.*)"/>
<conditions> <conditions>
<add input="{HTTPS}" pattern="off" /> <add input="{HTTPS}" pattern="off"/>
</conditions> </conditions>
<action type="Redirect" redirectType="Permanent" url="https://{HTTP_HOST}/{R:1}" /> <action type="Redirect" redirectType="Permanent" url="https://{HTTP_HOST}/{R:1}"/>
</rule> </rule>
</rules> </rules>
</rewrite> </rewrite>
</system.webServer> </system.webServer>
<system.data> <system.data>
<DbProviderFactories> <DbProviderFactories>
<remove invariant="MySql.Data.MySqlClient" /> <remove invariant="MySql.Data.MySqlClient"/>
<add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.7.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" /> <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.7.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
</DbProviderFactories> </DbProviderFactories>
</system.data> </system.data>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" /> <assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.10.2.2046" newVersion="5.10.2.2046" /> <bindingRedirect oldVersion="0.0.0.0-5.10.2.2046" newVersion="5.10.2.2046"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0"/>
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" /> <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.CodePages" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly> </dependentAssembly>
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>
<!--ProjectGuid: 9b651bc0-361a-4f93-8118-dd8a986f2371-->

19
admin/addHp.aspx.vb
View File

@@ -1,6 +1,4 @@
 
Imports Ganss.XSS
Partial Class admin_InputBox Partial Class admin_InputBox
Inherits System.Web.UI.Page Inherits System.Web.UI.Page
Public laenderkuerzel As String = "de" Public laenderkuerzel As String = "de"
@@ -28,21 +26,6 @@ Partial Class admin_InputBox
laenderkuerzel = "de" laenderkuerzel = "de"
End If 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 If Not Request.QueryString("menuID") Is Nothing Then
@@ -52,7 +35,7 @@ Partial Class admin_InputBox
End If End If
hp_content = DB.qry_contentNew(menueId, laenderkuerzel) hp_content = DB.qry_contentNew(menueId, laenderkuerzel)
'cleanHtml = sanitizer.Sanitize(hp_content.ToString)
Page.Session("hp_content") = hp_content Page.Session("hp_content") = hp_content

6
css/Customers/CustomerAVISO.css
View File

@@ -42,7 +42,7 @@ hr{
border: none; border: none;
border-radius: 0; 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; 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 { .accordion #accordionExample #collapseOne .card card-body #cont3 .container {
margin-left: 2px; margin-left: 2px;
@@ -72,6 +72,10 @@ hr{
#normaltable{ #normaltable{
width:100%; width:100%;
} }
.CSS_Input {
font-size:/*17px*/1.063em;
margin-left:4px;
}
@media (prefers-reduced-motion:reduce) { @media (prefers-reduced-motion:reduce) {
.accordion-button { .accordion-button {
transition: none transition: none

10
packages.config
View File

@@ -1,12 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="AngleSharp" version="0.16.0" targetFramework="net47" />
<package id="AngleSharp.Css" version="0.16.1" targetFramework="net47" />
<package id="AntiXSS.NetStandard.HtmlSanitization" version="0.1.125" targetFramework="net47" />
<package id="bootstrap" version="5.0.2" targetFramework="net47" /> <package id="bootstrap" version="5.0.2" targetFramework="net47" />
<package id="CompareNETObjects" version="4.73.0" targetFramework="net47" /> <package id="CompareNETObjects" version="4.73.0" targetFramework="net47" />
<package id="DotNetZip" version="1.15.0" targetFramework="net47" /> <package id="DotNetZip" version="1.15.0" targetFramework="net47" />
<package id="HtmlSanitizer" version="6.0.441" targetFramework="net47" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="3.0.0" targetFramework="net47" developmentDependency="true" /> <package id="Microsoft.CodeAnalysis.Analyzers" version="3.0.0" targetFramework="net47" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.Common" version="3.9.0" targetFramework="net47" /> <package id="Microsoft.CodeAnalysis.Common" version="3.9.0" targetFramework="net47" />
<package id="Microsoft.CodeAnalysis.CSharp" version="3.9.0" targetFramework="net47" /> <package id="Microsoft.CodeAnalysis.CSharp" version="3.9.0" targetFramework="net47" />
@@ -22,14 +18,10 @@
<package id="System.Buffers" version="4.5.1" targetFramework="net47" /> <package id="System.Buffers" version="4.5.1" targetFramework="net47" />
<package id="System.Collections" version="4.3.0" targetFramework="net47" /> <package id="System.Collections" version="4.3.0" targetFramework="net47" />
<package id="System.Collections.Immutable" version="5.0.0" targetFramework="net47" /> <package id="System.Collections.Immutable" version="5.0.0" targetFramework="net47" />
<package id="System.Configuration.ConfigurationManager" version="4.7.0" targetFramework="net47" />
<package id="System.Memory" version="4.5.4" targetFramework="net47" /> <package id="System.Memory" version="4.5.4" targetFramework="net47" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" /> <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />
<package id="System.Reflection.Metadata" version="5.0.0" targetFramework="net47" /> <package id="System.Reflection.Metadata" version="5.0.0" targetFramework="net47" />
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net47" /> <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net47" />
<package id="System.Security.AccessControl" version="4.7.0" targetFramework="net47" /> <package id="System.Text.Encoding.CodePages" version="4.5.1" targetFramework="net47" />
<package id="System.Security.Permissions" version="4.7.0" targetFramework="net47" />
<package id="System.Security.Principal.Windows" version="4.7.0" targetFramework="net47" />
<package id="System.Text.Encoding.CodePages" version="5.0.0" targetFramework="net47" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net47" /> <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net47" />
</packages> </packages>

4
sendFeedback.aspx
View File

@@ -105,7 +105,7 @@
End Sub End Sub
Function SendEmail() As Boolean Function SendEmail() As Boolean
Dim Msg As New MailMessage Dim Msg As New MailMessage
Dim myCredentials As New System.Net.NetworkCredential Dim myCredentials As New System.Net.NetworkCredential
myCredentials.UserName = "al@verag.ag" myCredentials.UserName = "al@verag.ag"
@@ -125,7 +125,7 @@
' Dim attachment As Attachment = New Attachment(File.OpenRead(excel), "Kundenliste.xlsx") ' Dim attachment As Attachment = New Attachment(File.OpenRead(excel), "Kundenliste.xlsx")
' Msg.Attachments.Add(attachment) ' Msg.Attachments.Add(attachment)
' mySmtpsvr.Send(Msg) ' mySmtpsvr.Send(Msg)
MsgBox("SENT") MsgBox("SENT")
Return True Return True
Catch ex As Exception Catch ex As Exception
MsgBox(Err.Number & ex.Message & ex.StackTrace.ToString) 'Falls ein Fehler auftritt wird eine MsgBox angezeigt MsgBox(Err.Number & ex.Message & ex.StackTrace.ToString) 'Falls ein Fehler auftritt wird eine MsgBox angezeigt