Nochmal

Verbesserung DocSearchLoad, Mapping Sharedrive

Refactoring Zusatzsuchen, Dokumentenhandling & Cleanup

Umfangreiches Refactoring der Zusatzsuchen-Logik (Validator/ValidatorSearch): Vereinheitlichung und Typprüfung der DataTables, zentrale Filterung, robustere Tab-Steuerung und thread-sicheres Nachladen. Netzlaufwerk-Mapping und Dokumentenpfad-Handling wurden entfernt bzw. auf neue Handler ausgelagert. Profilsuchen-Handling vereinheitlicht, Parametrierung (Working Mode) klarer strukturiert. Diverse Bugfixes, verbessertes Logging, Cleanup von Ressourcen und Projektdateien, veraltete Komponenten entfernt. Update auf DocumentViewer 2.6.0.0. Die Anwendung ist robuster, wartbarer und für Erweiterungen vorbereitet.

app/SetupVS19/Product.wxs

@@ -99,23 +99,17 @@
 			</Component>-->
 
 			<Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
-				<File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes"/>
+				<File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll" KeyPath="yes"/>
-				<File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll"/>
+				<File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll"/>
-				<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll"/>
+				<File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll"/>
-				<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll"/>
+				<File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="M:\Bibliotheken\3rdParty\windream\Interop.WMOBRWSLib.dll"/>
 			</Component>
 
 			<Component Id="FormsUtilsLibs" Guid="51c183a7-af21-481a-bd34-0e547e6f6e1c">
-				<File Id="FormsUtilsLib" Name="FormsUtils.dll" Source="P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll" KeyPath="yes" />
+				<File Id="FormsUtilsLib" Name="FormsUtils.dll" Source="M:\Bibliotheken\3rdParty\FormsUtils.dll" KeyPath="yes" />
-			</Component>
-
-			<Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
-				<File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll" KeyPath="yes"/>
 			</Component>
 
 			<Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
-				<File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="yes"/>
-				<File Id="DDLibStandards" Name="DD_LIB_Standards.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll"/>
 				<File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="DigitalData.Controls.LookupGrid.dll"/>
 				<File Id="DDSnapPanel" Name="DigitalData.Controls.SnapPanel.dll" Source="DigitalData.Controls.SnapPanel.dll"/>
 				<File Id="DDCommonGUIs" Name="DigitalData.GUIs.Common.dll" Source="DigitalData.GUIs.Common.dll"/>
@@ -139,58 +133,58 @@
 			</Component>
       <Component Id="RuntimeLibs" Guid="F7170744-3DB5-4275-ACCD-7F3B9BDE1D6E">
         <File Id="Newtonsoft.Json" Name="Newtonsoft.Json.dll" Source="Newtonsoft.Json.dll" KeyPath="yes" />
-        <File Id="System.Memory" Name="System.Memory.dll" Source="System.Memory.dll" />
-        <File Id="System.Runtime.CompilerServices.Unsafe" Name="System.Runtime.CompilerServices.Unsafe.dll" Source="System.Runtime.CompilerServices.Unsafe.dll" />
-        <File Id="System.Buffers" Name="System.Buffers.dll" Source="System.Buffers.dll" />
-        <File Id="System.Collections.Immutable" Name="System.Collections.Immutable.dll" Source="System.Collections.Immutable.dll" />
-        <File Id="System.Numerics.Vectors" Name="System.Numerics.Vectors.dll" Source="System.Numerics.Vectors.dll" />
-        <File Id="System.Security.Cryptography.Pkcs" Name="System.Security.Cryptography.Pkcs.dll" Source="System.Security.Cryptography.Pkcs.dll" />
         <File Id="System.Text.Json" Name="System.Text.Json.dll" Source="System.Text.Json.dll" />
-        <File Id="System.Text.Encodings.Web" Name="System.Text.Encodings.Web.dll" Source="System.Text.Encodings.Web.dll" />
-        <File Id="System.Threading.Tasks.Extensions" Name="System.Threading.Tasks.Extensions.dll" Source="System.Threading.Tasks.Extensions.dll" />
-        <File Id="Microsoft.Bcl.AsyncInterfaces" Name="Microsoft.Bcl.AsyncInterfaces.dll" Source="Microsoft.Bcl.AsyncInterfaces.dll" />
-        <File Id="protobuf_net" Name="protobuf-net.dll" Source="protobuf-net.dll" />
-        <File Id="DocumentFormat.OpenXml" Name="DocumentFormat.OpenXml.dll" Source="DocumentFormat.OpenXml.dll" />
-        <File Id="DocumentFormat.OpenXml.Framework" Name="DocumentFormat.OpenXml.Framework.dll" Source="DocumentFormat.OpenXml.Framework.dll" />
         <File Id="FirebirdSql.Data.FirebirdClient" Name="FirebirdSql.Data.FirebirdClient.dll" Source="FirebirdSql.Data.FirebirdClient.dll" />
         <File Id="EntityFramework" Name="EntityFramework.dll" Source="EntityFramework.dll" />
         <File Id="EntityFramework.SqlServer" Name="EntityFramework.SqlServer.dll" Source="EntityFramework.SqlServer.dll" />
         <File Id="EntityFramework.Firebird" Name="EntityFramework.Firebird.dll" Source="EntityFramework.Firebird.dll" />
       </Component>
       
-			<Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
-				<File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes"/>
-			</Component>
-
-			<Component Id="PDFsharp" Guid="9cd1cfb7-3f84-4a8b-aa51-642b723fcd70">
-				<File Id="PdfSharpgdi" Name="PdfSharp-gdi.dll" Source="P:\Visual Studio Projekte\Bibliotheken\PdfSharp-gdi.dll" KeyPath="yes"/>
-			</Component>
-
 			<Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
-				<File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" KeyPath="yes" />
+        <File Id="GdPicture.NET.14" Name="GdPicture.NET.14.dll" KeyPath="yes" />
-				<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" />
+        <File Id="GdPicture.NET.14.CAD" Name="GdPicture.NET.14.CAD.dll" />
-				<File Id="GdPicture.NET.14.filters.64" Name="GdPicture.NET.14.filters.64.dll" />
+        <File Id="GdPicture.NET.14.CAD.DWG" Name="GdPicture.NET.14.CAD.DWG.dll" />
-				<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" />
+        <File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" />
-				<File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" />
+        <File Id="GdPicture.NET.14.filters64" Name="GdPicture.NET.14.filters.64.dll" />
-				<File Id="GdPicture.NET.14.Imaging.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
+        <File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" />
-				<File Id="GdPicture.NET.14.Rendering.Skia.64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
+        <File Id="GdPicture.NET.14.image64" Name="GdPicture.NET.14.image.gdimgplug.64.dll" />
-        <File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.dll" />
+        <File Id="GdPicture.NET.14.Imaging.Formats" Name="GdPicture.NET.14.Imaging.Formats.dll" />
-        <File Id="GdPicture.NET.14.Common" Name="GdPicture.NET.14.Common.dll" />
         <File Id="GdPicture.NET.14.Imaging.Rendering" Name="GdPicture.NET.14.Imaging.Rendering.dll" />
+        <File Id="GdPicture.NET.14.Imaging.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
+        <File Id="GdPicture.NET.14.Rendering.Skia.64" Name="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
+        <File Id="GdPicture.NET.14.Imaging" Name="GdPicture.NET.14.Imaging.dll" />
+        <File Id="GdPicture.NET.14.Imaging.ML.64" Name="GdPicture.NET.14.Imaging.ML.64.dll" />
+        <File Id="GdPicture.NET.14.Imaging.ML" Name="GdPicture.NET.14.Imaging.ML.dll" />
+        <File Id="GdPicture.NET.14.Imaging.Formats.Conversion" Name="GdPicture.NET.14.Imaging.Formats.Conversion.dll" />
+        <File Id="GdPicture.NET.14.Common" Name="GdPicture.NET.14.Common.dll" />
         <File Id="GdPicture.NET.14.Document" Name="GdPicture.NET.14.Document.dll" />
         <File Id="GdPicture.NET.14.PDF" Name="GdPicture.NET.14.PDF.dll" />
-        <File Id="GdPicture.NET.14.Imaging.Formats" Name="GdPicture.NET.14.Imaging.Formats.dll" />
         <File Id="GdPicture.NET.14.RTF" Name="GdPicture.NET.14.RTF.dll" />
+        <File Id="GdPicture.NET.14.SVG" Name="GdPicture.NET.14.SVG.dll" />
         <File Id="GdPicture.NET.14.OpenDocument" Name="GdPicture.NET.14.OpenDocument.dll" />
         <File Id="GdPicture.NET.14.OpenXML" Name="GdPicture.NET.14.OpenXML.dll" />
         <File Id="GdPicture.NET.14.Email" Name="GdPicture.NET.14.Email.dll" />
         <File Id="GdPicture.NET.14.HTML" Name="GdPicture.NET.14.HTML.dll" />
         <File Id="GdPicture.NET.14.MSOfficeBinary" Name="GdPicture.NET.14.MSOfficeBinary.dll"/>
-        <File Id="GdPicture.NET.14.CAD" Name="GdPicture.NET.14.CAD.dll"/>
-        <File Id="GdPicture.NET.14.CAD.DWG" Name="GdPicture.NET.14.CAD.DWG.dll"/>
         <File Id="BouncyCastle.Cryptography" Name="BouncyCastle.Cryptography.dll"/>
-        <File Id="System.ValueTuple" Name="System.ValueTuple.dll" />
+        <File Id="DocumentFormat.OpenXml" Name="DocumentFormat.OpenXml.dll" />
+        <File Id="DocumentFormat.OpenXml.Framework" Name="DocumentFormat.OpenXml.Framework.dll" />
+        <File Id="Microsoft.Bcl.AsyncInterfaces" Name="Microsoft.Bcl.AsyncInterfaces.dll" />
+        <File Id="OpenMcdf" Name="OpenMcdf.dll" />
+        <File Id="protobufnet.Core" Name="protobuf-net.Core.dll" />
+        <File Id="protobufnet" Name="protobuf-net.dll" />
+        <File Id="RtfPipe" Name="RtfPipe.dll" />
+        <File Id="System.Buffers" Name="System.Buffers.dll" />
+        <File Id="System.CodeDom" Name="System.CodeDom.dll" />
+        <File Id="System.Collections.Immutable" Name="System.Collections.Immutable.dll" />
         <File Id="System.IO.Packaging" Name="System.IO.Packaging.dll" />
+        <File Id="System.Memory" Name="System.Memory.dll" />
+        <File Id="System.Numerics.Vectors" Name="System.Numerics.Vectors.dll" />
+        <File Id="System.Runtime.CompilerServices.Unsafe" Name="System.Runtime.CompilerServices.Unsafe.dll" />
+        <File Id="System.Security.Cryptography.Pkcs" Name="System.Security.Cryptography.Pkcs.dll" />
+        <File Id="System.Text.Encodings.Web" Name="System.Text.Encodings.Web.dll" />
+        <File Id="System.Threading.Tasks.Extensions" Name="System.Threading.Tasks.Extensions.dll" />
+        <File Id="System.ValueTuple" Name="System.ValueTuple.dll" />
       </Component>
 
 			<Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
@@ -307,9 +301,6 @@
 			<ComponentRef Id="FormsUtilsLibs"/>
 			<ComponentRef Id="DDLibs" />
 			<ComponentRef Id="RuntimeLibs" />
-			<ComponentRef Id="Oracle" />
-			<ComponentRef Id="PDFsharp" />
-			<ComponentRef Id="IndependentsoftLibs" />
 			<ComponentRef Id="DevExpressLibs" />
 			<ComponentRef Id="GDPictureLibs" />
 			<ComponentRef Id="Devexpress.Locales.de" />

app/TaskFlow.sln

@@ -7,8 +7,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\Setu
 EndProject
 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "taskFLOW", "TaskFlow\taskFLOW.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
 EndProject
-Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "DocumentViewer", "..\..\..\2_DLL Projekte\Controls.DocumentViewer\DocumentViewer.vbproj", "{0958CDDF-4A16-41F6-8837-8335F71D599C}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CD_ROM|Any CPU = CD_ROM|Any CPU
@@ -63,26 +61,6 @@ Global
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|Any CPU.Build.0 = Release|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Debug|x86
 		{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Debug|x86
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|x86.ActiveCfg = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.CD_ROM|x86.Build.0 = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Debug|x86.Build.0 = Debug|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|Any CPU.ActiveCfg = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|Any CPU.Build.0 = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|x86.ActiveCfg = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.DVD-5|x86.Build.0 = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|x86.ActiveCfg = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.Release|x86.Build.0 = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|Any CPU.Build.0 = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|x86.ActiveCfg = Release|Any CPU
-		{0958CDDF-4A16-41F6-8837-8335F71D599C}.SingleImage|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

app/TaskFlow/ClassAllgemeineFunktionen.vb

@@ -3,6 +3,7 @@ Imports System.Data.OracleClient
 Imports System.IO
 Imports WINDREAMLib
 Imports DevExpress.Utils.CommonDialogs
+Imports System.Runtime.InteropServices
 
 Public Class ClassAllgemeineFunktionen
     Public Shared Function GUI_LANGUAGE_INFO(pTITLE As String)

app/TaskFlow/ClassIDBData.vb

@@ -155,52 +155,64 @@
     End Function
     Public Function GetVariableValue(oAttributeName As String, Optional oIDBTyp As Integer = 0, Optional FromIDB As Boolean = False) As Object
         Try
-            Dim oSingleAttribute As Boolean = True
+            ' Bestimme, ob es sich um ein Single-Value-Attribut handelt (nicht Typ 8 oder 9)
-            Select Case oIDBTyp
+            Dim oIsSingleAttribute As Boolean = (oIDBTyp <> 8 AndAlso oIDBTyp <> 9)
-                Case 8
+
-                    oSingleAttribute = False
+            LOGGER.Debug($"IDBData - GetVariableValue - Attribute: [{oAttributeName}] - IsSingleAttribute: [{oIsSingleAttribute}] - FromIDB: [{FromIDB}]")
-                Case 9
+
-                    oSingleAttribute = False
+            ' Schnellpfad: Direkt aus gecachter DataTable holen
-            End Select
+            If oIsSingleAttribute AndAlso IDB_DT_DOC_DATA.Rows.Count = 1 AndAlso Not FromIDB Then
-            Dim oAttributeValue
-            LOGGER.Debug($"IDBData - GetVariableValue - oSingleAttribute [{oSingleAttribute.ToString}] - FromIDB [{FromIDB.ToString}]")
-            If oSingleAttribute = True And IDB_DT_DOC_DATA.Rows.Count = 1 And FromIDB = False Then
                 Try
-                    If oAttributeName = "IDBCreatedWhen" Then
+                    Dim oMappedName As String = MapSystemAttributeName(oAttributeName)
-                        oAttributeName = "ADDED_WHEN"
+                    Dim oValue As Object = IDB_DT_DOC_DATA.Rows(0).Item(oMappedName)
-                    ElseIf oAttributeName = "IDBCreatedWho" Then
+                    LOGGER.Debug($"IDBData - GetVariableValue - Retrieved from cache: Attribute=[{oAttributeName}] MappedName=[{oMappedName}] Value=[{oValue}]")
-                        oAttributeName = "ADDED_WHO"
+                    Return oValue
-                    ElseIf oAttributeName = "IDBChangedWhen" Then
-                        oAttributeName = "CHANGED_WHEN"
-                    ElseIf oAttributeName = "IDBChangedWho" Then
-                        oAttributeName = "CHANGED_WHO"
-                    End If
-                    LOGGER.Debug($"IDBData - GetVariableValue - IDB_DT_DOC_DATA.Rows.Count = 1")
-                    oAttributeValue = IDB_DT_DOC_DATA.Rows(0).Item(oAttributeName)
                 Catch ex As Exception
                     LOGGER.Debug($"Error getting Attribute from IDB_DT_DOC_DATA: {ex.Message}")
+                    ' Fallthrough zum Datenbank-Fallback
                 End Try
+            End If
 
-            End If
+            ' Fallback: Wert aus Datenbank über Funktion holen
-            If Not IsNothing(oAttributeValue) Then
+            LOGGER.Debug($"Retrieving value for attribute [{oAttributeName}] via FNIDB_PM_GET_VARIABLE_VALUE")
-                LOGGER.Debug($"IDBData - GetVariableValue - Returning value: [{oAttributeValue}]")
+
-                Return oAttributeValue
+            Dim oSQL As String = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({CURRENT_DOC_ID},'{oAttributeName}','{USER_LANGUAGE}',CONVERT(BIT,'{IDB_USES_WMFILESTORE}'))"
+            LOGGER.Debug($"SQL: {oSQL}")
+
+            Dim oResultTable As DataTable = DatabaseFallback.GetDatatableIDB(oSQL)
+
+            If oResultTable IsNot Nothing AndAlso oResultTable.Rows.Count = 1 Then
+                Dim oValue As Object = oResultTable.Rows(0).Item(0)
+                LOGGER.Debug($"IDBData - GetVariableValue - Retrieved from DB: [{oValue}]")
+                Return oValue
             Else
-                LOGGER.Debug($"oAttributeValue for Attribute [{oAttributeName}] is so far nothing..Now trying FNIDB_PM_GET_VARIABLE_VALUE ")
+                LOGGER.Info($"IDBData - GetVariableValue - No value found in DB for attribute [{oAttributeName}] - SQL [{oSQL}]")
             End If
-            Dim oFNSQL = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({CURRENT_DOC_ID},'{oAttributeName}','{USER_LANGUAGE}',CONVERT(BIT,'{IDB_USES_WMFILESTORE}'))"
+
-            LOGGER.Debug($": {oFNSQL}")
+            Return oResultTable
-            oAttributeValue = DatabaseFallback.GetDatatableIDB(oFNSQL)
+
-            Dim odt As DataTable = oAttributeValue
-            If odt.Rows.Count = 1 Then
-                oAttributeValue = odt.Rows(0).Item(0)
-            End If
-            Return oAttributeValue
         Catch ex As Exception
             LOGGER.Error(ex)
             Return Nothing
         End Try
+    End Function
 
+    ''' <summary>
+    ''' Mappt System-Attributnamen auf interne Spaltennamen.
+    ''' </summary>
+    Private Function MapSystemAttributeName(attributeName As String) As String
+        Select Case attributeName
+            Case "IDBCreatedWhen"
+                Return "ADDED_WHEN"
+            Case "IDBCreatedWho"
+                Return "ADDED_WHO"
+            Case "IDBChangedWhen"
+                Return "CHANGED_WHEN"
+            Case "IDBChangedWho"
+                Return "CHANGED_WHO"
+            Case Else
+                Return attributeName
+        End Select
     End Function
     Public Function Delete_Term_Object_From_Metadata(oAttributeName As String, oTerm2Delete As String) As Object
         Try

app/TaskFlow/ClassInit.vb

@@ -483,6 +483,14 @@ Public Class ClassInit
             'BASEDATA_DT_TBDD_CONNECTION = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_CONNECTION", "")
             BASEDATA_DT_TBDD_CONNECTION = DatabaseFallback.GetDatatable("TBDD_CONNECTION", New GetDatatableOptions(oSql, DatabaseType.ECM))
 
+            oStep = "TBDD_CATALOG"
+            oSql = "select CAT_TITLE,CAT_STRING from TBDD_CATALOG"
+            BASEDATA_DT_TBDD_CATALOG = DatabaseFallback.GetDatatable("TBDD_CATALOG", New GetDatatableOptions(oSql, DatabaseType.ECM))
+
+            For Each oROW As DataRow In BASEDATA_DT_TBDD_CATALOG.Rows
+
+            Next
+
             oStep = "TBDD_3RD_PARTY_MODULES"
             oSql = "Select * FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1"
             Dim oTBDD_3RD_PARTY_MODULES As DataTable

app/TaskFlow/ClassPMWindream.vb

@@ -35,7 +35,7 @@ Public Class ClassPMWindream
 #End Region
 
 #Region "+++++ Variablen +++++"
-    Private oController As New WMOSearchController
+    'Private oController As New WMOSearchController
 #End Region
 
 #Region "+++++ Allgemeine Methoden und Funktionen +++++"

app/TaskFlow/ClassParamRefresh.vb

@@ -60,227 +60,242 @@ Public Class ClassParamRefresh
             ' Use For Each loop over words and display them.
             Dim oMode As String
             For Each oMode In oSplitWorkMode
-                LOGGER.Debug($"oWorkingMode Parameter: {oMode}")
+                ProcessWorkingModeParameter(oMode, pMode)
-                If oMode = "PM.FORCE_LAYOUT_OVERVIEW" Then
+                'LOGGER.Debug($"oWorkingMode Parameter: {oMode}")
-                    FORCE_LAYOUT_OVERVIEW = True
+                'If oMode = "PM.FORCE_LAYOUT_OVERVIEW" Then
-                    LOGGER.Debug($"FORCE_LAYOUT_OVERVIEW [{FORCE_LAYOUT_OVERVIEW}]")
+                '    FORCE_LAYOUT_OVERVIEW = True
-                ElseIf oMode = "PM.NO_MASS_VALIDATOR" Then
+                '    LOGGER.Debug($"FORCE_LAYOUT_OVERVIEW [{FORCE_LAYOUT_OVERVIEW}]")
-                    SHOW_MASS_VALIDATOR = False
+                'ElseIf oMode = "PM.NO_MASS_VALIDATOR" Then
-                    LOGGER.Info($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]")
+                '    SHOW_MASS_VALIDATOR = False
-                ElseIf oMode = "PM.NO_CHARTS" Then
+                '    LOGGER.Info($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]")
-                    SHOW_CHARTS = False
+                'ElseIf oMode = "PM.NO_CHARTS" Then
-                    LOGGER.Debug($"SHOW_CHARTS [{SHOW_CHARTS}]")
+                '    SHOW_CHARTS = False
-                ElseIf oMode = "PM.DEBUG_LOG" Then
+                '    LOGGER.Debug($"SHOW_CHARTS [{SHOW_CHARTS}]")
-                    DEBUG = True
+                'ElseIf oMode = "PM.DEBUG_LOG" Then
-                    LOGCONFIG.Debug = True
+                '    DEBUG = True
-                ElseIf oMode = "PM.LOG_HOTSPOTS" Then
+                '    LOGCONFIG.Debug = True
-                    LOG_HOTSPOTS = True
+                'ElseIf oMode = "PM.LOG_HOTSPOTS" Then
-                ElseIf oMode.StartsWith("OPERATION_MODE_FS") Then
+                '    LOG_HOTSPOTS = True
-                    OPERATION_MODE_FS = oMode.Replace("OPERATION_MODE_FS=", "")
+                'ElseIf oMode.StartsWith("OPERATION_MODE_FS") Then
-                    If OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM Then
+                '    OPERATION_MODE_FS = oMode.Replace("OPERATION_MODE_FS=", "")
-                        IDB_USES_WMFILESTORE = True
+                '    If OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM Then
-                    End If
+                '        IDB_USES_WMFILESTORE = True
-                    LOGGER.Info("OPERATION_MODE_FS: " + OPERATION_MODE_FS)
+                '    End If
-                ElseIf oMode = "PM.IDBWITHWMFS" Then
+                '    LOGGER.Info("OPERATION_MODE_FS: " + OPERATION_MODE_FS)
-                    IDB_USES_WMFILESTORE = True
+                'ElseIf oMode = "PM.IDBWITHWMFS" Then
-                ElseIf oMode = "PM.NO_BASICCONF" Then
+                '    IDB_USES_WMFILESTORE = True
-                    BASIC_CONF_VISIBLE = False
+                'ElseIf oMode = "PM.NO_BASICCONF" Then
-                    LOGGER.Info($"BASIC_CONF_VISIBLE [{BASIC_CONF_VISIBLE}]")
+                '    BASIC_CONF_VISIBLE = False
-                ElseIf oMode = "PM.SYS_LOCKED_MAINTENANCE" Then
+                '    LOGGER.Info($"BASIC_CONF_VISIBLE [{BASIC_CONF_VISIBLE}]")
-                    SYS_LOCKED_MAINTENANCE = True
+                'ElseIf oMode = "PM.SYS_LOCKED_MAINTENANCE" Then
-                ElseIf oMode.StartsWith("PM.IDB_CONID!") Then
+                '    SYS_LOCKED_MAINTENANCE = True
-                    If CONNECTION_STRING_IDB <> "" And dbIDBInitialized = True Then
+                'ElseIf oMode.StartsWith("PM.IDB_CONID!") Then
-                        IDB_ACTIVE = True
+                '    If CONNECTION_STRING_IDB <> "" And dbIDBInitialized = True Then
-                        Continue For
+                '        IDB_ACTIVE = True
-                    Else
+                '        Continue For
-                        Dim Database_IDB As MSSQLServer = Nothing
+                '    Else
-                        Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "")
+                '        Dim Database_IDB As MSSQLServer = Nothing
+                '        Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "")
+                '        Dim oConString = DatabaseFallback.GetConnectionString(CON_ID)
+                '        CONNECTION_STRING_IDB = oConString
+                '        Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB)
+                '        If Database_IDB.DBInitialized = True Then
+                '            IDB_ACTIVE = True
+                '            LOGGER.Info($"IDB is active - IDB-Connection [{CON_ID}]!")
+                '            DatabaseFallback.InitializeIDB(Database_IDB)
+                '        Else
+                '            IDB_ACTIVE = False
+                '        End If
+                '    End If
+                'ElseIf oMode = "PM.EXCEL_OVERVIEW" Then
+                '    EXCEL_OVERVIEW = True
+                '    LOGGER.Info($"EXCEL_OVERVIEW [{EXCEL_OVERVIEW}]")
+                'ElseIf oMode = "PM.MONITORING" Then
+                '    MONITORING_ACTIVE = True
+                '    LOGGER.Debug($"MONITORING_ACTIVE [{MONITORING_ACTIVE}]")
+                'ElseIf oMode = "PM.GHOSTMODE" Then
+                '    GHOSTMODE_ACTIVE = True
+                '    LOGGER.Info($"GHOSTMODE_ACTIVE [{GHOSTMODE_ACTIVE}]")
+                'ElseIf oMode.StartsWith("PM.COLORSCHEME") Then
+                '    Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "")
+                '    RIBBON_COLOR_SCHEME = oColorScheme.ToUpper
+                '    LOGGER.Debug($"RIBBON_COLOR_SCHEME [{RIBBON_COLOR_SCHEME}]")
+                'ElseIf oMode.StartsWith("PM.NO_DETAIL_PROFILES") Then
+                '    NO_DETAIL_PROFILES = True
+                '    LOGGER.Debug($"NO_DETAIL_PROFILES [{NO_DETAIL_PROFILES}]")
+                'ElseIf oMode = "PM.NO_POPUP" Then
+                '    POPUP_REMINDER_ACTIVE = False
+                '    LOGGER.Debug($"POPUP_REMINDER_ACTIVE [{POPUP_REMINDER_ACTIVE}]")
+                'ElseIf oMode.StartsWith("PM.POPUP_TIMELAPS_OVERRIDE") Then
+                '    Dim oTimeLapse = oMode.Replace("PM.POPUP_TIMELAPS_OVERRIDE=", "")
+                '    LOGGER.Info($"CENTRAL POPUP_TIMELAPS_OVERRIDE [{oTimeLapse}]")
+                '    Try
+                '        CONFIG.Config.ReminderTimer = oTimeLapse
+                '    Catch ex As Exception
+                '    End Try
 
-                        Dim oConString = DatabaseFallback.GetConnectionString(CON_ID)
+                'ElseIf oMode.StartsWith("PM.CONV_IDENTIFICATION") Then
+                '    Dim oIdent = oMode.Replace("PM.CONV_IDENTIFICATION=", "")
+                '    CONV_IDENTIFICATION = oIdent
+                'ElseIf oMode.StartsWith("PM.INACTIVITY_DURATION") Then
+                '    Dim oInactivityDuration = oMode.Replace("PM.INACTIVITY_DURATION=", "")
+                '    Try
+                '        INACTIVITY_DURATION = CInt(oInactivityDuration)
+                '        LOGGER.Debug($"InactivityDuration [{INACTIVITY_DURATION}]")
+                '    Catch ex As Exception
+                '        LOGGER.Warn($"INACTIVITY_DURATION = 0 - {ex.Message}")
+                '        INACTIVITY_DURATION = 0
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.COL_LAST_EDITED") Then
+                '    Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_EDITED=", "")
+                '    Try
+                '        LAST_EDITED_COLUMN = oLEDITEDCOL
+                '        LOGGER.Debug($"LAST_EDITED_COLUMN: {oLEDITEDCOL}")
+                '    Catch ex As Exception
+                '        LAST_EDITED_COLUMN = ""
 
-                        CONNECTION_STRING_IDB = oConString
+                '    End Try
-                        Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB)
+                'ElseIf oMode.StartsWith("PM.COL_LAST_ADDED") Then
-                        If Database_IDB.DBInitialized = True Then
+                '    Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_ADDED=", "")
-                            IDB_ACTIVE = True
+                '    Try
-                            LOGGER.Info($"IDB is active - IDB-Connection [{CON_ID}]!")
+                '        LAST_ADDED_COLUMN = oLEDITEDCOL
-                            DatabaseFallback.InitializeIDB(Database_IDB)
+                '        LOGGER.Debug($"LAST_ADDED_COLUMN: {oLEDITEDCOL}")
-                        Else
+                '    Catch ex As Exception
-                            IDB_ACTIVE = False
+                '        LAST_ADDED_COLUMN = ""
-                        End If
-                    End If
-                ElseIf oMode = "PM.EXCEL_OVERVIEW" Then
-                    EXCEL_OVERVIEW = True
-                    LOGGER.Info($"EXCEL_OVERVIEW [{EXCEL_OVERVIEW}]")
-                ElseIf oMode = "PM.MONITORING" Then
-                    MONITORING_ACTIVE = True
-                    LOGGER.Debug($"MONITORING_ACTIVE [{MONITORING_ACTIVE}]")
-                ElseIf oMode = "PM.GHOSTMODE" Then
-                    GHOSTMODE_ACTIVE = True
-                    LOGGER.Info($"GHOSTMODE_ACTIVE [{GHOSTMODE_ACTIVE}]")
-                ElseIf oMode.StartsWith("PM.COLORSCHEME") Then
-                    Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "")
-                    RIBBON_COLOR_SCHEME = oColorScheme.ToUpper
-                    LOGGER.Debug($"RIBBON_COLOR_SCHEME [{RIBBON_COLOR_SCHEME}]")
-                ElseIf oMode.StartsWith("PM.NO_DETAIL_PROFILES") Then
-                    NO_DETAIL_PROFILES = True
-                    LOGGER.Debug($"NO_DETAIL_PROFILES [{NO_DETAIL_PROFILES}]")
-                ElseIf oMode = "PM.NO_POPUP" Then
-                    POPUP_REMINDER_ACTIVE = False
-                    LOGGER.Debug($"POPUP_REMINDER_ACTIVE [{POPUP_REMINDER_ACTIVE}]")
-                ElseIf oMode.StartsWith("PM.POPUP_TIMELAPS_OVERRIDE") Then
-                    Dim oTimeLapse = oMode.Replace("PM.POPUP_TIMELAPS_OVERRIDE=", "")
-                    LOGGER.Info($"CENTRAL POPUP_TIMELAPS_OVERRIDE [{oTimeLapse}]")
-                    Try
-                        CONFIG.Config.ReminderTimer = oTimeLapse
-                    Catch ex As Exception
-                    End Try
 
-                ElseIf oMode.StartsWith("PM.CONV_IDENTIFICATION") Then
+                '    End Try
-                    Dim oIdent = oMode.Replace("PM.CONV_IDENTIFICATION=", "")
+                'ElseIf oMode.StartsWith("PM.MON_COL_CHANGED_WHEN") Then
-                    CONV_IDENTIFICATION = oIdent
+                '    Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_CHANGED_WHEN=", "")
-                ElseIf oMode.StartsWith("PM.INACTIVITY_DURATION") Then
+                '    Try
-                    Dim oInactivityDuration = oMode.Replace("PM.INACTIVITY_DURATION=", "")
+                '        MON_EDITED_COLUMN = oLEDITEDCOL
-                    Try
+                '        LOGGER.Debug($"MON_EDITED_COLUMN: {oLEDITEDCOL}")
-                        INACTIVITY_DURATION = CInt(oInactivityDuration)
+                '    Catch ex As Exception
-                        LOGGER.Debug($"InactivityDuration [{INACTIVITY_DURATION}]")
-                    Catch ex As Exception
-                        LOGGER.Warn($"INACTIVITY_DURATION = 0 - {ex.Message}")
-                        INACTIVITY_DURATION = 0
-                    End Try
-                ElseIf oMode.StartsWith("PM.COL_LAST_EDITED") Then
-                    Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_EDITED=", "")
-                    Try
-                        LAST_EDITED_COLUMN = oLEDITEDCOL
-                        LOGGER.Debug($"LAST_EDITED_COLUMN: {oLEDITEDCOL}")
-                    Catch ex As Exception
-                        LAST_EDITED_COLUMN = ""
 
-                    End Try
+                '    End Try
-                ElseIf oMode.StartsWith("PM.COL_LAST_ADDED") Then
+                'ElseIf oMode.StartsWith("PM.MON_COL_ADDED_WHEN") Then
-                    Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_ADDED=", "")
+                '    Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_ADDED_WHEN=", "")
-                    Try
+                '    Try
-                        LAST_ADDED_COLUMN = oLEDITEDCOL
+                '        MON_ADDED_COLUMN = oLEDITEDCOL
-                        LOGGER.Debug($"LAST_ADDED_COLUMN: {oLEDITEDCOL}")
+                '        LOGGER.Debug($"MON_COL_ADDED_WHEN: {oLEDITEDCOL}")
-                    Catch ex As Exception
+                '    Catch ex As Exception
-                        LAST_ADDED_COLUMN = ""
 
-                    End Try
+                '    End Try
-                ElseIf oMode.StartsWith("PM.MON_COL_CHANGED_WHEN") Then
+                'ElseIf oMode.StartsWith("PM.USE_APPSERVER") Then
-                    Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_CHANGED_WHEN=", "")
+                '    Dim oUSE_APPSERVER = oMode.Replace("PM.USE_APPSERVER=", "")
-                    Try
+                '    Try
-                        MON_EDITED_COLUMN = oLEDITEDCOL
+                '        USE_APPSERVER = CBool(oUSE_APPSERVER)
-                        LOGGER.Debug($"MON_EDITED_COLUMN: {oLEDITEDCOL}")
+                '    Catch ex As Exception
-                    Catch ex As Exception
+                '        USE_APPSERVER = False
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.COPYWM2TEMP") Then
+                '    Dim oCOPYWM2TEMP = oMode.Replace("PM.COPYWM2TEMP=", "")
+                '    Try
+                '        COPY_WMFILE_2TEMP = CBool(oCOPYWM2TEMP)
+                '    Catch ex As Exception
+                '        COPY_WMFILE_2TEMP = False
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.MAP_SHARE_DRIVE") Then
+                '    Dim oMAP_SHARE_DRIVE = oMode.Replace("PM.MAP_SHARE_DRIVE=", "")
+                '    Try
+                '        MAP_SHARE_DRIVE = oMAP_SHARE_DRIVE
+                '    Catch ex As Exception
+                '        oMAP_SHARE_DRIVE = String.Empty
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.MAP_BLACKLIST") Then
+                '    Dim oMAP_BLACKLIST = oMode.Replace("PM.MAP_BLACKLIST=", "")
+                '    Try
+                '        MAP_BLACKLIST = oMAP_BLACKLIST
+                '    Catch ex As Exception
+                '        MAP_BLACKLIST = String.Empty
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.SEARCH1") Then
+                '    Dim oSearch1 = oMode.Replace("PM.SEARCH1=", "")
+                '    Try
+                '        SEARCH1 = oSearch1
+                '    Catch ex As Exception
+                '        SEARCH1 = ""
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.SEARCH2") Then
+                '    Dim oSearch2 = oMode.Replace("PM.SEARCH2=", "")
+                '    Try
+                '        SEARCH2 = oSearch2
+                '    Catch ex As Exception
+                '        SEARCH2 = ""
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.TRAFFICLIGHT_ICON") Then
+                '    Dim oParam = oMode.Replace("PM.TRAFFICLIGHT_ICON=", "")
+                '    Try
+                '        TL_ICON = CBool(oParam)
+                '    Catch ex As Exception
+                '        TL_ICON = False
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.TITLE_NOTIFICATIONS") Then
+                '    Dim oParam = oMode.Replace("PM.TITLE_NOTIFICATIONS=", "")
+                '    Try
+                '        TITLE_NOTIFICATIONS = oParam
+                '    Catch ex As Exception
+                '        TITLE_NOTIFICATIONS = ""
+                '    End Try
+                'ElseIf oMode.StartsWith("TF.InheritanceMsgAmount") And pMode = "Load" Then
+                '    Dim oParam = oMode.Replace("TF.InheritanceMsgAmount=", "")
+                '    Try
+                '        InheritanceMsgAmount = oParam
+                '    Catch ex As Exception
 
+                '    End Try
+                'ElseIf oMode.StartsWith("TF.InheritanceCalcReset") And pMode = "Load" Then
+                '    Dim oParam = oMode.Replace("TF.InheritanceCalcReset=", "")
+                '    Try
+                '        If CBool(oParam) = True Then
+                '            LOGGER.Info("Inheritance_Counts werden  auf 0 zurückgesetzt bzw gelöscht")
+                '            Dim oDELETESQL = "DELETE FROM TBDD_USER_KEY_VALUE_PAIR 
+                '             WHERE FK_USER_ID = " & USER_ID & " And [FK_MODULE_ID] = '" & USER_MODULE_ID & "' AND KEY_NAME LIKE 'INHERITANCE_CONFIRM_%'"
+                '            DatabaseECM.ExecuteNonQuery(oDELETESQL)
 
-                    End Try
+                '            UserInheritance_ConfirmationByColumn = Nothing
-                ElseIf oMode.StartsWith("PM.MON_COL_ADDED_WHEN") Then
+                '            CONFIG.Save()
-                    Dim oLEDITEDCOL = oMode.Replace("PM.MON_COL_ADDED_WHEN=", "")
+                '        End If
-                    Try
+                '    Catch ex As Exception
-                        MON_ADDED_COLUMN = oLEDITEDCOL
-                        LOGGER.Debug($"MON_COL_ADDED_WHEN: {oLEDITEDCOL}")
-                    Catch ex As Exception
 
+                '    End Try
+                'ElseIf oMode.StartsWith("PM.START_CW") Then
+                '    Dim oAfterReplace = oMode.Replace("PM.START_CW=", "")
+                '    Try
+                '        START_CW = True
+                '        LOGGER.Debug("PM.START_CW = True")
+                '        Dim oSplit As String() = oAfterReplace.Split("~")
+                '        START_CW_CAPTION = oSplit(0)
+                '        Try
+                '            START_CW_LOC_VARIANT = oSplit(1)
+                '        Catch ex As Exception
+                '            START_CW_LOC_VARIANT = "-1"
+                '            LOGGER.Warn($"Could not read START_CW_LOCVARIANT : {ex.Message}")
+                '        End Try
 
-                    End Try
+                '    Catch ex As Exception
-                ElseIf oMode.StartsWith("PM.USE_APPSERVER") Then
+                '        LOGGER.Warn($"Could not read START_CW Param: {ex.Message}")
-                    Dim oUSE_APPSERVER = oMode.Replace("PM.USE_APPSERVER=", "")
+                '        START_CW = False
-                    Try
+                '    End Try
-                        USE_APPSERVER = CBool(oUSE_APPSERVER)
+                'ElseIf oMode.StartsWith("PM.RibbonPageCustTitle") Then
-                    Catch ex As Exception
+                '    Dim oAfterReplace = oMode.Replace("PM.RibbonPageCustTitle=", "")
-                        USE_APPSERVER = False
+                '    RibbonPageCustTitle = oAfterReplace
-
+                'ElseIf oMode.StartsWith("PM.RibbonPageCustItm1") Then
-                    End Try
+                '    Dim oAfterReplace = oMode.Replace("PM.RibbonPageCustItm1=", "")
-                ElseIf oMode.StartsWith("PM.SEARCH1") Then
+                '    RibbonPageCustItm1 = oAfterReplace
-                    Dim oSearch1 = oMode.Replace("PM.SEARCH1=", "")
+                'ElseIf oMode.StartsWith("PM.ButtonExport2FolderCaption") Then
-                    Try
+                '    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2FolderCaption=", "")
-                        SEARCH1 = oSearch1
+                '    ButtonExport2Folder_Caption = oAfterReplace
-                    Catch ex As Exception
+                'ElseIf oMode.StartsWith("PM.ButtonExport2Folder_Mode") Then
-                        SEARCH1 = ""
+                '    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2Folder_Mode=", "")
-
+                '    ButtonExport2Folder_Mode = oAfterReplace
-                    End Try
+                'ElseIf oMode.StartsWith("PM.ButtonExport2Folder_RootFolder") Then
-                ElseIf oMode.StartsWith("PM.SEARCH2") Then
+                '    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2Folder_RootFolder=", "")
-                    Dim oSearch2 = oMode.Replace("PM.SEARCH2=", "")
+                '    ButtonExport2Folder_RootFolder = oAfterReplace
-                    Try
+                'ElseIf oMode = "MAINFORM_ALLOW_LOGFILES" Then
-                        SEARCH2 = oSearch2
+                '    MAINFORM_CREATE_LOG_FILES = True
-                    Catch ex As Exception
+                'Else
-                        SEARCH2 = ""
+                '    LOGGER.Info($"Wrong oMode: {oMode}")
-
+                'End If
-                    End Try
-                ElseIf oMode.StartsWith("PM.TRAFFICLIGHT_ICON") Then
-                    Dim oParam = oMode.Replace("PM.TRAFFICLIGHT_ICON=", "")
-                    Try
-                        TL_ICON = CBool(oParam)
-                    Catch ex As Exception
-                        TL_ICON = False
-                    End Try
-                ElseIf oMode.StartsWith("PM.TITLE_NOTIFICATIONS") Then
-                    Dim oParam = oMode.Replace("PM.TITLE_NOTIFICATIONS=", "")
-                    Try
-                        TITLE_NOTIFICATIONS = oParam
-                    Catch ex As Exception
-                        TITLE_NOTIFICATIONS = ""
-                    End Try
-                ElseIf oMode.StartsWith("TF.InheritanceMsgAmount") And pMode = "Load" Then
-                    Dim oParam = oMode.Replace("TF.InheritanceMsgAmount=", "")
-                    Try
-                        InheritanceMsgAmount = oParam
-                    Catch ex As Exception
-
-                    End Try
-                ElseIf oMode.StartsWith("TF.InheritanceCalcReset") And pMode = "Load" Then
-                    Dim oParam = oMode.Replace("TF.InheritanceCalcReset=", "")
-                    Try
-                        If CBool(oParam) = True Then
-                            LOGGER.Info("Inheritance_Counts werden  auf 0 zurückgesetzt bzw gelöscht")
-                            Dim oDELETESQL = "DELETE FROM TBDD_USER_KEY_VALUE_PAIR 
-                             WHERE FK_USER_ID = " & USER_ID & " And [FK_MODULE_ID] = '" & USER_MODULE_ID & "' AND KEY_NAME LIKE 'INHERITANCE_CONFIRM_%'"
-                            DatabaseECM.ExecuteNonQuery(oDELETESQL)
-
-                            UserInheritance_ConfirmationByColumn = Nothing
-                            CONFIG.Save()
-                        End If
-                    Catch ex As Exception
-
-                    End Try
-                ElseIf oMode.StartsWith("PM.START_CW") Then
-                    Dim oAfterReplace = oMode.Replace("PM.START_CW=", "")
-                    Try
-                        START_CW = True
-                        LOGGER.Debug("PM.START_CW = True")
-                        Dim oSplit As String() = oAfterReplace.Split("~")
-                        START_CW_CAPTION = oSplit(0)
-                        Try
-                            START_CW_LOC_VARIANT = oSplit(1)
-                        Catch ex As Exception
-                            START_CW_LOC_VARIANT = "-1"
-                            LOGGER.Warn($"Could not read START_CW_LOCVARIANT : {ex.Message}")
-                        End Try
-
-                    Catch ex As Exception
-                        LOGGER.Warn($"Could not read START_CW Param: {ex.Message}")
-                        START_CW = False
-                    End Try
-                ElseIf oMode.StartsWith("PM.RibbonPageCustTitle") Then
-                    Dim oAfterReplace = oMode.Replace("PM.RibbonPageCustTitle=", "")
-                    RibbonPageCustTitle = oAfterReplace
-                ElseIf oMode.StartsWith("PM.RibbonPageCustItm1") Then
-                    Dim oAfterReplace = oMode.Replace("PM.RibbonPageCustItm1=", "")
-                    RibbonPageCustItm1 = oAfterReplace
-                ElseIf oMode.StartsWith("PM.ButtonExport2FolderCaption") Then
-                    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2FolderCaption=", "")
-                    ButtonExport2Folder_Caption = oAfterReplace
-                ElseIf oMode.StartsWith("PM.ButtonExport2Folder_Mode") Then
-                    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2Folder_Mode=", "")
-                    ButtonExport2Folder_Mode = oAfterReplace
-                ElseIf oMode.StartsWith("PM.ButtonExport2Folder_RootFolder") Then
-                    Dim oAfterReplace = oMode.Replace("PM.ButtonExport2Folder_RootFolder=", "")
-                    ButtonExport2Folder_RootFolder = oAfterReplace
-                ElseIf oMode = "MAINFORM_ALLOW_LOGFILES" Then
-                    MAINFORM_CREATE_LOG_FILES = True
-                Else
-                    LOGGER.Info($"Wrong oMode: {oMode}")
-                End If
             Next
             'If IDB_ACTIVE Then
             '    If CONNECTION_STRING_APP_SERVER <> String.Empty Then
@@ -298,4 +313,267 @@ Public Class ClassParamRefresh
         End If
         oStopwatch.Done()
     End Sub
+    Private Shared Sub ProcessWorkingModeParameter(oMode As String, pMode As String)
+        LOGGER.Debug($"Processing Working Mode Parameter: {oMode}")
+
+        Select Case True
+            Case oMode = "PM.FORCE_LAYOUT_OVERVIEW"
+                SetBooleanParameter(FORCE_LAYOUT_OVERVIEW, True, "FORCE_LAYOUT_OVERVIEW")
+
+            Case oMode = "PM.NO_MASS_VALIDATOR"
+                SetBooleanParameter(SHOW_MASS_VALIDATOR, False, "SHOW_MASS_VALIDATOR", LogLevel.Info)
+
+            Case oMode = "PM.NO_CHARTS"
+                SetBooleanParameter(SHOW_CHARTS, False, "SHOW_CHARTS")
+
+            Case oMode = "PM.DEBUG_LOG"
+                DEBUG = True
+                LOGCONFIG.Debug = True
+                LOGGER.Debug($"DEBUG_LOG = True")
+
+            Case oMode = "PM.LOG_HOTSPOTS"
+                SetBooleanParameter(LOG_HOTSPOTS, True, "LOG_HOTSPOTS")
+
+            Case oMode.StartsWith("OPERATION_MODE_FS")
+                OPERATION_MODE_FS = ExtractParameterValue(oMode, "OPERATION_MODE_FS")
+                If OPERATION_MODE_FS = ClassConstants.OpModeFS_IDBWM Then
+                    IDB_USES_WMFILESTORE = True
+                End If
+                LOGGER.Info($"OPERATION_MODE_FS = {OPERATION_MODE_FS}")
+
+            Case oMode = "PM.IDBWITHWMFS"
+                SetBooleanParameter(IDB_USES_WMFILESTORE, True, "IDB_USES_WMFILESTORE", LogLevel.Info)
+
+            Case oMode = "PM.NO_BASICCONF"
+                SetBooleanParameter(BASIC_CONF_VISIBLE, False, "BASIC_CONF_VISIBLE", LogLevel.Info)
+
+            Case oMode = "PM.SYS_LOCKED_MAINTENANCE"
+                SetBooleanParameter(SYS_LOCKED_MAINTENANCE, True, "SYS_LOCKED_MAINTENANCE")
+
+            Case oMode.StartsWith("PM.IDB_CONID!")
+                ProcessIDBConnection(oMode)
+
+            Case oMode = "PM.EXCEL_OVERVIEW"
+                SetBooleanParameter(EXCEL_OVERVIEW, True, "EXCEL_OVERVIEW", LogLevel.Info)
+
+            Case oMode = "PM.MONITORING"
+                SetBooleanParameter(MONITORING_ACTIVE, True, "MONITORING_ACTIVE")
+
+            Case oMode = "PM.GHOSTMODE"
+                SetBooleanParameter(GHOSTMODE_ACTIVE, True, "GHOSTMODE_ACTIVE", LogLevel.Info)
+
+            Case oMode.StartsWith("PM.COLORSCHEME")
+                RIBBON_COLOR_SCHEME = ExtractParameterValue(oMode, "PM.COLORSCHEME").ToUpper
+                LOGGER.Debug($"RIBBON_COLOR_SCHEME = {RIBBON_COLOR_SCHEME}")
+
+            Case oMode.StartsWith("PM.NO_DETAIL_PROFILES")
+                SetBooleanParameter(NO_DETAIL_PROFILES, True, "NO_DETAIL_PROFILES")
+
+            Case oMode = "PM.NO_POPUP"
+                SetBooleanParameter(POPUP_REMINDER_ACTIVE, False, "POPUP_REMINDER_ACTIVE")
+
+            Case oMode.StartsWith("PM.POPUP_TIMELAPS_OVERRIDE")
+                ProcessPopupTimeLapse(oMode)
+
+            Case oMode.StartsWith("PM.CONV_IDENTIFICATION")
+                CONV_IDENTIFICATION = ExtractParameterValue(oMode, "PM.CONV_IDENTIFICATION")
+                LOGGER.Debug($"CONV_IDENTIFICATION = {CONV_IDENTIFICATION}")
+
+            Case oMode.StartsWith("PM.INACTIVITY_DURATION")
+                ProcessIntegerParameter(oMode, "PM.INACTIVITY_DURATION", INACTIVITY_DURATION, "InactivityDuration")
+
+            Case oMode.StartsWith("PM.COL_LAST_EDITED")
+                LAST_EDITED_COLUMN = ExtractParameterValue(oMode, "PM.COL_LAST_EDITED")
+                LOGGER.Debug($"LAST_EDITED_COLUMN = {LAST_EDITED_COLUMN}")
+
+            Case oMode.StartsWith("PM.COL_LAST_ADDED")
+                LAST_ADDED_COLUMN = ExtractParameterValue(oMode, "PM.COL_LAST_ADDED")
+                LOGGER.Debug($"LAST_ADDED_COLUMN = {LAST_ADDED_COLUMN}")
+
+            Case oMode.StartsWith("PM.MON_COL_CHANGED_WHEN")
+                MON_EDITED_COLUMN = ExtractParameterValue(oMode, "PM.MON_COL_CHANGED_WHEN")
+                LOGGER.Debug($"MON_EDITED_COLUMN = {MON_EDITED_COLUMN}")
+
+            Case oMode.StartsWith("PM.MON_COL_ADDED_WHEN")
+                MON_ADDED_COLUMN = ExtractParameterValue(oMode, "PM.MON_COL_ADDED_WHEN")
+                LOGGER.Debug($"MON_ADDED_COLUMN = {MON_ADDED_COLUMN}")
+
+            Case oMode.StartsWith("PM.USE_APPSERVER")
+                ProcessBooleanParameter(oMode, "PM.USE_APPSERVER", USE_APPSERVER, "USE_APPSERVER")
+
+            Case oMode.StartsWith("PM.COPYWM2TEMP")
+                ProcessBooleanParameter(oMode, "PM.COPYWM2TEMP", COPY_WMFILE_2TEMP, "COPY_WMFILE_2TEMP")
+
+            Case oMode.StartsWith("PM.MAP_SHARE_DRIVE")
+                MAP_SHARE_DRIVE = ExtractParameterValue(oMode, "PM.MAP_SHARE_DRIVE")
+                LOGGER.Debug($"MAP_SHARE_DRIVE = {MAP_SHARE_DRIVE}")
+
+            Case oMode.StartsWith("PM.MAP_BLACKLIST")
+                MAP_BLACKLIST = ExtractParameterValue(oMode, "PM.MAP_BLACKLIST")
+                LOGGER.Debug($"MAP_BLACKLIST = {MAP_BLACKLIST}")
+
+            Case oMode.StartsWith("PM.SEARCH1")
+                SEARCH1 = ExtractParameterValue(oMode, "PM.SEARCH1")
+                LOGGER.Debug($"SEARCH1 = {SEARCH1}")
+
+            Case oMode.StartsWith("PM.SEARCH2")
+                SEARCH2 = ExtractParameterValue(oMode, "PM.SEARCH2")
+                LOGGER.Debug($"SEARCH2 = {SEARCH2}")
+
+            Case oMode.StartsWith("PM.TRAFFICLIGHT_ICON")
+                ProcessBooleanParameter(oMode, "PM.TRAFFICLIGHT_ICON", TL_ICON, "TL_ICON")
+
+            Case oMode.StartsWith("PM.TITLE_NOTIFICATIONS")
+                TITLE_NOTIFICATIONS = ExtractParameterValue(oMode, "PM.TITLE_NOTIFICATIONS")
+                LOGGER.Debug($"TITLE_NOTIFICATIONS = {TITLE_NOTIFICATIONS}")
+
+            Case oMode.StartsWith("TF.InheritanceMsgAmount") AndAlso pMode = "Load"
+                InheritanceMsgAmount = ExtractParameterValue(oMode, "TF.InheritanceMsgAmount")
+                LOGGER.Debug($"InheritanceMsgAmount = {InheritanceMsgAmount}")
+
+            Case oMode.StartsWith("TF.InheritanceCalcReset") AndAlso pMode = "Load"
+                ProcessInheritanceReset(oMode)
+
+            Case oMode.StartsWith("PM.START_CW")
+                ProcessStartCW(oMode)
+
+            Case oMode.StartsWith("PM.RibbonPageCustTitle")
+                RibbonPageCustTitle = ExtractParameterValue(oMode, "PM.RibbonPageCustTitle")
+                LOGGER.Debug($"RibbonPageCustTitle = {RibbonPageCustTitle}")
+
+            Case oMode.StartsWith("PM.RibbonPageCustItm1")
+                RibbonPageCustItm1 = ExtractParameterValue(oMode, "PM.RibbonPageCustItm1")
+                LOGGER.Debug($"RibbonPageCustItm1 = {RibbonPageCustItm1}")
+
+            Case oMode.StartsWith("PM.ButtonExport2FolderCaption")
+                ButtonExport2Folder_Caption = ExtractParameterValue(oMode, "PM.ButtonExport2FolderCaption")
+                LOGGER.Debug($"ButtonExport2FolderCaption = {ButtonExport2Folder_Caption}")
+
+            Case oMode.StartsWith("PM.ButtonExport2Folder_Mode")
+                ButtonExport2Folder_Mode = ExtractParameterValue(oMode, "PM.ButtonExport2Folder_Mode")
+                LOGGER.Debug($"ButtonExport2Folder_Mode = {ButtonExport2Folder_Mode}")
+
+            Case oMode.StartsWith("PM.ButtonExport2Folder_RootFolder")
+                ButtonExport2Folder_RootFolder = ExtractParameterValue(oMode, "PM.ButtonExport2Folder_RootFolder")
+                LOGGER.Debug($"ButtonExport2Folder_RootFolder = {ButtonExport2Folder_RootFolder}")
+
+            Case oMode = "MAINFORM_ALLOW_LOGFILES"
+                SetBooleanParameter(MAINFORM_CREATE_LOG_FILES, True, "MAINFORM_CREATE_LOG_FILES")
+
+            Case Else
+                LOGGER.Info($"Unknown Working Mode Parameter: {oMode}")
+        End Select
+    End Sub
+    Private Shared Function ExtractParameterValue(parameterString As String, prefix As String) As String
+        Return parameterString.Replace($"{prefix}=", "")
+    End Function
+
+    Private Shared Sub SetBooleanParameter(ByRef target As Boolean, value As Boolean, paramName As String, Optional logLevel As LogLevel = LogLevel.Debug)
+        target = value
+        LogParameterValue(paramName, value.ToString(), logLevel)
+    End Sub
+
+    Private Shared Sub ProcessBooleanParameter(oMode As String, prefix As String, ByRef target As Boolean, paramName As String)
+        Dim value = ExtractParameterValue(oMode, prefix)
+        Try
+            target = CBool(value)
+            LOGGER.Debug($"{paramName} = {target}")
+        Catch ex As Exception
+            target = False
+            LOGGER.Warn($"Failed to parse {paramName}: {ex.Message}")
+        End Try
+    End Sub
+
+    Private Shared Sub ProcessIntegerParameter(oMode As String, prefix As String, ByRef target As Integer, paramName As String)
+        Dim value = ExtractParameterValue(oMode, prefix)
+        Try
+            target = CInt(value)
+            LOGGER.Debug($"{paramName} = {target}")
+        Catch ex As Exception
+            LOGGER.Warn($"Failed to parse {paramName}: {ex.Message}. Setting to 0")
+            target = 0
+        End Try
+    End Sub
+
+    Private Shared Sub ProcessIDBConnection(oMode As String)
+        Dim Database_IDB As MSSQLServer = Nothing
+        Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "")
+        Dim oConString = DatabaseFallback.GetConnectionString(CON_ID)
+        CONNECTION_STRING_IDB = oConString
+        Database_IDB = New MSSQLServer(LOGCONFIG, CONNECTION_STRING_IDB)
+
+        If Database_IDB.DBInitialized = True Then
+            IDB_ACTIVE = True
+            LOGGER.Info($"IDB is active - IDB-Connection [{CON_ID}]")
+            DatabaseFallback.InitializeIDB(Database_IDB)
+        Else
+            IDB_ACTIVE = False
+            LOGGER.Warn($"Failed to initialize IDB with Connection [{CON_ID}]")
+        End If
+        If CONNECTION_STRING_IDB <> "" AndAlso Database_IDB.DBInitialized = True Then
+            IDB_ACTIVE = True
+            LOGGER.Debug("IDB already initialized and active")
+            Return
+        End If
+    End Sub
+
+    Private Shared Sub ProcessPopupTimeLapse(oMode As String)
+        Dim oTimeLapse = ExtractParameterValue(oMode, "PM.POPUP_TIMELAPS_OVERRIDE")
+        LOGGER.Info($"POPUP_TIMELAPS_OVERRIDE = {oTimeLapse}")
+        Try
+            CONFIG.Config.ReminderTimer = oTimeLapse
+        Catch ex As Exception
+            LOGGER.Warn($"Failed to set ReminderTimer: {ex.Message}")
+        End Try
+    End Sub
+
+    Private Shared Sub ProcessInheritanceReset(oMode As String)
+        Dim oParam = ExtractParameterValue(oMode, "TF.InheritanceCalcReset")
+        Try
+            If CBool(oParam) = True Then
+                LOGGER.Info("Inheritance_Counts werden auf 0 zurückgesetzt bzw gelöscht")
+                Dim oDELETESQL = "DELETE FROM TBDD_USER_KEY_VALUE_PAIR 
+                             WHERE FK_USER_ID = " & USER_ID & " And [FK_MODULE_ID] = '" & USER_MODULE_ID & "' AND KEY_NAME LIKE 'INHERITANCE_CONFIRM_%'"
+                DatabaseECM.ExecuteNonQuery(oDELETESQL)
+                UserInheritance_ConfirmationByColumn = Nothing
+                CONFIG.Save()
+            End If
+        Catch ex As Exception
+            LOGGER.Warn($"Failed to process InheritanceCalcReset: {ex.Message}")
+        End Try
+    End Sub
+
+    Private Shared Sub ProcessStartCW(oMode As String)
+        Dim oAfterReplace = ExtractParameterValue(oMode, "PM.START_CW")
+        Try
+            START_CW = True
+            LOGGER.Debug("PM.START_CW = True")
+            Dim oSplit As String() = oAfterReplace.Split("~")
+            START_CW_CAPTION = oSplit(0)
+            Try
+                START_CW_LOC_VARIANT = oSplit(1)
+                LOGGER.Debug($"START_CW_LOC_VARIANT = {START_CW_LOC_VARIANT}")
+            Catch ex As Exception
+                START_CW_LOC_VARIANT = "-1"
+                LOGGER.Warn($"Could not read START_CW_LOC_VARIANT: {ex.Message}")
+            End Try
+        Catch ex As Exception
+            LOGGER.Warn($"Could not read START_CW Param: {ex.Message}")
+            START_CW = False
+        End Try
+    End Sub
+
+    Private Shared Sub LogParameterValue(paramName As String, value As String, logLevel As LogLevel)
+        Select Case logLevel
+            Case LogLevel.Info
+                LOGGER.Info($"{paramName} = {value}")
+            Case Else
+                LOGGER.Debug($"{paramName} = {value}")
+        End Select
+    End Sub
+
+    Private Enum LogLevel
+        Debug
+        Info
+    End Enum
 End Class

app/TaskFlow/ClassWindream_allgemein.vb

@@ -124,7 +124,7 @@ Public Class ClassWindream_allgemein
     Public Function Start_WMCC_andCo()
         Try
             ' 04.10.18: Überprüft, ob der Benutzer Mitglied der SERVER_USER Gruppe ist
-            Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T INNER JOIN TBDD_GROUPS T1 on T1.GUID = T.GROUP_ID WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID
+            Dim sql = "SELECT T.GUID FROM TBDD_GROUPS_USER T WITH (NOLOCK) INNER JOIN TBDD_GROUPS T1 WITH (NOLOCK) on T1.GUID = T.GROUP_ID WHERE T1.NAME = 'SERVER_USER' AND T.USER_ID = " & USER_ID
             Dim userExistsInServerUserGroup = DatabaseFallback.GetScalarValueECM(sql) ', CONNECTION_STRING_ECM, "StartWMCC-userExistsInServerUserGroup")
 
             If WMSESSION_STARTSTOP_STARTUP = True Then

app/TaskFlow/ModuleMySettings.vb

@@ -4,6 +4,9 @@
     Public Property CONNECTION_STRING_ECM As String = ""
     Public Property CONNECTION_STRING_IDB As String = ""
     Public Property IDB_ACTIVE As Boolean = False
+    Public Property COPY_WMFILE_2TEMP As Boolean = False
+    Public Property MAP_SHARE_DRIVE As String = String.Empty
+    Public Property MAP_BLACKLIST As String = String.Empty
     Public Property EDMIAppServerActive As Boolean = False
 
     Public Property OPERATION_MODE_FS As String = "PURE_WM"

app/TaskFlow/ModuleRuntimeVariables.vb

@@ -19,6 +19,7 @@ Module ModuleRuntimeVariables
     ' Diese Werte müssen später zur Laufzeit geladen werden
     Public Property ActiveWorkflowType As Integer
     Public Property BASEDATA_DT_TBDD_CONNECTION As DataTable
+    Public Property BASEDATA_DT_TBDD_CATALOG As DataTable
     Public Property BASEDATA_DT_TBDD_SQL_COMMANDS As DataTable
     Public Property BASEDATA_DT_CONFIG As DataTable
     Public Property BASEDATA_DTGRID_GROUPS As DataTable
@@ -29,8 +30,8 @@ Module ModuleRuntimeVariables
     Public Property BASEDATA_DT_PROFILES_SEARCHES_DOC As DataTable
     Public Property DT_FILTERED_PROFILE_SEARCHES_DOC As DataTable
 
-    Public Property BASEDATA_DT_PROFILES_SEARCHES_SQL As DataTable
+    Public Property BASEDATA_DT_PROFILES_SEARCHES_DATA As DataTable
-    Public Property BASEDATA_DT_PROFILE_SEARCHES_SQL As DataTable
+    Public Property DT_FILTERED_PROFILE_SEARCHES_DATA As DataTable
     Public Property BASEDATA_DT_VW_PROFILE_USER As DataTable
 
     Public Property BASEDATA_TBDD_COLUMNS_FORMAT As DataTable
@@ -82,6 +83,10 @@ Module ModuleRuntimeVariables
     Public Property USER_USERNAME_ORG As String = ""
     Public Property USER_GHOST_MODE_ACTIVE As Boolean = False
     Public Property USER_GHOST_MODE_USRNAME As String = ""
+    ''' <summary>
+    ''' Temporärer Ordner für Dokumentkopien (wenn COPY_WMFILE_2TEMP = True)
+    ''' </summary>
+    Public TEMP_DOCUMENT_FOLDER As String = String.Empty
     Public Class UserInheritanceConfirmation
         Public Property ColumnName As String = ""
         Public Property Count As Integer

app/TaskFlow/My Project/AssemblyInfo.vb

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.8.7.1")>
+<Assembly: AssemblyVersion("2.9.0.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 <Assembly: NeutralResourcesLanguage("")>

app/TaskFlow/TaskFlow.vbproj

@@ -151,9 +151,9 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Controls.DocumentViewer, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\obj\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Controls.LookupGrid">
       <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
@@ -1256,7 +1256,7 @@
     <None Include="Resources\PM_mit_slogan.JPG" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="taskFLOW-TEST-Debug.txt" />
+    <Content Include="logtaskflow.txt" />
     <None Include="Changelog.md" />
     <Content Include="DataColumnExpression.txt" />
     <Content Include="DD_Icons_ICO_PMANAGER_48px.ico" />

app/TaskFlow/frmAnnotations.vb

@@ -7,7 +7,7 @@ Public Class frmAnnotations
 
         Try
             Me.Cursor = Cursors.WaitCursor
-            ClassAnnotation.Annotate_PDF(txttitle.Text, txtcontent.Text, txtSeitenzahl.Text, True)
+            ' ClassAnnotation.Annotate_PDF(txttitle.Text, txtcontent.Text, txtSeitenzahl.Text, True)
             Me.Cursor = Cursors.Default
             Me.Close()
         Catch ex As Exception

app/TaskFlow/frmMain.vb

@@ -2044,12 +2044,12 @@ Public Class frmMain
                 End If
 
                 ' ========== SEARCH SQL PREPARATION ==========
-                BASEDATA_DT_PROFILE_SEARCHES_SQL = Nothing
+                DT_FILTERED_PROFILE_SEARCHES_DATA = Nothing
-                rows = BASEDATA_DT_PROFILES_SEARCHES_SQL.Select(oExpression, "TAB_INDEX")
+                rows = BASEDATA_DT_PROFILES_SEARCHES_DATA.Select(oExpression, "TAB_INDEX")
                 If rows.Length > 0 Then
-                    BASEDATA_DT_PROFILE_SEARCHES_SQL = rows.CopyToDataTable()
+                    DT_FILTERED_PROFILE_SEARCHES_DATA = rows.CopyToDataTable()
                 Else
-                    BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Clone()
+                    DT_FILTERED_PROFILE_SEARCHES_DATA = BASEDATA_DT_PROFILES_SEARCHES_DATA.Clone()
                 End If
 
                 ' ========== VALIDATOR-FORM ÖFFNEN ==========
@@ -3178,6 +3178,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
             End If
 
             BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseECM.GetDatatable(oSQL)
+            EnsureProfileSearchType(BASEDATA_DT_PROFILES_SEARCHES_DOC, "DOC", NameOf(BASEDATA_DT_PROFILES_SEARCHES_DOC))
 
             If pMode = "Load" Then
                 DT_FILTERED_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone()
@@ -3185,16 +3186,18 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
             If pMode = "bwBasicData" Then bwBasicData.ReportProgress(50)
             oSQL = "select * from TBPM_PROFILE_SEARCH WITH (NOLOCK) where TYPE = 'SQL' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX"
 
-            BASEDATA_DT_PROFILES_SEARCHES_SQL = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
+            BASEDATA_DT_PROFILES_SEARCHES_DATA = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
-                .FilterExpression = "TYPE = 'SQL'",
+            .FilterExpression = "TYPE = 'SQL'",
-                .SortByColumn = "PROFILE_ID,TAB_INDEX"
+            .SortByColumn = "PROFILE_ID,TAB_INDEX"
             })
