MS

app/DD-Record-Organizer/App.config

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="DD_Record_Organizer.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="DD_Record_Organizer.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
         <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="DD_Record_Organizer.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+            <section name="DD_Record_Organizer.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <connectionStrings>
@@ -14,7 +14,7 @@
             providerName="System.Data.SqlClient" />
     </connectionStrings>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
     </startup>
     <userSettings>
         <DD_Record_Organizer.My.MySettings>
@@ -63,6 +63,9 @@
             <setting name="UserDocIDIndexname" serializeAs="String">
                 <value>Dokument-ID</value>
             </setting>
+            <setting name="UseAppConfigConString" serializeAs="String">
+                <value>False</value>
+            </setting>
         </DD_Record_Organizer.My.MySettings>
     </userSettings>
     <applicationSettings>
@@ -72,4 +75,12 @@
             </setting>
         </DD_Record_Organizer.My.MySettings>
     </applicationSettings>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

app/DD-Record-Organizer/Classes/ClassConfig.vb

@@ -0,0 +1,11 @@
+Imports DigitalData.Modules.Config.ConfigAttributes
+Imports DigitalData.Modules.Logging
+
+Public Class ClassConfig
+    ' Global Settings (from computerconfig, overridable by userconfig)
+    <ConnectionString>
+    Public Property ConnectionString As String = ""
+    ' Misc Settings
+    Public Property DEBUG As Boolean = False
+
+End Class

app/DD-Record-Organizer/Classes/ClassInit.vb

@@ -1,36 +1,85 @@
 Imports System.ComponentModel
 Imports System.IO
 Imports DD_LIB_Standards
+Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
 
 Public Class ClassInit
     Public Sub New()
     End Sub
 
-    Public Sub InitLogger()
+    Public Sub InitLoggerANDConfig()
-        LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
+        Try
+            LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
                                         My.Application.Info.CompanyName,
                                         "ADDI")
-        LOGGER = LOGCONFIG.GetLogger()
+            LOGGER = LOGCONFIG.GetLogger()
 
-        LOGGER.Info("## ADDI started - {0}", Now)
+            LOGGER.Info("## ADDI started - {0}", Now)
-        Try
+            Try
-            Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
+                Dim directory As New IO.DirectoryInfo(Application.LocalUserAppDataPath & "\Log")
 
-            For Each file As IO.FileInfo In directory.GetFiles
+                For Each file As IO.FileInfo In directory.GetFiles
-                If (Now - file.CreationTime).Days > 29 Then
+                    If (Now - file.CreationTime).Days > 29 Then
-                    file.Delete()
+                        file.Delete()
-                Else
+                    Else
-                    Exit For
+                        Exit For
+                    End If
+
+
+                Next
+            Catch ex As Exception
+
+            End Try
+
+            Dim oUserAppDataPath As String = Application.UserAppDataPath
+            Dim oLegacyAppDataPath As String = Application.UserAppDataPath
+            Dim oCommonAppDataPath = Application.CommonAppDataPath
+            Dim oStartupPath = Application.StartupPath
+            ' If AppConfig from Startup Path should be forced, rewrite the common app data path
+            If My.Settings.UseAppConfigConString = True Then
+                ' UserAppDataPath = StartupPath
+                oCommonAppDataPath = oStartupPath
+            End If
+
+            CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, oCommonAppDataPath, oStartupPath)
+            LOGGER.Info("Config loaded")
+            Try
+                If CONFIG.Config.ConnectionString <> String.Empty Then
+                    LOGGER.Debug("Connection String loaded")
+                    MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString)
                 End If
 
 
-            Next
+            Catch ex As Exception
+                LOGGER.Error(ex, "Unexpected Error Getting CONFIG.TestMode or CONFIG.ConnectionStringTest")
+            End Try
         Catch ex As Exception
 
         End Try
-    End Sub
 
+    End Sub
+    Private Shared Function DecryptConnectionString(EncryptedConnectionString As String) As String
+        Dim oBuilder As New SqlClient.SqlConnectionStringBuilder With {
+            .ConnectionString = EncryptedConnectionString
+        }
+
+        If oBuilder.ConnectionString.Contains("Password=") Then
+            Dim oPlaintextPassword As String
+            Dim oDecryptor As New ClassEncryption("!35452didalog=")
+
+            Try
+                oPlaintextPassword = oDecryptor.DecryptData(oBuilder.Password)
+            Catch ex As Exception
+                LOGGER.Error(ex)
+                LOGGER.Debug("Password {0} could not be decrypted. Assuming plaintext password.")
+                oPlaintextPassword = oBuilder.Password
+            End Try
+            Return EncryptedConnectionString.Replace(oBuilder.Password, oPlaintextPassword)
+        Else
+            Return EncryptedConnectionString
+        End If
+    End Function
     Public Shared Function InitDatabase()
         Try
             Dim dbResult As Boolean
@@ -41,6 +90,10 @@ Public Class ClassInit
                 MsgBox("The Exclude File Structure for files in Folderwatch could not be initialized!", MsgBoxStyle.Information)
             End If
             clsDatabase.GUI = True
+            If CONFIG.Config.ConnectionString <> String.Empty Then
+                LOGGER.Debug("Connection String from CONFIG")
+                MyConnectionString = DecryptConnectionString(CONFIG.Config.ConnectionString)
+            End If
             If MyConnectionString <> String.Empty Then
                 dbResult = clsDatabase.Init(MyConnectionString)
             Else
@@ -140,7 +193,7 @@ Public Class ClassInit
                 End If
             End If
 
