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

merge

Browse Source
This commit is contained in:
Andreas Luxbauer
2024-06-06 14:59:23 +02:00
parent 1a007934dd 4fef52e00c
commit 42e14286ee
7 changed files with 132 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
VERAGAddIn/ThisAddIn.vb
View File

@@ -113,38 +113,41 @@ Public Class ThisAddIn
Public Shared Sub MailChanged(sender As System.Object, Optional ByRef Mail As Outlook.MailItem = Nothing, Optional ByVal Commenttext As String = "")
' If MailOpened = True And SendFromOpenMail = True Then RemoveHandler SelectedMail.PropertyChange, AddressOf MailChanged
'MsgBox(MailOpened)
Dim Changes As String = Date.Now.ToString & ": "
If Mail Is Nothing Then Mail = SelectedMail
If sender IsNot Nothing Then
Select Case sender.ToString
Case "Categories"
If Mail.Categories IsNot Nothing Then
Changes &= "Kategorie geändert auf " & Mail.Categories.ToString & " von: "
Else
Changes &= "Kategorie gelöscht von: "
End If
'-------------- AUS PERFPRMANCEGRÜNDEN DEAKTIVIERT : 2024-05-16 d.breimaier -> UMBAU ÄNDERUNGSPROTOKOLL AUF SQL
'Dim Changes As String = Date.Now.ToString & ": "
'If Mail Is Nothing Then Mail = SelectedMail
Case "UnRead"
If Mail.UnRead = True Then
Changes &= "Mail als ungelesen markiert von: "
Else
Changes &= "Mail als gelesen markiert von: "
End If
'If sender IsNot Nothing Then
' Select Case sender.ToString
' Case "Categories"
' If Mail.Categories IsNot Nothing Then
' Changes &= "Kategorie geändert auf " & Mail.Categories.ToString & " von: "
' Else
' Changes &= "Kategorie gelöscht von: "
' End If
'Case "FlagStatus"
' MsgBox("FlagStatus")
Case Else
Exit Sub
End Select
Else
Changes &= Commenttext
End If
' Case "UnRead"
' If Mail.UnRead = True Then
' Changes &= "Mail als ungelesen markiert von: "
' Else
' Changes &= "Mail als gelesen markiert von: "
' End If
Changes &= " " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
' Case Else
' Exit Sub
' End Select
'Else
' Changes &= Commenttext
'End If
'Changes &= " " & VERAG_PROG_ALLGEMEIN.cAllgemein.USRNAME
'Mail.FormDescription.Comment &= Changes & vbCrLf
'Mail.Save()
'-------------- AUS PERFPRMANCEGRÜNDEN DEAKTIVIERT : 2024-05-16 d.breimaier -> UMBAU ÄNDERUNGSPROTOKOLL AUF SQL
Mail.FormDescription.Comment &= Changes & vbCrLf
Mail.Save()
' MsgBox(Changes)
End Sub

28
VERAGAddIn/VERAGAddIn.vbproj
View File

