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

RadioButton Select lässt nur bei angewähltem FreigabeButton oder wenn kein Button angewäht ist freigegeben.

Browse Source
This commit is contained in:
ja
2021-09-16 09:17:31 +02:00
parent 1461e76f70
commit 0f0c299b29
4 changed files with 53 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
Customers/CustomsAviso.aspx
View File

@@ -69,7 +69,6 @@
<div class="col-12" style="text-align:end"> <div class="col-12" style="text-align:end">
<asp:LinkButton ID="btn_resetForm" runat="server" onclick="btn_resetForm_Click" style="margin-right:2px">Filter zurücksetzen</asp:LinkButton> <asp:LinkButton ID="btn_resetForm" runat="server" onclick="btn_resetForm_Click" style="margin-right:2px">Filter zurücksetzen</asp:LinkButton>
</div> </div>
<div style="height:0.936768149882904vh"></div> <div style="height:0.936768149882904vh"></div>
@@ -78,28 +77,25 @@
</div> </div>
<div class="col-8" style="margin-left:8px" > <div class="col-8" style="margin-left:8px" >
<asp:RadioButtonList id="RadioButtonList1" runat="server" RepeatDirection="Horizontal" style="border-color:#fff"> <asp:RadioButtonList id="RadioButtonList1" runat="server" RepeatDirection="Horizontal" style="border-color:#fff">
<asp:ListItem ID="rbt_Erf" GroupName="radio" style="font-size:/*17px*/1.063em"> Erfasst</asp:ListItem> <asp:ListItem ID="rbt_Erf" GroupName="radios" style="font-size:/*17px*/1.063em"> Erfasst</asp:ListItem>
<asp:ListItem ID="rbt_Vorb" GroupName="radio" style="font-size:/*17px*/1.063em">Vorbereitet</asp:ListItem> <asp:ListItem ID="rbt_Vorb" GroupName="radios" style="font-size:/*17px*/1.063em">Vorbereitet</asp:ListItem>
<asp:ListItem ID="rbt_Vorg" GroupName="radio" style="font-size:/*17px*/1.063em"> Vorgeschrieben</asp:ListItem> <asp:ListItem ID="rbt_Vorg" GroupName="radios" style="font-size:/*17px*/1.063em"> Vorgeschrieben</asp:ListItem>
<asp:ListItem ID="rbt_Ankunft" GroupName="radio" style="font-size:/*17px*/1.063em">Ankunft</asp:ListItem> <asp:ListItem ID="rbt_Ankunft" GroupName="radios" style="font-size:/*17px*/1.063em">Ankunft</asp:ListItem>
<asp:ListItem ID="rbt_Freig" onclick="optionensichtbarkeit()" 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"> Freigabe</asp:ListItem> <asp:ListItem ID="rbt_Freig" GroupName="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">Freigabe</asp:ListItem>
</asp:RadioButtonList> </asp:RadioButtonList>
</div> </div>
</div> </div>
</div> </div>
<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"> <div class="col-12" id="container2" style="margin-left:2px">
<div class="container2" style="margin-left:2px">
<div class="align-content-start">
<asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label> <asp:Label ID="lbl_von" runat="server" Text="Von:"></asp:Label>
<asp:TextBox id="pickdate1" Type="Date" runat="server"></asp:TextBox> <asp:TextBox id="pickdate1" Type="Date" runat="server"></asp:TextBox>
<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" runat="server"></asp:TextBox> <asp:TextBox id="pickdate2" Type="Date" runat="server"></asp:TextBox>
</div> </div>
</div>
</div>
<div style="height:/*12px*/0.936768149882904vh"></div> <div style="height:/*12px*/0.936768149882904vh"></div>
<hr> <hr>
<div id="accordion"> <div id="accordion">
@@ -134,7 +130,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -189,15 +185,7 @@
</div> </div>
</div>--%> </div>--%>
<script type="text/javascript">
function optionensichtbarkeit() {
if (rbt_Freig.checked) {
document.getElementById("container2").style.display = "inline";
} else {
document.getElementById("container2").style.display= "hidden";
}
}
</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');
@@ -208,5 +196,28 @@
}); });
</script> </script>
<script src="//code.jquery.com/jquery-1.11.1.min.js"></script> <script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
<script type='text/javascript'>
$(document).ready(function () {
$("#container2").hide();
let htmlNodes = document.getElementsByName('status');
let radioButtonsArray = Array.from(htmlNodes);
let isAnyRadioButtonChecked = radioButtonsArray.some(element => element.checked);
if (isAnyRadioButtonChecked == false){
$("#container2").show();
} else {
$("#container2").hide();
}
$('#<%=RadioButtonList1.ClientID %> input[type="radio"]').change(function () {
if ($(this).val() == "Freigabe") {
$("#container2").show();
} else {
$("#container2").hide();
}
});
});
</script>
</asp:Content> </asp:Content>