-                sql = "SELECT * FROM TBDD_SQL_COMMANDS"
+            sql = "SELECT * FROM TBDD_SQL_COMMANDS"
             Dim oDTSQL_COMMANDS As DataTable = ClassDatabase.Return_Datatable(sql, True)
             For Each oRow As DataRow In oDTSQL_COMMANDS.Rows
                 If oRow.Item("TITLE") = "ADDI_DOC_SEARCH_RECORD" Then
@@ -214,6 +267,15 @@ WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
                 USER_GENERAL_VIEWER = USER_DT.Rows(0).Item("GENERAL_VIEWER")
                 Right_RO = True
 
+                Try
+                    If CBool(USER_DT.Rows(0).Item("PMO_READ_ONLY")) = True Then
+                        WM_READ_ONLY = True
+                        LOGGER.Info("WINDREAM IS CONFIGURED READ ONLY!!")
+                    End If
+                Catch ex As Exception
+
+                End Try
+
 
                 If Right_RO = False Then
                     LOGGER.Warn("User '" & USER_USERNAME & "' not authorized for using Record-Organizer!")
@@ -280,23 +342,28 @@ WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
 
                     End If
                     Try
-                        If SHARE_DRIVE_ACTIVE = True Then
+                        If WM_READ_ONLY = True Then
-
+                            If SHARE_DRIVE_ACTIVE = True Then
-                        End If
+                                LOGGER.Info($"SHAREDRIVE IS ACTIVE = {SHARE_DRIVE_ACTIVE.ToString}")
-                        LOGGER.Info($"SHAREDRIVE IS ACTIVE = {SHARE_DRIVE_ACTIVE.ToString}")
-                        Try
-                            WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, "", "", "", "")
-                            If IsNothing(WMMOD) Then
-                                MsgBox("No windream connectable", MsgBoxStyle.Exclamation)
                             End If
-                        Catch ex As Exception
-                            LOGGER.Warn("Could not create the login for DigitalData.Modules.Windream.Windream!")
-                        End Try
 
-                        If clsWindream.Create_Session = False Then
+                        Else
-                            LOGGER.Warn("Could not create the login for windream - No session created!")
+                            Try
-                            ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "ADDI will start anyway but be aware that searching and importing won't be possible!")
+                                WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, "", "", "", "")
+                                If IsNothing(WMMOD) Then
+                                    MsgBox("No windream connectable", MsgBoxStyle.Exclamation)
+                                End If
+                            Catch ex As Exception
+                                LOGGER.Warn("Could not create the login for DigitalData.Modules.Windream.Windream!")
+                            End Try
+
+                            If clsWindream.Create_Session = False Then
+                                LOGGER.Warn("Could not create the login for windream - No session created!")
+                                ClassHelper.MSGBOX_Handler("ERROR", "windream-login Error:", "Could not create the login/session!", "ADDI will start anyway but be aware that searching and importing won't be possible!")
+                            End If
                         End If
+
+
                     Catch ex As Exception
                         LOGGER.Warn("Unexpected Error in clswindream.Init: " & ex.Message)
                         MsgBox("Unexpected Error in Creating windream-Session: " & ex.Message & vbNewLine & "Please inform Your sysadmin!", MsgBoxStyle.Critical)

app/DD-Record-Organizer/DD-Record-Organizer.vbproj

@@ -11,7 +11,7 @@
     <AssemblyName>DD-Record-Organizer</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
@@ -169,10 +169,15 @@
     <Reference Include="DevExpress.XtraWizard.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
+    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Windream">
+    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Windream, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
     </Reference>
     <Reference Include="DLLLicenseManager">
@@ -209,8 +214,8 @@
     <Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="Oracle.ManagedDataAccess, Version=4.121.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -256,6 +261,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Classes\ClassConfig.vb" />
     <Compile Include="Classes\NodeNavigation\ClassAsyncNodeBuild.vb" />
     <Compile Include="Classes\ClassAsyncReturnDT.vb" />
     <Compile Include="Classes\ClassBackgroundHelper.vb" />
@@ -1146,6 +1152,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmConfig_Basic.resx">
       <DependentUpon>frmConfig_Basic.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmLevel_Designer.resx">
       <DependentUpon>frmLevel_Designer.vb</DependentUpon>

app/DD-Record-Organizer/ModuleHelperMethods.vb

@@ -264,7 +264,7 @@ Module ModuleHelperMethods
 
     End Sub
 
-    Public Sub OpenFormConstructor(id As Integer, Optional recordId As Integer = -1)
+    Public Sub OpenFormConstructor(id As Integer, NodeNav As Boolean, EntityID As Int16, Optional recordId As Integer = -1)
         Try
             If CURRENT_OPEN_CONSTRUCTOR_FORMS.Contains(id) Then
                 Dim frm1 As New frmConstructor_Main
@@ -286,25 +286,42 @@ Module ModuleHelperMethods
             CURRENT_CONSTRUCTOR_ID = id
             CURRENT_OPEN_CONSTRUCTOR_FORMS.Add(id)
 
-            ' Dim frm As New frmNodeNavigation()
+            If NodeNav Then
-            'frm.Tag = id
+                Dim frmNN As New frmNodeNavigation(EntityID, CURRENT_CONSTRUCTOR_ID)
+                frmNN.Tag = id
+                Dim activeChild1 As Form = MAIN_FORM.ActiveMdiChild
+                If activeChild1 IsNot Nothing Then
+                    activeChild1.WindowState = FormWindowState.Normal
+                End If
 
+                If recordId <> -1 Then
+                    ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
+                    JUMP_RECORD_ID = recordId
+                End If
 