+            EnsureProfileSearchType(BASEDATA_DT_PROFILES_SEARCHES_DATA, "SQL", NameOf(BASEDATA_DT_PROFILES_SEARCHES_DATA))
+
             oSQL = String.Format("SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,'{0}',CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG, '{0}' as LANGUAGE, * FROM TBPM_PROFILE_CONTROLS WITH (NOLOCK)", {USER_LANGUAGE})
             BASEDATA_TBPM_PROFILE_CONTROLS = DatabaseFallback.GetDatatable("TBPM_PROFILE_CONTROLS_LANGUAGE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
                 .FilterExpression = String.Format("LANGUAGE = '{0}'", {USER_LANGUAGE})
             })
             If pMode = "Load" Then
-                BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Clone()
+                DT_FILTERED_PROFILE_SEARCHES_DATA = BASEDATA_DT_PROFILES_SEARCHES_DATA.Clone()
             End If
             If pMode = "bwBasicData" Then bwBasicData.ReportProgress(60)
             LoadVWPM_CONTROL_INDEX()
@@ -3215,6 +3218,53 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
         End Try
         oStopWatch.Done()
     End Sub
+    Private Sub EnsureProfileSearchType(ByRef pTable As DataTable, expectedType As String, tableName As String)
+        Try
+            If pTable Is Nothing Then
+                LOGGER.Warn($"{tableName} is Nothing - type guard skipped")
+                Exit Sub
+            End If
+
+            If pTable.Columns.Contains("TYPE") = False Then
+                LOGGER.Warn($"{tableName} has no TYPE column - type guard skipped")
+                Exit Sub
+            End If
+
+            Dim cleanedTable As DataTable = pTable.Clone()
+            Dim removedCount As Integer = 0
+            Dim sampleInvalidSql As String = String.Empty
+
+            For Each row As DataRow In pTable.Rows
+                Dim rowType As String = String.Empty
+                If row("TYPE") IsNot DBNull.Value Then
+                    rowType = row("TYPE").ToString().Trim().ToUpperInvariant()
+                End If
+
+                If rowType = expectedType.ToUpperInvariant() Then
+                    cleanedTable.ImportRow(row)
+                Else
+                    removedCount += 1
+                    If sampleInvalidSql = String.Empty AndAlso pTable.Columns.Contains("SQL_COMMAND") Then
+                        If row("SQL_COMMAND") IsNot DBNull.Value Then
+                            sampleInvalidSql = row("SQL_COMMAND").ToString()
+                        End If
+                    End If
+                End If
+            Next
+
+            If removedCount > 0 Then
+                LOGGER.Warn($"{tableName}: removed {removedCount} row(s) with unexpected TYPE. Expected TYPE='{expectedType}'.")
+                If sampleInvalidSql <> String.Empty Then
+                    LOGGER.Warn($"{tableName}: sample unexpected SQL_COMMAND => {sampleInvalidSql}")
+                End If
+            End If
+            LOGGER.Debug($"{tableName}: {cleanedTable.Rows.Count} rows with TYPE='{expectedType}' after type guard.")
+            pTable = cleanedTable
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            LOGGER.Warn($"EnsureProfileSearchType failed for {tableName}")
+        End Try
+    End Sub
     Private Sub ConfigureGlobalLookAndFeel()
         If RIBBON_COLOR_SCHEME <> "" Then
             UserLookAndFeel.Default.UseDefaultLookAndFeel = False
