addin fix barsan

2026-10-23 09:18:09 +02:00
parent 16d3ac2391
commit b3f99c114c
3 changed files with 56 additions and 39 deletions
--- a/VERAGAddIn/rbnMailItem.vb
+++ b/VERAGAddIn/rbnMailItem.vb
@@ -16,7 +16,7 @@ Public Class rbnMailItem
        Group1.Label = "VERAG"
        btnAVISOUnleashed.Visible = False

-        VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
+        'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True

        LOGIN_OK = AVISO_Mail_Functions.initFirmaUser()
        currentexplorer = ThisAddIn.SharedExplorer
--- a/VERAGAddIn/rbnVERAG.Designer.vb
+++ b/VERAGAddIn/rbnVERAG.Designer.vb
@@ -43,6 +43,7 @@
    Private Sub InitializeComponent()
        Me.Tab1 = Me.Factory.CreateRibbonTab
        Me.VERAG = Me.Factory.CreateRibbonGroup
+        Me.btnAVISOUnleashed = Me.Factory.CreateRibbonButton
        Me.Button2 = Me.Factory.CreateRibbonButton
        Me.btnPdfPrint = Me.Factory.CreateRibbonButton
        Me.btnAvisoMail = Me.Factory.CreateRibbonButton
@@ -55,7 +56,6 @@
        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()
@@ -78,6 +78,15 @@
        Me.VERAG.Label = "AVISO"
        Me.VERAG.Name = "VERAG"
        '
+        '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
+        '
        'Button2
        '
        Me.Button2.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
@@ -169,15 +178,6 @@
        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"
--- a/VERAGAddIn/rbnVERAG.vb
+++ b/VERAGAddIn/rbnVERAG.vb
@@ -51,7 +51,7 @@ Public Class VERAGRibbon

    Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load

-        cAllgemein.TESTSYSTEM = True
+        ' cAllgemein.TESTSYSTEM = True

        VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED = True
        If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then
@@ -670,9 +670,9 @@ Public Class AVISO_Mail_Functions
    End Function

    Shared Function isMail_Barsan(mailItem As Outlook.MailItem) As Boolean
-        '--------------------- WIRD NICHT MEHR GENUTZT
-        Return False
-        '--------------------- WIRD NICHT MEHR GENUTZT
+        '--------------------- WIRD NICHT MEHR GENUTZT -> DOCH!!!!!
+        'Return False
+        '--------------------- WIRD NICHT MEHR GENUTZT -> DOCH!!!!!
        Try
            If mailItem IsNot Nothing Then
                Dim srch As String = "<a href=""https://portal.barsan.com/Dokuman/DokumanGoster.aspx"
@@ -878,7 +878,7 @@ Public Class AVISO_Mail_Functions
            html = html.Replace("<B>•</B>", "<b>•</b>")
            html = html.Replace("<B>•</b>", "<b>•</b>")

-            Dim srch As String = "<b>•</b>"
+            Dim srch As String = "#8226;"
            If html.ToString.Contains(srch) Then

                Dim myDelims As String() = New String() {srch}
@@ -900,43 +900,60 @@ Public Class AVISO_Mail_Functions

                        'Ansonten stüzt der Webservice-Aufruf ab! ABER -> For .NET 4.7 or later, the System.Net.ServicePointManager.SecurityProtocol should not be set manualy!
                        System.Net.ServicePointManager.SecurityProtocol = System.Net.ServicePointManager.SecurityProtocol Or SecurityProtocolType.Tls11 Or SecurityProtocolType.Tls12
-                        If l.ToString.ToLower().Contains(".pdf") Then
+                        If l.ToString.ToLower().Contains(".pdf") OrElse l.ToString.ToLower().Contains(".xls") Then

                            Dim pdfNameOrigin As String = ""
                            Dim pdfStringName = l.ToString.ToLower().Substring(0, l.ToString.IndexOf(linkinHTML) - 1).Trim()