-            Dim frm As New frmConstructor_Main()
+                frmNN.MdiParent = MAIN_FORM
-            frm.Tag = id
+                frmNN.Show()
+            Else
+                Dim frm As New frmConstructor_Main()
+                frm.Tag = id
 
-            Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
+                Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
-            If activeChild IsNot Nothing Then
+                If activeChild IsNot Nothing Then
-                activeChild.WindowState = FormWindowState.Normal
+                    activeChild.WindowState = FormWindowState.Normal
+                End If
+
+                If recordId <> -1 Then
+                    ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
+                    JUMP_RECORD_ID = recordId
+                End If
+
+                frm.MdiParent = MAIN_FORM
+                frm.Show()
             End If
 
-            If recordId <> -1 Then
-                ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
-                JUMP_RECORD_ID = recordId
-            End If
 
-            frm.MdiParent = MAIN_FORM
+
-            frm.Show()
+
         Catch ex As Exception
             LOGGER.Warn("Error in OpenFormConstructor: " & ex.Message)
             MsgBox("Error in OpenFormConstructor: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)

app/DD-Record-Organizer/ModuleMySettings.vb

@@ -7,7 +7,7 @@ Imports DigitalData.Modules.Windream
 
 Module ModuleMySettings
     Public PATH_FileExclusions As String = Path.Combine(Application.UserAppDataPath(), "FileExclusions.xml")
-    Dim ConfigPath As String = Path.Combine(Application.UserAppDataPath(), "UserConfig.xml")
+    Dim ConfigPath As String = Path.Combine(Application.UserAppDataPath(), "UserConfig2.xml")
 
     Public MyConnectionString As String = ""
     Public MyFormsDesign As String = ""
@@ -24,6 +24,7 @@ Module ModuleMySettings
     Public WMPATH_PREFIX As String
     Public WMMOD As Windream
     Public SHARE_DRIVE_ACTIVE As Boolean = False
+    Public WM_READ_ONLY As Boolean = False
     Public GridDocResult_BestFitColumns As Boolean = True
     Public SQL_FULLTEXT As String
 
@@ -134,33 +135,33 @@ Module ModuleMySettings
                 Select Case Row.Item("ConfigName")
                     Case "MyConnectionString"
                         Dim connstring As String
-                        'Den ConnectonString mit verschlüsseltem PW laden
+                        ''Den ConnectonString mit verschlüsseltem PW laden
                         Dim csb As New SqlClient.SqlConnectionStringBuilder
                         csb.ConnectionString = Row.Item("Value")
-                        If Not csb.ConnectionString = "" Then
+                        'If Not csb.ConnectionString = "" Then
-                            If csb.ConnectionString.Contains("Password=") Then
+                        '    If csb.ConnectionString.Contains("Password=") Then
-                                'sa-
+                        '        'sa-
-                                'Jetzt das Passwort entschlüsseln
+                        '        'Jetzt das Passwort entschlüsseln
-                                Dim PWplainText As String
+                        '        Dim PWplainText As String
-                                Dim wrapper As New ClassEncryption("!35452didalog=")
+                        '        Dim wrapper As New ClassEncryption("!35452didalog=")
-                                ' DecryptData throws if the wrong password is used.
+                        '        ' DecryptData throws if the wrong password is used.
-                                Try
+                        '        Try
-                                    PWplainText = wrapper.DecryptData(csb.Password)
+                        '            PWplainText = wrapper.DecryptData(csb.Password)
-                                    connstring = Row.Item("Value").ToString.Replace(csb.Password, PWplainText)
+                        '            connstring = Row.Item("Value").ToString.Replace(csb.Password, PWplainText)
-                                Catch ex As Exception
+                        '        Catch ex As Exception
-                                    LOGGER.Warn("- the Password '" & csb.Password & "' could not be decrypted")
+                        '            LOGGER.Warn("- the Password '" & csb.Password & "' could not be decrypted")
-                                    connstring = ""
+                        '            connstring = ""
-                                End Try
+                        '        End Try
 
-                            Else
+                        '    Else
-                                'Windows-Auth
+                        '        'Windows-Auth
-                                connstring = Row.Item("Value").ToString
+                        '        connstring = Row.Item("Value").ToString
-                            End If
+                        '    End If
 
-                            MyConnectionString = connstring
+                        '    MyConnectionString = connstring
-                        Else
+                        'Else
-                            MyConnectionString = ""
+                        '    MyConnectionString = ""
-                        End If
+                        'End If
                     Case "MyProxyConnectionString"
                         Dim connstring As String
                         'Den ConnectonString mit verschlüsseltem PW laden

app/DD-Record-Organizer/ModuleRuntimeVariables.vb

@@ -1,11 +1,15 @@
-Module ModuleRuntimeVariables
+Imports DigitalData.Modules.Config
+
+Module ModuleRuntimeVariables
+    Public Property CONFIG As ConfigManager(Of ClassConfig)
+
     Public ESC_Hidden As Boolean = False
 
     Public MIN_REQUIRED_VERSION As String
 
     Public MAIN_FORM As frmMain = Nothing
     Public ERROR_INIT = "NONE"
-    
+
     ' Diese Werte müssen später zur Laufzeit geladen werden
     Public CURRENT_PARENT_ENTITY_ID As Integer
     Public CURRENT_PARENT_RECORD_ID As Integer
@@ -160,11 +164,11 @@
     Public CURRENT_COMBOBOX_SELECTED_TEXT As String = ""
     Public CURRENT_TEXTBOX_SELECTED_TEXT As String = ""
     Public RIGHT_CONTROL_CHANGED As Boolean = False
-    Public MSG_RIGHTMODULE_DE = "Achtung: " & vbNewLine & "Sie haben Änderungen an Rechte-relevanten Eingaben vorgenommen!" & vbNewLine & _
+    Public MSG_RIGHTMODULE_DE = "Achtung: " & vbNewLine & "Sie haben Änderungen an Rechte-relevanten Eingaben vorgenommen!" & vbNewLine &
-                   "Alle Rechte der zu diesem Datensatz gespeicherten Dateien werden nach Speichern serverseitig und im Hintergrund überprüft!" & vbNewLine & _
+                   "Alle Rechte der zu diesem Datensatz gespeicherten Dateien werden nach Speichern serverseitig und im Hintergrund überprüft!" & vbNewLine &
                    "Dies kann je nach Anzahl der Dateien bis zu 10 Minuten dauern!" & vbNewLine & "Wollen Sie fortfahren?"
-    Public MSG_RIGHTMODULE_EN_US = "Attention:" & "You applied changes to right-relevant data!" & vbNewLine & _
+    Public MSG_RIGHTMODULE_EN_US = "Attention:" & "You applied changes to right-relevant data!" & vbNewLine &
-                        "All rights of files belonging to this record will be checked and changed after Saving!" & vbNewLine & _
+                        "All rights of files belonging to this record will be checked and changed after Saving!" & vbNewLine &
                     "This might take up to 10 Minutes (related to the amount of files)!" & vbNewLine & "Would You like to continue?"
 
     'File Adding User FAU

app/DD-Record-Organizer/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.7.6.0")>
+<Assembly: AssemblyVersion("2.8.1.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

app/DD-Record-Organizer/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -54,17 +54,6 @@ Namespace My
             End Get
         End Property
         
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True"& _ 
-            ";User ID=sa;Password=dd")>  _
-        Public ReadOnly Property DD_DMSConnectionString() As String
-            Get
-                Return CType(Me("DD_DMSConnectionString"),String)
-            End Get
-        End Property
-        
         <Global.System.Configuration.UserScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("*.db"),  _
@@ -266,6 +255,29 @@ Namespace My
                 Me("UserDocIDIndexname") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True"& _ 
+            ";User ID=sa;Password=dd")>  _
+        Public ReadOnly Property DD_DMSConnectionString() As String
+            Get
+                Return CType(Me("DD_DMSConnectionString"),String)
+            End Get
+        End Property
+        
+        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
+        Public Property UseAppConfigConString() As Boolean
+            Get
+                Return CType(Me("UseAppConfigConString"),Boolean)
+            End Get
+            Set
+                Me("UseAppConfigConString") = value
+            End Set
+        End Property
     End Class
 End Namespace
 