@@ -33,11 +33,11 @@
<TargetFrameworkProfile />
<IsWebBootstrapper>True</IsWebBootstrapper>
<BootstrapperEnabled>true</BootstrapperEnabled>
<PublishUrl>\\ftps.verag.ag\g\ftp\programme\VERAGAddin_test\</PublishUrl>
<InstallUrl>http://ftps.verag.ag/VERAGAddin_test/</InstallUrl>
<PublishUrl>\\ftps.verag.ag\g\ftp\programme\VERAGAddin\</PublishUrl>
<InstallUrl>http://ftps.verag.ag/VERAGAddin/</InstallUrl>
<TargetCulture>de</TargetCulture>
<ApplicationVersion>1.0.1.127</ApplicationVersion>
<AutoIncrementApplicationRevision>false</AutoIncrementApplicationRevision>
<ApplicationVersion>1.0.1.125</ApplicationVersion>
<AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
<UpdateEnabled>true</UpdateEnabled>
<UpdateInterval>0</UpdateInterval>
<UpdateIntervalUnits>days</UpdateIntervalUnits>
@@ -159,6 +159,10 @@
-->
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="AVISO, Version=3.9.7.0, Culture=neutral, processorArchitecture=AMD64">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\Aviso\AVISO\Aviso\bin\Debug\AVISO.exe</HintPath>
</Reference>
<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.Data" />
@@ -169,6 +173,10 @@
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="VERAG_PROG_ALLGEMEIN, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.Office.Tools.v4.0.Framework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@@ -341,13 +349,13 @@
<None Include="Resources\pdfprint.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\AVISO\Aviso\Aviso\Aviso.vbproj">
<Project>{7bdd8c2f-2c9e-49f1-a365-3b1da1c84991}</Project>
<Name>Aviso</Name>
<ProjectReference Include="..\..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj">
<Project>{5b947a66-009a-4bb6-b925-f84a01045095}</Project>
<Name>TELOTEC_Worker_lib</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\SDL\SDL\SDL\SDL.vbproj">
<Project>{289bcd77-bc00-4ba1-95ed-a79176d99525}</Project>
<Name>SDL</Name>
<ProjectReference Include="..\..\Aviso\AVISO\Gemeinsames\Gemeinsames.vbproj">
<Project>{110c923b-cb02-4fd0-af24-95e0f0eeeff5}</Project>
<Name>Gemeinsames</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\VERAG_PROG_ALLGEMEIN.vbproj">
<Project>{a3b497bd-842c-4a2b-b398-ed1976849df1}</Project>

11
VERAGAddIn/frmAvisoAnfügen.vb
View File

@@ -93,7 +93,8 @@ Public Class frmAvisoAnfuegen
Dim sql = "SELECT TOP 10 AvisoID, Grenzstelle as Grenze, Datum, LKW_Nr,Auftraggeber,Frächter,Firma FROM Aviso left join tblSendungen on tblSnd_AvisoID=AvisoID WHERE status <>2 " & firma & " "
If IsDate(txtSrchDat.Text) Then sql &= " AND Datum > '" & CDate(txtSrchDat.Text).ToShortDateString & "'"
If txtLKWNr.Text <> "" Then sql &= " AND (LKW_Nr LIKE '%" & txtLKWNr.Text & "%' OR AvisoID ='" & txtLKWNr.Text & "')"
If txtLKWNr.Text <> "" Then sql &= " AND (LKW_Nr LIKE '%" & txtLKWNr.Text & "%'" & IIf(IsNumeric(txtLKWNr.Text), " OR AvisoID ='" & txtLKWNr.Text & "')", ")")
If cboFiliale._value <> "" Then sql &= " AND FilialenNr LIKE '%" & cboFiliale._value & "%'"
@@ -104,8 +105,8 @@ Public Class frmAvisoAnfuegen
.LOAD()
'.Columns("AvisoId").Visible = False
.Columns("AvisoId").HeaderText = "LKW-ID"
.Columns("AvisoId").Width = 60
.Columns("AvisoID").HeaderText = "LKW-ID"
.Columns("AvisoID").Width = 60
.AutoSizeColumnsMode = Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill
.Columns("Grenze").Width = 40
.Columns("Datum").Width = 80
@@ -117,7 +118,7 @@ Public Class frmAvisoAnfuegen
End With
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
UseWaitCursor = False
@@ -167,7 +168,7 @@ Public Class frmAvisoAnfuegen
End If
End With
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
UseWaitCursor = False
End Sub

3
VERAGAddIn/rbnMailItem.Designer.vb generated
View File

@@ -41,7 +41,6 @@
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Me.Tab1 = Me.Factory.CreateRibbonTab
Me.Group1 = Me.Factory.CreateRibbonGroup
Me.Button1 = Me.Factory.CreateRibbonButton
@@ -52,7 +51,7 @@
Me.btnGestellungsgarantien = Me.Factory.CreateRibbonButton
Me.btnInfo = 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.Group1.SuspendLayout()
Me.SuspendLayout()