@@ -4082,10 +4132,10 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
                         oExpression = $"PROFILE_ID = {CURRENT_ProfilGUID}"
                         BASEDATA_DT_PROFILES_SEARCHES_DOC.Select(oExpression, "TAB_INDEX").CopyToDataTable(DT_FILTERED_PROFILE_SEARCHES_DOC, LoadOption.PreserveChanges)
 
-                        BASEDATA_DT_PROFILE_SEARCHES_SQL = Nothing
+                        DT_FILTERED_PROFILE_SEARCHES_DATA = Nothing
-                        BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Copy
+                        DT_FILTERED_PROFILE_SEARCHES_DATA = BASEDATA_DT_PROFILES_SEARCHES_DATA.Copy
-                        BASEDATA_DT_PROFILE_SEARCHES_SQL.Clear()
+                        DT_FILTERED_PROFILE_SEARCHES_DATA.Clear()
-                        BASEDATA_DT_PROFILES_SEARCHES_SQL.Select(oExpression, "TAB_INDEX").CopyToDataTable(BASEDATA_DT_PROFILE_SEARCHES_SQL, LoadOption.PreserveChanges)
+                        BASEDATA_DT_PROFILES_SEARCHES_DATA.Select(oExpression, "TAB_INDEX").CopyToDataTable(DT_FILTERED_PROFILE_SEARCHES_DATA, LoadOption.PreserveChanges)
 
                         Try
                             Dim oEnvironment = GetEnvironment()

