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

Info button in Status vorne in Tabelle zur besseren Übersichtlichkeit.

Browse Source
This commit is contained in:
ja
2021-08-11 11:18:33 +02:00
parent c1469cac74
commit eff3b5c027
2 changed files with 111 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
newpageJulius_Sidebar.aspx
View File

@@ -282,7 +282,7 @@
margin-bottom: 0.313rem; margin-bottom: 0.313rem;
} }
a.download { /* a.download {
background: #fff; background: #fff;
color: #043381; color: #043381;
} }

132
status_Julius.aspx
View File

@@ -87,6 +87,9 @@ Imports System.Data.SqlClient
background-color:#fff; background-color:#fff;
} }
body{ body{
font-family: 'Poppins', sans-serif;
background: #fafafa;
background-image: url(images/road.jpg); background-image: url(images/road.jpg);
background-position:center center; background-position:center center;
background-repeat: no-repeat; background-repeat: no-repeat;
@@ -208,6 +211,18 @@ Imports System.Data.SqlClient
margin-left:-1rem; margin-left:-1rem;
margin-right:-1rem; margin-right:-1rem;
} }
/* ---------------------------------------------------
CONTENT STYLE
----------------------------------------------------- */
#content {
width: 100%;
padding: 20px;
padding: 1.25em;
min-height: 100vh;
transition: all 0.5s;
}
/* --------------------------------------------------- /* ---------------------------------------------------
MEDIAQUERIES MEDIAQUERIES
----------------------------------------------------- */ ----------------------------------------------------- */
@@ -292,53 +307,56 @@ Imports System.Data.SqlClient
} }
@media (min-width: 320px) and (min-height: 640px) { @media (min-width: 320px) and (min-height: 640px) {
#sidebar { #sidebar {
margin-left: /*-250px*/-15.625rem; margin-left: -250px;
padding-top:0.5em; padding-top: 0.86em;
padding-top:0.6254886630179828vh; font-size: 1em;
/*font-size:18px;*/ font-size: 16px;
font-size:1.2em;
} }
#content{ #content_all{
font-size: 1.2em; font-size: 1rem;
max-width:50%; font-size: 1.2333000033333vw;
min-width:50%; min-width: 110%;
margin-left:0.25rem; float: left;
margin-right:0.25rem; margin-left: 0px;
/*margin-left:4px;
margin-right:4px;*/
} }
#footer_content{ #footer_content b{
font-size:0.4em; font-size: 1rem;
font-size: 0.8333333333333334vw; padding-inline: 0.13480833333333331vw;
/*padding-inline:1px;*/ padding-inline: 0.063em;
padding-inline:0.09em;
max-width: 100%; max-width: 100%;
min-width: 60%; min-width: 60%;
} }
.nav-link dropdown-toggle .nav-link dropdown-toggle
{ {
font-size:0.86em; font-size: 0.86rem;
font-size:1.7916666666666667vw;
font-style: inherit; font-style: inherit;
font-size-adjust:-4.52;
} }
nav-item dropdown::marker{ nav-item dropdown::marker{
font-size: 0em;
font-size: 0rem; font-size: 0rem;
font-size:0vw;
overflow: hidden; overflow: hidden;
} }
#navbarDropdown{ #navbarDropdown{
font-size: initial; font-size: initial;
} }
#navbar{ #navbar{
font-size:1.125em; font-size: initial;
font-size:2.34375vw;
overflow: hidden; overflow: hidden;
background-color:#fff;
} }
#sidebar.active { #sidebar.active {
margin-left: 0rem; margin-left: -0px;
}
}
#navbar.menu_class{
width: 2.604166666666667vw;
width: 1.25em;
height: 1.09460516028147vh;
height: 0.875em;
}
#pagecontent{
font-size: 1em;
display: flex;
align-items: center;
justify-content: center
} }
#rowTable{ #rowTable{
width:120%; width:120%;
@@ -353,26 +371,6 @@ Imports System.Data.SqlClient
max-height: 3.75em; max-height: 3.75em;
z-index: 2; z-index: 2;
} }
#offcanvasWithBothOptions{
min-width: 45.57291666666667vw;
min-width: 21.875em;
max-width: 45.57291666666667vw;
max-width: 21.875em;
}
.offcanvas-body {
background-color: #fff;
color: #043381;
font-size: 1.7692852087756545vw;
font-size: 1.563em;
}
.offcanvas-body ul li :hover{
background-color: #043381;
color: #fff;
}
.offcanvas-header{
background-color: #fff;
color: #043381;
}
} }
#navbar.menu_class{ #navbar.menu_class{
width: 1.25em; width: 1.25em;
@@ -417,6 +415,36 @@ Imports System.Data.SqlClient
height:1.875em; height:1.875em;
height:2.34375vh; height:2.34375vh;
} }
.main-menu div.menu_01 .menu_logo{
position: absolute;
left: 0.625em;
top: 1.25em;
margin: 0rem;
padding: 0em;
max-width: 1.688em;
max-height: 3.75em;
z-index: 2;
}
#offcanvasWithBothOptions{
min-width: 45.57291666666667vw;
min-width: 21.875em;
max-width: 45.57291666666667vw;
max-width: 21.875em;
}
.offcanvas-body {
background-color: #fff;
color: #043381;
font-size: 1.7692852087756545vw;
font-size: 1.563em;
}
.offcanvas-body ul li :hover{
background-color: #043381;
color: #fff;
}
.offcanvas-header{
background-color: #fff;
color: #043381;
}
</style> </style>
</html> </html>
@@ -574,11 +602,11 @@ Imports System.Data.SqlClient
<% <%
End If End If
'Response.Write(DB2.qry_contentNew(menuID, lan)) %> 'Response.Write(DB2.qry_contentNew(menuID, lan)) %>
<br /><br /><br /> <br /><br />
<h1><%= LT.getTxt(1, lan, "Herzlich Willkommen bei VERAG Spedition AG!")%></h1> <h1><%= LT.getTxt(1, lan, "Herzlich Willkommen bei VERAG Spedition AG!")%></h1>
<div id="line"></div> <div id="line"></div>
<br /><br /><br /> <br /><br />
<%--Der Warenaustausch zwischen der Europäischen Union und Süd-Osteuropa ist mit aufwendigen und komplizierten Abläufen verbunden.--%> <%--Der Warenaustausch zwischen der Europäischen Union und Süd-Osteuropa ist mit aufwendigen und komplizierten Abläufen verbunden.--%>
<p> <%= LT.getTxt(2, lan, "Hier finden Sie Informationen zu Ihrem Sendungsstatus.")%> </p> <p> <%= LT.getTxt(2, lan, "Hier finden Sie Informationen zu Ihrem Sendungsstatus.")%> </p>
@@ -761,7 +789,7 @@ Imports System.Data.SqlClient
<div id="conovertab" > <div id="conovertab" >
<div class="container-flex" style="/*margin-right:25px*/margin-right:1.563em;margin-right:2.6371308016877637vw;/*margin-left:-2px;*/margin-left:-1.1em;margin-left: 1.2109704641350211vw"> <div class="container-flex" style="/*margin-right:25px*/margin-right:1.563em;margin-right:2.6371308016877637vw;/*margin-left:-2px;*/margin-left:-1.1em;margin-left: 1.2109704641350211vw">
<table class="tableStatus table-striped" id="tablemain" border="1" cellspacing="0" contenteditable="false"> <table class="tableStatus table-striped" id="tablemain" border="1" cellspacing="0" contenteditable="false">
<thead><tr><th ><%= LT.getTxt(20, lan, "Nr.") %></th><th ><%= LT.getTxt(21, lan, "Spedition/PosNr") %></th><th><%= LT.getTxt(22, lan, "Sendungsdaten") %></th><th><%= LT.getTxt(23, lan, "Absender") %></th><th><%= LT.getTxt(24, lan, "Empfänger") %></th><th> Status </th><th>Infos</th></tr> </thead> <thead><tr><th>Infos</th><th ><%= LT.getTxt(20, lan, "Nr.") %></th><th ><%= LT.getTxt(21, lan, "Spedition/PosNr") %></th><th><%= LT.getTxt(22, lan, "Sendungsdaten") %></th><th><%= LT.getTxt(23, lan, "Absender") %></th><th><%= LT.getTxt(24, lan, "Empfänger") %></th><th> Status </th></tr> </thead>
<% <%
For Each s In SENDUNG_LIST For Each s In SENDUNG_LIST
Dim sndDat As String = "" '"<b>" & s.tblSnd_Abfertigungsart_ID & "</b>" Dim sndDat As String = "" '"<b>" & s.tblSnd_Abfertigungsart_ID & "</b>"
@@ -805,11 +833,11 @@ Imports System.Data.SqlClient
Dim vermerkcount = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & " /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO").Rows Dim vermerkcount = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & " /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO").Rows
If vermerkcount.Count = 0 Then %> If vermerkcount.Count = 0 Then %>
<tr <% Response.Write(trBg) %> style="color:#043381;" data-bs-toggle="tooltip" data-bs-placement="top" title="Keine zusätzlichen Infos zu Ihrem Auftrag vorhanden. Bitte wählen Sie einen anderen aus."> <td><center> <% Response.Write(cnt) %></center></td><td> <% Response.Write(txtCluster)%> </td><td> <% Response.Write(sndDat) %> </td><td> <% Response.Write(If(s.tblSnd_Absender, "")) %> </td><td> <% Response.Write(If(s.tblSnd_Empfaenger, "")) %> </td><td <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><td></td><!--</button>--></tr> <tr <% Response.Write(trBg) %> style="color:#043381;" data-bs-toggle="tooltip" data-bs-placement="top" title="Keine zusätzlichen Infos zu Ihrem Auftrag vorhanden. Bitte wählen Sie einen anderen aus."><center><td></td> <td><% Response.Write(cnt) %></center></td><td> <% Response.Write(txtCluster)%> </td><td> <% Response.Write(sndDat) %> </td><td> <% Response.Write(If(s.tblSnd_Absender, "")) %> </td><td> <% Response.Write(If(s.tblSnd_Empfaenger, "")) %> </td><td <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><!--</button>--></tr>
<% <%
Else Else
%> %>
<tr <% Response.Write(trBg) %> style="color:#043381;" <a href="#collapseExample" data-toggle="collapse" data-target="#demo<%=cnt %>" role="button" aria-expanded="false" aria-controls="collapseExample" data-bs-toggle="tooltip" data-bs-placement="top" title="Für zusätzliche Infos auf die Zeile oder das Info-Symbol tippen."><td><center> <% Response.Write(cnt) %></center></td><td> <% Response.Write(txtCluster)%> </td><td> <% Response.Write(sndDat) %> </td><td> <% Response.Write(If(s.tblSnd_Absender, "")) %> </td><td> <% Response.Write(If(s.tblSnd_Empfaenger, "")) %> </td><td <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td><td><center><button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo<%=cnt %>" id="togglecollapse"><img src="images/Icons/service/hilfe.png" width="15" height="15" /></button></center></td></a><!--</button>--></tr> <tr <% Response.Write(trBg) %> style="color:#043381;" <a href="#collapseExample" data-toggle="collapse" data-target="#demo<%=cnt %>" role="button" aria-expanded="false" aria-controls="collapseExample" data-bs-toggle="tooltip" data-bs-placement="top" title="Für zusätzliche Infos auf die Zeile oder das Info-Symbol tippen."><td><center><button type="button" class="btn btn-primary" data-toggle="collapse" data-target="#demo<%=cnt %>" id="togglecollapse"><img src="images/Icons/service/hilfe.png" width="15" height="15" /></button></center></td><td><center> <% Response.Write(cnt) %></center></td><td> <% Response.Write(txtCluster)%> </td><td> <% Response.Write(sndDat) %> </td><td> <% Response.Write(If(s.tblSnd_Absender, "")) %> </td><td> <% Response.Write(If(s.tblSnd_Empfaenger, "")) %> </td><td <% Response.Write(statOK_style) %> > <% Response.Write(statOK) %> </td></a><!--</button>--></tr>
<% End If <% End If
Dim VERMERKE = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & " /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO") Dim VERMERKE = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND SendungID=" & s.tblSnd_SendungID & " /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO")
If VERMERKE IsNot Nothing Then If VERMERKE IsNot Nothing Then