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"> -->
<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{
background-color:aliceblue;
color:#043381;
}
.dropbtn {
@@ -87,6 +97,7 @@
font-size: 1em;
border: none;
}
/* Dropdown Content (Hidden by Default) */
.dropdown-content {
display: none;
@@ -148,7 +159,6 @@
max-width: initial !important; // overwrite default max-width
width: fit-content !important; // flexible width
min-width: 1500px !important; // makes it fat enough by default
}
}
.modal-content {
@@ -468,9 +478,7 @@
Response.Write(ex.Message & ex.StackTrace)
End Try
%>
<div></div>
</div>
<div></div></div>
<%-- <div class="footer_menu">
<div class="footer_menu_content">
<table>

8
KundenseiteJulius.aspx
View File

@@ -71,6 +71,14 @@
<!-- <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
<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 {
color: #043381;
position: absolute;

12
newpageJulius_Sidebar.aspx
View File

@@ -88,6 +88,13 @@
body {
font-family: 'Poppins', sans-serif;
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 {
@@ -400,7 +407,7 @@
#navbar.menu_class{
width: 2.604166666666667vw;
width: 1.25em;
height:1.8229166666666667vw;
height: 1.09460516028147vh;
height: 0.875em;
}
#pagecontent{
@@ -777,7 +784,6 @@
End If
%>
<div class="dropdown-divider"></div>
<li class="nav-item dropdown">
<!--<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>
<%
@@ -799,7 +805,7 @@
</li>
<li>
<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">
<% Dim stringDE = "&nbsp DE"
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>
<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{
background-color: #043381;
}
@@ -393,7 +401,7 @@ Imports System.Data.SqlClient
</div>
<div id="main-menu">
</div> -->
<div class="container" style:"align-items:center"> <!-- </div> -->
<!-- </div> -->
<div id="main-page" style="margin-left:15px;margin-right:15px;justify-self:center">
<%
' Dim lan As String = Request.QueryString("lan")
@@ -442,8 +450,8 @@ Imports System.Data.SqlClient
<!-- Page Content -->
<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="content">
<div class="container" style="/*margin-top:5px;*/margin-top:0.313rem; margin-top:0.6510416666666667vw;justify-self:center">
<div class="d-none d-md-block">
<nav class="navbar navbar-expand-md navbar-light bg-light" style="background-color:#fff;">
<div class="container">
@@ -457,7 +465,7 @@ Imports System.Data.SqlClient
<div style="width:72%;display:flex;"></div>
<div class="me-auto">
<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">
<% Dim stringDE = "&nbsp DE"
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>
</div>
</div> -->
</div>
<%
End If
'Response.Write(DB2.qry_contentNew(menuID, lan)) %>
@@ -704,9 +712,9 @@ Imports System.Data.SqlClient
<br />
<h1><%= LT.getTxt(19, lan, "Sendungsliste!") %></h1>
</div>
<br />
<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">
<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
%></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
' 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>
</p>
<%
End If
End If
Catch ex As Exception
Response.Write(ex.Message & ex.StackTrace)
End Try
%>
<br /><br /><br /><br />
<!-- <div style="height:150px; place-self:safe center">-->
</div></div></div></div>
</div></div>
<%-- <div class="footer_menu">
<div class="footer_menu_content">
<table>