edv/VERAGAddin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addin

Browse Source
This commit is contained in:
d.breimaier
2025-12-31 09:01:21 +01:00
parent 03018f0390
commit b24d57cd2a
4 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
VERAGAddIn/VERAGAddIn.vbproj
View File

@@ -36,7 +36,7 @@
<PublishUrl>\\ftps.verag.ag\g\FTP\Programme\VeragAddin\</PublishUrl> <PublishUrl>\\ftps.verag.ag\g\FTP\Programme\VeragAddin\</PublishUrl>
<InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl> <InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
<TargetCulture>de</TargetCulture> <TargetCulture>de</TargetCulture>
<ApplicationVersion>1.0.1.132</ApplicationVersion> <ApplicationVersion>1.0.1.133</ApplicationVersion>
<AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision> <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
<UpdateEnabled>true</UpdateEnabled> <UpdateEnabled>true</UpdateEnabled>
<UpdateInterval>0</UpdateInterval> <UpdateInterval>0</UpdateInterval>
@@ -81,7 +81,7 @@
</BootstrapperPackage> </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.VSTORuntime.4.0"> <BootstrapperPackage Include="Microsoft.VSTORuntime.4.0">
<Visible>False</Visible> <Visible>False</Visible>
<ProductName>Microsoft Visual Studio 2010 Tools for Office Runtime %28x86 and x64%29</ProductName> <ProductName>Microsoft Visual Studio 2010-Tools für Office-Laufzeit %28x86 und x64%29</ProductName>
<Install>true</Install> <Install>true</Install>
</BootstrapperPackage> </BootstrapperPackage>
<BootstrapperPackage Include="Microsoft.Windows.Installer.4.5"> <BootstrapperPackage Include="Microsoft.Windows.Installer.4.5">
@@ -274,7 +274,6 @@
<None Include="Resources\GS\gsdll32.lib"> <None Include="Resources\GS\gsdll32.lib">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="Sebastian.pfx" />
<None Include="ThisAddIn.Designer.xml"> <None Include="ThisAddIn.Designer.xml">
<DependentUpon>ThisAddIn.vb</DependentUpon> <DependentUpon>ThisAddIn.vb</DependentUpon>
</None> </None>
@@ -351,15 +350,15 @@
<None Include="Resources\pdfprint.png" /> <None Include="Resources\pdfprint.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj"> <ProjectReference Include="..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj">
<Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project> <Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project>
<Name>TELOTEC_Worker_lib</Name> <Name>TELOTEC_Worker_lib</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\AVISO\Aviso\Aviso\Aviso.vbproj"> <ProjectReference Include="..\..\Aviso\AVISO\Aviso\Aviso.vbproj">
<Project>{7bdd8c2f-2c9e-49f1-a365-3b1da1c84991}</Project> <Project>{7bdd8c2f-2c9e-49f1-a365-3b1da1c84991}</Project>
<Name>Aviso</Name> <Name>Aviso</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\AVISO\Aviso\Gemeinsames\Gemeinsames.vbproj"> <ProjectReference Include="..\..\Aviso\AVISO\Gemeinsames\Gemeinsames.vbproj">
<Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project> <Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
<Name>Gemeinsames</Name> <Name>Gemeinsames</Name>
</ProjectReference> </ProjectReference>
@@ -367,7 +366,7 @@
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project> <Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>
<Name>VERAG_PROG_ALLGEMEIN</Name> <Name>VERAG_PROG_ALLGEMEIN</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\SDL\SDL\SDL\SDL.vbproj"> <ProjectReference Include="..\..\SDL\SDL\SDL\SDL.vbproj">
<Project>{289BCD77-BC00-4BA1-95ED-A79176D99525}</Project> <Project>{289BCD77-BC00-4BA1-95ED-A79176D99525}</Project>
<Name>SDL</Name> <Name>SDL</Name>
</ProjectReference> </ProjectReference>
@@ -395,7 +394,7 @@
<ManifestKeyFile>AL20231110.pfx</ManifestKeyFile> <ManifestKeyFile>AL20231110.pfx</ManifestKeyFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ManifestCertificateThumbprint>75156A186435E8542612CE6E7E26CA9FCE0A5BAF</ManifestCertificateThumbprint> <ManifestCertificateThumbprint>D21E170FE10FFCC8532FBDEFB75A35DB90661CC0</ManifestCertificateThumbprint>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<SignAssembly>false</SignAssembly> <SignAssembly>false</SignAssembly>
@@ -407,7 +406,7 @@
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<AssemblyOriginatorKeyFile>AL20231110.pfx</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>PrivateCodeSignaturDaniel20240131.pfx</AssemblyOriginatorKeyFile>
</PropertyGroup> </PropertyGroup>
<PropertyGroup /> <PropertyGroup />
<!-- Include the build rules for a Visual Basic project. --> <!-- Include the build rules for a Visual Basic project. -->