24
Customers/CustomsAviso.aspx.vb
View File

@@ -42,14 +42,19 @@ Partial Class Kundenbereich_Default
'MsgBox(Session.Item("CustomerID").ToString) 'MsgBox(Session.Item("CustomerID").ToString)
'MsgBox(Session.Item("PW").ToString) 'MsgBox(Session.Item("PW").ToString)
Kdnrtext = Session.Item("CustomerID").ToString Kdnrtext = Session.Item("CustomerID").ToString
dt = Nothing dt = Nothing
If txt_Absender.Text IsNot "" Then If txt_Absender.Text IsNot "" Then
txt_Absender.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Absender = txt_Absender.Text Absender = txt_Absender.Text
ElseIf txt_Empfaenger.Text IsNot "" Then ElseIf txt_Empfaenger.Text IsNot "" Then
txt_Empfaenger.ValidateRequestMode = UI.ValidateRequestMode.Enabled
Empfaenger = txt_Empfaenger.Text Empfaenger = txt_Empfaenger.Text
ElseIf txt_KdNrAuftrag.Text IsNot "" Then ElseIf txt_KdNrAuftrag.Text IsNot "" Then
txt_KdNrAuftrag.ValidateRequestMode = UI.ValidateRequestMode.Enabled
KDNAFNR = txt_KdNrAuftrag.Text KDNAFNR = txt_KdNrAuftrag.Text
ElseIf txt_LKWNr.Text IsNot "" Then ElseIf txt_LKWNr.Text IsNot "" Then
txt_LKWNr.ValidateRequestMode = UI.ValidateRequestMode.Enabled
LKWNR = txt_LKWNr.Text LKWNR = txt_LKWNr.Text
End If End If
@@ -60,7 +65,9 @@ Partial Class Kundenbereich_Default
If pickdate1.Text = Not "TT.MM.JJJJ" And pickdate2.Text = Not "TT.MM.JJJJ" Then If pickdate1.Text = Not "TT.MM.JJJJ" And pickdate2.Text = Not "TT.MM.JJJJ" Then
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
Try Try
pickdate1.ValidateRequestMode = UI.ValidateRequestMode.Enabled
datevon = Date.Parse(pickdate1.Text) datevon = Date.Parse(pickdate1.Text)
pickdate2.ValidateRequestMode = UI.ValidateRequestMode.Enabled
datebis = Date.Parse(pickdate2.Text) datebis = Date.Parse(pickdate2.Text)
Catch ex As Exception Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation) MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
@@ -79,7 +86,7 @@ Partial Class Kundenbereich_Default
ElseIf rbt_Erf.Selected = False And rbt_Freig.Selected = False And rbt_Ankunft.Selected = False And rbt_Vorb.Selected = False And rbt_Vorg.Selected = False Then ElseIf rbt_Erf.Selected = False And rbt_Freig.Selected = False And rbt_Ankunft.Selected = False And rbt_Vorb.Selected = False And rbt_Vorg.Selected = False Then
If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then If pickdate1.Text = "TT.MM.JJJJ" And pickdate2.Text = "TT.MM.JJJJ" Then
MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!") MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
ElseIf pickdate1.Text = Not "TT.MM.JJJJ" And pickdate2.Text = Not "TT.MM.JJJJ" Then
pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString pickdate1.Text = Date.ParseExact("01" + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
pickdate2.Text = Date.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString pickdate2.Text = Date.ParseExact(Date.Now.Day.ToString + "-" + Date.Now.Month.ToString + "-" + Date.Now.Year.ToString, "dd-MM-yyyy", Nothing).ToString
datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing) datevon = Date.ParseExact(pickdate1.Text, "dd-MM-yyyy", Nothing)
@@ -182,16 +189,6 @@ Partial Class Kundenbereich_Default
tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString
tr.Cells.Add(tbl_CellKundAuftNr) tr.Cells.Add(tbl_CellKundAuftNr)
Dim btn2 As New ImageButton
btn2.ViewStateMode = ViewStateMode.Disabled
btn2.ImageUrl = "../images/Icons/service/hilfe_small.png"
'btn2.CssClass = "btn btn-primary"
btn2.Attributes.Add("href", "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString)
btn2.Attributes.Add("target", "_blank")
btn2.PostBackUrl = "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString
Dim btn As New LinkButton Dim btn As New LinkButton
btn.ViewStateMode = ViewStateMode.Disabled btn.ViewStateMode = ViewStateMode.Disabled
'btn.Text = "Text" 'btn.Text = "Text"
@@ -201,7 +198,8 @@ Partial Class Kundenbereich_Default
btn.Attributes.Add("target", "_blank") btn.Attributes.Add("target", "_blank")
btn.PostBackUrl = "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString btn.PostBackUrl = "../status_Julius.aspx?AvisoId=" + VERAG_PROG_ALLGEMEIN.cCryptography3.Encrypt(d("AvisoID")).ToString
tbl_CellInfo.Controls.Add(btn2) tbl_CellInfo.Controls.Add(btn)
tbl_CellInfo.ValidateRequestMode = UI.ValidateRequestMode.Enabled
tr.Cells.Add(tbl_CellInfo) tr.Cells.Add(tbl_CellInfo)
If rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then If rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then
@@ -218,8 +216,6 @@ Partial Class Kundenbereich_Default
normaltable.Rows.Add(tr) normaltable.Rows.Add(tr)
End If End If
i += 1 i += 1
Next Next
End If End If

28
css/Customers/CustomerAVISO.css
View File

@@ -67,13 +67,11 @@ hr{
box-shadow: inset 0 -1px 0 rgba(4, 51, 129,.125); box-shadow: inset 0 -1px 0 rgba(4, 51, 129,.125);
border:none; border:none;
} }
.accordion-button:not(.collapsed)::after {
.accordion-button:not(.collapsed)::after { background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230c63e4'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230c63e4'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e"); border: none;
border: none; transform: rotate(-180deg)
transform: rotate(-180deg) }
}
.accordion-button::after { .accordion-button::after {
flex-shrink: 0; flex-shrink: 0;
width: 1.25rem; width: 1.25rem;
@@ -90,11 +88,9 @@ hr{
transition: none transition: none
} }
} }
.accordion-button:hover { .accordion-button:hover {
z-index: 2 z-index: 2
} }
.accordion-button:focus { .accordion-button:focus {
z-index: 3; z-index: 3;
border-color: #043381; border-color: #043381;
@@ -112,70 +108,56 @@ hr{
color: #043381; color: #043381;
font-size: 22px; font-size: 22px;
} }
#tableSearch { #tableSearch {
width: 50%; width: 50%;
} }
#txt_Absender { #txt_Absender {
width: 250px; width: 250px;
padding-right: -2px; padding-right: -2px;
padding-left: 60px; padding-left: 60px;
} }
#txt_Empfaenger { #txt_Empfaenger {
width: 250px; width: 250px;
padding-right: -2px; padding-right: -2px;
padding-left: 60px; padding-left: 60px;
} }
#txt_LKWNr { #txt_LKWNr {
width: 250px; width: 250px;
padding-right: -2px; padding-right: -2px;
padding-left: 60px; padding-left: 60px;
} }
#txt_KdNrAuftrag { #txt_KdNrAuftrag {
width: 250px; width: 250px;
padding-right: -2px; padding-right: -2px;
padding-left: 60px; padding-left: 60px;
} }
.container-fluid { .container-fluid {
width: 700px; width: 700px;
} }
#cont1 { #cont1 {
width: 700px; width: 700px;
} }
#containerseiterand { #containerseiterand {
min-width: 700px; min-width: 700px;
} }
.flex-fill { .flex-fill {
width: 700px; width: 700px;
} }
#cont3 { #cont3 {
width: 700px; width: 700px;
} }
#cont4 { #cont4 {
min-width: 750px; min-width: 750px;
} }
tbody { tbody {
font-size: 3.303964757709251vw; font-size: 3.303964757709251vw;
height: auto; height: auto;
flex-wrap: wrap; flex-wrap: wrap;
width: fit-content; width: fit-content;
} }
#normaltable { #normaltable {
width: 100%; width: 100%;
} }
#conovertab { #conovertab {
/* max-width:width:150px 11.25em;*/ /* max-width:width:150px 11.25em;*/
margin-left: /*14px*/ 3.0837004405286343vw; margin-left: /*14px*/ 3.0837004405286343vw;

1
status_Julius.aspx
View File

@@ -430,6 +430,7 @@
txtCluster = "<i>" & s.tblSnd_FremdspeditionText & "</i>" txtCluster = "<i>" & s.tblSnd_FremdspeditionText & "</i>"
trBg = " class=""fremdspedition""" trBg = " class=""fremdspedition"""
Else Else
VERAG_PROG_ALLGEMEIN.cAllgemein.LOAD_FILIALEN()
If s.FilialenNr > 0 Then txtCluster = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(s.FilialenNr, False) If s.FilialenNr > 0 Then txtCluster = VERAG_PROG_ALLGEMEIN.cAllgemein.getFirmaFromFiliale2(s.FilialenNr, False)
If txtCluster <> "" Then If txtCluster <> "" Then
txtCluster = "<b>" & txtCluster & "</b><br/>" txtCluster = "<b>" & txtCluster & "</b><br/>"