Compare commits
2 Commits
03018f0390
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 4856d4e6d9 | |||
| b24d57cd2a |
@@ -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.134</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">
|
||||||
@@ -164,6 +164,9 @@
|
|||||||
-->
|
-->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Accessibility" />
|
<Reference Include="Accessibility" />
|
||||||
|
<Reference Include="HtmlAgilityPack, Version=1.12.4.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\..\Aviso\AVISO\packages\HtmlAgilityPack.1.12.4\lib\Net45\HtmlAgilityPack.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
<Reference Include="Microsoft.Office.Tools.Outlook.v4.0.Utilities, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
|
<Reference Include="Microsoft.Office.Tools.Outlook.v4.0.Utilities, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
|
||||||
<Reference Include="System" />
|
<Reference Include="System" />
|
||||||
<Reference Include="System.Data" />
|
<Reference Include="System.Data" />
|
||||||
@@ -269,12 +272,12 @@
|
|||||||
<None Include="AL20231110.pfx" />
|
<None Include="AL20231110.pfx" />
|
||||||
<None Include="app.config" />
|
<None Include="app.config" />
|
||||||
<None Include="Ich habe keine Ahnung, was ich hier mache.pfx" />
|
<None Include="Ich habe keine Ahnung, was ich hier mache.pfx" />
|
||||||
|
<None Include="packages.config" />
|
||||||
<None Include="PrivateCodeSignaturDaniel2024.pfx" />
|
<None Include="PrivateCodeSignaturDaniel2024.pfx" />
|
||||||
<None Include="PrivateCodeSignaturDaniel20240131.pfx" />
|
<None Include="PrivateCodeSignaturDaniel20240131.pfx" />
|
||||||
<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 +354,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 +370,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 +398,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 +410,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. -->
|
||||||
|
|||||||
@@ -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" />
|
||||||
|
|||||||
@@ -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
|
||||||
list.Add(selectedItem)
|
Dim selectedItem As Object = a.Item(CInt(r))
|
||||||
|
list.Add(selectedItem)
|
||||||
|
Next
|
||||||
a = list
|
a = list
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|||||||
4
VERAGAddIn/packages.config
Normal file
4
VERAGAddIn/packages.config
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<packages>
|
||||||
|
<package id="HtmlAgilityPack" version="1.12.4" targetFramework="net48" />
|
||||||
|
</packages>
|
||||||
3
VERAGAddIn/rbnMailItem.Designer.vb
generated
3
VERAGAddIn/rbnMailItem.Designer.vb
generated
@@ -41,7 +41,6 @@
|
|||||||
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
|
||||||
<System.Diagnostics.DebuggerStepThrough()>
|
<System.Diagnostics.DebuggerStepThrough()>
|
||||||
Private Sub InitializeComponent()
|
Private Sub InitializeComponent()
|
||||||
Me.components = New System.ComponentModel.Container()
|
|
||||||
Me.Tab1 = Me.Factory.CreateRibbonTab
|
Me.Tab1 = Me.Factory.CreateRibbonTab
|
||||||
Me.Group1 = Me.Factory.CreateRibbonGroup
|
Me.Group1 = Me.Factory.CreateRibbonGroup
|
||||||
Me.Button1 = Me.Factory.CreateRibbonButton
|
Me.Button1 = Me.Factory.CreateRibbonButton
|
||||||
@@ -52,7 +51,7 @@
|
|||||||
Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton
|
Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton
|
||||||
Me.btnInfo = Me.Factory.CreateRibbonButton
|
Me.btnInfo = Me.Factory.CreateRibbonButton
|
||||||
Me.btnUnsichtbar = Me.Factory.CreateRibbonButton
|
Me.btnUnsichtbar = Me.Factory.CreateRibbonButton
|
||||||
Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components)
|
Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon()
|
||||||
Me.Tab1.SuspendLayout()
|
Me.Tab1.SuspendLayout()
|
||||||
Me.Group1.SuspendLayout()
|
Me.Group1.SuspendLayout()
|
||||||
Me.SuspendLayout()
|
Me.SuspendLayout()
|
||||||
|
|||||||
10
VERAGAddIn/rbnVERAG.Designer.vb
generated
10
VERAGAddIn/rbnVERAG.Designer.vb
generated
@@ -52,6 +52,7 @@
|
|||||||
Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton
|
Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton
|
||||||
Me.SplitButton1 = Me.Factory.CreateRibbonSplitButton
|
Me.SplitButton1 = Me.Factory.CreateRibbonSplitButton
|
||||||
Me.Button1 = Me.Factory.CreateRibbonButton
|
Me.Button1 = Me.Factory.CreateRibbonButton
|
||||||
|
Me.btnDFDS = Me.Factory.CreateRibbonButton
|
||||||
Me.Button3 = Me.Factory.CreateRibbonButton
|
Me.Button3 = Me.Factory.CreateRibbonButton
|
||||||
Me.Button4 = Me.Factory.CreateRibbonButton
|
Me.Button4 = Me.Factory.CreateRibbonButton
|
||||||
Me.Tab1.SuspendLayout()
|
Me.Tab1.SuspendLayout()
|
||||||
@@ -132,6 +133,7 @@
|
|||||||
Me.SplitButton1.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
|
Me.SplitButton1.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
|
||||||
Me.SplitButton1.Image = Global.VERAGAddIn.My.Resources.Resources.wheel
|
Me.SplitButton1.Image = Global.VERAGAddIn.My.Resources.Resources.wheel
|
||||||
Me.SplitButton1.Items.Add(Me.Button1)
|
Me.SplitButton1.Items.Add(Me.Button1)
|
||||||
|
Me.SplitButton1.Items.Add(Me.btnDFDS)
|
||||||
Me.SplitButton1.Items.Add(Me.Button3)
|
Me.SplitButton1.Items.Add(Me.Button3)
|
||||||
Me.SplitButton1.Items.Add(Me.Button4)
|
Me.SplitButton1.Items.Add(Me.Button4)
|
||||||
Me.SplitButton1.Label = "Spezielle Optionen"
|
Me.SplitButton1.Label = "Spezielle Optionen"
|
||||||
@@ -144,6 +146,13 @@
|
|||||||
Me.Button1.Name = "Button1"
|
Me.Button1.Name = "Button1"
|
||||||
Me.Button1.ShowImage = True
|
Me.Button1.ShowImage = True
|
||||||
'
|
'
|
||||||
|
'btnDFDS
|
||||||
|
'
|
||||||
|
Me.btnDFDS.Image = Global.VERAGAddIn.My.Resources.Resources.pdf
|
||||||
|
Me.btnDFDS.Label = "DFDS PDFs auslesen"
|
||||||
|
Me.btnDFDS.Name = "btnDFDS"
|
||||||
|
Me.btnDFDS.ShowImage = True
|
||||||
|
'
|
||||||
'Button3
|
'Button3
|
||||||
'
|
'
|
||||||
Me.Button3.Image = Global.VERAGAddIn.My.Resources.Resources.pdf
|
Me.Button3.Image = Global.VERAGAddIn.My.Resources.Resources.pdf
|
||||||
@@ -184,6 +193,7 @@
|
|||||||
Friend WithEvents btnVertraege 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 btnGestellungsgarantien As Microsoft.Office.Tools.Ribbon.RibbonButton
|
||||||
Friend WithEvents Button3 As Microsoft.Office.Tools.Ribbon.RibbonButton
|
Friend WithEvents Button3 As Microsoft.Office.Tools.Ribbon.RibbonButton
|
||||||
|
Friend WithEvents btnDFDS As Microsoft.Office.Tools.Ribbon.RibbonButton
|
||||||
End Class
|
End Class
|
||||||
|
|
||||||
Partial Class ThisRibbonCollection
|
Partial Class ThisRibbonCollection
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
Option Explicit On
|
Option Explicit On
|
||||||
|
|
||||||
|
Imports System.Data
|
||||||
Imports System.Net
|
Imports System.Net
|
||||||
Imports System.Reflection
|
Imports System.Reflection
|
||||||
Imports System.Runtime.InteropServices
|
Imports System.Runtime.InteropServices
|
||||||
Imports System.Text.RegularExpressions
|
Imports System.Text.RegularExpressions
|
||||||
Imports System.Windows.Forms
|
Imports System.Windows.Forms
|
||||||
|
'Imports System.Windows.Forms.LinkLabel
|
||||||
|
Imports HtmlAgilityPack
|
||||||
Imports Microsoft.Office.Interop
|
Imports Microsoft.Office.Interop
|
||||||
Imports Microsoft.Office.Tools.Ribbon
|
Imports Microsoft.Office.Tools.Ribbon
|
||||||
Imports VERAG_PROG_ALLGEMEIN
|
Imports VERAG_PROG_ALLGEMEIN
|
||||||
@@ -95,6 +98,10 @@ Public Class VERAGRibbon
|
|||||||
Private Sub Button3_Click_1(sender As Object, e As RibbonControlEventArgs) Handles Button3.Click
|
Private Sub Button3_Click_1(sender As Object, e As RibbonControlEventArgs) Handles Button3.Click
|
||||||
If LOGIN_OK Then AVISO_Mail_Functions.newBarsanMAIL()
|
If LOGIN_OK Then AVISO_Mail_Functions.newBarsanMAIL()
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private Sub btnDFDS_Click(sender As Object, e As RibbonControlEventArgs) Handles btnDFDS.Click
|
||||||
|
If LOGIN_OK Then AVISO_Mail_Functions.newDSDFMAIL()
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
|
|
||||||
Public Class AVISO_Mail_Functions
|
Public Class AVISO_Mail_Functions
|
||||||
@@ -158,7 +165,7 @@ Public Class AVISO_Mail_Functions
|
|||||||
loadAttachment(mailItem, ATTACHMENTS_LIST)
|
loadAttachment(mailItem, ATTACHMENTS_LIST)
|
||||||
|
|
||||||
If isMail_EKOL(mailItem) Then
|
If isMail_EKOL(mailItem) Then
|
||||||
If vbYes = MsgBox("EKOL-Anhänge laden?", vbYesNoCancel) Then getATT_EKOL(mailItem, ATTACHMENTS_LIST)
|
If vbYes = MsgBox("DFDS-Anhänge laden?", vbYesNoCancel) Then getATT_DFDS(mailItem, ATTACHMENTS_LIST)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If isMail_Barsan(mailItem) Then
|
If isMail_Barsan(mailItem) Then
|
||||||
@@ -251,6 +258,25 @@ Public Class AVISO_Mail_Functions
|
|||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|
||||||
|
Shared Sub newDSDFMAIL()
|
||||||
|
Try
|
||||||
|
Dim explorer As Outlook.Explorer = Globals.ThisAddIn.Application.ActiveExplorer
|
||||||
|
Dim selection As Outlook.Selection = explorer.Selection
|
||||||
|
If selection.Count > 0 Then
|
||||||
|
Dim selectedItem = selection(1)
|
||||||
|
Dim mailItem As Outlook.MailItem = selectedItem
|
||||||
|
If mailItem IsNot Nothing Then
|
||||||
|
If AVISO_Mail_Functions.isMail_EKOL(mailItem) Then
|
||||||
|
VERAG_PROG_ALLGEMEIN.cFormularManager.PrintViaSpirePDF(AVISO_Mail_Functions.getATT_EKOL(mailItem))
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
End If
|
||||||
|
Catch ex As Exception
|
||||||
|
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||||
|
End Try
|
||||||
|
End Sub
|
||||||
|
|
||||||
Shared Sub newBarsanMAIL()
|
Shared Sub newBarsanMAIL()
|
||||||
Try
|
Try
|
||||||
Dim explorer As Outlook.Explorer = Globals.ThisAddIn.Application.ActiveExplorer
|
Dim explorer As Outlook.Explorer = Globals.ThisAddIn.Application.ActiveExplorer
|
||||||
@@ -463,13 +489,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 +526,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("”", "")
|
||||||
@@ -652,6 +679,105 @@ Public Class AVISO_Mail_Functions
|
|||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
|
||||||
|
Shared Function getATT_DFDS(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 DataTable
|
||||||
|
Try
|
||||||
|
|
||||||
|
If ATT Is Nothing Then ATT = New List(Of String)
|
||||||
|
|
||||||
|
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")
|
||||||
|
})
|
||||||
|
|
||||||
|
Dim doc As New HtmlAgilityPack.HtmlDocument()
|
||||||
|
doc.LoadHtml(mailItem.HTMLBody)
|
||||||
|
|
||||||
|
' all data rows (skip header)
|
||||||
|
Dim rows = doc.DocumentNode.SelectNodes("//tr[td]")
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
Dim linkNode = cells(7).SelectSingleNode(".//a")
|
||||||
|
|
||||||
|
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", ""), "")
|
||||||
|
)
|
||||||
|
|
||||||
|
Next
|
||||||
|
|
||||||
|
|
||||||
|
Dim counter As Integer = 1
|
||||||
|
Dim sendungsNrOld As String = ""
|
||||||
|
|
||||||
|
For Each r In dt.Rows
|
||||||
|
|
||||||
|
If r("LinkUrl") <> "" AndAlso r("LinkUrl").ToString.Contains("https://web01.ekoltransport.com.tr/dfdsdocumentservice/download/") Then
|
||||||
|
|
||||||
|
Dim sendungsNr As String = r("Record")
|
||||||
|
|
||||||
|
Dim Descr As String = r("Description")
|
||||||
|
|
||||||
|
If Descr <> "" Then
|
||||||
|
Descr.ToString.Replace(";", "_")
|
||||||
|
Descr.ToString.Replace(".", "_")
|
||||||
|
Descr.ToString.Replace(" ", "_")
|
||||||
|
Descr = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(Descr)
|
||||||
|
End If
|
||||||
|
|
||||||
|
If sendungsNrOld <> "" AndAlso sendungsNrOld <> sendungsNr Then
|
||||||
|
counter = 1
|
||||||
|
End If
|
||||||
|
|
||||||
|
Dim pdf = VERAG_PROG_ALLGEMEIN.cFormularManager.getPDFViaSpirePDF_FromURLStream(r("LinkUrl"), r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, ""),, False)
|
||||||
|
|
||||||
|
If IO.File.Exists(pdf) Then
|
||||||
|
ATT.Add(pdf)
|
||||||
|
counter += 1
|
||||||
|
End If
|
||||||
|
|
||||||
|
sendungsNrOld = r("Record")
|
||||||
|
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
Next
|
||||||
|
|
||||||
|
|
||||||
|
Catch ex As Exception
|
||||||
|
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
|
||||||
|
End Try
|
||||||
|
|
||||||
|
End Function
|
||||||
|
|
||||||
|
Private Shared Function Clean(input As String) As String
|
||||||
|
If String.IsNullOrWhiteSpace(input) Then Return ""
|
||||||
|
Return HtmlEntity.DeEntitize(input).
|
||||||
|
Replace("o:p", "").
|
||||||
|
Replace(vbCr, "").
|
||||||
|
Replace(vbLf, "").
|
||||||
|
Trim()
|
||||||
|
End Function
|
||||||
|
|
||||||
|
|
||||||
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)
|
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)
|
||||||
|
|
||||||
@@ -801,7 +927,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 +986,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 +998,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 +1012,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 +1024,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
|
||||||
|
|||||||
Reference in New Issue
Block a user