Zollern, etc.

VERAGAddIn/My Project/Resources.Designer.vb

@@ -130,6 +130,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property urgent_qu() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("urgent_qu", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

VERAGAddIn/My Project/Resources.resx

@@ -118,6 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="pdfprint" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="wheel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -133,16 +136,16 @@
   <data name="Aviso" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Aviso.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="_665209_email_512x512" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\665209_email_512x512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="vermerk" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Aviso1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Aviso1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="pdfprint" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="_665209_email_512x512" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\665209_email_512x512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="vermerk" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="urgent_qu" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\urgent_qu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

VERAGAddIn/VERAGAddIn.vbproj

@@ -36,7 +36,7 @@
     <PublishUrl>\\ftps.verag.ag\g\FTP\Programme\VeragAddin\</PublishUrl>
     <InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
     <TargetCulture>de</TargetCulture>
-    <ApplicationVersion>1.0.1.137</ApplicationVersion>
+    <ApplicationVersion>1.0.1.140</ApplicationVersion>
     <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
     <UpdateEnabled>true</UpdateEnabled>
     <UpdateInterval>0</UpdateInterval>
@@ -337,6 +337,7 @@
     <None Include="Resources\pdf.png" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Resources\urgent_qu.png" />
     <None Include="Resources\vermerk.png" />
     <None Include="Resources\pdf_gray.png" />
     <None Include="Resources\665209_email_512x512.png" />
@@ -362,10 +363,6 @@
       <Project>{7bdd8c2f-2c9e-49f1-a365-3b1da1c84991}</Project>
       <Name>Aviso</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Aviso\AVISO\Gemeinsames\Gemeinsames.vbproj">
-      <Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
-      <Name>Gemeinsames</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
       <Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
       <Name>VERAG_PROG_ALLGEMEIN</Name>
@@ -395,7 +392,8 @@
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>AL20231110.pfx</ManifestKeyFile>
+    <ManifestKeyFile>
+    </ManifestKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>D21E170FE10FFCC8532FBDEFB75A35DB90661CC0</ManifestCertificateThumbprint>

VERAGAddIn/app.config

@@ -52,7 +52,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
+		  <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -60,12 +60,32 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Spire.PdfViewer.Forms" publicKeyToken="663f351905198cb3" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.9.5.3046" newVersion="4.9.5.3046" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="itext.kernel" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.1.11.0" newVersion="7.1.11.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="itext.layout" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.1.11.0" newVersion="7.1.11.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="itext.io" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.1.11.0" newVersion="7.1.11.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="itext.forms" publicKeyToken="8354ae6d2174ddca" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.1.11.0" newVersion="7.1.11.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" /></startup></configuration>

VERAGAddIn/rbnMailItem.Designer.vb

@@ -44,6 +44,7 @@
         Me.components = New System.ComponentModel.Container()
         Me.Tab1 = Me.Factory.CreateRibbonTab
         Me.Group1 = Me.Factory.CreateRibbonGroup
+        Me.btnAVISOUnleashed = Me.Factory.CreateRibbonButton
         Me.Button1 = Me.Factory.CreateRibbonButton
         Me.btnAvisoMail2 = Me.Factory.CreateRibbonButton
         Me.SplitButton1 = Me.Factory.CreateRibbonSplitButton
@@ -66,6 +67,7 @@
         '
         'Group1
         '
+        Me.Group1.Items.Add(Me.btnAVISOUnleashed)
         Me.Group1.Items.Add(Me.Button1)
         Me.Group1.Items.Add(Me.btnAvisoMail2)
         Me.Group1.Items.Add(Me.SplitButton1)
@@ -74,6 +76,15 @@
         Me.Group1.Label = "AVISO"
         Me.Group1.Name = "Group1"
         '
+        'btnAVISOUnleashed
+        '
+        Me.btnAVISOUnleashed.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
+        Me.btnAVISOUnleashed.Image = Global.VERAGAddIn.My.Resources.Resources.urgent_qu
+        Me.btnAVISOUnleashed.Label = "AVISO Unleashed"
+        Me.btnAVISOUnleashed.Name = "btnAVISOUnleashed"
+        Me.btnAVISOUnleashed.ShowImage = True
+        Me.btnAVISOUnleashed.Visible = False
+        '
         'Button1
         '
         Me.Button1.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
@@ -160,6 +171,7 @@
     Friend WithEvents btnVollmachten As Microsoft.Office.Tools.Ribbon.RibbonButton
     Friend WithEvents btnVertraege As Microsoft.Office.Tools.Ribbon.RibbonButton
     Friend WithEvents btnGestellungsgarantien As Microsoft.Office.Tools.Ribbon.RibbonButton
+    Friend WithEvents btnAVISOUnleashed As Microsoft.Office.Tools.Ribbon.RibbonButton
 End Class
 
 Partial Class ThisRibbonCollection

VERAGAddIn/rbnMailItem.vb

@@ -1,9 +1,11 @@
 Option Explicit On
 
 
-Imports Microsoft.Office.Tools.Ribbon
-Imports Microsoft.Office.Interop
+Imports System.Drawing
 Imports System.Windows.Forms
+Imports Microsoft.Office.Interop
+Imports Microsoft.Office.Tools.Ribbon
+Imports VERAG_PROG_ALLGEMEIN.TESTJSON
 
 Public Class rbnMailItem
     Dim LOGIN_OK As Boolean = False
@@ -14,6 +16,17 @@ Public Class rbnMailItem
 
     Private Sub rbnMailItem_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load
         VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False
+        VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED = True
+
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
+            Group1.Label = "VERAG - UNLEASHED"
+            btnAVISOUnleashed.Visible = True
+        Else
+            Group1.Label = "VERAG"
+            btnAVISOUnleashed.Visible = False
+
+        End If
+
         'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
         LOGIN_OK = AVISO_Mail_Functions.initFirmaUser()
         currentexplorer = ThisAddIn.SharedExplorer
@@ -90,4 +103,5 @@ Public Class rbnMailItem
         End If
 
     End Sub
+
 End Class

VERAGAddIn/rbnVERAG.Designer.vb

@@ -55,6 +55,7 @@
         Me.btnDFDS = Me.Factory.CreateRibbonButton
         Me.Button3 = Me.Factory.CreateRibbonButton
         Me.Button4 = Me.Factory.CreateRibbonButton
+        Me.btnAVISOUnleashed = Me.Factory.CreateRibbonButton
         Me.Tab1.SuspendLayout()
         Me.VERAG.SuspendLayout()
         Me.SuspendLayout()
@@ -68,6 +69,7 @@
         '
         'VERAG
         '
+        Me.VERAG.Items.Add(Me.btnAVISOUnleashed)
         Me.VERAG.Items.Add(Me.Button2)
         Me.VERAG.Items.Add(Me.btnPdfPrint)
         Me.VERAG.Items.Add(Me.btnAvisoMail)
@@ -167,6 +169,15 @@
         Me.Button4.Name = "Button4"
         Me.Button4.ShowImage = True
         '
+        'btnAVISOUnleashed
+        '
+        Me.btnAVISOUnleashed.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
+        Me.btnAVISOUnleashed.Image = Global.VERAGAddIn.My.Resources.Resources.urgent_qu
+        Me.btnAVISOUnleashed.Label = "AVISO Unleashed"
+        Me.btnAVISOUnleashed.Name = "btnAVISOUnleashed"
+        Me.btnAVISOUnleashed.ShowImage = True
+        Me.btnAVISOUnleashed.Visible = False
+        '
         'VERAGRibbon
         '
         Me.Name = "VERAGRibbon"
@@ -194,6 +205,7 @@
     Friend WithEvents btnGestellungsgarantien As Microsoft.Office.Tools.Ribbon.RibbonButton
     Friend WithEvents Button3 As Microsoft.Office.Tools.Ribbon.RibbonButton
     Friend WithEvents btnDFDS As Microsoft.Office.Tools.Ribbon.RibbonButton
+    Friend WithEvents btnAVISOUnleashed As Microsoft.Office.Tools.Ribbon.RibbonButton
 End Class
 
 Partial Class ThisRibbonCollection

VERAGAddIn/rbnVERAG.vb

@@ -52,6 +52,16 @@ Public Class VERAGRibbon
     Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load
 
         cAllgemein.TESTSYSTEM = False
+
+        VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED = True
+        If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
+            VERAG.Label = "VERAG - UNLEASHED"
+            btnAVISOUnleashed.Visible = True
+        Else
+            VERAG.Label = "VERAG"
+            btnAVISOUnleashed.Visible = False
+
+        End If
         'cAllgemein.TESTSYSTEM = True
         LOGIN_OK = AVISO_Mail_Functions.initFirmaUser()
 
@@ -730,41 +740,51 @@ Public Class AVISO_Mail_Functions
 
             Dim dt As New DataTable()
             dt.Columns.AddRange({
-                New DataColumn("Record"),
-                New DataColumn("Consignee"),
-                New DataColumn("Quantity"),
-                New DataColumn("GrossWeight"),
-                New DataColumn("OrderCustoms"),
-                New DataColumn("OperationType"),
-                New DataColumn("Description"),
-                New DataColumn("LinkText"),
-                New DataColumn("LinkUrl")
-            })
+    New DataColumn("Record"),
+    New DataColumn("Consignee"),
+    New DataColumn("Quantity"),
+    New DataColumn("GrossWeight"),
+    New DataColumn("OrderCustoms"),
+    New DataColumn("Address"),
+    New DataColumn("Code"),
+    New DataColumn("OperationType"),
+    New DataColumn("Links") ' store ALL links (doc + cmr)
+})
 
             Dim doc As New HtmlAgilityPack.HtmlDocument()
             doc.LoadHtml(mailItem.HTMLBody)
 
