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:56:27 +02:00
parent eff3b5c027
commit 78fd8f89cd
1 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
status_Julius.aspx
View File

@@ -289,7 +289,7 @@ Imports System.Data.SqlClient
tbody{ tbody{
font-size:19.2px; font-size:19.2px;
height: auto; height: auto;
width: fit-content;
overflow-y:auto; overflow-y:auto;
overflow-x:hidden; overflow-x:hidden;
flex-wrap:wrap; flex-wrap:wrap;
@@ -505,16 +505,15 @@ Imports System.Data.SqlClient
<div class="container" style="/*margin-top:5px;*/margin-top:0.313rem; margin-top:0.6510416666666667vw; place-content:center; margin-left:10px;margin-right:4px"> <div class="container" style="/*margin-top:5px;*/margin-top:0.313rem; margin-top:0.6510416666666667vw; place-content:center; margin-left:10px;margin-right:4px">
<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-lg navbar-light bg-light">
<div class="container"> <a class="navbar-brand" id="navbarbrandhauptpage" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="Logo Verag Spedition (Blaue Schrift) AG (Graue Schrift)" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a>
<a class="navbar-brand" id="navbarbrandhauptpage" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="Logo Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a>
<% <%
Dim curentMenuId As String = "1" Dim curentMenuId As String = "1"
If Not Request.QueryString("menuID") Is Nothing Then If Not Request.QueryString("menuID") Is Nothing Then
curentMenuId = Request.QueryString("menuID") curentMenuId = Request.QueryString("menuID")
End If End If
%> %>
<div style="width:72%;display:flex;"></div> <div style="width:62%;"></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:32px; 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:32px; justify-items:center;" alt="Logo Schriftzug: Verag Spedition AG Blaue Schrift: Verag Spedition Graue Schrift: AG" /></center></button>
@@ -535,13 +534,14 @@ Imports System.Data.SqlClient
</div> </div>
</div> </div>
</div> </div>
</div>
</nav> </nav>
</div> </div>
<div class="d-md-none"> <div class="d-md-none">
<nav class="navbar navbar-expand-lg navbar-light bg-light" style="background-color:#fff;"> <nav class="navbar navbar-expand-lg navbar-light bg-light justify-content-between flex-nowrap">
<a href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" alt="Schriftzug: Verag AG Blaue Schrift: Verag Spedition Graue Schrift: AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"/></a>
<a class="navbar-brand" href="newpageJulius_Sidebar.aspx?lan2=DE"><img src="images/Logo_small.png" style="width:initial;height:initial;" alt="VERAG Spedition AG Logo with blue word color until grey AG" data-toggle="tooltip" data-placement="top" title="https://www.verag.ag"></a>
<button class="btn btn-primary" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasWithBothOptions" aria-controls="offcanvasWithBothOptions" style="background-color:#fff; color:#043381;"><img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;width:30px;"/></button> <button class="btn btn-primary" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvasWithBothOptions" aria-controls="offcanvasWithBothOptions" style="background-color:#fff; color:#043381;"><img id="myImage" src="<%=flagpath%>" style="border:1px solid #fff;width:30px;"/></button>
</nav> </nav>
</div> </div>
@@ -551,14 +551,12 @@ Imports System.Data.SqlClient
<button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button> <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
</div> </div>
<div class="offcanvas-body"> <div class="offcanvas-body">
<ul style="list-style: none;">
<% Dim strDElang = "&nbsp Deutsch" <% Dim strDElang = "&nbsp Deutsch"
Dim strENlang = "&nbsp Englisch" Dim strENlang = "&nbsp Englisch"
Dim strBIHLang = "&nbsp Bosnien und Herzegowina" Dim strBIHLang = "&nbsp Bosnien und Herzegowina"
Dim strSRBlang = "&nbsp Serbien" Dim strSRBlang = "&nbsp Serbien"
Dim strBGlang = "&nbsp Bulgarien" Dim strBGlang = "&nbsp Bulgarien"
Dim strTRlang = "&nbsp Türkei"%> Dim strTRlang = "&nbsp Türkei"%>
<ul style="list-style: none;"> <ul style="list-style: none;">
<li style="transform: rotate(0);"> <li style="transform: rotate(0);">
<!--<a id="ButtonDeutschLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=DE"><img src="<%'= imgPath%>images/flags/flagge_DE_AT.gif" <%' If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/>DE/AT</a>--> <!--<a id="ButtonDeutschLangPicker" class="btn btn-primary btn-sm" href="<%'= navParent%>&lan=DE"><img src="<%'= imgPath%>images/flags/flagge_DE_AT.gif" <%' If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/>DE/AT</a>-->
@@ -679,7 +677,7 @@ Imports System.Data.SqlClient
<div class="d-none d-md-block"> <div class="d-none d-md-block">
<table style="width:100%" class="table-responsive" contenteditable="false"><tr> <td> <table style="width:100%" class="table-responsive" contenteditable="false"><tr> <td>
<table> <table>
<tr><td style="/*width:150px;*/width:9.375em;width: 10.615711252653927vw"></td><td></td></tr> <!-- <tr><td style="/*width:150px;*/width:9.375em;width: 10.615711252653927vw"></td><td></td></tr>-->
<tr><td><b><%= LT.getTxt(3, lan, "LKW-Kennzeichen") %>:</b></td><td><span style="font-size:20px"><%= AVISO.LKW_Nr %></span></td></tr> <tr><td><b><%= LT.getTxt(3, lan, "LKW-Kennzeichen") %>:</b></td><td><span style="font-size:20px"><%= AVISO.LKW_Nr %></span></td></tr>
<tr><td><b><%= LT.getTxt(14, lan, "LKW-ID") %>:</b></td><td><%= AVISO.AvisoID %></td></tr> <tr><td><b><%= LT.getTxt(14, lan, "LKW-ID") %>:</b></td><td><%= AVISO.AvisoID %></td></tr>
@@ -687,7 +685,6 @@ Imports System.Data.SqlClient
<tr><td><b><%= LT.getTxt(4, lan, "Avisierer") %>:</b></td><td><%= AVISO.Auftraggeber %></td></tr> <tr><td><b><%= LT.getTxt(4, lan, "Avisierer") %>:</b></td><td><%= AVISO.Auftraggeber %></td></tr>
<tr><td><b><%= LT.getTxt(8, lan, "Frachtführer") %>:</b></td><td><%= AVISO.Frächter %></td></tr> <tr><td><b><%= LT.getTxt(8, lan, "Frachtführer") %>:</b></td><td><%= AVISO.Frächter %></td></tr>
<tr style="height:10px"></tr> <tr style="height:10px"></tr>
<tr><td><b>STATUS:</b></td><td><span ><% <tr><td><b>STATUS:</b></td><td><span ><%
Select Case(AVISO.Status) Select Case(AVISO.Status)
@@ -759,13 +756,12 @@ Imports System.Data.SqlClient
<!-- <div style="height:20px"></div>--> <!-- <div style="height:20px"></div>-->
<span style="font-size:1em;font-size:16px;font-size:1em"><%= LT.getTxt(18, lan, "Bitte haben Sie noch Geduld bis ihr Auftrag fertig ist. Sie können den aktuellen Status Ihres LKWs am Bildschirm verfolgen.<br />Bei Status ""OK"" können Sie an den Schalter kommen.") %></span> <span style="font-size:1em;font-size:16px;font-size:1em"><%= LT.getTxt(18, lan, "Bitte haben Sie noch Geduld bis ihr Auftrag fertig ist. Sie können den aktuellen Status Ihres LKWs am Bildschirm verfolgen.<br />Bei Status ""OK"" können Sie an den Schalter kommen.") %></span>
<% End If %> <% End If %>
<div id="abstand"></div> <div id="abstand"></div>
<h1>Allgemeine Vermerke</h1> <h1>Allgemeine Vermerke</h1>
<br /> <br />
<div class="container-flex" style="flex-flow:nowrap;margin:inherit;/*margin-right:25px*/margin-right:1.563em;margin-right:2.6371308016877637vw;/*margin-left:-2px;*/margin-left:-0.125em;margin-left: 0.2109704641350211vw"> <div class="container-flex" style="flex-flow:nowrap;margin:inherit;/*margin-right:25px*/margin-right:1.563em;margin-right:2.6371308016877637vw;/*margin-left:-2px;*/margin-left:-0.125em;margin-left: 0.2109704641350211vw">
<table class="tableStatus table-striped" border="1" cellspacing="0" contenteditable="false"> <% <table class="tableStatus table-striped" border="1" cellspacing="0" contenteditable="false" style="width:100%"> <%
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") 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 If VERMERKE_LKW IsNot Nothing Then
Dim vermerkeUeberschrift = LT.getTxt(25, lan, "Probleme/Vermerke") & ":" Dim vermerkeUeberschrift = LT.getTxt(25, lan, "Probleme/Vermerke") & ":"
@@ -787,7 +783,7 @@ Imports System.Data.SqlClient
</div> </div>
<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>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> <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>
<% <%