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

Lang Pick Button Änderungen

Browse Source
This commit is contained in:
ja
2021-08-09 13:08:11 +02:00
parent 9509d71a5e
commit e0c961541d
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AvisoTV_FLEX.aspx
View File

@@ -443,7 +443,7 @@
End Try End Try
'Dim link As String = "Par1=" + AVISO_ROW("LKW_Nr") + "Par2=" + AVISO_ROW("Frächter") + "Par3=" + AVISO_ROW("Auftraggeber") + "Par4=" + AVISO_ROW("Ankunft") + "Par5=" + AVISO_ROW("LKW_Fertig") + "Par6=" + STANDORT + "Par7=" + lan 'Dim link As String = "Par1=" + AVISO_ROW("LKW_Nr") + "Par2=" + AVISO_ROW("Frächter") + "Par3=" + AVISO_ROW("Auftraggeber") + "Par4=" + AVISO_ROW("Ankunft") + "Par5=" + AVISO_ROW("LKW_Fertig") + "Par6=" + STANDORT + "Par7=" + lan
%> %>
<tbody class="table-light table-responsive-xxl table-striped" contenteditable="false"> <tbody class="table-light table-responsive-xxl table-striped" contenteditable="false">
<tr style="transform: rotate(0);"> <tr style="transform: rotate(0);">
<th scope="row"><a href="status_Julius.aspx?AvisoId=<%=AvisoId%>&lan2=<%=laenderkuerzel%>" rel="nofollow" target="_blank" class="stretched-link"><%Response.Write(cnt + 1)%></a></th> <th scope="row"><a href="status_Julius.aspx?AvisoId=<%=AvisoId%>&lan2=<%=laenderkuerzel%>" rel="nofollow" target="_blank" class="stretched-link"><%Response.Write(cnt + 1)%></a></th>
@@ -472,7 +472,7 @@
%> %>
<div></div> <div></div>
</div> </div>
<%-- <div class="footer_menu"> <%-- <div class="footer_menu">
<div class="footer_menu_content"> <div class="footer_menu_content">

21
status_Julius.aspx
View File

@@ -10,8 +10,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" http-equiv="X-UA-Compatible" content="IE=edge"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" http-equiv="X-UA-Compatible" content="IE=edge"/>
<!-- Bootstrap CSS --> <!-- Bootstrap CSS -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"> <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-EVSTQN3/azprG1Anm3QDgpJLIm9Nao0Yz1ztcQTwFspd3yD65VohhpuuCOmLASjC" crossorigin="anonymous"/>
<link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"> <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.18.3/dist/bootstrap-table.min.css"/>
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js"></script> <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js"></script>
@@ -340,7 +340,7 @@
border-color: #043381; border-color: #043381;
} }
table { table {
font-size: 1em; font-size: 16px;
font-size:1.150066666666665vw; font-size:1.150066666666665vw;
} }
alert alert-success align-items-center{ alert alert-success align-items-center{
@@ -486,7 +486,7 @@
<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" style="background-color:#fff;">
<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 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>
<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>
@@ -497,15 +497,15 @@
<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;"> <ul style="list-style: none;">
<li>
<% Dim strDElang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Deutsch" <% Dim strDElang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Deutsch"
Dim strENlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Englisch" Dim strENlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Englisch"
Dim strBIHLang = "&nbsp &nbsp &nbsp Bosnien und Herzegowina" Dim strBIHLang = "&nbsp &nbsp &nbsp Bosnien und Herzegowina"
Dim strSRBlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Serbien" Dim strSRBlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Serbien"
Dim strBGlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Bulgarien" Dim strBGlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Bulgarien"
Dim strTRlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Türkei"%> Dim strTRlang = "&nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp &nbsp Türkei"%>
<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>-->
<a id="ButtonDeutschLangPicker2" href="<%= navParent%>&lan2=DE" class="stretched-link"><img src="<%= imgPath%>images/flags/flagge_DE_AT.gif" <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/><%=strDElang %></a> <a id="ButtonDeutschLangPicker2" href="<%= navParent%>&lan2=DE" class="stretched-link"><img src="<%= imgPath%>images/flags/flagge_DE_AT.gif" <% If laenderkuerzel = "de" Then Response.Write("style='border:1px solid #000'")%>/><%=strDElang %></a>
</li> </li>
@@ -761,9 +761,8 @@
<% <%
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="15px" height="15px" /></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> <% 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>
<% 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
%> %>
@@ -778,7 +777,7 @@
<i><% Response.Write(CDate(r("Datum")).ToString("dd.MM.yyyy HH:mm") & ": " & V_LST.getTxt(r("VermerkeCode"), lan)) %></i> <i><% Response.Write(CDate(r("Datum")).ToString("dd.MM.yyyy HH:mm") & ": " & V_LST.getTxt(r("VermerkeCode"), lan)) %></i>
</td> </td>
</tr> <% vermerkeUeberschrift = "" </tr> <% vermerkeUeberschrift = ""
Next %> Next %>
<% <%
End If %> End If %>
</table></td></tr> </table></td></tr>