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

Versuch zur Beseitigung möglicher SQL Deadlock Quellen durch C# Code (kein Erfolg, also weiterhin kleine Änderungen!)

Browse Source
This commit is contained in:
ja
2021-08-09 16:32:16 +02:00
parent e0c961541d
commit 30f2ab75df
2 changed files with 66 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
AvisoTV_FLEX.aspx
View File

@@ -253,7 +253,7 @@
max-width: 17.692852087756545vw;
}
#normaltable {
font-size: 1.125em;
font-size:1.188em;
padding-left: - 0.125em;
}
}
@@ -298,7 +298,6 @@
</head>
<body>
<div class="align-self-center">
<form id="leftLinks" runat="server">
@@ -380,7 +379,7 @@
<h1>Verag AVISO-TV Online</h1>
<div id="line"></div>
<br/>
Hier finden Sie Informationen zu den aktuell an der Grenze stehenden LKWs.
<h3>Hier finden Sie Informationen zu den aktuell an der Grenze stehenden LKWs.</h3>
<!--<br><br>
Die Mitarbeiter der VERAG Spedition AG haben sich auf die Bereiche Zoll und Steuer spezialisiert und können so ihren Kunden einen individuell abgestimmten Service anbieten.
@@ -412,7 +411,7 @@
<h2><%=STANDORT %></h2>
</span>
<div class="container-xxl" style="overflow-y:auto;scroll-padding-inline:auto;min-width:97%; max-width:100%">
<table class="table table-hover" id="normaltable" border="8" cellspacing="0" contenteditable="false">
<table class="table table-hover" id="normaltable" border="0" cellspacing="0" contenteditable="false">
<thead style="background-color:#043381; color:white; font-weight:900"><tr ><th>Nr.</th><th>LKW Kennzeichen</th><th>Frächter</th><th>Avisierer</th><th>Ankunft</th><th>Dauer</th><th>LKW fertig</th></tr></thead>
<%
Dim cnt = 0
@@ -469,7 +468,6 @@
Catch ex As Exception
Response.Write(ex.Message & ex.StackTrace)
End Try
%>
<div></div>
</div>

36
status_Julius.aspx
View File

@@ -3,6 +3,8 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
Imports System.Data
Imports System.Data.SqlClient
<head>
<!-- Bootstrap -->
<html lang="en">
@@ -247,7 +249,7 @@
}
tbody{
font-size:18px;
font-size:19.2px;
height: auto;
width: fit-content;
overflow-y:auto;
@@ -265,17 +267,16 @@
background-color:#fff;
}
}
@media (min-width: 768px){
#sidebar {
margin-left: /*-250px*/-15.625rem;
padding-top:0.5em;
padding-top:0.6254886630179828vh;
/*font-size:18px;*/
font-size:1.563em;
font-size:1.2em;
}
#content{
font-size: 17px;
font-size: 1.2em;
max-width:50%;
min-width:50%;
margin-left:0.25rem;
@@ -326,7 +327,6 @@
height: 0.875em;
height: 1.09375vh;
}
#pagecontent{
font-size: 1.12em;
/* font-size: 2.3333333333333335vw;*/
@@ -340,8 +340,7 @@
border-color: #043381;
}
table {
font-size: 16px;
font-size:1.150066666666665vw;
font-size: 1.12em;
}
alert alert-success align-items-center{
width: 7.813em;
@@ -387,16 +386,15 @@
</div>
</a>-->
<div id="bodycontent" style="width:65%;" class="container-lg">
<div id="bodycontent" style="width:68%;" class="container-lg">
<!-- <div id="content"> -->
<!-- <div id="nav-main">
<div id="art-logo"></div>
</div>
<div id="main-menu">
</div> -->
<div class="container-align-center"> <!-- </div> -->
<div id="main-page">
<div class="container" style:"align-items:center"> <!-- </div> -->
<div id="main-page" style="margin-left:15px;margin-right:15px;justify-self:center">
<%
' Dim lan As String = Request.QueryString("lan")
'If lan = "" Then lan = "de"
@@ -443,26 +441,23 @@
%>
<!-- Page Content -->
<div class="container">
<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="d-none d-md-block">
<nav class="navbar navbar-expand-md navbar-light bg-light" style="background-color:#fff;">
<div class="container">
<a class="navbar-brand" id="navbarbrandhauptpage" 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" 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"
If Not Request.QueryString("menuID") Is Nothing Then
curentMenuId = Request.QueryString("menuID")
End If
%>
<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="Schriftzug: Verag 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:3.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"
@@ -490,7 +485,6 @@
<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>
</div>
<div class="offcanvas offcanvas-end" data-bs-scroll="true" tabindex="-1" id="offcanvasWithBothOptions" aria-labelledby="offcanvasWithBothOptionsLabel">
<div class="offcanvas-header">
<h5 class="offcanvas-title" id="offcanvasWithBothOptionsLabel">Sprachauswahl:</h5>
@@ -563,6 +557,7 @@
<% '?key=hello%20world
Try
VERAG_PROG_ALLGEMEIN.cAllgemein.ERR_OP_GLOBAL = VERAG_PROG_ALLGEMEIN.ERROR_OP.SHOW
'Dim AD As New VERAG_PROG_ALLGEMEIN.cAdressen(799124)
Dim VERAGSQL = New VERAG_PROG_ALLGEMEIN.SQL
@@ -712,7 +707,7 @@
<div id="conovertab">
<div class="container-flex" style="flex-flow:nowrap">
<table class="tableStatus table-striped" id="tablemain" border="8" 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>
<%
For Each s In SENDUNG_LIST
@@ -766,7 +761,7 @@
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
%>
<tr id="demo<%=cnt %>" class="collapse"><td colspan="7"><table style="min-width:100%;border-spacing:0px;border-inline:hidden;">
<tr id="demo<%=cnt %>" class="collapse"><td colspan="7"><table style="min-width:100%;border-spacing:0px;border-inline:hidden;border:none;margin-inline:0px 0px;margin:0px 0px 0px 0px">
<%
Dim vermerkeUeberschrift = LT.getTxt(25, lan, "Probleme/Vermerke") & ":"
For Each r In VERMERKE.Rows()%>
@@ -819,6 +814,7 @@
</p>
<%
End If
Catch ex As Exception
Response.Write(ex.Message & ex.StackTrace)
End Try