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

Hinzufügen der Tabelle der nur den gesmaten LKW betreffenden Vermerke

Browse Source
This commit is contained in:
ja
2021-08-10 14:55:43 +02:00
parent f5af0ecd95
commit 34341aa7fe
4 changed files with 144 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AvisoTV_FLEX.aspx
View File

@@ -74,8 +74,18 @@
<!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> --> <!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
<style> <style>
body{
background-image: url(images/road.jpg);
background-position:center center;
background-repeat: no-repeat;
background-attachment:fixed;
background-size:cover;
background-color:#043381;
}
#headertable:hover{ #headertable:hover{
background-color:aliceblue; background-color:aliceblue;
color:#043381;
} }
.dropbtn { .dropbtn {
@@ -87,6 +97,7 @@
font-size: 1em; font-size: 1em;
border: none; border: none;
} }
/* Dropdown Content (Hidden by Default) */ /* Dropdown Content (Hidden by Default) */
.dropdown-content { .dropdown-content {
display: none; display: none;
@@ -148,7 +159,6 @@
max-width: initial !important; // overwrite default max-width max-width: initial !important; // overwrite default max-width
width: fit-content !important; // flexible width width: fit-content !important; // flexible width
min-width: 1500px !important; // makes it fat enough by default min-width: 1500px !important; // makes it fat enough by default
} }
} }
.modal-content { .modal-content {
@@ -468,9 +478,7 @@
Response.Write(ex.Message & ex.StackTrace) Response.Write(ex.Message & ex.StackTrace)
End Try End Try
%> %>
<div></div> <div></div></div>
</div>
<%-- <div class="footer_menu"> <%-- <div class="footer_menu">
<div class="footer_menu_content"> <div class="footer_menu_content">
<table> <table>

8
KundenseiteJulius.aspx
View File

@@ -71,6 +71,14 @@
<!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> --> <!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
<style> <style>
body{
background-image: url(images/road.jpg);
background-position:center center;
background-repeat: no-repeat;
background-attachment:fixed;
background-size:cover;
background-color:#043381;
}
.dropbtn { .dropbtn {
color: #043381; color: #043381;
position: absolute; position: absolute;

124
newpageJulius_Sidebar.aspx
View File

@@ -88,6 +88,13 @@
body { body {
font-family: 'Poppins', sans-serif; font-family: 'Poppins', sans-serif;
background: #fafafa; background: #fafafa;
background-image: url(images/road.jpg);
background-position:center center;
background-repeat: no-repeat;
background-attachment:fixed;
background-size:cover;
background-color:#043381;
} }
p { p {
@@ -309,89 +316,89 @@
font-size:16px; font-size:16px;
} }
#content{ #content{
font-size:1.57em; font-size: 1.57em;
font-size:3.270833333333333vw; font-size: 3.270833333333333vw;
min-width:70%; min-width: 70%;
} }
#footer_content b{ #footer_content b{
font-size:1em; font-size: 1em;
font-size:2.083333333333333vw; font-size: 2.083333333333333vw;
padding-inline:0.063rem; padding-inline: 0.063rem;
} }
.nav-link dropdown-toggle .nav-link dropdown-toggle
{ {
font-size: 1em; font-size: 1em;
font-size: 2.083333333333333vw; font-size: 2.083333333333333vw;
font-style:inherit; font-style: inherit;
font-size-adjust:-2.52; font-size-adjust: -2.52;
} }
nav-item dropdown::marker{ nav-item dropdown::marker{
font-size:0px; font-size: 0px;
font-size: 0rem; font-size: 0rem;
} }
#navbarDropdown{ #navbarDropdown{
font-size:16px; font-size: 16px;
font-size: 1rem; font-size: 1rem;
font-size: 2.083333333333333vw; font-size: 2.083333333333333vw;
} }
#navbar{ #navbar{
font-size:initial; font-size: initial;
position:relative; position: relative;
} }
#sidebar.active { #sidebar.active {
margin-left: 0rem; margin-left: 0rem;
} }
#sidebarCollapse span { #sidebarCollapse span {
display:compact; display: compact;
position:sticky; position: sticky;
} }
#navbarbrandhauptpage{ #navbarbrandhauptpage{
transform: translateX(-50%); transform: translateX(-50%);
left: 00%; left: 00%;
top:20%; top: 20%;
position: absolute; position: absolute;
text-align:center; text-align: center;
height:26px; height: 26px;
width:150px; width: 150px;
} }
} }
@media (min-width: 768px) { @media (min-width: 768px) {
#sidebar { #sidebar {
margin-left: -250px; margin-left: -250px;
padding-top:0.86em; padding-top: 0.86em;
font-size:1em; font-size: 1em;
font-size:16px; font-size: 16px;
} }
#content_all{ #content_all{
font-size: 1rem; font-size: 1rem;
font-size: 1.2333000033333vw; font-size: 1.2333000033333vw;
min-width:110%; min-width: 110%;
float:left; float: left;
margin-left:80px; margin-left: 80px;
} }
#footer_content b{ #footer_content b{
font-size:1rem; font-size: 1rem;
padding-inline:0.13480833333333331vw; padding-inline: 0.13480833333333331vw;
padding-inline:0.063em; padding-inline: 0.063em;
max-width:100%; max-width: 100%;
min-width:60%; min-width: 60%;
} }
.nav-link dropdown-toggle .nav-link dropdown-toggle
{ {
font-size:0.86rem; font-size: 0.86rem;
font-style:inherit; font-style: inherit;
} }
nav-item dropdown::marker{ nav-item dropdown::marker{
font-size:0rem; font-size: 0rem;
overflow:hidden; overflow: hidden;
} }
#navbarDropdown{ #navbarDropdown{
font-size:initial; font-size: initial;
} }
#navbar{ #navbar{
font-size:initial; font-size: initial;
overflow:hidden; overflow: hidden;
} }
#sidebar.active { #sidebar.active {
margin-left: -50px; margin-left: -50px;
@@ -400,11 +407,11 @@
#navbar.menu_class{ #navbar.menu_class{
width: 2.604166666666667vw; width: 2.604166666666667vw;
width: 1.25em; width: 1.25em;
height:1.8229166666666667vw; height: 1.09460516028147vh;
height: 0.875em; height: 0.875em;
} }
#pagecontent{ #pagecontent{
font-size:1em; font-size: 1em;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center justify-content: center
@@ -445,45 +452,45 @@
/*# sourceMappingURL=bootstrap.min.css.map */ /*# sourceMappingURL=bootstrap.min.css.map */
/*Menue Header IMG style*/ /*Menue Header IMG style*/
.main-menu div.menu_01 .menu_logo{ .main-menu div.menu_01 .menu_logo{
position:absolute; position: absolute;
left: 0.625em; left: 0.625em;
top: 1.25em; top: 1.25em;
margin:0rem; margin: 0rem;
padding:0em; padding: 0em;
max-width: 1.688em; max-width: 1.688em;
max-height: 3.75em; max-height: 3.75em;
z-index:2; z-index: 2;
} }
#offcanvasWithBothOptions{ #offcanvasWithBothOptions{
min-width:45.57291666666667vw; min-width: 45.57291666666667vw;
min-width:21.875em; min-width: 21.875em;
max-width:45.57291666666667vw; max-width: 45.57291666666667vw;
max-width:21.875em; max-width: 21.875em;
} }
.offcanvas-body { .offcanvas-body {
background-color:#fff; background-color: #fff;
color:#043381; color: #043381;
font-size: 1.7692852087756545vw; font-size: 1.7692852087756545vw;
font-size:1.563em; font-size: 1.563em;
} }
.offcanvas-body ul li :hover{ .offcanvas-body ul li :hover{
background-color:#043381; background-color: #043381;
color:#fff; color: #fff;
} }
.offcanvas-header{ .offcanvas-header{
background-color:#fff; background-color: #fff;
color:#043381; color: #043381;
} }
btn-primary{ btn-primary{
color:#043381; color: #043381;
background-color:#fff; background-color: #fff;
} }
li { li {
list-style-type: none; list-style-type: none;
} }
#sidebarCollapse span { #sidebarCollapse span {
display:compact; display: compact;
position:sticky; position: sticky;
} }
</style> </style>
</head> </head>
@@ -777,7 +784,6 @@
End If End If
%> %>
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<li class="nav-item dropdown">
<!--<td><a href="<%'= navParent%>?menuID=<%'= nav3.id%>&lan=<%'= laenderkuerzel %>"><%'= nav3.bezeichnung %></a></td> --> <!--<td><a href="<%'= navParent%>?menuID=<%'= nav3.id%>&lan=<%'= laenderkuerzel %>"><%'= nav3.bezeichnung %></a></td> -->
<a class="dropdown-item" href="<%= navParent%>?menuID=<%= nav3.id%>&lan=<%= laenderkuerzel %>"><%= nav3.bezeichnung %></a></div> <a class="dropdown-item" href="<%= navParent%>?menuID=<%= nav3.id%>&lan=<%= laenderkuerzel %>"><%= nav3.bezeichnung %></a></div>
<% <%
@@ -799,7 +805,7 @@
</li> </li>
<li> <li>
<div class="dropdown" style="background-color:#fff; color:#043381;"> <div class="dropdown" style="background-color:#fff; color:#043381;">
<button class="dropbtn" style="background-color:#fff;color:#043381;"> <img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;/*width:28px;*/ width:3.0145vw; justify-items:center" alt="Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG"/></button> <button class="dropbtn" style="background-color:#fff;color:#043381;"> <img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;/*width:28px;*/ width:2.0145vw; justify-items:center" alt="Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG"/></button>
<div class="dropdown-content"> <div class="dropdown-content">
<% Dim stringDE = "&nbsp DE" <% Dim stringDE = "&nbsp DE"
Dim stringEN = "&nbsp EN" Dim stringEN = "&nbsp EN"

