From 16f00e8cdda95f3c3c3a3216efcf2ec8eeb2c4a0 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Thu, 27 Mar 2025 17:04:56 +0100 Subject: [PATCH] MS SQL Editor Patterns etc, DocumentViewer Relation mailldll --- Controls.DocumentViewer/App.config | 35 +++- Controls.DocumentViewer/DocumentViewer.vbproj | 156 +++++++++++------- Controls.DocumentViewer/MailLicense.xml | 23 +++ .../My Project/AssemblyInfo.vb | 16 +- Controls.DocumentViewer/README.txt | 5 + Controls.DocumentViewer/packages.config | 22 ++- .../My Project/AssemblyInfo.vb | 4 +- Controls.LookupGrid/frmLookupGrid.Designer.vb | 2 +- Controls.LookupGrid/frmLookupGrid.resx | 18 +- GUIs.Common/My Project/AssemblyInfo.vb | 10 +- GUIs.Common/SQLEditor/Placeholders.vb | 15 +- GUIs.Common/SQLEditor/frmSQLEditor.vb | 3 +- GUIs.Test.ZUGFeRDTest/packages.config | 1 + 13 files changed, 214 insertions(+), 96 deletions(-) create mode 100644 Controls.DocumentViewer/MailLicense.xml create mode 100644 Controls.DocumentViewer/README.txt diff --git a/Controls.DocumentViewer/App.config b/Controls.DocumentViewer/App.config index d7280a11..661e5655 100644 --- a/Controls.DocumentViewer/App.config +++ b/Controls.DocumentViewer/App.config @@ -1,8 +1,12 @@  - - - + + +
+ + + + @@ -29,6 +33,29 @@ + + + + + + + + + + + + + + + + - + + + + + + + + \ No newline at end of file diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj index 41aa8e05..872042f6 100644 --- a/Controls.DocumentViewer/DocumentViewer.vbproj +++ b/Controls.DocumentViewer/DocumentViewer.vbproj @@ -1,5 +1,6 @@  + Debug @@ -78,21 +79,23 @@ - - False - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + + ..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll - - False - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + + ..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll - - False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + ..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll - - False - ..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + + ..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll + + + ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + + + ..\packages\DigitalData.Modules.Messaging.1.9.8\lib\net462\DigitalData.Modules.Messaging.dll ..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll @@ -100,65 +103,81 @@ ..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.dll + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll + + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + + + ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.CAD.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.CAD.DWG.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Common.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Document.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Email.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.HTML.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.OpenDocument.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.OpenXML.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.PDF.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.RTF.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.SVG.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll + True ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -167,8 +186,11 @@ ..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll - - ..\packages\GdPicture.14.3.1\lib\net462\Microsoft.Win32.Registry.dll + + ..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll + + + ..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -185,14 +207,17 @@ - ..\packages\protobuf-net.3.2.45\lib\net462\protobuf-net.dll + ..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll - ..\packages\protobuf-net.Core.3.2.45\lib\net462\protobuf-net.Core.dll + ..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll + + ..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll @@ -203,10 +228,15 @@ ..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll + + + ..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll + + ..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll @@ -233,9 +263,6 @@ ..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll - - ..\packages\GdPicture.14.3.1\lib\net462\System.Security.Principal.Windows.dll - ..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll @@ -358,12 +385,19 @@ + + + + - Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - + + + + + \ No newline at end of file diff --git a/Controls.DocumentViewer/MailLicense.xml b/Controls.DocumentViewer/MailLicense.xml new file mode 100644 index 00000000..05105264 --- /dev/null +++ b/Controls.DocumentViewer/MailLicense.xml @@ -0,0 +1,23 @@ + + + 4dc5ef40-f1a9-468b-994c-b7ed600ad878 + Mail.dll + 2022-07-29 + Digital Data GmbH + single developer + Digital Data GmbH + + + + + + + + + + 75MRtl4ipYelIZYlpT8O7QDX9Zc= + + + Raxfkz6DfQVs/sMvH+F2nH0eHXD8FoUFSdP3t7AgBUdpABJQx86srlyuMSEhXPlc1THCqPouEVob4RsWnd9OXvTiPPSOUSK9zuNG6uz93KLAhpSD5PraAgBCF4jwZArlAp7aCNfZpHqQ3w6TRHS+CfravUU0AHHG3MZ1ZcRkGuo= + + \ No newline at end of file diff --git a/Controls.DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb index cc822b89..b3de4dd4 100644 --- a/Controls.DocumentViewer/My Project/AssemblyInfo.vb +++ b/Controls.DocumentViewer/My Project/AssemblyInfo.vb @@ -8,12 +8,12 @@ Imports System.Runtime.InteropServices ' Werte der Assemblyattribute überprüfen - - - - - - + + + + + + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Controls.DocumentViewer/README.txt b/Controls.DocumentViewer/README.txt new file mode 100644 index 00000000..58cbced4 --- /dev/null +++ b/Controls.DocumentViewer/README.txt @@ -0,0 +1,5 @@ +BASE MODULE +=========== + +This module is intended for often used constants and datastructures. +Therefor it is important that this module does not have any dependencies on other modules!! \ No newline at end of file diff --git a/Controls.DocumentViewer/packages.config b/Controls.DocumentViewer/packages.config index 3d31ce5f..28bd167f 100644 --- a/Controls.DocumentViewer/packages.config +++ b/Controls.DocumentViewer/packages.config @@ -1,25 +1,39 @@  + + + + + + - - + + + + + + + + - - + + + + diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index 3c468bb3..24865c0c 100644 --- a/Controls.LookupGrid/My Project/AssemblyInfo.vb +++ b/Controls.LookupGrid/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Controls.LookupGrid/frmLookupGrid.Designer.vb b/Controls.LookupGrid/frmLookupGrid.Designer.vb index f92eb661..68efc5e5 100644 --- a/Controls.LookupGrid/frmLookupGrid.Designer.vb +++ b/Controls.LookupGrid/frmLookupGrid.Designer.vb @@ -67,8 +67,8 @@ Partial Class frmLookupGrid ' 'btnClear ' - Me.btnClear.DialogResult = System.Windows.Forms.DialogResult.OK resources.ApplyResources(Me.btnClear, "btnClear") + Me.btnClear.DialogResult = System.Windows.Forms.DialogResult.OK Me.btnClear.Name = "btnClear" Me.btnClear.UseVisualStyleBackColor = True ' diff --git a/Controls.LookupGrid/frmLookupGrid.resx b/Controls.LookupGrid/frmLookupGrid.resx index 0d72761d..29eb5c64 100644 --- a/Controls.LookupGrid/frmLookupGrid.resx +++ b/Controls.LookupGrid/frmLookupGrid.resx @@ -147,7 +147,7 @@ 12, 2 - 364, 262 + 364, 249 @@ -165,11 +165,14 @@ 0 + + Bottom, Left + - 12, 10 + 3, 10 - 117, 23 + 117, 32 0 @@ -189,11 +192,14 @@ 0 + + Bottom, Left + 135, 10 - 117, 23 + 117, 32 0 @@ -217,7 +223,7 @@ Bottom - 0, 273 + 0, 260 6, 6, 6, 6 @@ -247,7 +253,7 @@ 6, 13 - 388, 318 + 388, 305 390, 293 diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index e91f2bf6..8c77d361 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices ' Werte der Assemblyattribute überprüfen - - + + - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/GUIs.Common/SQLEditor/Placeholders.vb b/GUIs.Common/SQLEditor/Placeholders.vb index 45efcf8b..5b0c40f9 100644 --- a/GUIs.Common/SQLEditor/Placeholders.vb +++ b/GUIs.Common/SQLEditor/Placeholders.vb @@ -5,16 +5,22 @@ Namespace SQLEditor Public Class Placeholders Public Const AUTO_INDEX_ZOOFLOW = "ATTR_A" Public Const MAN_INDEX_ZOOFLOW = "ATTR_M" - - Public Function GetInternalPlaceholders() As GalleryItemGroup + Public Function GetInternalPlaceholders(AttributStore As String) As GalleryItemGroup Dim oModule = "INT" Dim oImage = My.Resources.electronics_desktopmac - + Dim oImagePrivate = My.Resources._private + Dim oValue As String + If AttributStore = "WM" Then + oValue = "WMDocID" + Else + oValue = "IDBObjID" + End If Dim oItems As New List(Of GalleryItem)() From { GetGalleryItem(New Placeholder("USERNAME", "Benutzername", oModule, "USERNAME"), oImage), GetGalleryItem(New Placeholder("MACHINE", "Aktuelles Datum", oModule, "MACHINE"), oImage), GetGalleryItem(New Placeholder("DOMAIN", "Email-Adresse", oModule, "DOMAIN"), oImage), - GetGalleryItem(New Placeholder("DATE", "Vorname", oModule, "DATE"), oImage) + GetGalleryItem(New Placeholder("DATE", "Vorname", oModule, "DATE"), oImage), + GetGalleryItem(New Placeholder(oValue, "UniqueObjectID", oModule, oValue), oImagePrivate) } Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Intern"} @@ -35,6 +41,7 @@ Namespace SQLEditor Return oGroup1 End Function + Friend Function GetWindreamPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup Dim oImage = My.Resources.bo_contract Dim oItems As New List(Of GalleryItem)() diff --git a/GUIs.Common/SQLEditor/frmSQLEditor.vb b/GUIs.Common/SQLEditor/frmSQLEditor.vb index 7c7231c3..3a676591 100644 --- a/GUIs.Common/SQLEditor/frmSQLEditor.vb +++ b/GUIs.Common/SQLEditor/frmSQLEditor.vb @@ -33,6 +33,7 @@ Public Class frmSQLEditor Public Property PlaceholdersAutomaticPrefix As String Public Property PlaceholdersAutomaticTitle As String = "Automatisches Attribut" Public Property PlaceholdersWindream As List(Of String) + Public Property ATTRIBUTE_STORE As String = "WM" Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer) MyClass.New(pLogConfig, pDatabase, True) @@ -164,7 +165,7 @@ Public Class frmSQLEditor End If oPlaceholders.Add(Placeholders.GetUserPlaceholders()) - oPlaceholders.Add(Placeholders.GetInternalPlaceholders()) + oPlaceholders.Add(Placeholders.GetInternalPlaceholders(ATTRIBUTE_STORE)) Return oPlaceholders End Function diff --git a/GUIs.Test.ZUGFeRDTest/packages.config b/GUIs.Test.ZUGFeRDTest/packages.config index 14342fdd..1a366059 100644 --- a/GUIs.Test.ZUGFeRDTest/packages.config +++ b/GUIs.Test.ZUGFeRDTest/packages.config @@ -4,5 +4,6 @@ + \ No newline at end of file