-                            Dim pdfNamefromFile = l.ToString.ToLower().Substring(l.ToString.IndexOf(""">") + 2, l.ToString.IndexOf(".pdf") - l.ToString.IndexOf(""">") + 2).Trim()
-                            pdfNamefromFile = pdfNamefromFile.Replace(".pdf", "")
+                            Dim pdfNamefromFile = ""
+
+                            If l.ToString.ToLower().Contains(".pdf") Then
+                                pdfNamefromFile = l.ToString.ToLower().Substring(l.ToString.IndexOf(""">") + 2, l.ToString.IndexOf(".pdf") - l.ToString.IndexOf(""">") + 2).Trim()
+                                pdfNamefromFile = pdfNamefromFile.Replace(".pdf", "")
+
+                            ElseIf l.ToString.ToLower().Contains(".xlsx") Then
+                                pdfNamefromFile = l.ToString.ToLower().Substring(l.ToString.IndexOf(""">") + 2, l.ToString.IndexOf(".xlsx") - l.ToString.IndexOf(""">") + 2).Trim()
+                                pdfNamefromFile = pdfNamefromFile.Replace(".xlsx", "")
+
+
+                            ElseIf l.ToString.ToLower().Contains(".xls") Then
+                                pdfNamefromFile = l.ToString.ToLower().Substring(l.ToString.IndexOf(""">") + 2, l.ToString.IndexOf(".xls") - l.ToString.IndexOf(""">") + 2).Trim()
+                                pdfNamefromFile = pdfNamefromFile.Replace(".xls", "")
+                            End If
+
+
                            Dim numName As Boolean = False



-                            For Each x As Char In pdfStringName
-                                If Char.IsDigit(x) Then
-                                    pdfNameOrigin &= x
-                                    numName = True
+                                For Each x As Char In pdfStringName
+                                    If Char.IsDigit(x) Then
+                                        pdfNameOrigin &= x
+                                        numName = True
+                                    Else
+                                        Exit For
+                                    End If
+                                Next
+                                If lastPdfName <> "" AndAlso lastPdfName = pdfNameOrigin Then
+                                    pdfNameWithCounter = pdfNameOrigin & "_" & counter
+                                    counter = counter + 1
                                Else
-                                    Exit For
+                                    If pdfNameWithCounter <> "" Then
+                                        counter = 1
+                                        pdfNameWithCounter = ""
+                                    End If
                                End If
-                            Next
-                            If lastPdfName <> "" AndAlso lastPdfName = pdfNameOrigin Then
-                                pdfNameWithCounter = pdfNameOrigin & "_" & counter
-                                counter = counter + 1
-                            Else
-                                If pdfNameWithCounter <> "" Then
-                                    counter = 1
-                                    pdfNameWithCounter = ""
-                                End If
-                            End If

-                            Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(link, IIf(pdfNameWithCounter <> "", pdfNameWithCounter, IIf(numName = False, pdfNamefromFile, pdfNameOrigin)),, False)
+                            Dim fileName_NEW = VERAG_PROG_ALLGEMEIN.cFormularManager.getFile_FromURLStream_NEW(link, IIf(pdfNameWithCounter <> "", pdfNameWithCounter, IIf(numName = False, pdfNamefromFile, pdfNameOrigin)), False)
+
+                            'Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(link, IIf(pdfNameWithCounter <> "", pdfNameWithCounter, IIf(numName = False, pdfNamefromFile, pdfNameOrigin)),, False)
                            If pdfNameOrigin <> "" Then lastPdfName = pdfNameOrigin
-                            If IO.File.Exists(pdf) Then
-                                ATT.Add(pdf)
+                            If IO.File.Exists(fileName_NEW) AndAlso (fileName_NEW.ToLower.EndsWith(".pdf") Or fileName_NEW.ToLower.EndsWith(".xls") Or fileName_NEW.ToLower.EndsWith(".xlsx")) Then
+                                ATT.Add(fileName_NEW)
                            End If
                            If pdfNamefromFile.ToLower.Contains("bordro") Then art = "Bordro"
-                        End If
+                            End If

-                    End If
+                        End If
                    cnt += 1
                Next
            End If