10
VERAGAddIn/app.config
View File

@@ -16,7 +16,7 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" /> <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" /> <bindingRedirect oldVersion="0.0.0.0-1.8.2.0" newVersion="1.8.2.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" /> <assemblyIdentity name="Spire.Pdf" publicKeyToken="663f351905198cb3" culture="neutral" />
@@ -44,19 +44,19 @@
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" /> <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" /> <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" /> <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" /> <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" /> <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly> </dependentAssembly>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" /> <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

15
VERAGAddIn/frmAvisoFormularAnfügen.vb
View File

@@ -205,12 +205,17 @@ Public Class frmAvisoFormularAnfuegen
If ATT IsNot Nothing Then If ATT IsNot Nothing Then
If ATT.Count > 1 Then If ATT.Count > 1 Then
ATT = ATTTemp ATT = ATTTemp
If dgvAnhaenge.SelectedCells.Count = 0 Then If dgvAnhaenge.SelectedRows.Count = 0 Then
MsgBox("Bitte Anhang markieren!") MsgBox("Bitte Anhang markieren!")
DialogResult = DialogResult.None DialogResult = DialogResult.None
Exit Sub Exit Sub
Else 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
End If End If
@@ -323,11 +328,13 @@ Public Class frmAvisoFormularAnfuegen
End Sub 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 If (a IsNot Nothing) AndAlso (a.Count > 1) Then
Dim list As New List(Of String) Dim list As New List(Of String)
Dim selectedItem As Object = a.Item(tmpIndex) For Each r In tmpIndex
Dim selectedItem As Object = a.Item(CInt(r))
list.Add(selectedItem) list.Add(selectedItem)
Next
a = list a = list
End If End If
End Sub End Sub

16
VERAGAddIn/rbnVERAG.vb
View File

@@ -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) 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 Try
If AvisoId > 0 Then 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 For Each ATT In ATTACHMENTS_LIST
Dim fi As New IO.FileInfo(ATT) Dim fi As New IO.FileInfo(ATT)
Dim Bezeichnung = BezeichnungAnh Dim Bezeichnung = BezeichnungAnh
If Bezeichnung = "" Then Bezeichnung = fi.Name If Bezeichnung = "" Then Bezeichnung = fi.Name
uploadAttachments(sender, AvisoId, fi.FullName, Bezeichnung, kdNr, enableOverwritting) uploadAttachments(sender, AvisoId, fi.FullName, Bezeichnung, kdNr, enableOverwritting, multifiles)
Next Next
End If End If
@@ -499,7 +500,7 @@ Public Class AVISO_Mail_Functions
End While End While
'Dim iof As New IO.FileInfo(attachment.PathName) 'Dim iof As New IO.FileInfo(attachment.PathName)
Dim fileName As String = attachment.FileName 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("“", "") fileName = fileName.Replace("“", "")
fileName = fileName.Replace("”", "") fileName = fileName.Replace("”", "")
@@ -801,7 +802,6 @@ Public Class AVISO_Mail_Functions
mailItem.SaveAs(strTmpPath, Outlook.OlSaveAsType.olMSG) mailItem.SaveAs(strTmpPath, Outlook.OlSaveAsType.olMSG)
uploadAttachments(sender, AvisoId, strTmpPath, bezeichnung, kdNr, enableOverwritting) uploadAttachments(sender, AvisoId, strTmpPath, bezeichnung, kdNr, enableOverwritting)
' Clean up the temporary .MSG file from the user's temporary folder ' 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 If sender Is Nothing Then
Exit Sub Exit Sub
@@ -873,7 +873,7 @@ Public Class AVISO_Mail_Functions
Select Case button.Name Select Case button.Name
Case "btnVollmachten" 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) Dim path = DS.uploadDataToDATENSERVER(strTmpPath)
If path Then If path Then
Dim c As New cKundenVollmachten(AvisoId) Dim c As New cKundenVollmachten(AvisoId)
@@ -887,7 +887,7 @@ Public Class AVISO_Mail_Functions
Case "btnVertraege" 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) Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
If path Then If path Then
Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(AvisoId) Dim KV As New VERAG_PROG_ALLGEMEIN.cKundenVertraege(AvisoId)
@@ -899,7 +899,7 @@ Public Class AVISO_Mail_Functions
Case "btnGestellungsgarantien" Case "btnGestellungsgarantien"
Dim gg As New VERAG_PROG_ALLGEMEIN.cGestellungsgarantien(AvisoId) 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) Dim path = DS.uploadDataToDATENSERVER(strTmpPath,,,,,, enableOverweriting)
If path Then If path Then
gg.gg_datenarchivId = DS.da_id gg.gg_datenarchivId = DS.da_id