-            Dim rows = doc.DocumentNode.SelectNodes("//tr[td]")
+            Dim rows = doc.DocumentNode.SelectNodes("//tr")
 
             If rows Is Nothing Then Return dt
 
             For Each row In rows
+
                 Dim cells = row.SelectNodes("td")
-                If cells Is Nothing OrElse cells.Count < 8 Then Continue For
+                If cells Is Nothing Then Continue For
 
-                Dim linkNode = cells(7).SelectSingleNode(".//a")
+                Dim recordText As String = Clean(cells(0).InnerText)
 
-                dt.Rows.Add(
-                    Clean(cells(0).InnerText),
-                    Clean(cells(1).InnerText),
-                    Clean(cells(2).InnerText),
-                    Clean(cells(3).InnerText),
-                    Clean(cells(4).InnerText),
-                    Clean(cells(5).InnerText),
-                    Clean(cells(6).InnerText),
-                    If(linkNode IsNot Nothing, Clean(linkNode.InnerText), ""),
-                    If(linkNode IsNot Nothing, linkNode.GetAttributeValue("href", ""), "")
-                )
+                If Not IsNumeric(recordText) Then Continue For
+
+                Dim linkNodes = row.SelectNodes(".//a")
+                Dim links As New List(Of String)
+
+                If linkNodes IsNot Nothing Then
+                    For Each ln In linkNodes
+                        Dim href = ln.GetAttributeValue("href", "")
+                        If href <> "" Then links.Add(href)
+                    Next
+                End If
+
+                Dim GetCell = Function(index As Integer) As String
+                                  If cells.Count > index Then
+                                      Return Clean(cells(index).InnerText)
+                                  End If
+                                  Return ""
+                              End Function
+
+                dt.Rows.Add(recordText, GetCell(1), GetCell(2), GetCell(3), GetCell(4), GetCell(5), GetCell(6), GetCell(7), String.Join("|", links))
 
             Next
 
