From 7874423adcdba06fa61aeb1dbacafc13beb6b7ef Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 21 Feb 2024 08:04:33 +0100 Subject: [PATCH 1/5] addin --- VERAGAddIn.sln | 16 +++++++---- VERAGAddIn/VERAGAddIn.vbproj | 21 +++++++------- VERAGAddIn/frmAvisoAnfügen.vb | 11 ++++---- VERAGAddIn/rbnMailItem.vb | 10 +++---- VERAGAddIn/rbnVERAG.vb | 53 ++++++++++++++++++----------------- 5 files changed, 60 insertions(+), 51 deletions(-) diff --git a/VERAGAddIn.sln b/VERAGAddIn.sln index ebb1973..3a7a8d1 100644 --- a/VERAGAddIn.sln +++ b/VERAGAddIn.sln @@ -4,6 +4,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 17.3.32825.248 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "VERAGAddIn", "VERAGAddIn\VERAGAddIn.vbproj", "{D579F7A6-7D29-4295-B382-DA5F7EFB4528}" + ProjectSection(ProjectDependencies) = postProject + {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991} = {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991} + {A3B497BD-842C-4A2B-B398-ED1976849DF1} = {A3B497BD-842C-4A2B-B398-ED1976849DF1} + EndProjectSection EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TELOTEC_Worker_lib", "..\ADMIN\ADMIN\TELOTEK_Worker_lib\TELOTEC_Worker_lib.vbproj", "{5B947A66-009A-4BB6-B925-F84A01045095}" EndProject @@ -91,8 +95,8 @@ Global {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x64.Build.0 = Release|Any CPU {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x86.ActiveCfg = Release|Any CPU {289BCD77-BC00-4BA1-95ED-A79176D99525}.Release|x86.Build.0 = Release|Any CPU - {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.ActiveCfg = Debug|x64 + {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Any CPU.Build.0 = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|Mixed Platforms.Build.0 = Debug|x64 {7BDD8C2F-2C9E-49F1-A365-3B1DA1C84991}.Debug|x64.ActiveCfg = Debug|x64 @@ -123,12 +127,12 @@ Global {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x64.Build.0 = Release|x64 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.ActiveCfg = Release|x86 {110C923B-CB02-4FD0-AF24-95E0F0EEEFF5}.Release|x86.Build.0 = Release|x86 - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.ActiveCfg = Debug|x64 + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Any CPU.Build.0 = Debug|x64 {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.ActiveCfg = Debug|x64 {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|Mixed Platforms.Build.0 = Debug|x64 - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|Any CPU - {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|Any CPU + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.ActiveCfg = Debug|x64 + {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x64.Build.0 = Debug|x64 {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.ActiveCfg = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Debug|x86.Build.0 = Debug|Any CPU {A3B497BD-842C-4A2B-B398-ED1976849DF1}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj index 5cd27f1..c4aade1 100644 --- a/VERAGAddIn/VERAGAddIn.vbproj +++ b/VERAGAddIn/VERAGAddIn.vbproj @@ -33,11 +33,11 @@ True true - \\ftps.verag.ag\g\ftp\programme\VERAGAddin_Test\ - http://ftps.verag.ag/VERAGAddin_Test/ + \\ftps.verag.ag\g\ftp\programme\VERAGAddin_test\ + http://ftps.verag.ag/VERAGAddin_test/ de - 1.0.1.115 - false + 1.0.1.158 + true true 0 days @@ -159,6 +159,10 @@ --> + + False + ..\..\Aviso\AVISO\Aviso\bin\Debug\AVISO.exe + @@ -169,8 +173,9 @@ - - ..\..\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll + + False + ..\..\SDL\SDL\VERAG_PROG_ALLGEMEIN\bin\Debug\VERAG_PROG_ALLGEMEIN.dll @@ -347,10 +352,6 @@ {5b947a66-009a-4bb6-b925-f84a01045095} TELOTEC_Worker_lib - - {7bdd8c2f-2c9e-49f1-a365-3b1da1c84991} - Aviso - {110c923b-cb02-4fd0-af24-95e0f0eeeff5} Gemeinsames diff --git a/VERAGAddIn/frmAvisoAnfügen.vb b/VERAGAddIn/frmAvisoAnfügen.vb index 484d0bb..2e83ff9 100644 --- a/VERAGAddIn/frmAvisoAnfügen.vb +++ b/VERAGAddIn/frmAvisoAnfügen.vb @@ -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 diff --git a/VERAGAddIn/rbnMailItem.vb b/VERAGAddIn/rbnMailItem.vb index 1e963c3..1dd4628 100644 --- a/VERAGAddIn/rbnMailItem.vb +++ b/VERAGAddIn/rbnMailItem.vb @@ -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 diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index a1a8270..f91aa17 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -49,6 +49,7 @@ Public Class VERAGRibbon 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 +119,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 @@ -186,7 +187,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 +222,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 +241,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 +264,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 +291,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 +318,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 +337,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 +351,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 +374,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 +389,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 +405,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 +427,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 +554,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 +571,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 +583,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 +628,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 +714,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 +761,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 +790,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) From e268e9d17a2f122853d47c85d6271e7711723eef Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 21 Feb 2024 08:05:28 +0100 Subject: [PATCH 2/5] addin --- VERAGAddIn/VERAGAddIn.vbproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj index c4aade1..f4e6188 100644 --- a/VERAGAddIn/VERAGAddIn.vbproj +++ b/VERAGAddIn/VERAGAddIn.vbproj @@ -33,10 +33,10 @@ True true - \\ftps.verag.ag\g\ftp\programme\VERAGAddin_test\ - http://ftps.verag.ag/VERAGAddin_test/ + \\ftps.verag.ag\g\ftp\programme\VERAGAddin\ + http://ftps.verag.ag/VERAGAddin/ de - 1.0.1.158 + 1.0.1.122 true true 0 From b39332d6b25aecdc190e55110c655fd1cf064268 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 7 Mar 2024 16:48:21 +0100 Subject: [PATCH 3/5] commit --- VERAGAddIn/VERAGAddIn.vbproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj index f4e6188..67a348c 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.122 + 1.0.1.123 true true 0 From eb00a4249380342167622a475ba581f739170897 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 17 Apr 2024 08:50:07 +0200 Subject: [PATCH 4/5] =?UTF-8?q?API=20Einstellungen,=20=C3=9Cberstundenausz?= =?UTF-8?q?ahlung,=20Sammelrechnungsdruck,=20etc?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERAGAddIn/rbnMailItem.Designer.vb | 3 +-- VERAGAddIn/rbnVERAG.vb | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/VERAGAddIn/rbnMailItem.Designer.vb b/VERAGAddIn/rbnMailItem.Designer.vb index 7e2ad2d..fd74683 100644 --- a/VERAGAddIn/rbnMailItem.Designer.vb +++ b/VERAGAddIn/rbnMailItem.Designer.vb @@ -41,7 +41,6 @@ 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. 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() diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index f91aa17..66476aa 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -136,12 +136,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 = "" From 4fef52e00cae19c348d513fe738382e93fed8daa Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Thu, 16 May 2024 09:38:23 +0200 Subject: [PATCH 5/5] =?UTF-8?q?=C3=84nderungen=20ADDIn=20(Deaktivierung=20?= =?UTF-8?q?der=20Protokolierung=20aus=20Performance-Gr=C3=BCnden)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERAGAddIn/ThisAddIn.vb | 57 +++++++++++++++++++----------------- VERAGAddIn/VERAGAddIn.vbproj | 2 +- VERAGAddIn/rbnVERAG.vb | 2 ++ 3 files changed, 33 insertions(+), 28 deletions(-) diff --git a/VERAGAddIn/ThisAddIn.vb b/VERAGAddIn/ThisAddIn.vb index add44e5..90bf6e2 100644 --- a/VERAGAddIn/ThisAddIn.vb +++ b/VERAGAddIn/ThisAddIn.vb @@ -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 diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj index 67a348c..d7c87ac 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.123 + 1.0.1.125 true true 0 diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index 66476aa..ed27c12 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -47,6 +47,8 @@ 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)