clean up

app/DD-Record-Organizer/Classes/Commands/ClassFormCommands.vb

@@ -1,5 +1,25 @@
 Public Class ClassFormCommands
 
+    Public Shared Function LoadConstructorForms(pScreenId As Integer, pConstructorId As Integer, pLanguage As String)
+        Try
+            Dim Sql = $"SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION](
+                '{pLanguage}',
+                'FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), 
+                {pScreenId}) AS 'CAPTION' 
+            FROM VWPMO_CONSTRUCTOR_FORMS
+            WHERE 
+                SCREEN_ID = {pScreenId} AND 
+                CONSTRUCT_ID = {pConstructorId} 
+            ORDER BY SEQUENCE"
+
+            Dim oTable = MYDB_ECM.GetDatatable(Sql)
+
+            Return oTable
+        Catch ex As Exception
+            Return Nothing
+        End Try
+    End Function
+
     Public Shared Function LoadForm(guid) As DataTable
         Try
             Dim SQL As String = "SELECT NAME, LEVEL FROM TBPMO_FORM WHERE GUID = " & guid

app/DD-Record-Organizer/Classes/Commands/ClassNodeCommands.vb

@@ -2,7 +2,7 @@
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 
-Public Class ClassNodeLoader
+Public Class ClassNodeCommands
     Inherits BaseClass
 
     Private ReadOnly Database As MSSQLServer

app/DD-Record-Organizer/OrgFlow.vbproj

@@ -272,6 +272,7 @@
   <ItemGroup>
     <Compile Include="Classes\ClassConfig.vb" />
     <Compile Include="Classes\ClassTreeListViewState.vb" />
+    <Compile Include="Classes\Commands\ClassNodeCommands.vb" />
     <Compile Include="Classes\NodeNavigation\ClassAsyncNodeBuild.vb" />
     <Compile Include="Classes\ClassAsyncReturnDT.vb" />
     <Compile Include="Classes\ClassBackgroundHelper.vb" />
@@ -295,7 +296,7 @@
     <Compile Include="Classes\ClassNodeNavigation.vb" />
     <Compile Include="Classes\ClassPosGrid.vb" />
     <Compile Include="Classes\ClassProxy.vb" />
-    <Compile Include="Classes\ClassRecordCommands.vb" />
+    <Compile Include="Classes\Commands\ClassRecordCommands.vb" />
     <Compile Include="Classes\ClassRecordState.vb" />
     <Compile Include="Classes\ClassRecordView.vb" />
     <Compile Include="Classes\ClassRightManagement.vb" />
@@ -307,7 +308,6 @@
     <Compile Include="Classes\ClassWindreamDocGrid.vb" />
     <Compile Include="Classes\ClassWorkflow.vb" />
     <Compile Include="Classes\NodeNavigation\ClassNodeCreator.vb" />
-    <Compile Include="Classes\NodeNavigation\ClassNodeLoader.vb" />
     <Compile Include="DD_DMSDataSet.Designer.vb">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -533,9 +533,9 @@
     <Compile Include="Classes\ClassDragDrop.vb" />
     <Compile Include="Classes\ClassEmail.vb" />
     <Compile Include="Classes\ClassEncryption.vb" />
-    <Compile Include="Classes\ClassFormCommands.vb" />
+    <Compile Include="Classes\Commands\ClassFormCommands.vb" />
-    <Compile Include="Classes\ClassFunctionCommands.vb" />
+    <Compile Include="Classes\Commands\ClassFunctionCommands.vb" />
-    <Compile Include="Classes\ClassFunctionCommandsUI.vb" />
+    <Compile Include="Classes\Commands\ClassFunctionCommandsUI.vb" />
     <Compile Include="Classes\ClassHelper.vb" />
     <Compile Include="Classes\ClassImport_Windream.vb" />
     <Compile Include="Classes\ClassInit.vb" />

app/DD-Record-Organizer/frmNodeNavigation.resx

@@ -469,9 +469,6 @@
   <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

app/DD-Record-Organizer/frmNodeNavigation.vb

@@ -11,12 +11,10 @@ Imports DevExpress.XtraPrinting
 Imports System.Threading
 Imports System.Text
 Imports System.IO
-Imports System.Runtime.InteropServices
 Imports DD_LIB_Standards
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database
-Imports System.Configuration
 
 Public Class frmNodeNavigation
 #Region "Laufzeitvariablen & Konstanten"