10
VERAGAddIn/rbnMailItem.vb
View File

@@ -37,7 +37,7 @@ Public Class rbnMailItem
Dim INSPECTOR As Outlook.Inspector = e.Control.Context
AVISO_Mail_Functions.NewAviso(INSPECTOR.CurrentItem)
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End If
End Sub
@@ -49,7 +49,7 @@ Public Class rbnMailItem
AVISO_Mail_Functions.addMailToAviso(INSPECTOR.CurrentItem, sender)
'Me.Context
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End If
End Sub
@@ -60,8 +60,8 @@ Public Class rbnMailItem
Dim INSPECTOR As Outlook.Inspector = e.Control.Context
MsgBox(INSPECTOR.CurrentItem.FormDescription.Comment)
Catch
MsgBox("Fehler beim Anzeigen der Mailinformationen.")
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
@@ -85,7 +85,7 @@ Public Class rbnMailItem
AVISO_Mail_Functions.addMailToAviso(INSPECTOR.CurrentItem, sender)
'Me.Context
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End If

61
VERAGAddIn/rbnVERAG.vb
View File

@@ -47,8 +47,11 @@ Public Class VERAGRibbon
Private Sub Button4_Click(sender As Object, e As RibbonControlEventArgs) Handles Button4.Click
Try
MsgBox("User: " & System.Security.Principal.WindowsIdentity.GetCurrent().Name & vbNewLine & "Version: " & Assembly.GetExecutingAssembly().GetName().Version.ToString & vbNewLine & "System: " & IIf(cAllgemein.TESTSYSTEM, "TEST", "PRODUKTIV"))
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
@@ -118,7 +121,7 @@ Public Class AVISO_Mail_Functions
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & vbNewLine & ex.InnerException.ToString, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
@@ -135,12 +138,14 @@ Public Class AVISO_Mail_Functions
Shared Sub addMailToAviso(mailItem As Outlook.MailItem, sender As Object)
Try
If mailItem IsNot Nothing Then
' Remove special characters from the file name and make sure it is not longer than 100 characters
' Remove special characters from the file name and make sure it is not longer than 100 characters
Dim strFileName As String = "E-Mail"
If mailItem.Subject IsNot Nothing AndAlso mailItem.Subject <> "" Then
strFileName = Left(Regex.Replace(mailItem.Subject, "[\/\\\:\?!€,&'\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, " ") & ".msg"
strFileName = Left(Regex.Replace(mailItem.Subject, "[\/\\\:\?!€,&'\*\<\>\|""]", ""), 100).Replace("""", "").Replace(vbTab, "_")
strFileName = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(strFileName)
strFileName = strFileName.Replace("?", "")
strFileName = strFileName.Replace(".", "")
strFileName &= ".msg"
End If
'Dim strFileName As String = "Mail.msg"
Dim pdf_mail = ""
@@ -186,7 +191,7 @@ Public Class AVISO_Mail_Functions
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
@@ -221,7 +226,7 @@ Public Class AVISO_Mail_Functions
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End If
End If
@@ -240,7 +245,7 @@ Public Class AVISO_Mail_Functions
End If
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
@@ -263,7 +268,7 @@ Public Class AVISO_Mail_Functions
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
Shared Function initFirmaUser() As Boolean
@@ -290,23 +295,23 @@ Public Class AVISO_Mail_Functions
End If
End If
Catch ex As Exception
' MsgBox(ex.Message & ex.StackTrace)
' VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
If Not LOGIN_OK Then
LOGIN_OK = ADMIN.checkLogin("MAIL_USER", "VERAG_MAIL_USER_2017", VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA)
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return LOGIN_OK
End Function
Shared Sub NewAviso_Hauptfenster()
VERAG_PROG_ALLGEMEIN.DATENVERVER_OPTIONS.clearTMPPath("OutlookAttach")
Try
Dim explorer As Outlook.Explorer = Globals.ThisAddIn.Application.ActiveExplorer
Dim selection As Outlook.Selection = explorer.Selection
If selection.Count > 0 Then
@@ -317,8 +322,9 @@ Public Class AVISO_Mail_Functions
End If
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
@@ -335,7 +341,7 @@ Public Class AVISO_Mail_Functions
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Sub
@@ -349,12 +355,13 @@ Public Class AVISO_Mail_Functions
End Function
Shared Sub NewAviso(mailItem As Outlook.MailItem)
Dim ATTACHMENTS_LIST As New List(Of String)
Dim ATTACHMENTS_LIST As New List(Of String)
Dim KundenNr = -1
Dim EingangsDatum As Date = CDate("01.01.1990")
If mailItem IsNot Nothing Then
Try
'MsgBox(mailItem.To)
@@ -371,7 +378,7 @@ Public Class AVISO_Mail_Functions
End If
KundenNr = VERAG_PROG_ALLGEMEIN.cKundenKontakte.getKdNrFromMailAdress(senderMail, False) ' false, wenn mehrere Niederlassungen von Frimen im KdStamm vorhanden... falsche KdNr...
KundenNr = 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)
@@ -386,7 +393,7 @@ Public Class AVISO_Mail_Functions
loadAttachment(mailItem, ATTACHMENTS_LIST)
VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID = 0
cGlobal.Aktive_ID = 0
Dim mainForm As New AVISO.frmEintragAviso
mainForm.ATT = ATTACHMENTS_LIST
If KundenNr > 0 Then
@@ -402,14 +409,14 @@ Public Class AVISO_Mail_Functions
mainForm.ShowDialog()
ATTACHMENTS_LIST = mainForm.ATT
If VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID > 0 Then
If cGlobal.Aktive_ID > 0 Then
saveAttachment(ATTACHMENTS_LIST, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID, -1, art, "")
saveMail(mailItem, VERAG_PROG_ALLGEMEIN.cGlobal.Aktive_ID,, False)
saveAttachment(ATTACHMENTS_LIST, cGlobal.Aktive_ID, -1, art, "")
saveMail(mailItem, cGlobal.Aktive_ID,, False)
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Finally
Try
@@ -424,7 +431,7 @@ Public Class AVISO_Mail_Functions
'End If
Catch ex As Exception
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace & ex.InnerException.ToString, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Try
@@ -551,7 +558,7 @@ Public Class AVISO_Mail_Functions
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
End Function
Public Shared Function GetTempFilePathWithExtension(ByVal extension As String) As String
@@ -568,7 +575,7 @@ Public Class AVISO_Mail_Functions
Return mailItem.HTMLBody.ToString.Contains(srch)
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return False
End Function
@@ -580,7 +587,7 @@ Public Class AVISO_Mail_Functions
Return mailItem.HTMLBody.ToString.Contains(srch)
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return False
End Function
@@ -625,7 +632,7 @@ Public Class AVISO_Mail_Functions
INFO = getEKOL_Var(html, "Route :")
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ATT
End Function
@@ -711,7 +718,7 @@ Public Class AVISO_Mail_Functions
'INFO = getEKOL_Var(html, "Route :")
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
End Try
Return ATT
End Function
@@ -758,7 +765,7 @@ Public Class AVISO_Mail_Functions
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Finally
If mailItem IsNot Nothing Then
Marshal.ReleaseComObject(mailItem)
@@ -787,7 +794,7 @@ Public Class AVISO_Mail_Functions
System.IO.File.Delete(strTmpPath)
End If
Catch ex As Exception
MsgBox(ex.Message & ex.StackTrace)
VERAG_PROG_ALLGEMEIN.cErrorHandler.ERR(ex.Message, ex.StackTrace, System.Reflection.MethodInfo.GetCurrentMethod.Name)
Finally
If mailItem IsNot Nothing Then
Marshal.ReleaseComObject(mailItem)