diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj index eeb7199..274af73 100644 --- a/VERAGAddIn/VERAGAddIn.vbproj +++ b/VERAGAddIn/VERAGAddIn.vbproj @@ -36,7 +36,7 @@ \\ftps.verag.ag\g\FTP\Programme\VeragAddin\ http://ftps.verag.ag/VERAGAddin/ de - 1.0.1.132 + 1.0.1.133 true true 0 @@ -81,7 +81,7 @@ False - Microsoft Visual Studio 2010 Tools for Office Runtime %28x86 and x64%29 + Microsoft Visual Studio 2010-Tools für Office-Laufzeit %28x86 und x64%29 true @@ -274,7 +274,6 @@ Always - ThisAddIn.vb @@ -351,15 +350,15 @@ - + {5b947a66-009a-4bb6-b925-f84a01045095} TELOTEC_Worker_lib - + {7bdd8c2f-2c9e-49f1-a365-3b1da1c84991} Aviso - + {110c923b-cb02-4fd0-af24-95e0f0eeeff5} Gemeinsames @@ -367,7 +366,7 @@ {a3b497bd-842c-4a2b-b398-ed1976849df1} VERAG_PROG_ALLGEMEIN - + {289BCD77-BC00-4BA1-95ED-A79176D99525} SDL @@ -395,7 +394,7 @@ AL20231110.pfx - 75156A186435E8542612CE6E7E26CA9FCE0A5BAF + D21E170FE10FFCC8532FBDEFB75A35DB90661CC0 false @@ -407,7 +406,7 @@ false - AL20231110.pfx + PrivateCodeSignaturDaniel20240131.pfx diff --git a/VERAGAddIn/app.config b/VERAGAddIn/app.config index 9281de8..ac224fb 100644 --- a/VERAGAddIn/app.config +++ b/VERAGAddIn/app.config @@ -16,7 +16,7 @@ - + @@ -44,19 +44,19 @@ - + - + - + - + diff --git a/VERAGAddIn/frmAvisoFormularAnfügen.vb b/VERAGAddIn/frmAvisoFormularAnfügen.vb index 626b899..cf48d00 100644 --- a/VERAGAddIn/frmAvisoFormularAnfügen.vb +++ b/VERAGAddIn/frmAvisoFormularAnfügen.vb @@ -205,12 +205,17 @@ Public Class frmAvisoFormularAnfuegen If ATT IsNot Nothing Then If ATT.Count > 1 Then ATT = ATTTemp - If dgvAnhaenge.SelectedCells.Count = 0 Then + If dgvAnhaenge.SelectedRows.Count = 0 Then MsgBox("Bitte Anhang markieren!") DialogResult = DialogResult.None Exit Sub Else - RemoveNotUsedAttachmentOnList(ATT, dgvAnhaenge.SelectedCells.Item(0).RowIndex) + Dim listOfSelectedAttachmendIndex As New List(Of Integer) + For Each indexOfAttachment As DataGridViewRow In dgvAnhaenge.SelectedRows + listOfSelectedAttachmendIndex.Add(indexOfAttachment.Index) + Next + + RemoveNotUsedAttachmentOnList(ATT, listOfSelectedAttachmendIndex) End If End If @@ -323,11 +328,13 @@ Public Class frmAvisoFormularAnfuegen End Sub - Private Sub RemoveNotUsedAttachmentOnList(ByRef a As List(Of String), tmpIndex As Integer) + Private Sub RemoveNotUsedAttachmentOnList(ByRef a As List(Of String), tmpIndex As List(Of Integer)) If (a IsNot Nothing) AndAlso (a.Count > 1) Then Dim list As New List(Of String) - Dim selectedItem As Object = a.Item(tmpIndex) - list.Add(selectedItem) + For Each r In tmpIndex + Dim selectedItem As Object = a.Item(CInt(r)) + list.Add(selectedItem) + Next a = list End If End Sub diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index 7f0e5f0..491e03c 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -463,13 +463,14 @@ Public Class AVISO_Mail_Functions Shared Sub saveAttachmentOnDatenserver(ByRef ATTACHMENTS_LIST As List(Of String), AvisoId As Integer, BezeichnungAnh As String, Optional sender As Object = Nothing, Optional kdNr As Integer = -1, Optional enableOverwritting As Boolean = False) Try If AvisoId > 0 Then - If ATTACHMENTS_LIST.Count > 1 Then BezeichnungAnh = "" ' nur wenn 1 Anhang wird die Bezeichnung übernommen. + Dim multifiles As Boolean = False + If ATTACHMENTS_LIST.Count > 1 Then BezeichnungAnh = "" : multifiles = True ' nur wenn 1 Anhang wird die Bezeichnung übernommen. For Each ATT In ATTACHMENTS_LIST Dim fi As New IO.FileInfo(ATT) Dim Bezeichnung = BezeichnungAnh If Bezeichnung = "" Then Bezeichnung = fi.Name - uploadAttachments(sender, AvisoId, fi.FullName, Bezeichnung, kdNr, enableOverwritting) + uploadAttachments(sender, AvisoId, fi.FullName, Bezeichnung, kdNr, enableOverwritting, multifiles) Next End If @@ -499,7 +500,7 @@ Public Class AVISO_Mail_Functions End While 'Dim iof As New IO.FileInfo(attachment.PathName) Dim fileName As String = attachment.FileName - fileName = Left(Regex.Replace(fileName, "[\/\\\:\?!€,&'\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, "_") + fileName = Right(Regex.Replace(fileName, "[\/\\\:\?!€,&'\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, "_") fileName = fileName.Replace("""", "") fileName = fileName.Replace("“", "") fileName = fileName.Replace("”", "") @@ -801,7 +802,6 @@ Public Class AVISO_Mail_Functions mailItem.SaveAs(strTmpPath, Outlook.OlSaveAsType.olMSG) - uploadAttachments(sender, AvisoId, strTmpPath, bezeichnung, kdNr, enableOverwritting) ' Clean up the temporary .MSG file from the user's temporary folder @@ -861,7 +861,7 @@ Public Class AVISO_Mail_Functions - Shared Sub uploadAttachments(sender As Object, AvisoId As Integer, strTmpPath As String, Optional bezeichnung As String = "", Optional kdNr As Integer = -1, Optional enableOverweriting As Boolean = False) + Shared Sub uploadAttachments(sender As Object, AvisoId As Integer, strTmpPath As String, Optional bezeichnung As String = "", Optional kdNr As Integer = -1, Optional enableOverweriting As Boolean = False, Optional multifiles As Boolean = False) If sender Is Nothing Then Exit Sub @@ -873,7 +873,7 @@ Public Class AVISO_Mail_Functions Select Case button.Name Case "btnVollmachten" - Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", bezeichnung, kdNr) + Dim DS = New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "VOLLMACHTEN", "VMID_" & AvisoId, "", "", bezeichnung, kdNr, multifiles) Dim path = DS.uploadDataToDATENSERVER(strTmpPath) If path Then Dim c As New cKundenVollmachten(AvisoId) @@ -887,7 +887,7 @@ Public Class AVISO_Mail_Functions Case "btnVertraege" - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & AvisoId, kdNr) + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "KD_VERTRÄGE", "", "", "", "KV_" & AvisoId, kdNr, multifiles) Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting) If path Then Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(AvisoId) @@ -899,7 +899,7 @@ Public Class AVISO_Mail_Functions Case "btnGestellungsgarantien" Dim gg As New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(AvisoId) - Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "GESTELLUNGS_GARANTIEN", "", "", "", "GG_" & gg.gg_Zollamt, kdNr) + Dim DS As New VERAG_PROG_ALLGEMEIN.cDATENSERVER("DOKUMENTE", "GESTELLUNGS_GARANTIEN", "", "", "", "GG_" & gg.gg_Zollamt, kdNr, multifiles) Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting) If path Then gg.gg_datenarchivId = DS.da_id