From 34341aa7feeec0b743fac820395ee0e4c875ef72 Mon Sep 17 00:00:00 2001
From: ja <ja@verag.ag>
Date: Tue, 10 Aug 2021 14:55:43 +0200
Subject: [PATCH] =?UTF-8?q?Hinzuf=C3=BCgen=20der=20Tabelle=20der=20nur=20d?=
 =?UTF-8?q?en=20gesmaten=20LKW=20betreffenden=20Vermerke?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AvisoTV_FLEX.aspx          |  36 ++++++----
 KundenseiteJulius.aspx     |   8 +++
 newpageJulius_Sidebar.aspx | 132 +++++++++++++++++++------------------
 status_Julius.aspx         |  57 ++++++++++++----
 4 files changed, 144 insertions(+), 89 deletions(-)

diff --git a/AvisoTV_FLEX.aspx b/AvisoTV_FLEX.aspx
index 1a45c82..2a1a2f0 100644
--- a/AvisoTV_FLEX.aspx
+++ b/AvisoTV_FLEX.aspx
@@ -71,11 +71,21 @@
         <link rel="stylesheet" type="text/css" href="css/style.css"/>
         <link rel="stylesheet" type="text/css" href="css/status.css"/>
         <link rel="SHORTCUT ICON" href="images/Icons/favicon/favicon.ico" />
-    <!--    <link rel="stylesheet" type="text/css" href="css/edit_main.css"> -->
+    <!-- <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 {
@@ -86,7 +96,8 @@
                     padding: 1em;
                     font-size: 1em;
                     border: none;
-                }
+        }
+
         /* Dropdown Content (Hidden by Default) */
         .dropdown-content {
             display: none;
@@ -117,13 +128,13 @@
             background-color: #043381;
         }          
         table{           
-        border-collapse: collapse;
-        border-spacing: 0px;
-        width: 60%;
-        border: 1px solid #ddd;
-        border:1px solid #ddd;
-        background-color:white;
-        color:#043381;
+            border-collapse: collapse;
+            border-spacing: 0px;
+            width: 60%;
+            border: 1px solid #ddd;
+            border:1px solid #ddd;
+            background-color:white;
+            color:#043381;
         }
         #flex-container{
             width:1800px;            
@@ -147,8 +158,7 @@
                 padding: 1.75rem 0 !important;
                 max-width: initial !important; // overwrite default max-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 {
@@ -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>                    
diff --git a/KundenseiteJulius.aspx b/KundenseiteJulius.aspx
index 4aeab2c..04f1afe 100644
--- a/KundenseiteJulius.aspx
+++ b/KundenseiteJulius.aspx
@@ -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;
diff --git a/newpageJulius_Sidebar.aspx b/newpageJulius_Sidebar.aspx
index 52bd05d..18b739f 100644
--- a/newpageJulius_Sidebar.aspx
+++ b/newpageJulius_Sidebar.aspx
@@ -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 {
@@ -309,102 +316,102 @@
                     font-size:16px;
                 }
                #content{                       
-                   font-size:1.57em;
-                   font-size:3.270833333333333vw;
-                   min-width:70%;
+                   font-size: 1.57em;
+                   font-size: 3.270833333333333vw;
+                   min-width: 70%;
                 }
                 #footer_content b{                    
-                    font-size:1em;
-                    font-size:2.083333333333333vw;                    
-                    padding-inline:0.063rem;                     
+                    font-size: 1em;
+                    font-size: 2.083333333333333vw;                    
+                    padding-inline: 0.063rem;                     
                 }
                .nav-link dropdown-toggle
                {                   
                    font-size: 1em;
                    font-size: 2.083333333333333vw;
-                   font-style:inherit;
-                   font-size-adjust:-2.52;
+                   font-style: inherit;
+                   font-size-adjust: -2.52;
                }    
                nav-item dropdown::marker{
-                 font-size:0px;
+                 font-size: 0px;
                  font-size: 0rem;
                }
                #navbarDropdown{
-                   font-size:16px; 
+                   font-size: 16px; 
                    font-size: 1rem;
                    font-size: 2.083333333333333vw;       
                }
                #navbar{
-                   font-size:initial;
-                   position:relative;
+                   font-size: initial;
+                   position: relative;
                }              
                 #sidebar.active {
                     margin-left: 0rem;
                 }
                 #sidebarCollapse span {
-                   display:compact;
-                   position:sticky;
+                   display: compact;
+                   position: sticky;
                 }
                 #navbarbrandhauptpage{
                   transform: translateX(-50%);
                   left: 00%;
-                  top:20%;
+                  top: 20%;
                   position: absolute;
-                  text-align:center;                   
-                  height:26px;                                    
-                  width:150px;                   
+                  text-align: center;                   
+                  height: 26px;                                    
+                  width: 150px;                   
                 }
             }
 
              @media (min-width: 768px) {
                 #sidebar {                    
                     margin-left: -250px;                    
-                    padding-top:0.86em;
-                    font-size:1em;
-                    font-size:16px;
+                    padding-top: 0.86em;
+                    font-size: 1em;
+                    font-size: 16px;
                 }
                #content_all{                        
                    font-size: 1rem;
                    font-size: 1.2333000033333vw;
