Barsan-Mails

2023-10-20 09:26:57 +02:00
parent 106a4e2e35
commit 89a5cf2cde
3 changed files with 55 additions and 22 deletions
--- a/VERAGAddIn/VERAGAddIn.vbproj
+++ b/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.104</ApplicationVersion>
+    <ApplicationVersion>1.0.1.105</ApplicationVersion>
    <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
    <UpdateEnabled>true</UpdateEnabled>
    <UpdateInterval>0</UpdateInterval>
--- a/VERAGAddIn/frmAvisoAnfügen.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.vb
@@ -7,14 +7,16 @@ Public Class frmAvisoAnfuegen
    Public SendungsId = -1
    Public Bezeichnung = ""
    Public PDF_MAIL = ""
+    Public Art = ""

    Public ATT As List(Of String)

-    Sub New(Bezeichnung)
+    Sub New(Bezeichnung, Art)

        ' Dieser Aufruf ist für den Designer erforderlich.
        InitializeComponent()
        Me.Bezeichnung = Bezeichnung
+        Me.Art = Art
        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.

    End Sub
@@ -42,7 +44,9 @@ Public Class frmAvisoAnfuegen
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATB-Nr", "ATB"))
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("ATA-Nr", "ATA"))
        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Sonstiges", "Sonstiges"))
+        cboArt.Items.Add(New VERAG_PROG_ALLGEMEIN.MyListItem("Bordro", "Bordro"))

+        If Art <> "" Then cboArt.changeItem(Art)

        initAttachment()
    End Sub
--- a/VERAGAddIn/rbnVERAG.vb
+++ b/VERAGAddIn/rbnVERAG.vb
@@ -18,6 +18,7 @@ Imports System.Threading.Tasks
 Imports System.Net.Http
 Imports System.Diagnostics
 Imports VERAG_PROG_ALLGEMEIN.Kleinma.Controls
+Imports System.Data.Odbc

 Public Class VERAGRibbon
    Dim LOGIN_OK = False
@@ -160,17 +161,11 @@ Public Class AVISO_Mail_Functions
                loadAttachment(mailItem, ATTACHMENTS_LIST)

                If isMail_EKOL(mailItem) Then
-                    If vbYes = MsgBox("EKOL-Anhänge laden?", vbYesNoCancel) Then
-                        getATT_EKOL(mailItem, ATTACHMENTS_LIST)
-                    End If
+                    If vbYes = MsgBox("EKOL-Anhänge laden?", vbYesNoCancel) Then getATT_EKOL(mailItem, ATTACHMENTS_LIST)
                End If

                If isMail_Barsan(mailItem) Then
-                    If vbYes = MsgBox("Barsan-Anhänge laden?", vbYesNoCancel) Then
-
-                        getATT_Barsan(mailItem, ATTACHMENTS_LIST)
-
-                    End If
+                    If vbYes = MsgBox("Barsan-Anhänge laden?", vbYesNoCancel) Then getATT_Barsan(mailItem, ATTACHMENTS_LIST, Art)
                End If

                Dim Bezeichnung = strFileName
@@ -374,6 +369,7 @@ Public Class AVISO_Mail_Functions
                'MsgBox(mailItem.To)
                'MsgBox(mailItem.)
                'MsgBox(getFirmaFromToMail(mailItem.To))
+                Dim art = ""

                EingangsDatum = mailItem.ReceivedTime
                Dim senderMail = ""
@@ -387,16 +383,12 @@ Public Class AVISO_Mail_Functions
                KundenNr = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getKdNrFromMailAdress(senderMail, False) ' false, wenn mehrere Niederlassungen von Frimen im KdStamm vorhanden... falsche KdNr...

                If isMail_EKOL(mailItem) Then
-                    If vbYes = MsgBox("EKOL-Anhänge laden?", vbYesNoCancel) Then
-                        getATT_EKOL(mailItem, ATTACHMENTS_LIST)
-                    End If
+                    If vbYes = MsgBox("EKOL-Anhänge laden?", vbYesNoCancel) Then getATT_EKOL(mailItem, ATTACHMENTS_LIST)
                End If
                'End If

                If isMail_Barsan(mailItem) Then
