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

Änderungen an CSS sowie der Anordnung der Radiobuttons in einer vertikaen Liste

Browse Source
This commit is contained in:
ja
2021-09-15 10:55:13 +02:00
parent c826f52dff
commit 18977f6a03
7 changed files with 182 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
Customers/CustomsAviso.aspx
View File

@@ -59,7 +59,7 @@
If AVISO_dt IsNot Nothing Then
If True Then 'AVISO.Status <> 1 And AVISO.Status <> 2 Then 'SENDUNGSTABELLE'%>
<div class="flex-fill" style="margin-left:4px">
<div class="col-12" style="margin-left:4px">
<div>
<div class="col-12" style="margin-left:2px">
@@ -78,12 +78,14 @@
<asp:Label ID="lbl_ArtderAuftraege" runat="server" Text="Art der Aufträge:" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn nichts angewählt ist, bitte das Datum eingrenzen."></asp:Label>
</div>
<div class="col-12" style="margin-left:8px" >
<asp:RadioButton ID="rbt_Erf" runat="server" Text="Erfasst"/>
<asp:RadioButton ID="rbt_Vorb" runat="server" Text="Vorbereitet"/>
<asp:RadioButton ID="rbt_Vorg" runat="server" Text="Vorgeschrieben"/>
<asp:RadioButton ID="rbt_Ankunft" runat="server" Text="Ankunft"/>
<asp:RadioButton ID="rbt_Freig" runat="server" onclick="optionensichtbarkeit()" Text="Freigabe" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn dieser Filter angewählt ist, bitte das Datum eingrenzen."/>
</div>
<asp:RadioButtonList id="RadioButtonList1" runat="server" RepeatDirection="Horizontal" style="width:100%">
<asp:ListItem ID="rbt_Erf" GroupName="radio"> Erfasst</asp:ListItem>
<asp:ListItem ID="rbt_Vorb" GroupName="radio">Vorbereitet</asp:ListItem>
<asp:ListItem ID="rbt_Vorg" GroupName="radio"> Vorgeschrieben</asp:ListItem>
<asp:ListItem ID="rbt_Ankunft" GroupName="radio">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."> Freigabe</asp:ListItem>
</asp:RadioButtonList>
</div>
</div>
</div>
<div style="height:0.936768149882904vh"></div>
@@ -103,40 +105,42 @@
</div>
</div>
<div style="height:/*12px*/0.936768149882904vh"></div>
<button class="btn btn-primary" id="btn_collapseoptionalparams" type="button" data-bs-toggle="collapse" data-bs-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample" style="width:100%; background-color:#fff;color">Für die erweiteren Optionen klicken!</button>
<hr>
<div id="accordion">
<div class="accordion" id="accordionExample">
<div class="accordion-item">
<h2 class="accordion-header" id="headingOne">
<button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne" style="background-color:#fff">Erweiterte Suche</button>
</h2>
</div>
<div class="collapse" id="collapseExample">
<div id="collapseOne" class="accordion-collapse collapse show" aria-labelledby="headingOne" data-bs-parent="#accordionExample">
<div class="card card-body">
<div class="col-12" id="cont3" style="border:/*1px*/0.04071661237785016vw #043381 solid; margin: 2px 2px 2px 2px">
<div class="col-12" id="cont3">
<div class="container" style="margin-left:2px">
<asp:Label ID="lbl_option_Suchparam" runat="server" Text="Optionale Suchparameter:" data-bs-toggle="tooltip" data-bs-placement="top" title="Wenn nichts angewählt ist, bitte das Datum eingrenzen."></asp:Label>
<div class="container" style="margin-left:2px">
<div style="height:/*12px*/0.936768149882904vh"></div>
<!-- Optionale Suchparameter-->
<div class="row">
<div class="col-8" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label>
<asp:TextBox ID="txt_Absender" runat="server" style="width:117px"></asp:TextBox>
<asp:Label ID="lbl_Empfaenger" runat="server" Text="Empfänger"></asp:Label>
<asp:TextBox ID="txt_Empfaenger" runat="server" style="width:117px"></asp:TextBox>
<asp:Label ID="lbl_LKWNr" runat="server" Text="LKW Nr"></asp:Label>
<asp:TextBox ID="txt_LKWNr" runat="server" style="width:117px"></asp:TextBox>
<div class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_LKWNr" runat="server" Text="LKW Nr"></asp:Label>
<asp:TextBox ID="txt_LKWNr" runat="server" style="width:117px; margin-left:25px;"></asp:TextBox>
<asp:Label ID="lbl_KdNrAuftrag" runat="server" Text="Kunden Auftrags Nr"></asp:Label>
<asp:TextBox ID="txt_KdNrAuftrag" runat="server" style="width:117px"></asp:TextBox>
<asp:Label ID="lbl_KdNrAuftrag" runat="server" Text="Kunden Auftrags Nr" style="margin-left:45px"></asp:Label>
<asp:TextBox ID="txt_KdNrAuftrag" runat="server" style="width:117px; margin-left:6px;"></asp:TextBox>
</div>
<div class="col-12" style="margin-right:/*1.52px;*/0.33480176211453744vw;">
<asp:Label ID="lbl_Absender" runat="server" Text="Absender"></asp:Label>
<asp:TextBox ID="txt_Absender" runat="server" style="width:155px; margin-left:8px;"></asp:TextBox>
<asp:Label ID="lbl_Empfaenger" runat="server" Text="Empfänger" style="margin-left:9px"></asp:Label>
<asp:TextBox ID="txt_Empfaenger" runat="server" style="width:155px; margin-left:52px;"></asp:TextBox>
</div>
</div>
</div>
</div>
</div></div>
</div></div></div>
<div style="height:/*24px*/1.873536299765808vh"></div>
<asp:Button ID="btn_Auftraege" runat="server" Text="Erhalte Aufträge" OnClick="btn_Auftraege_Click" style="margin-left:18px" />
<div style="height:/*32px*/2.498048399687744vh"></div>
@@ -199,6 +203,15 @@
}
}
</script>
<script src="//code.jquery.com/jquery-1.11.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 src="//code.jquery.com/jquery-1.11.1.min.js"></script>
</asp:Content>

