Fixen des Accordion Schließen Bugs sowie das lösen des RadioButton Design und Work-Problems
This commit is contained in:
@@ -31,11 +31,6 @@
|
||||
Sub Page_Load() Handles Me.Load
|
||||
'Login-Validierung
|
||||
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()
|
||||
End If
|
||||
|
||||
|
||||
@@ -27,12 +27,14 @@
|
||||
<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/Customers/CustomsAVISO.css"/>
|
||||
|
||||
</asp:Content>
|
||||
|
||||
<asp:Content ID="Content3" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
|
||||
<asp:ScriptManager ID="script1" runat="server"></asp:ScriptManager>
|
||||
<asp:UpdatePanel ID="panelupdate1" runat="server" UpdateMode="Conditional"><ContentTemplate>
|
||||
|
||||
|
||||
|
||||
<!-- Webiste-Content-->
|
||||
<div id="containerseiterand" style="margin-left:auto;margin-right:auto">
|
||||
<div class="container-fluid">
|
||||
@@ -74,33 +76,34 @@
|
||||
<div style="height:0.936768149882904vh"></div>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-none d-md-block">
|
||||
<div style=" width:780px; margin-left:8px">
|
||||
<asp:RadioButtonList id="RadioButtonList1" runat="server" RepeatDirection="Horizontal" style="border-color:#fff">
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
</asp:RadioButtonList>
|
||||
|
||||
<div style=" width:780px; margin-left:8px">
|
||||
<fieldset>
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
|
||||
<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>
|
||||
<label><input id="rbt_Erf" onchange="GetSelectedVal(this)" type="radio" name="art" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</label>
|
||||
<label><input id="rbt_Vorb" onchange="GetSelectedVal(this)" type="radio" name="art" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
|
||||
<label><input id="rbt_Vorg" onchange="GetSelectedVal(this)" type="radio" name="art" value="Vorgeschrieben" style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
|
||||
<label><input id="rbt_Ankunft" onchange="GetSelectedVal(this)" type="radio" name="art" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
|
||||
<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 class="d-md-none">
|
||||
<div class="col-8" style="margin-left:8px" >
|
||||
<asp:RadioButtonList id="RadioButtonList2" runat="server" RepeatDirection="Vertical" style="border-color:#fff">
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
<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>
|
||||
</asp:RadioButtonList>
|
||||
</div>
|
||||
<div class="col-8" style="margin-left:8px">
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
|
||||
<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>
|
||||
<label><input id="rbt_Erf_M" onchange="GetSelectedVal(this)" type="radio" name="art2" value="Erfasst" style="margin-right:4px" runat="server"/>Erfasst</label>
|
||||
<label><input id="rbt_Vorb_M" onchange="GetSelectedVal(this)" type="radio" name="art2" value="Vorbereitet" style="margin-right:4px" runat="server"/>Vorbereitet</label>
|
||||
<label><input id="rbt_Vorg_M" onchange="GetSelectedVal(this)" type="radio" name="art2" value="Vorgeschrieben" style="margin-right:4px" runat="server"/>Vorgeschrieben</label>
|
||||
<label><input id="rbt_Ankunft_M" onchange="GetSelectedVal(this)" type="radio" name="art2" value="Ankunft" style="margin-right:4px" runat="server"/>Ankunft</label>
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<asp:HiddenField ID="hfAccordionIndex" runat="server" />
|
||||
<div style="height:0.936768149882904vh"></div>
|
||||
<div class="col-12" id="cont4">
|
||||
<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:TextBox id="pickdate2" Type="Date" CssClass="classTarget" runat="server"></asp:TextBox>
|
||||
<asp:Label ID="lbl_ErrorCal" runat="server" Text=""></asp:Label>
|
||||
</div>
|
||||
<div id="Abstand"></div>
|
||||
<hr>
|
||||
|
||||
|
||||
<div id="accordion">
|
||||
<div class="accordion" id="accordionExample">
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="headingOne">
|
||||
@@ -122,7 +123,7 @@
|
||||
</h2>
|
||||
</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="col-12" id="cont3">
|
||||
<div class="container">
|
||||
@@ -190,7 +191,7 @@
|
||||
</asp:Table>
|
||||
|
||||
</div>
|
||||
</div></div>
|
||||
</div></div></div>
|
||||
</div>
|
||||
<br /><br /><br />
|
||||
<% End If
|
||||
@@ -201,46 +202,29 @@
|
||||
End Try %>
|
||||
<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>
|
||||
$('#accordion').on('shown.bs.collapse', function (e) {
|
||||
$(e.target).data('bs.collapse').$trigger.attr('src', 'https://s22.postimg.org/hkrauaofx/Mathematic_Minus2.png');
|
||||
});
|
||||
|
||||
$('#accordion').on('hidden.bs.collapse', function (e, f) {
|
||||
$(e.target).data('bs.collapse').$trigger.attr('src', 'https://s22.postimg.org/9takvqkal/Mathematic_Plus2.png');
|
||||
});
|
||||
</script>
|
||||
<script type='text/javascript'>
|
||||
$(document).ready(function() {
|
||||
/*$("#container2").hide();*/
|
||||
$('#<%=RadioButtonList1.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();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
|
||||
$('#<%=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>
|
||||
<script>
|
||||
function GetSelectedVal(ele) {
|
||||
var el = $(ele).closest('label').text();
|
||||
if (el == "Alle") {
|
||||
$("#container2").show();
|
||||
} else if (el == "Freigabe") {
|
||||
$("#container2").show();
|
||||
} else {
|
||||
$("#container2").hide();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
Sys.WebForms.PageRequestManager.getInstance().add_endRequest(EndRequestHandler);
|
||||
@@ -248,39 +232,6 @@
|
||||
function EndRequestHandler(sender, args) {
|
||||
$('.classTarget).datepicker({ dateFormat: 'dd.MM.yyyy' });
|
||||
}
|
||||
|
||||
});
|
||||
</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>
|
||||
|
||||
</script>
|
||||
</asp:Content>
|
||||
@@ -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 = ""
|
||||
|
||||
91
Web.config
91
Web.config
@@ -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
|
||||
http://go.microsoft.com/fwlink/?LinkId=169433
|
||||
@@ -25,16 +25,16 @@
|
||||
-->
|
||||
<system.web>
|
||||
<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>
|
||||
<sessionState mode="InProc" timeout="2880" cookieless="AutoDetect" regenerateExpiredSessionId="true" compressionEnabled="true" />
|
||||
<httpRuntime requestValidationMode="2.0" />
|
||||
<pages validateRequest="false" controlRenderingCompatibilityVersion="4.0" />
|
||||
<sessionState mode="InProc" timeout="2880" cookieless="true" regenerateExpiredSessionId="true" compressionEnabled="true"/>
|
||||
<httpRuntime requestValidationMode="2.0"/>
|
||||
<pages validateRequest="false" controlRenderingCompatibilityVersion="4.0"/>
|
||||
<!--<securityPolicy>
|
||||
<trustLevel name="Full" policyFile="internal"/>
|
||||
</securityPolicy>-->
|
||||
<customErrors mode="Off" />
|
||||
<compilation debug="true" strict="false" explicit="true" targetFramework="4.7">
|
||||
<customErrors mode="Off"/>
|
||||
<compilation strict="false" explicit="true" targetFramework="4.7" debug="true">
|
||||
<!-- <assemblies>
|
||||
<add assembly="MySql.Data, Version=5.5, Culture=neutral, PublicKeyToken=C5687FC88969C44D"/>
|
||||
</assemblies>
|
||||
@@ -48,79 +48,70 @@
|
||||
<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="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.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" />
|
||||
<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"/>
|
||||
</assemblies>
|
||||
</compilation>
|
||||
<membership defaultProvider="MySqlMembershipProvider">
|
||||
<providers>
|
||||
<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="/" />
|
||||
<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="/"/>
|
||||
</providers>
|
||||
</membership>
|
||||
</system.web>
|
||||
<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="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.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.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.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.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.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.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.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="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.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.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.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.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.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.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.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.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>
|
||||
<system.webServer>
|
||||
<rewrite>
|
||||
<rules>
|
||||
<rule name="HTTP to HTTPS redirect" enabled="false" stopProcessing="true">
|
||||
<match url="(.*)" />
|
||||
<match url="(.*)"/>
|
||||
<conditions>
|
||||
<add input="{HTTPS}" pattern="off" />
|
||||
<add input="{HTTPS}" pattern="off"/>
|
||||
</conditions>
|
||||
<action type="Redirect" redirectType="Permanent" url="https://{HTTP_HOST}/{R:1}" />
|
||||
<action type="Redirect" redirectType="Permanent" url="https://{HTTP_HOST}/{R:1}"/>
|
||||
</rule>
|
||||
</rules>
|
||||
</rewrite>
|
||||
</system.webServer>
|
||||
<system.data>
|
||||
<DbProviderFactories>
|
||||
<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" />
|
||||
<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"/>
|
||||
</DbProviderFactories>
|
||||
</system.data>
|
||||
<runtime>
|
||||
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" />
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.10.2.2046" newVersion="5.10.2.2046" />
|
||||
<assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-5.10.2.2046" newVersion="5.10.2.2046"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<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" />
|
||||
<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"/>
|
||||
</dependentAssembly>
|
||||
<dependentAssembly>
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
|
||||
<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" />
|
||||
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
|
||||
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
|
||||
</dependentAssembly>
|
||||
</assemblyBinding>
|
||||
</runtime>
|
||||
</configuration>
|
||||
</configuration>
|
||||
<!--ProjectGuid: 9b651bc0-361a-4f93-8118-dd8a986f2371-->
|
||||
@@ -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("<SCRIPT LANGUAGE=""JavaScript"">alert('Hello this is an Alert')</SCRIPT>")
|
||||
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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,12 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<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="CompareNETObjects" version="4.73.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.Common" 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.Collections" version="4.3.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.Numerics.Vectors" version="4.5.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.Security.AccessControl" version="4.7.0" 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.Text.Encoding.CodePages" version="4.5.1" targetFramework="net47" />
|
||||
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net47" />
|
||||
</packages>
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
<link href="bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
|
||||
|
||||
|
||||
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>Verag Feedback Panel</title>
|
||||
<link rel="stylesheet" type="text/css" href="css/main.css">
|
||||
@@ -31,15 +31,15 @@
|
||||
<script runat="server">
|
||||
|
||||
Protected Sub Button1_Click(sender As Object, e As EventArgs)
|
||||
|
||||
|
||||
SendEmail()
|
||||
If False Then
|
||||
|
||||
|
||||
Const SMTPSendUsing = 2 ' SMTP über Netzwerk
|
||||
Const SMTPServer = "smtp.1und1.de"
|
||||
Const SMTPServerPort = 25 '587'25
|
||||
Const SMTPConnectionTimeout = 10 'Sekunden
|
||||
|
||||
|
||||
Dim sSubject, sEmail, sMailBody, sFrom, sReadReceipt, sMsg
|
||||
sSubject = "Test"
|
||||
sEmail = "al@verag.ag"
|
||||
@@ -77,10 +77,10 @@
|
||||
If Err.Number <> 0 Then sMsg = "Fehler: " & Err.Description
|
||||
|
||||
Response.Write(sMsg)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
' Dim msgMail As New MailMessage("al@verag.ag", "al@verag.ag")
|
||||
|
||||
' msgMail.To = "christophw@sleeper.Dev.AlfaSierraPapa.Com"
|
||||
@@ -88,24 +88,24 @@
|
||||
' msgMail.From = "webmaster@aspheute.com"
|
||||
' msgMail.Subject = "Hi Chris, another mail"
|
||||
|
||||
|
||||
|
||||
'' Dim strBody As String = "<html><body><b>Hello World</b>" &
|
||||
' " <font color='red'>ASP.NET</font></body></html>"
|
||||
' msgMail.Body = strBody
|
||||
|
||||
|
||||
|
||||
' Dim smtp As New SmtpClient()
|
||||
' smtp.DeliveryMethod = SmtpDeliveryMethod.PickupDirectoryFromIis
|
||||
|
||||
|
||||
' smtp.Send(msgMail)
|
||||
|
||||
|
||||
Response.Write("Email was queued to disk")
|
||||
|
||||
|
||||
End If
|
||||
|
||||
|
||||
End Sub
|
||||
|
||||
Function SendEmail() As Boolean
|
||||
|
||||
Function SendEmail() As Boolean
|
||||
Dim Msg As New MailMessage
|
||||
Dim myCredentials As New System.Net.NetworkCredential
|
||||
myCredentials.UserName = "al@verag.ag"
|
||||
@@ -121,11 +121,11 @@
|
||||
Msg.To.Add("al@verag.ag")
|
||||
Msg.Subject = "TEST"
|
||||
Msg.Body = "TEST"
|
||||
|
||||
|
||||
' Dim attachment As Attachment = New Attachment(File.OpenRead(excel), "Kundenliste.xlsx")
|
||||
' Msg.Attachments.Add(attachment)
|
||||
' mySmtpsvr.Send(Msg)
|
||||
MsgBox("SENT")
|
||||
MsgBox("SENT")
|
||||
Return True
|
||||
Catch ex As Exception
|
||||
MsgBox(Err.Number & ex.Message & ex.StackTrace.ToString) 'Falls ein Fehler auftritt wird eine MsgBox angezeigt
|
||||
|
||||
Reference in New Issue
Block a user