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 0000000..e237380 Binary files /dev/null and b/VERAGAddIn/Resources/urgent_qu.png differ 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