43
Customers/CustomsAviso.aspx.vb
View File

@@ -47,9 +47,9 @@ Partial Class Kundenbereich_Default
End If
'Dim tr
If rbt_Erf.Checked = True Then
If rbt_Erf.Selected = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0},,, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Freig.Checked = True Then
ElseIf rbt_Freig.Selected = True 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
Try
@@ -63,13 +63,13 @@ Partial Class Kundenbereich_Default
Else
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {1}, Date.ParseExact("01-MM-yyyy", "dd-MM-yyyy", Nothing), Date.Now)
End If
ElseIf rbt_Ankunft.Checked = True Then
ElseIf rbt_Ankunft.Selected = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {3},,, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Vorb.Checked = True Then
ElseIf rbt_Vorb.Selected = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {4},,, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Vorg.Checked = True Then
ElseIf rbt_Vorg.Selected = True Then
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {5},,, Absender, Empfaenger, LKWNR, KDNAFNR)
ElseIf rbt_Erf.Checked = False And rbt_Freig.Checked = False And rbt_Ankunft.Checked = False And rbt_Vorb.Checked = False And rbt_Vorg.Checked = 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
MsgBox("Bitte ein Datum auswählen!", MsgBoxStyle.Information, "Information!")
@@ -85,11 +85,11 @@ Partial Class Kundenbereich_Default
Catch ex As Exception
MsgBox(ex.StackTrace, MsgBoxStyle.Exclamation)
End Try
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
End If
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
Else
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
Else
If Date.Parse(pickdate2.Text) > Date.Parse(pickdate1.Text) Then
Try
datevon = Date.Parse(pickdate1.Text)
@@ -99,7 +99,7 @@ Partial Class Kundenbereich_Default
End Try
Else
End If
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext,, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
dt = VERAG_PROG_ALLGEMEIN.cAviso.GET_KDLIST_WEB("", Kdnrtext, {0, 1, 2, 3, 4, 5}, datevon, datebis, Absender, Empfaenger, LKWNR, KDNAFNR)
End If
End If
@@ -182,17 +182,17 @@ Partial Class Kundenbereich_Default
tr.Cells.Add(tbl_CellLKWs)
tbl_CellKundAuftNr.Text = d("KdAuftragsNr_Avisierer").ToString
tr.Cells.Add(tbl_CellKundAuftNr)
If rbt_Ankunft.Checked = True AndAlso tbl_CellStatus.Text = "Ankunft" Then
If rbt_Ankunft.Selected = True AndAlso tbl_CellStatus.Text = "Ankunft" Then
normaltable.Rows.Add(tr)
ElseIf rbt_Erf.Checked = True AndAlso tbl_CellStatus.Text = "Erfasst" Then
ElseIf rbt_Erf.Selected = True AndAlso tbl_CellStatus.Text = "Erfasst" Then
normaltable.Rows.Add(tr)
ElseIf rbt_Freig.Checked = True AndAlso tbl_CellStatus.Text = "Freigegeben" Then
ElseIf rbt_Freig.Selected = True AndAlso tbl_CellStatus.Text = "Freigegeben" Then
normaltable.Rows.Add(tr)
ElseIf rbt_Vorb.Checked = True AndAlso tbl_CellStatus.Text = "Vorbereitet" Then
ElseIf rbt_Vorb.Selected = True AndAlso tbl_CellStatus.Text = "Vorbereitet" Then
normaltable.Rows.Add(tr)
ElseIf rbt_Vorg.Checked = True AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
ElseIf rbt_Vorg.Selected = True AndAlso tbl_CellStatus.Text = "Vorgeschrieben" Then
normaltable.Rows.Add(tr)
ElseIf rbt_Erf.Checked = False And rbt_Ankunft.Checked = False And rbt_Vorg.Checked = False And rbt_Freig.Checked = False And rbt_Vorb.Checked = False Then
ElseIf rbt_Erf.Selected = False And rbt_Ankunft.Selected = False And rbt_Vorg.Selected = False And rbt_Freig.Selected = False And rbt_Vorb.Selected = False Then
normaltable.Rows.Add(tr)
End If
@@ -203,15 +203,15 @@ Partial Class Kundenbereich_Default
Protected Sub btn_resetForm_Click(sender As Object, e As EventArgs)
rbt_Ankunft.Checked = False
rbt_Ankunft.Selected = False
rbt_Ankunft.Enabled = True
rbt_Erf.Checked = False
rbt_Erf.Selected = False
rbt_Erf.Enabled = True
rbt_Freig.Checked = False
rbt_Freig.Selected = False
rbt_Freig.Enabled = True
rbt_Vorg.Checked = False
rbt_Vorg.Selected = False
rbt_Vorg.Enabled = True
rbt_Vorb.Checked = False
rbt_Vorb.Selected = False
rbt_Vorb.Enabled = True
pickdate1.Text = ""
pickdate2.Text = ""
@@ -221,4 +221,5 @@ Partial Class Kundenbereich_Default
Kdnrtext = ""
'txt_KdNr.Focus()
End Sub
End Class