53
status_Julius.aspx
View File

@@ -83,6 +83,14 @@ Imports System.Data.SqlClient
<script type="text/javascript" src="js/toptions/top_up-min.js"></script> <script type="text/javascript" src="js/toptions/top_up-min.js"></script>
<style> <style>
body{
background-image: url(images/road.jpg);
background-position:center center;
background-repeat: no-repeat;
background-attachment:fixed;
background-size:cover;
background-color:#043381;
}
#togglecollapse{ #togglecollapse{
background-color: #043381; background-color: #043381;
} }
@@ -393,7 +401,7 @@ Imports System.Data.SqlClient
</div> </div>
<div id="main-menu"> <div id="main-menu">
</div> --> </div> -->
<div class="container" style:"align-items:center"> <!-- </div> --> <!-- </div> -->
<div id="main-page" style="margin-left:15px;margin-right:15px;justify-self:center"> <div id="main-page" style="margin-left:15px;margin-right:15px;justify-self:center">
<% <%
' Dim lan As String = Request.QueryString("lan") ' Dim lan As String = Request.QueryString("lan")
@@ -442,8 +450,8 @@ Imports System.Data.SqlClient
<!-- Page Content --> <!-- Page Content -->
<div class="container" style="margin-left:25px;margin-right:20px;justify-self:center"> <div class="container" style="margin-left:25px;margin-right:20px;justify-self:center">
<div class="align-content-center" style="/*margin-top:5px;*/margin-top:0.313rem; margin-top:0.6510416666666667vw;"> <div class="container" style="/*margin-top:5px;*/margin-top:0.313rem; margin-top:0.6510416666666667vw;justify-self:center">
<div class="content">
<div class="d-none d-md-block"> <div class="d-none d-md-block">
<nav class="navbar navbar-expand-md navbar-light bg-light" style="background-color:#fff;"> <nav class="navbar navbar-expand-md navbar-light bg-light" style="background-color:#fff;">
<div class="container"> <div class="container">
@@ -457,7 +465,7 @@ Imports System.Data.SqlClient
<div style="width:72%;display:flex;"></div> <div style="width:72%;display:flex;"></div>
<div class="me-auto"> <div class="me-auto">
<div class="dropdown" style="background-color:#fff; color:#043381; margin-right:9.813rem;"> <div class="dropdown" style="background-color:#fff; color:#043381; margin-right:9.813rem;">
<button class="dropbtn"> <center><img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;width:3.0145vw; justify-items:center;" alt="Logo Schriftzug: Verag Spedition AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button> <button class="dropbtn"> <center><img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;width:2.0145vw; justify-items:center;" alt="Logo Schriftzug: Verag Spedition AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button>
<div class="dropdown-content"> <div class="dropdown-content">
<% Dim stringDE = "&nbsp DE" <% Dim stringDE = "&nbsp DE"
Dim stringEN = "&nbsp EN" Dim stringEN = "&nbsp EN"
@@ -537,7 +545,7 @@ Imports System.Data.SqlClient
<a href="<%'= navParent%>&lan2=TR"><img src="images/flags/flagge_TR.gif" style="border:1px solid #000;width:30px;"/></a> <a href="<%'= navParent%>&lan2=TR"><img src="images/flags/flagge_TR.gif" style="border:1px solid #000;width:30px;"/></a>
</div> </div>
</div> --> </div> -->
</div>
<% <%
End If End If
'Response.Write(DB2.qry_contentNew(menuID, lan)) %> 'Response.Write(DB2.qry_contentNew(menuID, lan)) %>
@@ -704,9 +712,9 @@ Imports System.Data.SqlClient
<br /> <br />
<h1><%= LT.getTxt(19, lan, "Sendungsliste!") %></h1> <h1><%= LT.getTxt(19, lan, "Sendungsliste!") %></h1>
</div> </div>
<br />
<div id="conovertab"> <div id="conovertab">
<div class="container-flex" style="flex-flow:nowrap"> <div class="container-flex" style="flex-flow:nowrap; width:fit-content">
<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 ><%= 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>
<% <%
@@ -786,7 +794,32 @@ Imports System.Data.SqlClient
End If End If
End If End If
End If End If
%></table><% %></table>
<br />
<h3>Vermerke die den gesamten LKW betreffen:</h3>
<br />
<div class="container-flex" style="flex-flow:nowrap">
<table class="tableStatus table-striped" border="1" cellspacing="0" contenteditable="false"> <%
Dim VERMERKE_LKW = VERAGSQL.loadDgvBySql("SELECT [VermerkID],[VermerkArt],[AvisoID],[SendungID],[Datum],VermerkeCodes.Bezeichnung,VermerkeCode FROM [Vermerke] inner join VermerkeCodes ON VermerkeCode=VermerkCodeId WHERE LKW_Vermerk=1 AND AvisoID=" & AvisoId & " AND VermerkArt='A' /*AND VermerkIDAufgehoben IS NULL*/ ORDER BY Datum", "AVISO")
If VERMERKE_LKW IsNot Nothing Then
Dim vermerkeUeberschrift = LT.getTxt(25, lan, "Probleme/Vermerke") & ":"
For Each r In VERMERKE_LKW.Rows()
%>
<tr class="tableStatusVermerke"><td colspan="3" class="vermerkHeader"><u><i><% Response.Write(vermerkeUeberschrift) %></i></u>&nbsp&nbsp</td> <td style="border:0px solid white" colspan="3"><i><% Response.Write(CDate(r("Datum")).ToString("dd.MM.yyyy HH:mm") & ": " & V_LST.getTxt(r("VermerkeCode"), lan)) %></i></td></tr>
<% vermerkeUeberschrift = ""
Next
If VERMERKE_LKW.Rows().Count = 0 Then %> <tr class="tableStatusVermerke"><td colspan="3" class="vermerkHeader"><u><i><% Response.Write(vermerkeUeberschrift) %></i></u>&nbsp&nbsp</td> <td style="border:0px solid white" colspan="3"><i>Keine Vermerke vorhanden</i></td></tr>
<% End If
End If
%></table></div><%
Else Else
' Response.Write("<b>" & LT.getTxt(26, lan, "Der LKW konnte leider nicht gefunden werden!") & "</b>") ' Response.Write("<b>" & LT.getTxt(26, lan, "Der LKW konnte leider nicht gefunden werden!") & "</b>")
%> %>
@@ -814,15 +847,15 @@ Imports System.Data.SqlClient
<a id="ButtonPanel" class="btn btn-primary btn-lg" href="AvisoTV_Flex.aspx?&lan2=<%=lan %>" style="background-color:#fff; color:#043381;">Panel </a> <a id="ButtonPanel" class="btn btn-primary btn-lg" href="AvisoTV_Flex.aspx?&lan2=<%=lan %>" style="background-color:#fff; color:#043381;">Panel </a>
</p> </p>
<% <%
End If
End If
Catch ex As Exception Catch ex As Exception
Response.Write(ex.Message & ex.StackTrace) Response.Write(ex.Message & ex.StackTrace)
End Try End Try
%> %>
<br /><br /><br /><br /> <br /><br /><br /><br />
<!-- <div style="height:150px; place-self:safe center">--> <!-- <div style="height:150px; place-self:safe center">-->
</div></div></div></div> </div></div>
<%-- <div class="footer_menu"> <%-- <div class="footer_menu">
<div class="footer_menu_content"> <div class="footer_menu_content">
<table> <table>