app/TaskFlow/frmValidator.Designer.vb

@@ -762,7 +762,6 @@ Partial Class frmValidator
         Me.rbnPgGroupAttmt.ItemLinks.Add(Me.Attmnt_bbtnitm_LoadonClick)
         Me.rbnPgGroupAttmt.Name = "rbnPgGroupAttmt"
         resources.ApplyResources(Me.rbnPgGroupAttmt, "rbnPgGroupAttmt")
-        Me.rbnPgGroupAttmt.Visible = False
         '
         'RibbonPageGroupCustom
         '

app/TaskFlow/frmValidator.resx

@@ -616,7 +616,7 @@
     <value>DocumentViewer1</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.7.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>SplitContainer1.Panel2</value>

app/TaskFlow/frmValidatorSearch.resx

@@ -138,7 +138,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 557</value>
+    <value>279, 446</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="GridControlDocSearch1.TabIndex" type="System.Int32, mscorlib">
@@ -187,7 +187,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 557</value>
+    <value>279, 446</value>
   </data>
   <data name="GridControlDocSearch2.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -229,7 +229,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 557</value>
+    <value>279, 446</value>
   </data>
   <data name="GridControlDocSearch3.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -271,7 +271,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 557</value>
+    <value>279, 446</value>
   </data>
   <data name="GridControlDocSearch4.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -313,7 +313,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 557</value>
+    <value>279, 446</value>
   </data>
   <data name="GridControlDocSearch5.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -454,7 +454,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>344, 560</value>
+    <value>275, 448</value>
   </data>
   <data name="GridControlSearch1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -502,7 +502,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>275, 448</value>
   </data>
   <data name="GridControlSearch2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -520,7 +520,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>344, 560</value>
   </data>
   <data name="XtraTabPageSearch2.Text" xml:space="preserve">
     <value>Search2</value>
@@ -544,7 +544,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>275, 448</value>
   </data>
   <data name="GridControlSearch3.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -562,7 +562,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>344, 560</value>
   </data>
   <data name="XtraTabPageSearch3.Text" xml:space="preserve">
     <value>XtraTabPage1</value>
@@ -586,7 +586,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>275, 448</value>
   </data>
   <data name="GridControlSearch4.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -604,7 +604,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>344, 560</value>
   </data>
   <data name="XtraTabPageSearch4.Text" xml:space="preserve">
     <value>XtraTabPage2</value>
@@ -628,7 +628,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>275, 448</value>
   </data>
   <data name="GridControlSearch5.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -646,7 +646,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPageSearch5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>511, 560</value>
+    <value>344, 560</value>
   </data>
   <data name="XtraTabPageSearch5.Text" xml:space="preserve">
     <value>XtraTabPage3</value>

app/TaskFlow/frmValidatorSearch.vb

@@ -1,4 +1,5 @@
 Imports System.ComponentModel
+Imports System.Data.SqlClient
 Imports System.IO
 Imports System.Runtime.InteropServices
 Imports DevExpress.Utils
@@ -7,12 +8,13 @@ Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraTab
+Imports DigitalData.GUIs.Common
 Imports DigitalData.GUIs.Common.DocumentResultList
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.EDMI.API.Constants
 Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
-Imports DigitalData.Modules.ZooFlow.Constants
 Imports DigitalData.Modules.ZooFlow
-Imports DigitalData.GUIs.Common
+Imports DigitalData.Modules.ZooFlow.Constants
 
 Public Class frmValidatorSearch
     <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
@@ -43,7 +45,7 @@ Public Class frmValidatorSearch
 #End Region
     Public formLoaded As Boolean = False
     Public _DTDocSearches As DataTable
-    Public _DTSQLSearches As DataTable
+    Public _DTDATASearches As DataTable
     Private _frmValidator As frmValidator 'You need a reference to Form1
     Private Shared BW_DocPath As String
     Private Shared BW_DocID As Integer
@@ -51,6 +53,8 @@ Public Class frmValidatorSearch
     Private Documentloader As Loader
     Private Property OperationMode As OperationMode
     Private ReadOnly Environment As Environment
+    Private _documentPathHandler As DocumentPathHandler
+    Private _suppressTabEvents As Boolean = False
 
     Public Sub New(pfrmValidator As frmValidator, pEnvironment As Environment)
 
@@ -79,52 +83,354 @@ Public Class frmValidatorSearch
     End Function
     Public Sub TabPreload(TabCountSQL As Integer, TabCountDoc As Integer, DTSQL As DataTable, DTDOC As DataTable)
         Try
-            SplitContainerSearches.Panel1Collapsed = IIf(DTSQL.Rows.Count > 0, False, True)
+            LOGGER.Debug("=== TabPreload START ===")
-            SplitContainerSearches.Panel2Collapsed = IIf(DTDOC.Rows.Count > 0, False, True)
+            LOGGER.Debug($"Parameters: TabCountSQL={TabCountSQL}, TabCountDoc={TabCountDoc}, DTSQL.Rows={If(DTSQL?.Rows.Count, 0)}, DTDOC.Rows={If(DTDOC?.Rows.Count, 0)}")
-            If Me.InvokeRequired() Then
-                Me.Invoke(Sub() TabPreload(TabCountSQL, TabCountDoc, DTSQL, DTDOC))
-            Else
-                '#### SQL Tabs Design Laden
-
-                If DTSQL.Rows.Count > 0 Then
-                    LOGGER.Debug(String.Format("[{0} SQL-Definitions]", DTSQL.Rows.Count))
-                    For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
-                        If XtraTabControlSQL.TabPages(p).TabIndex >= TabCountSQL Then
-                            XtraTabControlSQL.TabPages(p).PageVisible = False
-                        End If
-                    Next
-                    For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
-                        If XtraTabControlSQL.TabPages(p).TabIndex >= TabCountSQL Then
-                            Exit For
-                        End If
-                        XtraTabControlSQL.TabPages(p).Text = DTSQL.Rows(p).Item("TAB_TITLE")
-
-                    Next
-                End If
-
-                If DTDOC.Rows.Count > 0 Then
-                    LOGGER.Debug(String.Format("[{0} Doc-Definitions]", DTDOC.Rows.Count))
-                    '#### Doc Tabs Design Laden
-                    For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
-                        If XtraTabControlDocs.TabPages(p).TabIndex >= TabCountDoc Then
-                            XtraTabControlDocs.TabPages(p).PageVisible = False
-                        End If
-                    Next
-                    For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
-                        If XtraTabControlDocs.TabPages(p).TabIndex >= TabCountDoc Then
-                            Exit For
-                        End If
-                        XtraTabControlDocs.TabPages(p).Text = DTDOC.Rows(p).Item("TAB_TITLE")
-                    Next
-
-                End If
-
 
+            ' Validierung der Parameter
+            If DTSQL Is Nothing Then
+                LOGGER.Warn("⚠️ DTSQL ist Nothing")
+                DTSQL = New DataTable()
+            End If
+            If DTDOC Is Nothing Then
+                LOGGER.Warn("⚠️ DTDOC ist Nothing")
+                DTDOC = New DataTable()
             End If
-        Catch ex As Exception
-            LOGGER.Error(ex)
-        End Try
 
+            ' Thread-Synchronisation
+            If Me.InvokeRequired() Then
+                LOGGER.Debug("InvokeRequired=True, rufe auf UI-Thread auf")
+                Me.Invoke(Sub() TabPreload(TabCountSQL, TabCountDoc, DTSQL, DTDOC))
+                Return
+            End If
+
+            LOGGER.Debug("Ausführung auf UI-Thread")
+
+            ' ============================================================
+            ' WICHTIG: Variablen VOR Try-Block deklarieren
+            ' ============================================================
+            Dim hasSQLData As Boolean = False
+            Dim hasDocData As Boolean = False
+            Dim actualSQLTabCount As Integer = 0
+            Dim actualDocTabCount As Integer = 0
+
+            ' ============================================================
+            ' KRITISCH: Events DEAKTIVIEREN während der Rekonfiguration
+            ' ============================================================
+            _suppressTabEvents = True
+            LOGGER.Debug("🚫 Tab-Events deaktiviert")
+
+            Try
+                ' KRITISCH: DataTables SOFORT zuweisen
+                _DTDATASearches = DTSQL
+                _DTDocSearches = DTDOC
+                LOGGER.Debug($"✓ _DTDATASearches und _DTDocSearches zugewiesen: SQL={_DTDATASearches.Rows.Count}, Doc={_DTDocSearches.Rows.Count}")
+
+                ' TabCount-Validierung
+                actualSQLTabCount = Math.Min(TabCountSQL, DTSQL.Rows.Count)
+                actualDocTabCount = Math.Min(TabCountDoc, DTDOC.Rows.Count)
+
+                If actualSQLTabCount <> TabCountSQL Then
+                    LOGGER.Warn($"⚠️ TabCountSQL korrigiert: {TabCountSQL} → {actualSQLTabCount}")
+                End If
+                If actualDocTabCount <> TabCountDoc Then
+                    LOGGER.Warn($"⚠️ TabCountDoc korrigiert: {TabCountDoc} → {actualDocTabCount}")
+                End If
+
+                ' Panel-Sichtbarkeit
+                hasSQLData = DTSQL.Rows.Count > 0 AndAlso actualSQLTabCount > 0
+                hasDocData = DTDOC.Rows.Count > 0 AndAlso actualDocTabCount > 0
+
+                SplitContainerSearches.Panel1Collapsed = Not hasSQLData
+                SplitContainerSearches.Panel2Collapsed = Not hasDocData
+
+                LOGGER.Debug($"Panel1Collapsed (SQL)={SplitContainerSearches.Panel1Collapsed}, Panel2Collapsed (Doc)={SplitContainerSearches.Panel2Collapsed}")
+
+                ' ============================================================
+                ' KRITISCH: DocumentViewer nur bei Doc-Searches sichtbar
+                ' ============================================================
+                If hasDocData Then
+                    If Not DocumentViewer1.Visible Then
+                        DocumentViewer1.Visible = True
+                        LOGGER.Debug("✓ DocumentViewer1 sichtbar gemacht (Doc-Searches vorhanden)")
+                    End If
+                Else
+                    If DocumentViewer1.Visible Then
+                        DocumentViewer1.Visible = False
+                        LOGGER.Debug("✓ DocumentViewer1 ausgeblendet (keine Doc-Searches)")
+                    End If
+                End If
+
+                ' #### SQL Tabs konfigurieren
+                If hasSQLData Then
+                    LOGGER.Debug($"Konfiguriere SQL-Tabs: {DTSQL.Rows.Count} Definitionen")
+
+                    ' ALLE Tabs unsichtbar machen
+                    For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
+                        XtraTabControlSQL.TabPages(p).PageVisible = False
+                    Next
+                    LOGGER.Debug($"Alle {XtraTabControlSQL.TabPages.Count} SQL-Tabs auf PageVisible=False gesetzt")
+
+                    ' Nur benötigte Tabs sichtbar machen
+                    Dim processedTabs As Integer = 0
+                    For p As Integer = 0 To Math.Min(actualSQLTabCount - 1, XtraTabControlSQL.TabPages.Count - 1)
+                        If p < DTSQL.Rows.Count Then
+                            Try
+                                Dim tabTitle As String = If(DTSQL.Rows(p).Item("TAB_TITLE")?.ToString(), $"Tab {p + 1}")
+                                XtraTabControlSQL.TabPages(p).Text = tabTitle
+                                XtraTabControlSQL.TabPages(p).PageVisible = True
+                                processedTabs += 1
+                                LOGGER.Debug($"SQL-Tab {p}: Text='{tabTitle}', PageVisible=True")
+                            Catch ex As Exception
+                                LOGGER.Error($"❌ Fehler beim Konfigurieren von SQL-Tab {p}", ex)
+                            End Try
+                        End If
+                    Next
+
+                    LOGGER.Info($"✓ {processedTabs} SQL-Tabs konfiguriert")
+                Else
+                    LOGGER.Debug("Keine SQL-Daten, alle Tabs ausblenden")
+                    For p As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
+                        XtraTabControlSQL.TabPages(p).PageVisible = False
+                    Next
+                End If
+
+                ' #### Doc Tabs konfigurieren
+                If hasDocData Then
+                    LOGGER.Debug($"Konfiguriere Doc-Tabs: {DTDOC.Rows.Count} Definitionen")
+
+                    ' ALLE Tabs unsichtbar machen
+                    For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
+                        XtraTabControlDocs.TabPages(p).PageVisible = False
+                    Next
+                    LOGGER.Debug($"Alle {XtraTabControlDocs.TabPages.Count} Doc-Tabs auf PageVisible=False gesetzt")
+
+                    ' Nur benötigte Tabs sichtbar machen
+                    Dim processedTabs As Integer = 0
+                    For p As Integer = 0 To Math.Min(actualDocTabCount - 1, XtraTabControlDocs.TabPages.Count - 1)
+                        If p < DTDOC.Rows.Count Then
+                            Try
+                                Dim tabTitle As String = If(DTDOC.Rows(p).Item("TAB_TITLE")?.ToString(), $"Tab {p + 1}")
+                                XtraTabControlDocs.TabPages(p).Text = tabTitle
+                                XtraTabControlDocs.TabPages(p).PageVisible = True
+                                processedTabs += 1
+                                LOGGER.Debug($"Doc-Tab {p}: Text='{tabTitle}', PageVisible=True")
+                            Catch ex As Exception
+                                LOGGER.Error($"❌ Fehler beim Konfigurieren von Doc-Tab {p}", ex)
+                            End Try
+                        End If
+                    Next
+
+                    LOGGER.Info($"✓ {processedTabs} Doc-Tabs konfiguriert")
+                Else
+                    LOGGER.Debug("Keine Doc-Daten, alle Tabs ausblenden")
+                    For p As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
+                        XtraTabControlDocs.TabPages(p).PageVisible = False
+                    Next
+                End If
+
+            Finally
+                ' ============================================================
+                ' KRITISCH: Events REAKTIVIEREN nach Rekonfiguration
+                ' ============================================================
+                _suppressTabEvents = False
+                LOGGER.Debug("✓ Tab-Events reaktiviert")
+            End Try
+
+            ' JETZT manuell den ersten sichtbaren Tab aktivieren
+            ' ERSETZE im unteren Teil von TabPreload den SQL-Block:
+            If hasSQLData AndAlso XtraTabControlSQL.TabPages.Count > 0 Then
+                Dim firstVisibleSqlIndex As Integer = -1
+                For i As Integer = 0 To XtraTabControlSQL.TabPages.Count - 1
+                    If XtraTabControlSQL.TabPages(i).PageVisible Then
+                        firstVisibleSqlIndex = i
+                        Exit For
+                    End If
+                Next
+
+                If firstVisibleSqlIndex >= 0 AndAlso _DTDATASearches IsNot Nothing AndAlso firstVisibleSqlIndex < _DTDATASearches.Rows.Count Then
+                    LOGGER.Debug($"Setze SQL SelectedTabPageIndex manuell auf {firstVisibleSqlIndex}")
+
+                    Dim prevSuppress As Boolean = _suppressTabEvents
+                    _suppressTabEvents = True
+                    XtraTabControlSQL.SelectedTabPageIndex = firstVisibleSqlIndex
+                    _suppressTabEvents = prevSuppress
+
+                    Try
+                        Dim selectedRow As DataRow = _DTDATASearches.Rows(firstVisibleSqlIndex)
+                        Dim oConID As Integer = If(IsDBNull(selectedRow.Item("CONN_ID")), 1, CInt(selectedRow.Item("CONN_ID")))
+                        Dim oCommand As String = selectedRow.Item("SQL_COMMAND")?.ToString()
+                        Dim oTabCaption As String = If(selectedRow.Item("TAB_TITLE")?.ToString(), $"Tab {firstVisibleSqlIndex}")
+
+                        If Not String.IsNullOrEmpty(oCommand) Then
+                            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
+                            LOGGER.Debug($"SQL-Tab {firstVisibleSqlIndex}: erzwungener Initial-Refresh")
+                            RefreshTabSQL(oConID, oCommand, firstVisibleSqlIndex, oTabCaption)
+                        End If
+                    Catch ex As Exception
+                        LOGGER.Error("❌ Fehler beim SQL-Initial-Refresh in TabPreload", ex)
+                    End Try
+                End If
+            End If
+
+            ' ERSETZE im unteren Teil von TabPreload den Doc-Block:
+            If hasDocData AndAlso XtraTabControlDocs.TabPages.Count > 0 Then
+                Dim firstVisibleDocIndex As Integer = -1
+                For i As Integer = 0 To XtraTabControlDocs.TabPages.Count - 1
+                    If XtraTabControlDocs.TabPages(i).PageVisible Then
+                        firstVisibleDocIndex = i
+                        Exit For
+                    End If
+                Next
+
+                If firstVisibleDocIndex >= 0 AndAlso _DTDocSearches IsNot Nothing AndAlso firstVisibleDocIndex < _DTDocSearches.Rows.Count Then
+                    LOGGER.Debug($"Setze Doc SelectedTabPageIndex manuell auf {firstVisibleDocIndex}")
+
+                    Dim prevSuppress As Boolean = _suppressTabEvents
+                    _suppressTabEvents = True
+                    XtraTabControlDocs.SelectedTabPageIndex = firstVisibleDocIndex
+                    _suppressTabEvents = prevSuppress
+
+                    Try
+                        Dim selectedRow As DataRow = _DTDocSearches.Rows(firstVisibleDocIndex)
+                        Dim oConID As Integer = If(IsDBNull(selectedRow.Item("CONN_ID")), 1, CInt(selectedRow.Item("CONN_ID")))
+                        Dim oCommand As String = selectedRow.Item("SQL_COMMAND")?.ToString()
+                        Dim oTabCaption As String = If(selectedRow.Item("TAB_TITLE")?.ToString(), $"Tab {firstVisibleDocIndex}")
+
+                        If Not String.IsNullOrEmpty(oCommand) Then
+                            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
+                            LOGGER.Debug($"Doc-Tab {firstVisibleDocIndex}: erzwungener Initial-Refresh")
+                            RefreshTabDoc(oConID, oCommand, firstVisibleDocIndex, oTabCaption)
+                        End If
+                    Catch ex As Exception
+                        LOGGER.Error("❌ Fehler beim Doc-Initial-Refresh in TabPreload", ex)
+                    End Try
+                End If
+            End If
+
+            LOGGER.Debug("=== TabPreload END ===")
+
+        Catch ex As Exception
+            LOGGER.Error("❌ Fehler in TabPreload", ex)
+            LOGGER.Error($"Stack Trace: {ex.StackTrace}")
+            _suppressTabEvents = False ' Sicherstellung
+
+            Try
+                SplitContainerSearches.Panel1Collapsed = True
+                SplitContainerSearches.Panel2Collapsed = True
+                DocumentViewer1.Visible = False
+            Catch collapseEx As Exception
+                LOGGER.Error("❌ Fehler beim Kollabieren der Panels", collapseEx)
+            End Try
+        End Try
+    End Sub
+    Private Sub XtraTabControlSQL_SelectedPageChanged(sender As Object, e As TabPageChangedEventArgs) Handles XtraTabControlSQL.SelectedPageChanged
+        Try
+            ' KRITISCH: Event unterdrücken während TabPreload läuft
+            If _suppressTabEvents Then
+                LOGGER.Debug($"🚫 XtraTabControlSQL_SelectedPageChanged unterdrückt (SelectedTabPageIndex={XtraTabControlSQL.SelectedTabPageIndex})")
+                Exit Sub
+            End If
+
+            LOGGER.Debug($"=== XtraTabControlSQL_SelectedPageChanged START - SelectedTabPageIndex={XtraTabControlSQL.SelectedTabPageIndex} ===")
+
+            If _DTDATASearches Is Nothing Then
+                LOGGER.Warn("⚠️ _DTDATASearches ist Nothing - Exit Sub")
+                Exit Sub
+            End If
+            If XtraTabControlSQL.SelectedTabPageIndex >= 0 AndAlso
+                Not XtraTabControlSQL.TabPages(XtraTabControlSQL.SelectedTabPageIndex).PageVisible Then
+                LOGGER.Debug("SQL-Tab ist nicht sichtbar - Exit Sub")
+                Exit Sub
+            End If
+
+            If XtraTabControlSQL.SelectedTabPageIndex >= _DTDATASearches.Rows.Count Then
+                LOGGER.Error($"❌ SelectedTabPageIndex ({XtraTabControlSQL.SelectedTabPageIndex}) >= _DTDATASearches.Rows.Count ({_DTDATASearches.Rows.Count}) - Exit Sub")
+                Exit Sub
+            End If
+
+            Dim selectedRow As DataRow = _DTDATASearches.Rows(XtraTabControlSQL.SelectedTabPageIndex)
+            Dim oConID As Integer = If(IsDBNull(selectedRow.Item("CONN_ID")), 1, CInt(selectedRow.Item("CONN_ID")))
+            Dim oCommand As String = selectedRow.Item("SQL_COMMAND")?.ToString()
+            Dim oTabIndex As Integer = XtraTabControlSQL.SelectedTabPageIndex
+            Dim oTabCaption As String = If(selectedRow.Item("TAB_TITLE")?.ToString(), $"Tab {oTabIndex}")
+
+            LOGGER.Debug($"Tab-Info: '{oTabCaption}', ConID={oConID}, TabIndex={oTabIndex}")
+
+            If String.IsNullOrEmpty(oCommand) Then
+                LOGGER.Warn($"⚠️ SQL_COMMAND ist leer für Tab '{oTabCaption}' - Exit Sub")
+                Exit Sub
+            End If
+
+            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
+            LOGGER.Debug($"SQL ersetzt, Länge={oCommand.Length} Zeichen")
+
+            ' ============================================================
+            ' KRITISCH: RefreshTabSQL aufrufen!
+            ' ============================================================
+            LOGGER.Debug($"Rufe RefreshTabSQL auf für Tab '{oTabCaption}'")
+            RefreshTabSQL(oConID, oCommand, oTabIndex, oTabCaption)
+
+            LOGGER.Debug("=== XtraTabControlSQL_SelectedPageChanged END ===")
+
+        Catch ex As Exception
+            LOGGER.Error("❌ Fehler in XtraTabControlSQL_SelectedPageChanged", ex)
+            LOGGER.Error($"Details: SelectedTabPageIndex={XtraTabControlSQL.SelectedTabPageIndex}, _DTDATASearches.Rows.Count={If(_DTDATASearches?.Rows.Count, 0)}")
+        End Try
+    End Sub
+
+    Private Sub XtraTabControlDocs_SelectedPageChanged_1(sender As Object, e As TabPageChangedEventArgs) Handles XtraTabControlDocs.SelectedPageChanged
+        Try
+            ' KRITISCH: Event unterdrücken während TabPreload läuft
+            If _suppressTabEvents Then
+                LOGGER.Debug($"🚫 XtraTabControlDocs_SelectedPageChanged unterdrückt (SelectedTabPageIndex={XtraTabControlDocs.SelectedTabPageIndex})")
+                Exit Sub
+            End If
+
+            LOGGER.Debug($"=== XtraTabControlDocs_SelectedPageChanged START - SelectedTabPageIndex={XtraTabControlDocs.SelectedTabPageIndex} ===")
+
+            If _DTDocSearches Is Nothing Then
+                LOGGER.Warn("⚠️ _DTDocSearches ist Nothing - Exit Sub")
+                Exit Sub
+            End If
+
+            If XtraTabControlDocs.SelectedTabPageIndex < 0 Then
+                LOGGER.Debug("SelectedTabPageIndex < 0 - Exit Sub")
+                Exit Sub
+            End If
+
+            If XtraTabControlDocs.SelectedTabPageIndex >= _DTDocSearches.Rows.Count Then
+                LOGGER.Error($"❌ SelectedTabPageIndex ({XtraTabControlDocs.SelectedTabPageIndex}) >= _DTDocSearches.Rows.Count ({_DTDocSearches.Rows.Count}) - Exit Sub")
+                Exit Sub
+            End If
+
+            Dim selectedRow As DataRow = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex)
+            Dim oConID As Integer = If(IsDBNull(selectedRow.Item("CONN_ID")), 1, CInt(selectedRow.Item("CONN_ID")))
+            Dim oCommand As String = selectedRow.Item("SQL_COMMAND")?.ToString()
+            Dim oTabIndex As Integer = XtraTabControlDocs.SelectedTabPageIndex
+            Dim oTabCaption As String = If(selectedRow.Item("TAB_TITLE")?.ToString(), $"Tab {oTabIndex}")
+
+            LOGGER.Debug($"Tab-Info: '{oTabCaption}', ConID={oConID}, TabIndex={oTabIndex}")
+
+            If String.IsNullOrEmpty(oCommand) Then
+                LOGGER.Warn($"⚠️ SQL_COMMAND ist leer für Tab '{oTabCaption}' - Exit Sub")
+                Exit Sub
+            End If
+
+            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
+            LOGGER.Debug($"SQL ersetzt, Länge={oCommand.Length} Zeichen")
+
+            ' ============================================================
+            ' KRITISCH: RefreshTabDoc aufrufen!
+            ' ============================================================
+            LOGGER.Debug($"Rufe RefreshTabDoc auf für Tab '{oTabCaption}'")
+            RefreshTabDoc(oConID, oCommand, oTabIndex, oTabCaption)
+
+            LOGGER.Debug("=== XtraTabControlDocs_SelectedPageChanged END ===")
+
+        Catch ex As Exception
+            LOGGER.Error("❌ Fehler in XtraTabControlDocs_SelectedPageChanged", ex)
+            LOGGER.Error($"Details: SelectedTabPageIndex={XtraTabControlDocs.SelectedTabPageIndex}, _DTDocSearches.Rows.Count={If(_DTDocSearches?.Rows.Count, 0)}")
+        End Try
     End Sub
     Public Sub RefreshTabSQL(ConID As Integer, SQLCommand As String, TabIndex As Integer, TabCaption As String)
         If Me.InvokeRequired() Then
@@ -237,28 +543,31 @@ Public Class frmValidatorSearch
                     myGridview = GridViewDocSearch5
             End Select
             myGridControl.ContextMenuStrip = ContextMenuStripWMFile
-            'Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_ConId(SQLCommand, ConID)
+
             Dim oDatatable As DataTable = DatabaseFallback.GetDatatable(New GetDatatableOptions(SQLCommand, DatabaseType.ECM) With {
-                .ConnectionId = ConID
+            .ConnectionId = ConID
-            })
+        })
 
             If Not IsNothing(oDatatable) Then
                 XtraTabControlDocs.TabPages(TabIndex).Text = $"{TabCaption} ({oDatatable.Rows.Count})"
-                clsWMDocGrid.DTDocuments = oDatatable
-                'Select Case TabIndex
-                '    Case 0
-                '        GridControlDocSearch1.DataSource = oDatatable
-                '    Case 1
-                '        GridControlDocSearch2.DataSource = oDatatable
-                '    Case 2
-                '        GridControlDocSearch3.DataSource = oDatatable
-                '    Case 3
-                '        GridControlDocSearch4.DataSource = oDatatable
-                '    Case 4
-                '        GridControlDocSearch5.DataSource = oDatatable
 
-                'End Select
+                ' FIX: Nicht jedes Doc-Tab liefert echte Dokumentspalten
+                Dim hasDocId As Boolean = oDatatable.Columns.Contains("DocID")
+                Dim hasFullFilename As Boolean = oDatatable.Columns.Contains("FULL_FILENAME")
+
+                If Not hasDocId OrElse Not hasFullFilename Then
+                    LOGGER.Warn($"⚠️ Refresh_Load_GridDoc: Tab [{TabCaption}] liefert kein Dokument-Schema (DocID/FULL_FILENAME fehlt). Fallback auf Standard-Grid.")
+                    myGridControl.DataSource = oDatatable
+                    myGridview.BestFitColumns(True)
+                    clsWMDocGrid.DTDocuments = Nothing
+                    ToolStripDropDownButtonFile.Visible = False
+                    tslblState.Text = $"Tab [{TabCaption}] refreshed (fallback grid) - {Now}"
+                    Exit Sub
+                End If
+
+                clsWMDocGrid.DTDocuments = oDatatable
                 Create_GridControl(myGridview, oDatatable)
+
                 Dim oxmlPath As String = ""
                 oxmlPath = Get_DocGrid_Layout_Filename(XtraTabControlDocs.SelectedTabPageIndex)
 
@@ -463,7 +772,8 @@ Public Class frmValidatorSearch
         If My.Settings.frmValSearchSplitterDistance > 20 Then
             SplitContainerSearches.SplitterDistance = My.Settings.frmValSearchSplitterDistance
         End If
-
+        ' DocumentPathHandler initialisieren
+        _documentPathHandler = New DocumentPathHandler(LOGCONFIG)
 
         ToolStripDropDownButtonFile.Visible = False
     End Sub
@@ -520,24 +830,7 @@ Public Class frmValidatorSearch
         formLoaded = True
     End Sub
 