14
bootstrap-5.0.2-dist/css/bootstrap.css vendored
View File

@@ -4430,9 +4430,9 @@ textarea.form-control-lg {
}
}
.accordion-button:not(.collapsed) {
color: #0c63e4;
background-color: #e7f1ff;
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.125);
color: #0c63e4;
background-color: #043381;
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.125);
}
.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");
@@ -4458,10 +4458,10 @@ textarea.form-control-lg {
z-index: 2;
}
.accordion-button:focus {
z-index: 3;
border-color: #86b7fe;
outline: 0;
box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
z-index: 3;
border-color: #043381;
outline: 0;
box-shadow: 0 0 0 0.25rem rgba(13, 110, 253, 0.25);
}
.accordion-header {

28
bootstrap-5.0.2-dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

90
css/Customers/CustomerAVISO.css
View File

@@ -34,16 +34,80 @@ btn_collapseoptionalparams:hover {
color: #fff;
background-color: #043381;
}
@media (max-width: 558.98px) {
#conovertab {
margin-left: 0px;
width: 315px;
overflow-x: auto;
hr{
color:#043381;
}
.accordion-button {
position: relative;
display: flex;
align-items: center;
width: 100%;
padding: 1rem 1.25rem;
font-size: 1rem;
color: #043381;
text-align: left;
background-color: #fff;
border: none;
border-radius: 0;
overflow-anchor: none;
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
}
#RadioButtonList1{
width:100%;
}
@media (prefers-reduced-motion:reduce) {
.accordion-button {
transition: none
}
}
.accordion-button:not(.collapsed) {
color: #043381;
background-color: #fff;
box-shadow: inset 0 -1px 0 rgba(4, 51, 129,.125);
border:none;
}
.accordion-button:not(.collapsed)::after {
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%230c63e4'%3e%3cpath fill-rule='evenodd' d='M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z'/%3e%3c/svg%3e");
border: none;
transform: rotate(-180deg)
}
.accordion-button::after {
flex-shrink: 0;
width: 1.25rem;
height: 1.25rem;
margin-left: auto;
content: "";
background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16' fill='%23212529'%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-repeat: no-repeat;
background-size: 1.25rem;
transition: transform .2s ease-in-out
}
@media (prefers-reduced-motion:reduce) {
.accordion-button::after {
transition: none
}
}
.accordion-button:hover {
z-index: 2
}
.accordion-button:focus {
z-index: 3;
border-color: #043381;
outline: 0;
box-shadow: 0 0 0 .25rem rgba(4, 51, 129,.25)
}
@media (max-width: 558.98px) {
h1 {
color: #043381;
font-size: 22px;
}
#tableSearch {
width: 50%;
}
@@ -53,48 +117,60 @@ btn_collapseoptionalparams:hover {
padding-right: -2px;
padding-left: 60px;
}
#txt_Empfaenger {
width: 250px;
padding-right: -2px;
padding-left: 60px;
}
#txt_LKWNr {
width: 250px;
padding-right: -2px;
padding-left: 60px;
}
#txt_KdNrAuftrag {
width: 250px;
padding-right: -2px;
padding-left: 60px;
}
.container-fluid {
width: 700px;
}
#cont1 {
width: 700px;
}
#containerseiterand {
min-width: 700px;
}
.flex-fill {
width: 700px;
}
#cont3 {
width: 700px;
}
#cont4 {
min-width: 750px;
}
tbody {
font-size: 3.303964757709251vw;
height: auto;
flex-wrap: wrap;
width: fit-content;
}
#normaltable{
width:100%;
#normaltable {
width: 100%;
}
#conovertab {
/* max-width:width:150px 11.25em;*/
margin-left: /*14px*/ 3.0837004405286343vw;

BIN
images/Icons/main/4829857_arrow_down_download_save_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
images/Icons/main/4829858_arrow_cloud_up_upload_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB