This commit is contained in:
2026-02-25 11:24:30 +01:00
parent bde9f336ba
commit 4f8f2529f9
8 changed files with 106 additions and 44 deletions

View File

@@ -130,6 +130,16 @@ Namespace My.Resources
End Get End Get
End Property End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary>
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
'''<summary> '''<summary>
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''</summary> '''</summary>

View File

@@ -118,6 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pdfprint" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="wheel" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="wheel" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
@@ -133,16 +136,16 @@
<data name="Aviso" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Aviso" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Aviso.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Aviso.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="_665209_email_512x512" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="vermerk" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\665209_email_512x512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="Aviso1" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="Aviso1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Aviso1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\Aviso1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="pdfprint" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="_665209_email_512x512" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\pdfprint.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\665209_email_512x512.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
<data name="vermerk" type="System.Resources.ResXFileRef, System.Windows.Forms"> <data name="urgent_qu" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\vermerk.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value> <value>..\Resources\urgent_qu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data> </data>
</root> </root>

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.7 KiB

View File

@@ -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.137</ApplicationVersion> <ApplicationVersion>1.0.1.138</ApplicationVersion>
<AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision> <AutoIncrementApplicationRevision>true</AutoIncrementApplicationRevision>
<UpdateEnabled>true</UpdateEnabled> <UpdateEnabled>true</UpdateEnabled>
<UpdateInterval>0</UpdateInterval> <UpdateInterval>0</UpdateInterval>
@@ -337,6 +337,7 @@
<None Include="Resources\pdf.png" /> <None Include="Resources\pdf.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Resources\urgent_qu.png" />
<None Include="Resources\vermerk.png" /> <None Include="Resources\vermerk.png" />
<None Include="Resources\pdf_gray.png" /> <None Include="Resources\pdf_gray.png" />
<None Include="Resources\665209_email_512x512.png" /> <None Include="Resources\665209_email_512x512.png" />

View File

@@ -44,15 +44,16 @@
Me.components = New System.ComponentModel.Container() 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.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.Button1 = Me.Factory.CreateRibbonButton
Me.btnAvisoMail2 = Me.Factory.CreateRibbonButton Me.btnAvisoMail2 = Me.Factory.CreateRibbonButton
Me.SplitButton1 = Me.Factory.CreateRibbonSplitButton Me.SplitButton1 = Me.Factory.CreateRibbonSplitButton
Me.btnVollmachten = Me.Factory.CreateRibbonButton Me.btnVollmachten = Me.Factory.CreateRibbonButton
Me.btnVertraege = Me.Factory.CreateRibbonButton Me.btnVertraege = Me.Factory.CreateRibbonButton
Me.btnGestellungsgarantien = 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.Tab1.SuspendLayout()
Me.Group1.SuspendLayout() Me.Group1.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
@@ -66,6 +67,7 @@
' '
'Group1 'Group1
' '
Me.Group1.Items.Add(Me.btnAVISOUnleashed)
Me.Group1.Items.Add(Me.Button1) Me.Group1.Items.Add(Me.Button1)
Me.Group1.Items.Add(Me.btnAvisoMail2) Me.Group1.Items.Add(Me.btnAvisoMail2)
Me.Group1.Items.Add(Me.SplitButton1) Me.Group1.Items.Add(Me.SplitButton1)
@@ -74,6 +76,31 @@
Me.Group1.Label = "AVISO" Me.Group1.Label = "AVISO"
Me.Group1.Name = "Group1" 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 'Button1
' '
Me.Button1.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge Me.Button1.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge
@@ -118,22 +145,6 @@
Me.btnGestellungsgarantien.Name = "btnGestellungsgarantien" Me.btnGestellungsgarantien.Name = "btnGestellungsgarantien"
Me.btnGestellungsgarantien.ShowImage = True 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 'rbnMailItem
' '
Me.Name = "rbnMailItem" Me.Name = "rbnMailItem"
@@ -160,6 +171,7 @@
Friend WithEvents btnVollmachten As Microsoft.Office.Tools.Ribbon.RibbonButton Friend WithEvents btnVollmachten As Microsoft.Office.Tools.Ribbon.RibbonButton
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 btnAVISOUnleashed As Microsoft.Office.Tools.Ribbon.RibbonButton
End Class End Class
Partial Class ThisRibbonCollection Partial Class ThisRibbonCollection

View File

@@ -1,9 +1,11 @@
Option Explicit On Option Explicit On
Imports Microsoft.Office.Tools.Ribbon Imports System.Drawing
Imports Microsoft.Office.Interop
Imports System.Windows.Forms Imports System.Windows.Forms
Imports Microsoft.Office.Interop
Imports Microsoft.Office.Tools.Ribbon
Imports VERAG_PROG_ALLGEMEIN.TESTJSON
Public Class rbnMailItem Public Class rbnMailItem
Dim LOGIN_OK As Boolean = False 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 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.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 'VERAG_PROG_ALLGEMEIN.cAllgemein.TESTSYSTEM = True
LOGIN_OK = AVISO_Mail_Functions.initFirmaUser() LOGIN_OK = AVISO_Mail_Functions.initFirmaUser()
currentexplorer = ThisAddIn.SharedExplorer currentexplorer = ThisAddIn.SharedExplorer
@@ -90,4 +103,5 @@ Public Class rbnMailItem
End If End If
End Sub End Sub
End Class End Class

View File

@@ -55,6 +55,7 @@
Me.btnDFDS = 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.btnAVISOUnleashed = Me.Factory.CreateRibbonButton
Me.Tab1.SuspendLayout() Me.Tab1.SuspendLayout()
Me.VERAG.SuspendLayout() Me.VERAG.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
@@ -68,6 +69,7 @@
' '
'VERAG 'VERAG
' '
Me.VERAG.Items.Add(Me.btnAVISOUnleashed)
Me.VERAG.Items.Add(Me.Button2) Me.VERAG.Items.Add(Me.Button2)
Me.VERAG.Items.Add(Me.btnPdfPrint) Me.VERAG.Items.Add(Me.btnPdfPrint)
Me.VERAG.Items.Add(Me.btnAvisoMail) Me.VERAG.Items.Add(Me.btnAvisoMail)
@@ -167,6 +169,15 @@
Me.Button4.Name = "Button4" Me.Button4.Name = "Button4"
Me.Button4.ShowImage = True 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 'VERAGRibbon
' '
Me.Name = "VERAGRibbon" Me.Name = "VERAGRibbon"
@@ -194,6 +205,7 @@
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 Friend WithEvents btnDFDS As Microsoft.Office.Tools.Ribbon.RibbonButton
Friend WithEvents btnAVISOUnleashed As Microsoft.Office.Tools.Ribbon.RibbonButton
End Class End Class
Partial Class ThisRibbonCollection Partial Class ThisRibbonCollection

View File

@@ -52,6 +52,16 @@ Public Class VERAGRibbon
Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load Private Sub Ribbon1_Load(ByVal sender As System.Object, ByVal e As RibbonUIEventArgs) Handles MyBase.Load
cAllgemein.TESTSYSTEM = False 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 'cAllgemein.TESTSYSTEM = True
LOGIN_OK = AVISO_Mail_Functions.initFirmaUser() LOGIN_OK = AVISO_Mail_Functions.initFirmaUser()
@@ -785,18 +795,18 @@ Public Class AVISO_Mail_Functions
Dim sendungsNr As String = r("Record") Dim sendungsNr As String = r("Record")
Dim Descr As String = r("Description") Dim Descr As String = r("Description")
If Descr <> "" Then If Descr <> "" Then
Descr = Descr.ToString.Replace(";", "_") Descr = Descr.ToString.Replace(";", "_")
Descr = Descr.ToString.Replace(".", "_") Descr = Descr.ToString.Replace(".", "_")
Descr = Descr.ToString.Replace(" ", "_") Descr = Descr.ToString.Replace(" ", "_")
Descr = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(Descr) Descr = VERAG_PROG_ALLGEMEIN.cDATENSERVER.replaceInvalidCahr(Descr)
End If End If
If sendungsNrOld <> "" AndAlso sendungsNrOld <> sendungsNr Then If sendungsNrOld <> "" AndAlso sendungsNrOld <> sendungsNr Then
counter = 1 counter = 1
End If End If
Dim file = VERAG_PROG_ALLGEMEIN.cFormularManager.getFile_FromURLStream(link, r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, ""),, False) 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 Else
If missingDocuments <> "" Then If missingDocuments <> "" Then
missingDocuments &= vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "") missingDocuments &= vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "")
Else Else
missingDocuments = "fehlende Dokumente: " & vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "") missingDocuments = "fehlende Dokumente: " & vbNewLine & r("Record") & "_" & counter & "_" & IIf(Descr <> "", Descr, "")
End If
End If End If
End If
counter += 1 counter += 1
sendungsNrOld = r("Record") sendungsNrOld = r("Record")
End If End If