-    Private Sub XtraTabControlSQL_SelectedPageChanged(sender As Object, e As TabPageChangedEventArgs) Handles XtraTabControlSQL.SelectedPageChanged
+
-        If IsNothing(_DTSQLSearches) Then Exit Sub
-        Dim oConID = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("CONN_ID")
-        Dim oCommand = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("SQL_COMMAND")
-        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
-        Dim oTabIndex = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("TAB_INDEX")
-        Dim oTabCaption = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("TAB_TITLE")
-        RefreshTabSQL(oConID, oCommand, oTabIndex, oTabCaption)
-    End Sub
-    Private Sub XtraTabControlDocs_SelectedPageChanged_1(sender As Object, e As TabPageChangedEventArgs) Handles XtraTabControlDocs.SelectedPageChanged
-        If IsNothing(_DTDocSearches) Then Exit Sub
-        Dim oConID = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("CONN_ID")
-        Dim oCommand = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("SQL_COMMAND")
-        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
-        Dim oTabIndex = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("TAB_INDEX")
-        Dim oTabCaption = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("TAB_TITLE")
-        RefreshTabDoc(oConID, oCommand, oTabIndex, oTabCaption)
-    End Sub
 
     Private Sub EigenschaftenDateiToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EigenschaftenDateiToolStripMenuItem.Click
         Show_File_Properties()
@@ -566,86 +859,126 @@ Public Class frmValidatorSearch
         Next
     End Sub
     Sub Refresh_DocID(myGrid As GridView)
-        Try
+        If myGrid Is Nothing Then
+            LOGGER.Warn("⚠️ Refresh_DocID: myGrid is Nothing - Exit Sub")
+            Return
+        End If
 
+        Try
             myGrid.ShowLoadingPanel()
             clsWMDocGrid.ActiveDocGrid = myGrid
             clsWMDocGrid.ActiveDocGrid.EndSelection()
             clsWMDocGrid.GetDocItems()
+
             If ToolStripDropDownButtonFile.Visible = False Then
                 ToolStripDropDownButtonFile.Visible = True
             End If
-            If clsWMDocGrid.SELECTED_DOC_ID <> 0 Then
-                If LastDocID = clsWMDocGrid.SELECTED_DOC_ID Then
-                    myGrid.HideLoadingPanel()
-                    Exit Sub
-                End If
-                Dim msg = "DocID: " & clsWMDocGrid.SELECTED_DOC_ID.ToString
-                tslblDocID.Text = msg
-                ToolStripDropDownButtonFile.Enabled = True
-                Dim oDocument As DocumentResultList.Document = Nothing
-                ' Load DocumentInfo 
-                oDocument = Documentloader.Load(clsWMDocGrid.SELECTED_DOC_ID, clsWMDocGrid.SELECTED_DOC_PATH)
 
-                If Not IsNothing(DocumentViewer1) Then
+            If clsWMDocGrid.SELECTED_DOC_ID = 0 Then
-                    Dim oFileName = $"{clsWMDocGrid.SELECTED_DOC_ID}.{oDocument.Extension}"
-                    If Not IsNothing(oDocument.Contents) Then
-                        DocumentViewer1.LoadFile_FromPath(clsWMDocGrid.SELECTED_DOC_PATH) ',oFileName, New MemoryStream(oDocument.Contents))
-                        LastDocID = clsWMDocGrid.SELECTED_DOC_ID
-                        DocumentViewer1.RightViewOnly(USER_RIGHT_VIEW_ONLY)
-                        If USER_RIGHT_VIEW_ONLY = True Then
-                            ToolStripDropDownButtonFile.Visible = False
-                        Else
-                            ToolStripDropDownButtonFile.Visible = True
-                        End If
-                    Else
-                        statlbl.Text = "odocument.content is nothing, Check Your log"
-                    End If
-
-
-                End If
-
-            Else
                 tslblDocID.Text = "DocRow not selected"
                 ToolStripDropDownButtonFile.Enabled = False
+                Return
             End If
+
+            If LastDocID = clsWMDocGrid.SELECTED_DOC_ID Then
+                Return
+            End If
+
+            tslblDocID.Text = "DocID: " & clsWMDocGrid.SELECTED_DOC_ID.ToString
+            ToolStripDropDownButtonFile.Enabled = True
+            LOGGER.Debug($"✓ DocID aktualisiert: {clsWMDocGrid.SELECTED_DOC_ID}")
+            If IsNothing(Documentloader) Then
+                If OperationMode = Nothing Then
+                    OperationMode = GetOperationMode()
+                End If
+                Documentloader = New Loader(LOGCONFIG, OperationMode, Environment.Service.Client, Environment.User)
+            End If
+
+            If _documentPathHandler Is Nothing Then
+                _documentPathHandler = New DocumentPathHandler(LOGCONFIG)
+            End If
+
+            Dim oDocument As DocumentResultList.Document = Documentloader.Load(clsWMDocGrid.SELECTED_DOC_ID, clsWMDocGrid.SELECTED_DOC_PATH)
+
+            If IsNothing(oDocument) Then
+                LOGGER.Warn($"⚠️ Refresh_DocID: Documentloader.Load lieferte Nothing (DocID={clsWMDocGrid.SELECTED_DOC_ID})")
+                statlbl.Text = "Dokument konnte nicht geladen werden."
+                Return
+            Else
+                LOGGER.Debug($"✓ Documentloader.Load erfolgreich für DocID={clsWMDocGrid.SELECTED_DOC_ID}, Pfad: {clsWMDocGrid.SELECTED_DOC_PATH}")
+            End If
+
+            If Not IsNothing(DocumentViewer1) AndAlso Not IsNothing(oDocument.Contents) Then
+                Dim options As New DocumentPathHandler.DocumentPathOptions With {
+                    .EnableMapping = COPY_WMFILE_2TEMP AndAlso Not String.IsNullOrWhiteSpace(WMSUFFIX),
+                    .WMSuffix = WMSUFFIX,
+                    .SpecificDrive = If(Len(MAP_SHARE_DRIVE) = 1, MAP_SHARE_DRIVE, ""),
+                    .DriveBlacklist = MAP_BLACKLIST,
+                    .CopyToTemp = COPY_WMFILE_2TEMP,
+                    .TempFolder = TEMP_DOCUMENT_FOLDER,
+                    .UnmapAfterCopy = True
+                }
+
+                Dim result = _documentPathHandler.ProcessDocumentPath(clsWMDocGrid.SELECTED_DOC_PATH, options)
+
+                If result.Success Then
+                    DocumentViewer1.LoadFile_FromPath(result.FinalPath)
+                    LastDocID = clsWMDocGrid.SELECTED_DOC_ID
+                    DocumentViewer1.RightViewOnly(USER_RIGHT_VIEW_ONLY)
+                    LOGGER.Debug($"✓ [ValidatorSearch] Dokument geladen: [{Path.GetFileName(result.FinalPath)}]")
+                Else
+                    LOGGER.Error($"❌ [ValidatorSearch] {result.ErrorMessage}")
+                    statlbl.Text = $"Fehler: {result.ErrorMessage}"
+                End If
+            Else
+                statlbl.Text = "Dokumentinhalt ist leer."
+            End If
+
         Catch ex As Exception
             LOGGER.Error(ex)
+        Finally
+            Try
+                myGrid.HideLoadingPanel()
+            Catch
+            End Try
         End Try
-        myGrid.HideLoadingPanel()
     End Sub
-    Private Sub GridViewDocSearch1_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewDocSearch1.FocusedRowChanged
+    Private Sub GridViewDocSearch_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDocSearch1.FocusedRowChanged,
-        Refresh_DocID(GridViewDocSearch1)
+    GridViewDocSearch2.FocusedRowChanged,
+    GridViewDocSearch3.FocusedRowChanged,
+    GridViewDocSearch4.FocusedRowChanged,
+    GridViewDocSearch5.FocusedRowChanged
+
+        If Not Me.Visible Then
+            Return
+        End If
+
+        Dim activeGrid As GridView = TryCast(sender, GridView)
+        If activeGrid Is Nothing Then
+            Return
+        End If
+
+        LOGGER.Debug($"FocusedRowChanged ausgelöst: [{activeGrid.Name}]")
+        Refresh_DocID(activeGrid)
     End Sub
 
-    Private Sub GridViewDocSearch2_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDocSearch2.FocusedRowChanged
+    Private Sub GridViewDocSearch_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch1.FocusedColumnChanged,
-        Refresh_DocID(GridViewDocSearch2)
+    GridViewDocSearch2.FocusedColumnChanged,
-    End Sub
+    GridViewDocSearch3.FocusedColumnChanged,
-    Private Sub GridViewDocSearch3_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDocSearch3.FocusedRowChanged
+    GridViewDocSearch4.FocusedColumnChanged,
-        Refresh_DocID(GridViewDocSearch3)
+    GridViewDocSearch5.FocusedColumnChanged
-    End Sub
-    Private Sub GridViewDocSearch4_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDocSearch4.FocusedRowChanged
-        Refresh_DocID(GridViewDocSearch4)
-    End Sub
-    Private Sub GridViewDocSearch5_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDocSearch5.FocusedRowChanged
-        Refresh_DocID(GridViewDocSearch5)
-    End Sub
 
-    Private Sub GridViewDocSearch1_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch1.FocusedColumnChanged
+        If Not Me.Visible Then
-        Refresh_DocID(GridViewDocSearch1)
+            Return
-    End Sub
+        End If
 
-    Private Sub GridViewDocSearch2_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch2.FocusedColumnChanged
+        Dim activeGrid As GridView = TryCast(sender, GridView)
-        Refresh_DocID(GridViewDocSearch2)
+        If activeGrid Is Nothing Then
-    End Sub
+            Return
-    Private Sub GridViewDocSearch3_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch3.FocusedColumnChanged
+        End If
-        Refresh_DocID(GridViewDocSearch3)
+
-    End Sub
+        LOGGER.Debug($"FocusedColumnChanged ausgelöst: [{activeGrid.Name}]")
-    Private Sub GridViewDocSearch4_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch4.FocusedColumnChanged
+        Refresh_DocID(activeGrid)
-        Refresh_DocID(GridViewDocSearch4)
-    End Sub
-    Private Sub GridViewDocSearch5_FocusedColumnChanged(sender As Object, e As FocusedColumnChangedEventArgs) Handles GridViewDocSearch5.FocusedColumnChanged
-        Refresh_DocID(GridViewDocSearch5)
     End Sub
 
     Private Sub DateiÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiÖffnenToolStripMenuItem.Click
@@ -741,14 +1074,16 @@ Public Class frmValidatorSearch
 
     End Sub
     Private Sub ToolStripButtonRefreshSearches_Click(sender As Object, e As EventArgs) Handles ToolStripButtonRefreshSearches.Click
-        If BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count > 0 Then
+        If DT_FILTERED_PROFILE_SEARCHES_DATA.Rows.Count > 0 Then
-            LOGGER.Debug($"There are [{BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows.Count}] SQLSearches configured!")
+            LOGGER.Debug($"There are [{DT_FILTERED_PROFILE_SEARCHES_DATA.Rows.Count}] DATASearches configured!")
-            _DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL
+            _DTDATASearches = DT_FILTERED_PROFILE_SEARCHES_DATA
-            Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
+            Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(0).Item("CONN_ID")
-            Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
+            Dim oCommand = DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(0).Item("SQL_COMMAND")
             oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
             XtraTabControlSQL.SelectedTabPageIndex = 0
-            Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE"))
+            Refresh_Load_GridSQL(oConID, oCommand, 0, DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(0).Item("TAB_TITLE"))
+        Else
+            LOGGER.Debug("No DATASearches configured for this profile!")
         End If
         If DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count > 0 Then
             LOGGER.Debug($"There are [{DT_FILTERED_PROFILE_SEARCHES_DOC.Rows.Count}] DocSearches configured!")
@@ -758,6 +1093,8 @@ Public Class frmValidatorSearch
             oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
             XtraTabControlDocs.SelectedTabPageIndex = 0
             RefreshTabDoc(oConID, oCommand, 0, DT_FILTERED_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE"))
+        Else
+            LOGGER.Debug("No DocSearches configured for this profile!")
         End If
     End Sub
 
@@ -802,48 +1139,57 @@ Public Class frmValidatorSearch
     End Sub
     Sub ReLoad_Active_SQLTab()
         Dim oTabIndex = XtraTabControlSQL.SelectedTabPageIndex
-        Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("CONN_ID")
+        Dim oConID = DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(oTabIndex).Item("CONN_ID")
-        Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("SQL_COMMAND")
+        Dim oCommand = DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(oTabIndex).Item("SQL_COMMAND")
         oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
-        RefreshTabSQL(oConID, oCommand, oTabIndex, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("TAB_TITLE"))
+        RefreshTabSQL(oConID, oCommand, oTabIndex, DT_FILTERED_PROFILE_SEARCHES_DATA.Rows(oTabIndex).Item("TAB_TITLE"))
     End Sub
 
     Private Sub GridControlDocSearch1_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch1.DoubleClick
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch1)
         FileShow()
     End Sub
     Private Sub GridControlDocSearch2_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch2.DoubleClick
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch2)
         FileShow()
     End Sub
     Private Sub GridControlDocSearch3_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch3.DoubleClick
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch3)
         FileShow()
     End Sub
     Private Sub GridControlDocSearch4_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch4.DoubleClick
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch4)
         FileShow()
     End Sub
     Private Sub GridControlDocSearch5_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch5.DoubleClick
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch5)
         FileShow()
     End Sub
 
     Private Sub GridControlDocSearch1_Click(sender As Object, e As EventArgs) Handles GridControlDocSearch1.Click
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch1)
 
     End Sub
     Private Sub GridControlDocSearch2_Click(sender As Object, e As EventArgs) Handles GridControlDocSearch2.Click
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch2)
     End Sub
     Private Sub GridControlDocSearch3_Click(sender As Object, e As EventArgs) Handles GridControlDocSearch3.Click
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch3)
     End Sub
     Private Sub GridControlDocSearch4_Click(sender As Object, e As EventArgs) Handles GridControlDocSearch4.Click
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch4)
     End Sub
     Private Sub GridControlDocSearch5_Click(sender As Object, e As EventArgs) Handles GridControlDocSearch5.Click
-
+        If Not Me.Visible Then Return
         Refresh_DocID(GridViewDocSearch5)
     End Sub
 

app/TaskFlow/taskFLOW.vbproj

@@ -151,9 +151,9 @@
       <SpecificVersion>False</SpecificVersion>
     </Reference>
     <Reference Include="DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
-    <Reference Include="DigitalData.Controls.DocumentViewer, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\obj\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Controls.LookupGrid">
       <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
@@ -1256,7 +1256,7 @@
     <None Include="Resources\PM_mit_slogan.JPG" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="taskFLOW-TEST-Debug.txt" />
+    <Content Include="logtaskflow.txt" />
     <None Include="Changelog.md" />
     <Content Include="DataColumnExpression.txt" />
     <Content Include="DD_Icons_ICO_PMANAGER_48px.ico" />