From 771fca60f0cceeaa18ea34ec20851e13cea19357 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Tue, 21 Apr 2026 09:50:06 +0200 Subject: [PATCH] =?UTF-8?q?Verweise=20nach=20Dom=C3=A4nenupdate=20erneuern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/TaskFlow/App.config | 14 +- app/TaskFlow/ClassAnnotation.vb | 38 --- app/TaskFlow/ClassWindream_allgemein.vb | 42 ++-- app/TaskFlow/ModuleFinalIndexProperties.vb | 2 +- ...ataAccess.Common.Configuration.Section.xsd | 138 +++++++++++ ...ataAccess.Client.Configuration.Section.xsd | 221 ++++++++++++++++++ app/TaskFlow/TaskFlow.vbproj | 110 ++++----- app/TaskFlow/frmMassValidator.vb | 59 +++-- app/TaskFlow/packages.config | 5 +- 9 files changed, 468 insertions(+), 161 deletions(-) delete mode 100644 app/TaskFlow/ClassAnnotation.vb create mode 100644 app/TaskFlow/Oracle.DataAccess.Common.Configuration.Section.xsd create mode 100644 app/TaskFlow/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd diff --git a/app/TaskFlow/App.config b/app/TaskFlow/App.config index 721c7a3..c7b0bd5 100644 --- a/app/TaskFlow/App.config +++ b/app/TaskFlow/App.config @@ -11,6 +11,7 @@
+
@@ -102,8 +103,7 @@ - + @@ -194,6 +194,10 @@ + + + + @@ -246,4 +250,10 @@ + + + + + + \ No newline at end of file diff --git a/app/TaskFlow/ClassAnnotation.vb b/app/TaskFlow/ClassAnnotation.vb deleted file mode 100644 index 649f5cd..0000000 --- a/app/TaskFlow/ClassAnnotation.vb +++ /dev/null @@ -1,38 +0,0 @@ -Imports PdfSharp.Pdf -Imports PdfSharp.Pdf.Annotations -Imports PdfSharp.Pdf.IO -Imports PdfSharp.Drawing -Public Class ClassAnnotation - Public Shared Function Annotate_PDF(title As String, content As String, page As Integer, fromGui As Boolean, Optional ycorrect As Integer = 0, Optional sizecorrect As Integer = 0) - If CURRENT_DOC_PATH.Length > 0 Then - Try - Dim doc As PdfDocument = PdfReader.Open(CURRENT_DOC_PATH, PdfDocumentOpenMode.Modify) - Dim firstPage As PdfPage = doc.Pages(page) - - Dim gfx As XGraphics = XGraphics.FromPdfPage(firstPage) - Dim rect As XRect = gfx.Transformer.WorldToDefaultPage(New XRect(New XPoint(30, 60 + ycorrect), New XSize(60 + sizecorrect, 40 + sizecorrect))) - - Dim annot As PdfTextAnnotation = New PdfTextAnnotation - - annot.Title = title - 'annot.Subject = txtsubject.Text - annot.Contents = content - annot.Rectangle = New PdfRectangle(rect) - - - firstPage.Annotations.Add(annot) - doc.Save(CURRENT_DOC_PATH) - Return True - Catch ex As Exception - If fromGui = True Then - MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Annotate pdf:") - End If - LOGGER.Error(ex) - LOGGER.Info("Unexpected error in Annotate pdf: " & ex.Message, False) - Return False - End Try - End If - - - End Function -End Class diff --git a/app/TaskFlow/ClassWindream_allgemein.vb b/app/TaskFlow/ClassWindream_allgemein.vb index 14e3589..d9fd0ba 100644 --- a/app/TaskFlow/ClassWindream_allgemein.vb +++ b/app/TaskFlow/ClassWindream_allgemein.vb @@ -322,30 +322,30 @@ LOGGER.Error(ex) ''' Name des Objekttyps ''' Objekttyp als WMObject ''' - Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject - Try - If IsNothing(Me.oSession) Then - LOGGER.Warn("⚠️ GetObjecttypeByName: WMSession is nothing") - Return Nothing - End If - ' alle Objekttypen auslesen - Dim oObjectTypes As WMObjects = Me.oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument) + 'Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject + ' Try + ' If IsNothing(Me.oSession) Then + ' LOGGER.Warn("⚠️ GetObjecttypeByName: WMSession is nothing") + ' Return Nothing + ' End If + ' ' alle Objekttypen auslesen + ' Dim oObjectTypes As WMObjects = Me.oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument) - ' alle Objekttypen durchlaufen und nach dem mit dem angegebenen Namen suchen - For Each oObjectType As WMObject In oObjectTypes - If oObjectType.aName = objekttypName Then - Return oObjectType - End If - Next + ' ' alle Objekttypen durchlaufen und nach dem mit dem angegebenen Namen suchen + ' For Each oObjectType As WMObject In oObjectTypes + ' If oObjectType.aName = objekttypName Then + ' Return oObjectType + ' End If + ' Next - Return Nothing + ' Return Nothing - Catch ex As Exception - LOGGER.Error(ex) - MsgBox("Es konnte ein Objekttyp nicht erstellt werden." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, "Objekttyp konnte nicht erstellt werden") - Return Nothing - End Try - End Function + ' Catch ex As Exception + ' LOGGER.Error(ex) + ' MsgBox("Es konnte ein Objekttyp nicht erstellt werden." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, "Objekttyp konnte nicht erstellt werden") + ' Return Nothing + ' End Try + 'End Function ''' ''' Überprüft ob der angegebene Index im Objekttyp existiert diff --git a/app/TaskFlow/ModuleFinalIndexProperties.vb b/app/TaskFlow/ModuleFinalIndexProperties.vb index fbd0558..9af936f 100644 --- a/app/TaskFlow/ModuleFinalIndexProperties.vb +++ b/app/TaskFlow/ModuleFinalIndexProperties.vb @@ -1,7 +1,7 @@ Imports System.ComponentModel Imports System.Drawing.Design Imports System.Globalization -Imports FormsUtils +Imports FormsUtils 'FormsUtils.dll als Fremdbibliothek für die Properties Module ModuleFinalIndexProperties diff --git a/app/TaskFlow/Oracle.DataAccess.Common.Configuration.Section.xsd b/app/TaskFlow/Oracle.DataAccess.Common.Configuration.Section.xsd new file mode 100644 index 0000000..eee2d5c --- /dev/null +++ b/app/TaskFlow/Oracle.DataAccess.Common.Configuration.Section.xsd @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/TaskFlow/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd b/app/TaskFlow/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd new file mode 100644 index 0000000..70935a1 --- /dev/null +++ b/app/TaskFlow/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd @@ -0,0 +1,221 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 7a5f6ec..3877f8f 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -173,23 +173,18 @@ False ..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - - False + ..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.EDMI.API.dll + ..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll False ..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll - - False - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\DigitalData.Modules.Interfaces.dll - - - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DD_Modules\11_2025\DigitalData.Modules.License.dll + + ..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll False @@ -202,15 +197,14 @@ False ..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll - - False + ..\..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll ..\..\..\..\2_DLL Projekte\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll - P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll + M:\Bibliotheken\Digital Data\DD_Modules\DLLLicenseManager.dll ..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll @@ -231,117 +225,109 @@ ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll - P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll + M:\Bibliotheken\3rdParty\FormsUtils.dll - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.dll - True + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll - True + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.CAD.dll - True + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.CAD.DWG.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Common.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Document.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Email.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.HTML.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - True - - - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.Markdown.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenDocument.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenXML.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.PDF.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.RTF.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.SVG.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll True - ..\packages\GdPicture.14.3.23\lib\net462\GdPicture.NET.14.wia.gateway.dll + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll True - True ..\packages\Google.Protobuf.3.33.2\lib\net45\Google.Protobuf.dll - P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll + M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll False - P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll + M:\Bibliotheken\3rdParty\windream\Interop.WMOBRWSLib.dll True - P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll + M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll True - P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll + M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll True - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Limilabs\Mail.dll + M:\Bibliotheken\3rdParty\Limilabs\Mail.dll ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -356,15 +342,6 @@ ..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll - - ..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Exceptions.dll - - - ..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Settings.dll - - - ..\packages\GdPicture.14.3.23\lib\net462\NativeSDK.Settings.Edition.dll - ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -377,11 +354,8 @@ ..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll - - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll - - - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\PdfSharp-gdi.dll + + ..\packages\Oracle.ManagedDataAccess.21.15.0\lib\net462\Oracle.ManagedDataAccess.dll ..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll @@ -392,9 +366,6 @@ ..\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 @@ -488,7 +459,6 @@ - @@ -1099,6 +1069,12 @@ + + Designer + + + Designer + @@ -1390,10 +1366,10 @@ - + - +