@@ -773,54 +793,59 @@ Public Class AVISO_Mail_Functions
             Dim sendungsNrOld As String = ""
             Dim missingDocuments As String = ""
 
-            For Each r In dt.Rows
+            For Each r As DataRow In dt.Rows
 
-                If r("LinkUrl") <> "" AndAlso r("LinkUrl").ToString.Contains("https://web01.ekoltransport.com.tr/dfdsdocumentservice/download/") Then
+                Dim links = r("Links").ToString().Split("|"c)
 
-                    Dim link As String = r("LinkUrl")
+                For Each linkRaw In links
 
-                    If link.EndsWith("%20") And link.Length > 3 Then
-                        link = link.Remove(link.Length - 3)
-                    End If
+                    If String.IsNullOrWhiteSpace(linkRaw) Then Continue For
 
-                    Dim sendungsNr As String = r("Record")
+                    If linkRaw.Contains("dfdsdocumentservice/download") Or linkRaw.Contains("quadronet.dfds.com/link") Then
 
-                        Dim Descr As String = r("Description")
+                        Dim link As String = linkRaw.Trim()
 
-                        If Descr <> "" Then
-                            Descr = Descr.ToString.Replace(";", "_")
-                            Descr = Descr.ToString.Replace(".", "_")
-                            Descr = Descr.ToString.Replace(" ", "_")
-                            Descr = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(Descr)
+                        If link.EndsWith("%20") Then
+                            link = link.Substring(0, link.Length - 3)
+                        End If
+
+                        Dim sendungsNr As String = r("Record").ToString()
+                        Dim descr As String = r("Consignee").ToString()
+
+                        If descr <> "" Then
+                            descr = descr.Replace(";", "_").Replace(".", "_").Replace(" ", "_")
+
+                            descr = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(descr)
                         End If
 
                         If sendungsNrOld <> "" AndAlso sendungsNrOld <> sendungsNr Then
                             counter = 1
                         End If
 
-                    Dim file = VERAG_PROG_ALLGEMEIN.cFormularManager.getFile_FromURLStream(link, r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, ""),, False)
+                        Dim filename As String = sendungsNr & "_" & counter &
+                                    If(descr <> "", "_" & descr, "")
 
-                    If IO.File.Exists(file) Then
-                        ATT.Add(file)
+                        Dim file = VERAG_PROG_ALLGEMEIN.cFormularManager.getFile_FromURLStream_NEW(link, filename,, False)
 
-                    Else
-                        If missingDocuments <> "" Then
-                                missingDocuments &= vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "")
+                        If IO.File.Exists(file) Then
+                            ATT.Add(file)
+                        Else
+                            If missingDocuments <> "" Then
+                                missingDocuments &= vbNewLine & filename
                             Else
-                                missingDocuments = "fehlende Dokumente: " & vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "")
+                                missingDocuments = "fehlende Dokumente:" & vbNewLine & filename
                             End If
                         End If
 
                         counter += 1
-
-                        sendungsNrOld = r("Record")
+                        sendungsNrOld = sendungsNr
 
                     End If
 
+                Next
 
             Next
 
-
             If missingDocuments <> "" Then
                 INFO = missingDocuments
             End If