From 4f8f2529f92cfdf84b409cb443c9d7c811943bd8 Mon Sep 17 00:00:00 2001 From: "d.breimaier" Date: Wed, 25 Feb 2026 11:24:30 +0100 Subject: [PATCH] Addin --- VERAGAddIn/My Project/Resources.Designer.vb | 10 ++++ VERAGAddIn/My Project/Resources.resx | 15 +++--- VERAGAddIn/Resources/urgent_qu.png | Bin 0 -> 6817 bytes VERAGAddIn/VERAGAddIn.vbproj | 3 +- VERAGAddIn/rbnMailItem.Designer.vb | 50 ++++++++++++-------- VERAGAddIn/rbnMailItem.vb | 18 ++++++- VERAGAddIn/rbnVERAG.Designer.vb | 12 +++++ VERAGAddIn/rbnVERAG.vb | 42 +++++++++------- 8 files changed, 106 insertions(+), 44 deletions(-) create mode 100644 VERAGAddIn/Resources/urgent_qu.png diff --git a/VERAGAddIn/My Project/Resources.Designer.vb b/VERAGAddIn/My Project/Resources.Designer.vb index 13d7cca..5b484f7 100644 --- a/VERAGAddIn/My Project/Resources.Designer.vb +++ b/VERAGAddIn/My Project/Resources.Designer.vb @@ -130,6 +130,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property urgent_qu() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("urgent_qu", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/VERAGAddIn/My Project/Resources.resx b/VERAGAddIn/My Project/Resources.resx index 4325d0e..2b5c9d8 100644 --- a/VERAGAddIn/My Project/Resources.resx +++ b/VERAGAddIn/My Project/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -133,16 +136,16 @@ ..\Resources\Aviso.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\665209_email_512x512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Aviso1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\665209_email_512x512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\urgent_qu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/VERAGAddIn/Resources/urgent_qu.png b/VERAGAddIn/Resources/urgent_qu.png new file mode 100644 index 0000000000000000000000000000000000000000..e237380bd026e5c50785a17b4182fdf61f9f8745 GIT binary patch literal 6817 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 Z{bqdIKp6V40{W-XX(KbkV)Er{{{?Zx<_Z7+ literal 0 HcmV?d00001 diff --git a/VERAGAddIn/VERAGAddIn.vbproj b/VERAGAddIn/VERAGAddIn.vbproj index 370ec37..abb039c 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.137 + 1.0.1.138 true true 0 @@ -337,6 +337,7 @@ + diff --git a/VERAGAddIn/rbnMailItem.Designer.vb b/VERAGAddIn/rbnMailItem.Designer.vb index 7e2ad2d..093d550 100644 --- a/VERAGAddIn/rbnMailItem.Designer.vb +++ b/VERAGAddIn/rbnMailItem.Designer.vb @@ -44,15 +44,16 @@ Me.components = New System.ComponentModel.Container() Me.Tab1 = Me.Factory.CreateRibbonTab Me.Group1 = Me.Factory.CreateRibbonGroup + Me.NotifyIcon1 = New System.Windows.Forms.NotifyIcon(Me.components) + Me.btnInfo = Me.Factory.CreateRibbonButton + Me.btnUnsichtbar = Me.Factory.CreateRibbonButton + Me.btnAVISOUnleashed = Me.Factory.CreateRibbonButton Me.Button1 = Me.Factory.CreateRibbonButton Me.btnAvisoMail2 = Me.Factory.CreateRibbonButton Me.SplitButton1 = Me.Factory.CreateRibbonSplitButton Me.btnVollmachten = Me.Factory.CreateRibbonButton Me.btnVertraege = Me.Factory.CreateRibbonButton 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.Tab1.SuspendLayout() Me.Group1.SuspendLayout() Me.SuspendLayout() @@ -66,6 +67,7 @@ ' 'Group1 ' + Me.Group1.Items.Add(Me.btnAVISOUnleashed) Me.Group1.Items.Add(Me.Button1) Me.Group1.Items.Add(Me.btnAvisoMail2) Me.Group1.Items.Add(Me.SplitButton1) @@ -74,6 +76,31 @@ Me.Group1.Label = "AVISO" Me.Group1.Name = "Group1" ' + 'NotifyIcon1 + ' + Me.NotifyIcon1.Text = "NotifyIcon1" + Me.NotifyIcon1.Visible = True + ' + 'btnInfo + ' + Me.btnInfo.Label = "?" + Me.btnInfo.Name = "btnInfo" + ' + 'btnUnsichtbar + ' + Me.btnUnsichtbar.Label = "i" + Me.btnUnsichtbar.Name = "btnUnsichtbar" + Me.btnUnsichtbar.Visible = False + ' + 'btnAVISOUnleashed + ' + Me.btnAVISOUnleashed.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge + Me.btnAVISOUnleashed.Image = Global.VERAGAddIn.My.Resources.Resources.urgent_qu + Me.btnAVISOUnleashed.Label = "AVISO Unleashed" + Me.btnAVISOUnleashed.Name = "btnAVISOUnleashed" + Me.btnAVISOUnleashed.ShowImage = True + Me.btnAVISOUnleashed.Visible = False + ' 'Button1 ' Me.Button1.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge @@ -118,22 +145,6 @@ Me.btnGestellungsgarantien.Name = "btnGestellungsgarantien" Me.btnGestellungsgarantien.ShowImage = True ' - 'btnInfo - ' - Me.btnInfo.Label = "?" - Me.btnInfo.Name = "btnInfo" - ' - 'btnUnsichtbar - ' - Me.btnUnsichtbar.Label = "i" - Me.btnUnsichtbar.Name = "btnUnsichtbar" - Me.btnUnsichtbar.Visible = False - ' - 'NotifyIcon1 - ' - Me.NotifyIcon1.Text = "NotifyIcon1" - Me.NotifyIcon1.Visible = True - ' 'rbnMailItem ' Me.Name = "rbnMailItem" @@ -160,6 +171,7 @@ Friend WithEvents btnVollmachten 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 btnAVISOUnleashed As Microsoft.Office.Tools.Ribbon.RibbonButton End Class Partial Class ThisRibbonCollection diff --git a/VERAGAddIn/rbnMailItem.vb b/VERAGAddIn/rbnMailItem.vb index 1dd4628..dc9d18e 100644 --- a/VERAGAddIn/rbnMailItem.vb +++ b/VERAGAddIn/rbnMailItem.vb @@ -1,9 +1,11 @@ Option Explicit On -Imports Microsoft.Office.Tools.Ribbon -Imports Microsoft.Office.Interop +Imports System.Drawing Imports System.Windows.Forms +Imports Microsoft.Office.Interop +Imports Microsoft.Office.Tools.Ribbon +Imports VERAG_PROG_ALLGEMEIN.TESTJSON Public Class rbnMailItem Dim LOGIN_OK As Boolean = False @@ -14,6 +16,17 @@ Public Class rbnMailItem Private Sub rbnMailItem_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = False + VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED = True + + If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then + Group1.Label = "VERAG - UNLEASHED" + btnAVISOUnleashed.Visible = True + Else + Group1.Label = "VERAG" + btnAVISOUnleashed.Visible = False + + End If + 'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True LOGIN_OK = AVISO_Mail_Functions.initFirmaUser() currentexplorer = ThisAddIn.SharedExplorer @@ -90,4 +103,5 @@ Public Class rbnMailItem End If End Sub + End Class diff --git a/VERAGAddIn/rbnVERAG.Designer.vb b/VERAGAddIn/rbnVERAG.Designer.vb index bc82bf4..2ad81e1 100644 --- a/VERAGAddIn/rbnVERAG.Designer.vb +++ b/VERAGAddIn/rbnVERAG.Designer.vb @@ -55,6 +55,7 @@ Me.btnDFDS = Me.Factory.CreateRibbonButton Me.Button3 = Me.Factory.CreateRibbonButton Me.Button4 = Me.Factory.CreateRibbonButton + Me.btnAVISOUnleashed = Me.Factory.CreateRibbonButton Me.Tab1.SuspendLayout() Me.VERAG.SuspendLayout() Me.SuspendLayout() @@ -68,6 +69,7 @@ ' 'VERAG ' + Me.VERAG.Items.Add(Me.btnAVISOUnleashed) Me.VERAG.Items.Add(Me.Button2) Me.VERAG.Items.Add(Me.btnPdfPrint) Me.VERAG.Items.Add(Me.btnAvisoMail) @@ -167,6 +169,15 @@ Me.Button4.Name = "Button4" Me.Button4.ShowImage = True ' + 'btnAVISOUnleashed + ' + Me.btnAVISOUnleashed.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge + Me.btnAVISOUnleashed.Image = Global.VERAGAddIn.My.Resources.Resources.urgent_qu + Me.btnAVISOUnleashed.Label = "AVISO Unleashed" + Me.btnAVISOUnleashed.Name = "btnAVISOUnleashed" + Me.btnAVISOUnleashed.ShowImage = True + Me.btnAVISOUnleashed.Visible = False + ' 'VERAGRibbon ' Me.Name = "VERAGRibbon" @@ -194,6 +205,7 @@ Friend WithEvents btnGestellungsgarantien As Microsoft.Office.Tools.Ribbon.RibbonButton Friend WithEvents Button3 As Microsoft.Office.Tools.Ribbon.RibbonButton Friend WithEvents btnDFDS As Microsoft.Office.Tools.Ribbon.RibbonButton + Friend WithEvents btnAVISOUnleashed As Microsoft.Office.Tools.Ribbon.RibbonButton End Class Partial Class ThisRibbonCollection diff --git a/VERAGAddIn/rbnVERAG.vb b/VERAGAddIn/rbnVERAG.vb index bc7ef0d..f6bf4e7 100644 --- a/VERAGAddIn/rbnVERAG.vb +++ b/VERAGAddIn/rbnVERAG.vb @@ -52,6 +52,16 @@ Public Class VERAGRibbon Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load cAllgemein.TESTSYSTEM = False + + VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED = True + If VERAG_PROG_ALLGEMEIN.cAllgemein.SQLGUIDE01_USED Then + VERAG.Label = "VERAG - UNLEASHED" + btnAVISOUnleashed.Visible = True + Else + VERAG.Label = "VERAG" + btnAVISOUnleashed.Visible = False + + End If 'cAllgemein.TESTSYSTEM = True LOGIN_OK = AVISO_Mail_Functions.initFirmaUser() @@ -785,18 +795,18 @@ Public Class AVISO_Mail_Functions Dim sendungsNr As String = r("Record") - Dim Descr As String = r("Description") + Dim Descr As String = r("Description") - If Descr <> "" Then - Descr = Descr.ToString.Replace(";", "_") - Descr = Descr.ToString.Replace(".", "_") - Descr = Descr.ToString.Replace(" ", "_") - Descr = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(Descr) - End If + If Descr <> "" Then + Descr = Descr.ToString.Replace(";", "_") + Descr = Descr.ToString.Replace(".", "_") + Descr = Descr.ToString.Replace(" ", "_") + Descr = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(Descr) + End If - If sendungsNrOld <> "" AndAlso sendungsNrOld <> sendungsNr Then - counter = 1 - End If + If sendungsNrOld <> "" AndAlso sendungsNrOld <> sendungsNr Then + counter = 1 + End If Dim file = VERAG_PROG_ALLGEMEIN.cFormularManager.getFile_FromURLStream(link, r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, ""),, False) @@ -805,15 +815,15 @@ Public Class AVISO_Mail_Functions Else If missingDocuments <> "" Then - missingDocuments &= vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "") - Else - missingDocuments = "fehlende Dokumente: " & vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "") - End If + missingDocuments &= vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "") + Else + missingDocuments = "fehlende Dokumente: " & vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "") End If + End If - counter += 1 + counter += 1 - sendungsNrOld = r("Record") + sendungsNrOld = r("Record") End If