app/DD-Record-Organizer/My Project/Settings.Settings

@@ -2,14 +2,6 @@
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
   <Profiles />
   <Settings>
-    <Setting Name="DD_DMSConnectionString" Type="(Connection string)" Scope="Application">
-      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
-  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
-&lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</Value>
-    </Setting>
     <Setting Name="WD_ENTITYIMP_EXCLUDE" Roaming="true" Type="System.String" Scope="User">
       <Value Profile="(Default)">*.db</Value>
     </Setting>
@@ -58,5 +50,16 @@
     <Setting Name="UserDocIDIndexname" Type="System.String" Scope="User">
       <Value Profile="(Default)">Dokument-ID</Value>
     </Setting>
+    <Setting Name="DD_DMSConnectionString" Type="(Connection string)" Scope="Application">
+      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
+&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
+  &lt;ConnectionString&gt;Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
+  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+      <Value Profile="(Default)">Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</Value>
+    </Setting>
+    <Setting Name="UseAppConfigConString" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

app/DD-Record-Organizer/Strings/ControlProperties.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Class ControlProperties

app/DD-Record-Organizer/frmConfig_Basic.vb

@@ -3,6 +3,7 @@ Imports System.Globalization
 Imports DevExpress.LookAndFeel
 Imports DD_LIB_Standards
 Imports System.IO
+Imports DevExpress.XtraCharts.Native
 
 Public Class frmConfig_Basic
     Private _Helper As New ClassHelper
@@ -50,7 +51,9 @@ Public Class frmConfig_Basic
                     con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & pw & ";"
                 End If
                 If rbConnDefault.Checked Then
-                    SaveMySettingsValue("MyConnectionString", con, "ConfigMain")
+                    CONFIG.Config.ConnectionString = con
+                    CONFIG.Save(ForceAll:=True)
+                    ' SaveMySettingsValue("MyConnectionString", con, "ConfigMain")
                 Else
                     SaveMySettingsValue("MyProxyConnectionString", con, "ConfigMain")
                 End If
@@ -193,7 +196,6 @@ Public Class frmConfig_Basic
         clsCURRENT.LOG_ERRORS_ONLY = DEBUG
         LOGCONFIG.Debug = DEBUG
 
-
     End Sub
     Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.CheckedChanged
         My.Settings.Save()

app/DD-Record-Organizer/frmCustomAppointment.vb

@@ -96,11 +96,11 @@ Partial Public Class frmCustomAppointment
             Dim RecordId = Integer.Parse(txtRecordID.Text)
             JUMP_RECORD_ID = RecordId
 
-            Dim constructId As Integer = ClassDatabase.Execute_Scalar("SELECT T.CONSTRUCT_ID FROM VWPMO_CONSTRUCTOR_FORMS T, TBPMO_RECORD T1 WHERE T.FORM_ID = T1.FORM_ID AND T1.GUID = " & JUMP_RECORD_ID)
+            Dim constructDT As DataTable = ClassDatabase.Return_Datatable("SELECT T.CONSTRUCT_ID,T.NODE_NAVIGATION, T.FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS T, TBPMO_RECORD T1 WHERE T.FORM_ID = T1.FORM_ID AND T1.GUID = " & JUMP_RECORD_ID)
 
             ' TODO: FormId und ConstructId herausfinden
 