-                   min-width:110%;
-                   float:left;
-                   margin-left:80px;
+                   min-width: 110%;
+                   float: left;
+                   margin-left: 80px;
                 }
                 #footer_content b{                   
-                   font-size:1rem;                   
-                   padding-inline:0.13480833333333331vw;
-                   padding-inline:0.063em;
-                   max-width:100%;
-                   min-width:60%;
+                   font-size: 1rem;                   
+                   padding-inline: 0.13480833333333331vw;
+                   padding-inline: 0.063em;
+                   max-width: 100%;
+                   min-width: 60%;
                 }
                .nav-link dropdown-toggle
                {                   
-                   font-size:0.86rem;
-                   font-style:inherit;                   
+                   font-size: 0.86rem;
+                   font-style: inherit;                   
                }    
                nav-item dropdown::marker{                
-                 font-size:0rem;
-                  overflow:hidden;
+                 font-size: 0rem;
+                  overflow: hidden;
                }
                #navbarDropdown{
-                   font-size:initial;             
+                   font-size: initial;             
                }
                #navbar{
-                   font-size:initial;
-                   overflow:hidden;
+                   font-size: initial;
+                   overflow: hidden;
                }
                #sidebar.active {                   
                     margin-left: -50px;
                 }
              }             
              #navbar.menu_class{
-                   width: 2.604166666666667vw;
-                   width: 1.25em;
-                   height:1.8229166666666667vw;
+                   width:  2.604166666666667vw;
+                   width:  1.25em;
+                   height: 1.09460516028147vh;
                    height: 0.875em;
              } 
              #pagecontent{                  
-                  font-size:1em;
+                  font-size: 1em;
                   display: flex;
                   align-items: center;
                   justify-content: center
@@ -445,45 +452,45 @@
             /*# sourceMappingURL=bootstrap.min.css.map */
             /*Menue Header IMG style*/              
             .main-menu div.menu_01 .menu_logo{
-                position:absolute;                      
+                position: absolute;                      
                 left: 0.625em;               
                 top: 1.25em;                
-                margin:0rem;                 
-                padding:0em;                
+                margin: 0rem;                 
+                padding: 0em;                
                 max-width: 1.688em;               
                 max-height: 3.75em;
-                z-index:2;
+                z-index: 2;
             } 
             #offcanvasWithBothOptions{
-                min-width:45.57291666666667vw;
-                min-width:21.875em;
-                max-width:45.57291666666667vw;
-                max-width:21.875em;
+                min-width: 45.57291666666667vw;
+                min-width: 21.875em;
+                max-width: 45.57291666666667vw;
+                max-width: 21.875em;
             }
             .offcanvas-body {
-               background-color:#fff;
-               color:#043381;
+               background-color: #fff;
+               color: #043381;
                font-size: 1.7692852087756545vw;
-               font-size:1.563em;
+               font-size: 1.563em;
             }
             .offcanvas-body ul li :hover{
-               background-color:#043381;
-               color:#fff;                    
+               background-color: #043381;
+               color: #fff;                    
             }
             .offcanvas-header{
-               background-color:#fff;
-               color:#043381;
+               background-color: #fff;
+               color: #043381;
             }    
             btn-primary{
-               color:#043381;
-               background-color:#fff;
+               color: #043381;
+               background-color: #fff;
             }
             li {
                list-style-type: none;
             }
             #sidebarCollapse span {
-               display:compact;
-               position:sticky;
+               display: compact;
+               position: sticky;
             }    
     </style>
 </head>
@@ -661,7 +668,7 @@
                                           </li>                            
                                      </ul>
                                </li>
-                               
+                                
                              <!--     <li>      
                                  <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#exampleModal">Feedback senden</button> -->
                        
@@ -776,8 +783,7 @@
                                                                                      <% cells = 0
                                                                                          End If
                                                                                   %>
-                                                                                  <div class="dropdown-divider"></div>  
-                                                                                            <li class="nav-item dropdown">                           
+                                                                                  <div class="dropdown-divider"></div>                                                   
                                                                                    <!--<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"
diff --git a/status_Julius.aspx b/status_Julius.aspx
index 116c5c7..bdff4c9 100644
--- a/status_Julius.aspx
+++ b/status_Julius.aspx
@@ -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,9 +794,34 @@ Imports System.Data.SqlClient
                                                                                            End If
                                                                                        End If
                                                                                    End If
-                                                                                                                            %></table><%
-                                                                                                                                          Else
-                                                                                                                                              ' Response.Write("<b>" & LT.getTxt(26, lan, "Der LKW konnte leider nicht gefunden werden!") & "</b>")
+                                                                                                                            %></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>")
                                                                                                                                                 %>
                                                                                                                                                    <svg xmlns="http://www.w3.org/2000/svg" style="display: none;"> 
                                                                                                                                                       <symbol id="exclamation-triangle-fill" fill="currentColor" viewBox="0 0 16 16">
@@ -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>