@@ -77,7 +75,7 @@ Public Class frmNodeNavigation
     Public CtrlBuilder As ClassControlBuilder
     Public CtrlCommandUI As ClassControlCommandsUI
 
-    Private ClassNodeLoader As ClassNodeLoader
+    Private ClassNodeCommands As ClassNodeCommands
 
     Private Debug As Boolean = False
 
@@ -100,7 +98,7 @@ Public Class frmNodeNavigation
         DocList = New ClassWindreamDocGrid(GridViewDoc_Search)
         WindowsEx = New WindowsEx(LOGCONFIG)
 
-        ClassNodeLoader = New ClassNodeLoader(LOGCONFIG, MYDB_ECM)
+        ClassNodeCommands = New ClassNodeCommands(LOGCONFIG, MYDB_ECM)
     End Sub
 
     Private Function Get_Splitter_Layout_Filename()
@@ -155,16 +153,18 @@ Public Class frmNodeNavigation
     End Sub
     Private Async Function frmNodeNavigation_Load(sender As Object, e As EventArgs) As Task Handles Me.Load
         CONSTRUCTORID = CURRENT_CONSTRUCTOR_ID
-        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 = MYDB_ECM.GetDatatable(Sql)
+        DT_VWPMO_CONSTRUCTOR_FORMS = ClassFormCommands.LoadConstructorForms(CURRENT_SCREEN_ID, oConstructID, USER_LANGUAGE)
+
+        '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 = MYDB_ECM.GetDatatable(Sql)
+
         CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = MYDB_ECM.GetDatatable(String.Format("SELECT T.* FROM TBPMO_ENTITY_RIGHT_CONTROLS T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID where T1.CONSTRUCT_ID = {0}", CONSTRUCTORID))
 
         Dim oGDPictureLicenseKey = MYDB_ECM.GetScalarValue(Queries.DD_ECM.ThirdPartyModules.GdPictureLicense)
         DocumentViewer.Init(LOGCONFIG, oGDPictureLicenseKey)
 
-
         ' Hintergrund Bild initialisieren
         'If (System.IO.File.Exists(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png")) Then
         '    WM_LOGO = New Bitmap(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png")
@@ -204,7 +204,7 @@ Public Class frmNodeNavigation
     Private Async Function Load_nodes() As Task
         Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
         Try
-            Dim oTable = Await ClassNodeLoader.LoadNodes(CURRENT_ENTITY_ID)
+            Dim oTable = Await ClassNodeCommands.LoadNodes(CURRENT_ENTITY_ID)
             DT_STRUCTURE_NODES = oTable
             'Dim oToken = RunningTaskTokenSource.Token
             'Dim oStructureNodeSql = $"SELECT 
@@ -602,17 +602,17 @@ Public Class frmNodeNavigation
                 ' tsButtonDelete.Enabled = True
             End If
 
-            Dim resultDT_VWPMO_CONSTRUCTOR_FORMS = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable()
+            Dim oRow = (From form In DT_VWPMO_CONSTRUCTOR_FORMS.AsEnumerable()
-                                                    Select form
+                        Select form
-                                                    Where form.Item("FORM_ID") = _EntityId).Single()
+                        Where form.Item("FORM_ID") = _EntityId).Single()
 
 
-            CURRENT_CONSTRUCTOR_DETAIL_ID = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("GUID")
+            CURRENT_CONSTRUCTOR_DETAIL_ID = oRow.Item("GUID")
-            CONTROL_DOCTYPE_MATCH = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("CONTROL_DOCTYPE_MATCH")
+            CONTROL_DOCTYPE_MATCH = oRow.Item("CONTROL_DOCTYPE_MATCH")
-            SQL_RECORD_AND_FILE_READ_ONLY = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("SQL_RIGHT_READ_AND_VIEW_ONLY")
+            SQL_RECORD_AND_FILE_READ_ONLY = oRow.Item("SQL_RIGHT_READ_AND_VIEW_ONLY")
-            SQL_DOC_READ_ONLY = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("SQL_RIGHT_WINDREAM_VIEW")
+            SQL_DOC_READ_ONLY = oRow.Item("SQL_RIGHT_WINDREAM_VIEW")
             Try
-                ADD_RECORDS_CONSTR = resultDT_VWPMO_CONSTRUCTOR_FORMS.Item("ADD_RECORDS")
+                ADD_RECORDS_CONSTR = oRow.Item("ADD_RECORDS")
             Catch ex As Exception
                 ADD_RECORDS_CONSTR = True
             End Try