-                    If vbYes = MsgBox("Barsan-Anhänge laden?", vbYesNoCancel) Then
-                        getATT_Barsan(mailItem, ATTACHMENTS_LIST)
-                    End If
+                    If vbYes = MsgBox("Barsan-Anhänge laden?", vbYesNoCancel) Then getATT_Barsan(mailItem, ATTACHMENTS_LIST, art)
                End If


@@ -421,7 +413,7 @@ Public Class AVISO_Mail_Functions

                If VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID > 0 Then

-                    saveAttachment(ATTACHMENTS_LIST, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, -1, "", "")
+                    saveAttachment(ATTACHMENTS_LIST, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, -1, art, "")
                    saveMail(mailItem, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID,, False)

                End If
@@ -649,7 +641,7 @@ Public Class AVISO_Mail_Functions



-    Shared Function getATT_Barsan(mailItem As Outlook.MailItem, Optional ByRef ATT As List(Of String) = Nothing, Optional ByRef LKW_Nr As String = "", Optional ByRef RefNr As String = "", Optional ByRef INFO As String = "") As List(Of String)
+    Shared Function getATT_Barsan(mailItem As Outlook.MailItem, Optional ByRef ATT As List(Of String) = Nothing, Optional ByRef art As String = "") As List(Of String)

        If ATT Is Nothing Then ATT = New List(Of String)
        Try
@@ -657,8 +649,11 @@ Public Class AVISO_Mail_Functions
            If mailItem Is Nothing Then Return ATT

            Dim html = mailItem.HTMLBody
+            html = html.Replace("<b>•</B>", "<b>•</b>")
+            html = html.Replace("<B>•</B>", "<b>•</b>")
+            html = html.Replace("<B>•</b>", "<b>•</b>")

-            Dim srch As String = "<a href=""https://portal.barsan.com/Dokuman/DokumanGoster.aspx"
+            Dim srch As String = "<b>•</b>"
            If html.ToString.Contains(srch) Then

                Dim myDelims As String() = New String() {srch}
@@ -666,20 +661,54 @@ Public Class AVISO_Mail_Functions

                ' Dim sp = html.ToString.Split(srch.ToString)
                Dim cnt = 0
+
+                Dim pdfNameWithCounter As String = ""
+                Dim counter As Integer = 1
+                Dim lastPdfName As String = ""
+                Dim linkinHTML = "<a href=""https://portal.barsan.com/Dokuman/DokumanGoster.aspx"
                For Each l In sp
                    If cnt > 0 AndAlso l.Contains(""">") Then ' ENDE
-                        Dim link = ("https://portal.barsan.com/Dokuman/DokumanGoster.aspx" & l.ToString.Substring(0, l.ToString.IndexOf(""">")))
+
+                        Dim lastIndexLink = l.ToString.IndexOf(linkinHTML) + linkinHTML.Length
+                        Dim link = ("https://portal.barsan.com/Dokuman/DokumanGoster.aspx" & l.ToString.Substring(lastIndexLink, l.ToString.IndexOf(""">") - lastIndexLink))


                        '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

-                            Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(link,, False)
+                            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 numName As Boolean = False

+
+
+                            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
+                                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)
+                            If pdfNameOrigin <> "" Then lastPdfName = pdfNameOrigin
                            If IO.File.Exists(pdf) Then
                                ATT.Add(pdf)
                            End If
+                            If pdfNamefromFile.ToLower.Contains("bordro") Then art = "Bordro"
                        End If

                    End If
@@ -781,7 +810,7 @@ Public Class AVISO_Mail_Functions

        Select Case sender.name
            Case "btnAvisoMail", "btnAvisoMail2"
-                Dim frmAvisoAnfügen As New frmAvisoAnfuegen(Bezeichnung)
+                Dim frmAvisoAnfügen As New frmAvisoAnfuegen(Bezeichnung, Art)
                frmAvisoAnfügen.ATT = Att
                If frmAvisoAnfügen.ShowDialog = DialogResult.OK Then
                    Dim AvisoId = frmAvisoAnfügen.AvisoId