-            OpenFormConstructor(constructId)
+            OpenFormConstructor(constructDT.Rows(0).Item(0), constructDT.Rows(0).Item(1), constructDT.Rows(0).Item(2))
             Me.Close()
         End If
     End Sub

app/DD-Record-Organizer/frmMain.vb

@@ -306,9 +306,9 @@ Public Class frmMain
 
     Public Sub LoadMenuItems2()
         Try
-            Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," &
+            Dim SQL2 As String = String.Format("SELECT A.GUID as CONSTRUCT_ID,A.NODE_NAVIGATION,B.FORM_ID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), A.GUID), {1}) AS FORM_TITLE, A.SEQUENCE_MENU, A.ADDED_WHO, A.ADDED_WHEN, A.CHANGED_WHO," &
-            "CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " &
+            "A.CHANGED_WHEN, A.MENU_IMG, A.SHORT_TITLE, A.LANGUAGE, " &
-            "'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 0 AND USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
+            "'CONSTR_MENUE' + CONVERT(VARCHAR(5), A.GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR A INNER JOIN TBPMO_FORM_CONSTRUCTOR_DETAIL B ON A.GUID = B.CONSTRUCT_ID where A.GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 0 AND USER_ID = {2}) ORDER BY A.SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
             Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
 
             If dt.Rows.Count <> 0 Then
@@ -337,7 +337,7 @@ Public Class frmMain
 
 
                     Dim index As Integer = row.Item("SEQUENCE_MENU")
-                    Dim tag As Integer = row.Item("GUID")
+                    Dim tag As String = row.Item("CONSTRUCT_ID") & "#" & row.Item("NODE_NAVIGATION") & "#" & row.Item("FORM_ID")
                     Dim item As New BarButtonItem(ribbonMain.Manager, title)
                     item.RibbonStyle = RibbonItemStyles.Large
                     item.Caption = title
@@ -359,9 +359,9 @@ Public Class frmMain
     End Sub
     Public Sub LoadQuickStartItems()
         Try
-            Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," &
+            Dim SQL2 As String = String.Format("SELECT A.GUID as CONSTRUCT_ID, B.FORM_ID, A.NODE_NAVIGATION,dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), A.GUID), {1}) AS FORM_TITLE, A.SEQUENCE_MENU, A.ADDED_WHO, A.ADDED_WHEN, A.CHANGED_WHO," &
-            "CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " &
+            "A.CHANGED_WHEN, A.MENU_IMG, A.SHORT_TITLE, A.LANGUAGE, " &
-            "'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 1 AND USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
+            "'CONSTR_MENUE' + CONVERT(VARCHAR(5), A.GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR A INNER JOIN TBPMO_FORM_CONSTRUCTOR_DETAIL B On A.GUID = B.CONSTRUCT_ID where A.GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 1 AND USER_ID = {2}) ORDER BY A.SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
             Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
             Dim image2 As Bitmap = LoadNoImage()
 
@@ -397,7 +397,7 @@ Public Class frmMain
 
 
                     Dim index As Integer = row.Item("SEQUENCE_MENU")
-                    Dim tag As Integer = row.Item("GUID")
+                    Dim tag As String = row.Item("CONSTRUCT_ID") & "#" & row.Item("NODE_NAVIGATION") & "#" & row.Item("FORM_ID")
                     Dim item As New BarButtonItem(ribbonMain.Manager, title)
                     item.RibbonStyle = RibbonItemStyles.Large
                     item.Caption = title
@@ -428,19 +428,23 @@ Public Class frmMain
         End Try
 
     End Sub
-
+    Private Function Get_FormKonfig(ByVal oStr As String) As List(Of String)
+        Return New List(Of String)(oStr.Split("#").ToArray())
+    End Function
     Private Sub ToolbarButtonItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
         Cursor = Cursors.WaitCursor
-        Dim formId As Integer = Integer.Parse(e.Item.Tag)
+        Dim oArr As List(Of String) = Get_FormKonfig(e.Item.Tag)
-        OpenFormConstructor(formId)
+        Dim formId As Integer = Integer.Parse(oArr(0))
+        OpenFormConstructor(formId, oArr(1), oArr(2))
         Cursor = Cursors.Default
     End Sub
 
     Private Sub NavbarItem_Click(sender As Object, e As NavBarLinkEventArgs)
-        Dim formID As Integer = Integer.Parse(e.Link.Item.Tag)
 
         Cursor = Cursors.WaitCursor
-        OpenFormConstructor(formID)
+        Dim oArr As List(Of String) = Get_FormKonfig(e.Link.Item.Tag)
+        Dim formId As Integer = Integer.Parse(oArr(0))
+        OpenFormConstructor(formId, oArr(1), oArr(2))
         Cursor = Cursors.Default
     End Sub
 
@@ -454,17 +458,19 @@ Public Class frmMain
     'End Sub
     Private Sub MenuItem2Click(sender As Object, e As EventArgs)
         Dim item As ToolStripMenuItem = DirectCast(sender, ToolStripMenuItem)
-        Dim formId As Integer = Integer.Parse(item.Tag)
         Cursor = Cursors.WaitCursor
-        OpenFormConstructor(formId)
+        Dim oArr As List(Of String) = Get_FormKonfig(item.Tag)
+        Dim formId As Integer = Integer.Parse(oArr(0))
+        OpenFormConstructor(formId, oArr(1), oArr(2))
         Cursor = Cursors.Default
     End Sub
 
-    Private Shared Sub QuickAccessClick(sender As Object, e As EventArgs)
+    Private Sub QuickAccessClick(sender As Object, e As EventArgs)
         Dim btn As ToolStripButton = CType(sender, ToolStripButton)
-        Dim formId As Integer
+
-        formId = Integer.Parse(sender.tag)
+        Dim oArr As List(Of String) = Get_FormKonfig(sender.Tag)
-        OpenFormConstructor(formId)
+        Dim formId As Integer = Integer.Parse(oArr(0))
+        OpenFormConstructor(formId, oArr(1), oArr(2))
     End Sub
 
     Private Sub SetBackground()
@@ -530,9 +536,7 @@ Public Class frmMain
         Me.Close()
     End Sub
 
-    Private Sub FormateProduktionenToolStripMenuItem_Click(sender As Object, e As EventArgs)
+
-        OpenFormConstructor(1)
-    End Sub
 
     Private Sub WorkflowTaskmanagementToolStripMenuItem_Click(sender As Object, e As EventArgs)
         OpenTaskmanagement()
@@ -569,7 +573,7 @@ Public Class frmMain
 
                 If Sett_ConstructorStart <> 0 Then
                     Cursor = Cursors.WaitCursor
-                    OpenFormConstructor(Sett_ConstructorStart)
+                    OpenFormConstructor(Sett_ConstructorStart, False, 99)
                     Cursor = Cursors.Default
                 End If
 

app/DD-Record-Organizer/frmNodeNavigation.Designer.vb

@@ -31,9 +31,9 @@ Partial Class frmNodeNavigation
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
-        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
         Me.TreeListDevexpress = New DevExpress.XtraTreeList.TreeList()
+        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
+        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -41,10 +41,10 @@ Partial Class frmNodeNavigation
         CType(Me.SplitContainerMain.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerMain.Panel2.SuspendLayout()
         Me.SplitContainerMain.SuspendLayout()
+        CType(Me.TreeListDevexpress, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer1.SuspendLayout()
-        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TreeListDevexpress, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'RibbonControl1
@@ -106,20 +106,6 @@ Partial Class frmNodeNavigation
         Me.SplitContainerMain.SplitterPosition = 451
         Me.SplitContainerMain.TabIndex = 2
         '
-        'SplitContainer1
-        '
-        Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainer1.Location = New System.Drawing.Point(0, 0)
-        Me.SplitContainer1.Name = "SplitContainer1"
-        Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal
-        Me.SplitContainer1.Size = New System.Drawing.Size(633, 674)
-        Me.SplitContainer1.SplitterDistance = 362
-        Me.SplitContainer1.TabIndex = 0
-        '
-        'ImageCollection1
-        '
-        Me.ImageCollection1.ImageStream = CType(resources.GetObject("ImageCollection1.ImageStream"), DevExpress.Utils.ImageCollectionStreamer)
-        '
         'TreeListDevexpress
         '
         Me.TreeListDevexpress.AllowDrop = True
@@ -129,6 +115,8 @@ Partial Class frmNodeNavigation
         Me.TreeListDevexpress.Dock = System.Windows.Forms.DockStyle.Fill
         Me.TreeListDevexpress.Location = New System.Drawing.Point(0, 0)
         Me.TreeListDevexpress.Name = "TreeListDevexpress"
+        Me.TreeListDevexpress.OptionsBehavior.Editable = False
+        Me.TreeListDevexpress.OptionsBehavior.ReadOnly = True
         Me.TreeListDevexpress.OptionsFilter.ExpandNodesOnFiltering = True
         Me.TreeListDevexpress.OptionsFilter.FilterMode = DevExpress.XtraTreeList.FilterMode.ParentBranch
         Me.TreeListDevexpress.OptionsFind.AlwaysVisible = True
@@ -142,6 +130,20 @@ Partial Class frmNodeNavigation
         Me.TreeListDevexpress.StateImageList = Me.ImageCollection1
         Me.TreeListDevexpress.TabIndex = 1
         '
+        'ImageCollection1
+        '
+        Me.ImageCollection1.ImageStream = CType(resources.GetObject("ImageCollection1.ImageStream"), DevExpress.Utils.ImageCollectionStreamer)
+        '
+        'SplitContainer1
+        '
+        Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainer1.Location = New System.Drawing.Point(0, 0)
+        Me.SplitContainer1.Name = "SplitContainer1"
+        Me.SplitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal
+        Me.SplitContainer1.Size = New System.Drawing.Size(633, 674)
+        Me.SplitContainer1.SplitterDistance = 362
+        Me.SplitContainer1.TabIndex = 0
+        '
         'frmNodeNavigation
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -150,6 +152,7 @@ Partial Class frmNodeNavigation
         Me.Controls.Add(Me.SplitContainerMain)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
+        Me.IconOptions.SvgImage = CType(resources.GetObject("frmNodeNavigation.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.Name = "frmNodeNavigation"
         Me.Ribbon = Me.RibbonControl1
         Me.StatusBar = Me.RibbonStatusBar1
@@ -161,10 +164,10 @@ Partial Class frmNodeNavigation
         Me.SplitContainerMain.Panel2.ResumeLayout(False)
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainerMain.ResumeLayout(False)
+        CType(Me.TreeListDevexpress, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainer1.ResumeLayout(False)
-        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TreeListDevexpress, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 

app/DD-Record-Organizer/frmNodeNavigation.resx

@@ -126,6 +126,30 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu
         NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEFAQAAAChE
         ZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0cmVhbWVyAAAAAAIAAAAL
+</value>
+  </data>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="frmNodeNavigation.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
+        QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
+        MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iSW5zZXJ0VHJl
+        ZVZpZXciPg0KICAgIDxwYXRoIGQ9Ik0xMyw4SDVDNC40LDgsNCw3LjYsNCw3VjNjMC0wLjUsMC40LTEs
+        MS0xaDhjMC42LDAsMSwwLjUsMSwxdjRDMTQsNy42LDEzLjYsOCwxMyw4eiBNMjYsMTd2LTQgICBjMC0w
+        LjYtMC41LTEtMS0xaC04Yy0wLjUsMC0xLDAuNC0xLDF2NGMwLDAuNSwwLjUsMSwxLDFoOEMyNS41LDE4
+        LDI2LDE3LjUsMjYsMTd6IE0yNiwyN3YtNGMwLTAuNS0wLjUtMS0xLTFoLThjLTAuNSwwLTEsMC41LTEs
+        MSAgIHY0YzAsMC41LDAuNSwxLDEsMWg4QzI1LjUsMjgsMjYsMjcuNSwyNiwyN3oiIGNsYXNzPSJZZWxs
+        b3ciIC8+DQogICAgPHBvbHlnb24gcG9pbnRzPSIxNCwxNiAxNCwxNCAxMCwxNCAxMCwxMCA4LDEwIDgs
+        MjYgMTQsMjYgMTQsMjQgMTAsMjQgMTAsMTYgICIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2
+        Zz4L
 </value>
   </data>
 </root>

app/DD-Record-Organizer/frmNodeNavigation.vb

@@ -7,17 +7,37 @@ Imports System.Threading
 
 Public Class frmNodeNavigation
     Dim DTNODES As DataTable
+    Dim DT_ADDING_USERS As DataTable
+    Dim DT_VWPMO_CONSTRUCTOR_FORMS As DataTable
     Private RunningTask As Task
     Private RunningTaskTokenSource As New CancellationTokenSource
     Private RunningTaskToken = RunningTaskTokenSource.Token
+    Private oEntityID As Int16
+    Private oConstructID As Int16
+    Private CONSTRUCTOR_DETAIL_ID As Int16
+
+    Public Sub New(pEntityID As Int16, oConstructID As Int16)
+
+        ' Dieser Aufruf ist für den Designer erforderlich.
+        InitializeComponent()
+        oEntityID = pEntityID
+        oConstructID = oConstructID
+        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
+    End Sub
+
     Private Sub frmNodeNavigation_Load(sender As Object, e As EventArgs) Handles Me.Load
 
+        Dim Sql = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " &
+            "FROM VWPMO_CONSTRUCTOR_FORMS WHERE SCREEN_ID = {2} AND  CONSTRUCT_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CURRENT_SCREEN_ID, oConstructID)
+
+        DT_VWPMO_CONSTRUCTOR_FORMS = ClassDatabase.Return_Datatable(Sql, True)
         Load_nodes()
     End Sub
     Async Function Load_nodes() As Threading.Tasks.Task
         Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
         Try
-
+            Load_Datafor_Entity()
             Dim oToken = RunningTaskTokenSource.Token
             Dim Sql = String.Format("select T.GUID,T.RECORD_ID, T.NODE_CONFIG_ID,T.NODE_CAPTION,T.ID1, T.BACK_COLOR,T.PARENT_GUID from VWPMO_STRUCTURE_NODES T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID WHERE T1.CONSTRUCT_ID = {0}", 1)
             DTNODES = ClassDatabase.Return_Datatable(Sql, True)
@@ -67,14 +87,6 @@ Public Class frmNodeNavigation
 
 
     End Function
-
-    Private Sub TreeListDevexpress_GetStateImage(sender As Object, e As DevExpress.XtraTreeList.GetStateImageEventArgs)
-        Dim Column_Config_ID As DevExpress.XtraTreeList.Columns.TreeListColumn = TreeListDevexpress.Columns("NODE_CONFIG_ID")
-        Dim configid = e.Node.GetDisplayText(Column_Config_ID)
-
-        e.Node.StateImageIndex = ImageCollection1.Images.Keys.IndexOf(configid)
-
-    End Sub
     Private Sub TreeListDevexpress_ColumnFilterChanged(sender As Object, e As EventArgs)
         Dim tree As TreeList = TryCast(sender, TreeList)
         Dim filteredColumns As List(Of TreeListColumn) = tree.Columns.Cast(Of TreeListColumn)().Where(Function(c) c.FilterInfo.AutoFilterRowValue IsNot Nothing).ToList()
@@ -124,7 +136,103 @@ Public Class frmNodeNavigation
         For Each treeListNode As DevExpress.XtraTreeList.Nodes.TreeListNode In TreeListDevexpress.Selection
             Dim oID = treeListNode.Id
             Dim PID = treeListNode.ParentNode
+            Dim Column_RecID As DevExpress.XtraTreeList.Columns.TreeListColumn = TreeListDevexpress.Columns("RECORD_ID")
+            Dim RecID = e.Node.GetDisplayText(Column_RecID)
             Console.WriteLine(oID)
         Next
     End Sub
+
+    Private Sub TreeListDevexpress_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeListDevexpress.GetStateImage
+        Dim Column_Config_ID As DevExpress.XtraTreeList.Columns.TreeListColumn = TreeListDevexpress.Columns("NODE_CONFIG_ID")
+        Dim configid = e.Node.GetDisplayText(Column_Config_ID)
+
+        e.Node.StateImageIndex = ImageCollection1.Images.Keys.IndexOf(configid)
+    End Sub
+    Sub Load_Adding_users()
+        Try
+            Dim oSql = String.Format("SELECT * FROM TBPMO_ENTITY_USERRIGHT_ADDING where ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", oConstructID)
+            DT_ADDING_USERS = ClassDatabase.Return_Datatable(oSql, False)
+        Catch ex As Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Load_Adding_users")
+        End Try
+    End Sub
+    Private Sub Load_Configurable_Nodes()
+        Try
+            Dim oSql = String.Format("SELECT * FROM TBPMO_STRUCTURE_NODES_CONFIGURATION where TYPE_NODE = 1000 AND ENTITY_ID IN (SELECT FORM_ID FROM VWPMO_CONSTRUCTOR_FORMS WHERE CONSTRUCT_ID = {0})", oConstructID)
+            NODE_CONFIGURABLE_NODES_DT = ClassDatabase.Return_Datatable(oSql, False)
+        Catch ex As Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Load_Configurable_Nodes")
+        End Try
+    End Sub
+    Sub Load_Datafor_Entity()
+
+        Try
+
+            If oEntityID <> CURRENT_ENTITY_ID Then
+                LOGGER.Info("Entity-Data needs to be reloaded...")
+
+                CURRENT_ENTITY_ID = oEntityID
+                CURRENT_CONSTRUCTOR_ID = oConstructID
+                Load_Adding_users()
+                Load_Configurable_Nodes()
+
+            End If
+
+
+            Dim sw As New SW("Load_Datafor_Entity")
+
+
+            'If NODE_NAVIGATION = True Then
+            '    ENTITY_ID = ClassNodeNavigation.Return_ENTITY_FOR_TAG(SelectedNode.Tag)
+            '    CURRENT_ENTITY_ID = ENTITY_ID
+            'End If
+
+            Dim result = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable()
+                          Select form
+                          Where form.Item("FORM_ID") = oEntityID).Single()
+            CONSTRUCTOR_DETAIL_ID = result.Item("GUID")
+            ' CONSTRUCT_EXPAND = result.Item("EXPAND")
+            Dim FORM_DATE_FORMAT = result.Item("DATE_FORMAT")
+            If FORM_DATE_FORMAT <> USER_DATE_FORMAT Then
+                CURRENT_DATE_FORMAT = USER_DATE_FORMAT
+            Else
+                CURRENT_DATE_FORMAT = FORM_DATE_FORMAT
+            End If
+            'LOCK_CONTROLS_BG_LOAD = result.Item("LOCK_CONTROLS_BG_LOAD")
+
+
+            FAU_AD_DOMAIN = ""
+            FAU_AD_SERVER = ""
+            FAU_AD_USER = ""
+            FAU_AD_USER_PW = ""
+
+            If DT_ADDING_USERS.Rows.Count > 0 Then
+                'Überprüfen ob für diese Entität ein spezifischer windream-User verwendet wird, wenn Dateien abgelegt werden?
+                Dim query1 = From _user In DT_ADDING_USERS.AsEnumerable()
+                             Select _user Where _user.Item("ENTITY_ID") = oEntityID
+                Dim Rows1 = query1.ToList()
+                For Each _row In Rows1
+                    FAU_AD_DOMAIN = _row.Item("AD_DOMAIN").ToString()
+                    FAU_AD_SERVER = _row.Item("AD_SERVER").ToString()
+                    FAU_AD_USER = _row.Item("AD_USER").ToString()
+                    Dim wrapper As New ClassEncryption("!35452didalog=")
+                    Dim PWplainText As String
+                    ' DecryptData throws if the wrong password is used.
+                    Try
+                        PWplainText = wrapper.DecryptData(_row.Item("AD_USER_PW").ToString())
+                    Catch ex As Exception
+                        LOGGER.Warn("- the Password for FileAddingUser '" & FAU_AD_USER & "' could not be decrypted")
+                        PWplainText = ""
+                    End Try
+                    FAU_AD_USER_PW = PWplainText
+                Next
+            End If
+            sw.Done()
+            ' Load_Entity_Data_CONTROLS_RECORDS()
+
+        Catch ex As Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Load_Datafor_Entity: " & ex.StackTrace)
+        End Try
+
+    End Sub
 End Class

app/DD-Record-Organizer/frmSplash.vb

@@ -72,7 +72,7 @@ Public NotInheritable Class frmSplash
         Try
             Dim Init = New ClassInit()
             bw.ReportProgress(CalcProgress(1), "Initializing basic Settings (Logger, Settings)")
-            Init.InitLogger()
+            Init.InitLoggerANDConfig()
             System.Threading.Thread.Sleep(500)
 
             bw.ReportProgress(CalcProgress(2), "Initializing Database")

app/DD-Record-Organizer/frmWM_IndexFile.vb

@@ -88,7 +88,7 @@ Public Class frmWM_IndexFile
             'Stream File to windream
             '#################################################################
             sw = New SW("File Stream")
-            Dim streamresult = _wm.NewFileStream(ImportFilePath, CURRENT_NEWFILENAME) 'clsWM_SET.Stream_File(ImportFilePath, CURRENT_NEWFILENAME, False)
+            Dim streamresult = _wm.NewFileStream(ImportFilePath, CURRENT_NEWFILENAME, OBJECT_TYPETextBox.Text)
             sw.Done()
             '#################################################################
             If streamresult = True Then

app/DD-Record-Organizer/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net452" />
+  <package id="NLog" version="5.0.5" targetFramework="net48" />
 </packages>