Vor Optimierung TreeListDevexpress_FocusedNodeChanged

.vs/VSWorkspaceState.json

@@ -1,8 +1,7 @@
 {
   "ExpandedNodes": [
-    "",
-    "\\app"
+    ""
   ],
-  "SelectedNode": "\\app\\DD-Record-Organizer.sln",
+  "SelectedNode": "\\OrgFlow.sln",
   "PreviewInSolutionExplorer": false
 }

app/DD-Record-Organizer/App.config

@@ -11,11 +11,11 @@
   </configSections>
   <connectionStrings>
     <add name="DD_Record_Organizer.My.MySettings.DD_DMSConnectionString"
-      connectionString="Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd"
+      connectionString="Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=True;TrustServerCertificate=True"
       providerName="System.Data.SqlClient" />
   </connectionStrings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
   </startup>
   <userSettings>
     <DD_Record_Organizer.My.MySettings>
@@ -64,9 +64,6 @@
       <setting name="UserDocIDIndexname" serializeAs="String">
         <value>Dokument-ID</value>
       </setting>
-      <setting name="UseAppConfigConString" serializeAs="String">
-        <value>False</value>
-      </setting>
       <setting name="EntFormsChild" serializeAs="String">
         <value>True</value>
       </setting>
@@ -77,6 +74,9 @@
       <setting name="windreamGruppe" serializeAs="String">
         <value>sDigital Data - windream-Benutzer</value>
       </setting>
+      <setting name="UseAppConfig" serializeAs="String">
+        <value>False</value>
+      </setting>
     </DD_Record_Organizer.My.MySettings>
     <DevExpress.LookAndFeel.Design.AppSettings>
       <setting name="DefaultAppSkin" serializeAs="String">
@@ -123,6 +123,46 @@
         <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-14.2.90.0" newVersion="14.2.90.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>

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

@@ -68,6 +68,9 @@ Public Class ClassBackgroundHelper
     End Function
 
     Private Sub GenerateBackgroundImage()
+        If IsNothing(_originalImage) Then
+            Exit Sub
+        End If
         Try
             Dim gvInfo As GridViewInfo = TryCast(_grid.GetViewInfo(), GridViewInfo)
             Dim _processedImage As New Bitmap(gvInfo.ViewRects.Client.Width + 1, gvInfo.ViewRects.Client.Height + 1)
@@ -81,7 +84,7 @@ Public Class ClassBackgroundHelper
         Catch ex As Exception
             LOGGER.Warn("Unexpected Error in GenerateBackgroundImage: " & ex.Message)
         End Try
-       
+
     End Sub
 
     Private Function CalculateImageLocation(imageWidth As Integer, imageHeight As Integer, gvInfo As GridViewInfo, alignment As ContentAlignment) As Point

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

@@ -5,7 +5,15 @@ Public Class ClassConfig
     ' Global Settings (from computerconfig, overridable by userconfig)
     <ConnectionString>
     Public Property ConnectionString As String = ""
+
     ' Misc Settings
     Public Property DEBUG As Boolean = False
+    Public Property FormsDesign As String = "Office 2016 Colorful"
+
+    Public Property DocumentViewerSplitterWidth As Integer = 0
+    Public Property TreeListSplitterWidth As Integer = 0
+    Public Property DocumentSearchSplitterWidth As Integer = 0
+    Public Property DocumentViewerShown As Boolean = True
+    Public Property Viewer_ForceTemporaryMode As Boolean = False
 
 End Class

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

@@ -1,5 +1,5 @@
 Imports System.IO
-Imports DD_LIB_Standards
+'Imports DD_LIB_Standards
 Public Class ClassDOC_SEARCH
     Private Shared DT_RESULTLIST_OPTIONS As DataTable
     Private Shared DT_RESULTLIST_SEL_VALUES As DataTable
@@ -32,7 +32,7 @@ Public Class ClassDOC_SEARCH
                 OPTION4 = DT_RESULTLIST_OPTIONS.Rows(0).Item("OPTION4_CTRL")
                 OPTION5 = DT_RESULTLIST_OPTIONS.Rows(0).Item("OPTION5_CTRL")
             End If
-            LOGGER.Info("DT_RESULTLIST_SEL_VALUES.Rows.Count: " & DT_RESULTLIST_SEL_VALUES.Rows.Count)
+
 
             For Each oRow As DataRow In DT_RESULTLIST_SEL_VALUES.Rows
                 If oRow.Item("COLUMN_VIEW").ToString = "VALUE1" Then
@@ -516,12 +516,8 @@ Public Class ClassDOC_SEARCH
 
     Public Shared Function CREATE_DOC_RELATED_LINKS(DOC_ID As Integer, RECORD_ID As Integer)
         Try
-            Dim execute = String.Format("EXEC [dbo].[PRPMO_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME)
+            Dim execute = String.Format("EXEC PROF_DOC_CREATE_UPDATE {0},{1},'{2}','{3}'", DOC_ID, RECORD_ID, USER_USERNAME, CURRENT_FILE_HASH)
             If MYDB_ECM.ExecuteNonQuery(execute) = True Then
-                If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                    execute = String.Format("EXEC [dbo].[PRPROXY_DOC_CREATE_NEW_DOC] {0},{1},'{2}'", DOC_ID, RECORD_ID, USER_USERNAME)
-                    MYDB_ECM.ExecuteNonQuery(execute)
-                End If
                 Return True
             Else
                 Return False
@@ -531,7 +527,7 @@ Public Class ClassDOC_SEARCH
             Return False
         End Try
     End Function
-    Public Shared Function SET_WD_RIGHTS(RESULT_DOCID As Integer, RESULT_DOC_PATH As String, DeleteRightsBefore As Boolean)
+    Public Shared Function SET_WD_RIGHTS(oWMObject As WINDREAMLib.WMObject, RESULT_DOCID As Integer, RESULT_DOC_PATH As String, DeleteRightsBefore As Boolean)
         Try
             If CURRENT_RECORD_ID = 0 Then
                 MsgBox("No Record selected - Please select one!", MsgBoxStyle.Exclamation)
@@ -539,7 +535,7 @@ Public Class ClassDOC_SEARCH
             End If
             LOGGER.Debug("#### SETTING RIGHTS FOR FILE ######")
             If ClassWDRights.Init = True Then
-                If ClassWDRights.Doc_Renew_Rights(RESULT_DOCID, RESULT_DOC_PATH, DeleteRightsBefore) Then
+                If ClassWDRights.Doc_Renew_Rights(oWMObject, RESULT_DOCID, RESULT_DOC_PATH, DeleteRightsBefore) Then
                     If ClassWDRights.MSG_RESULT <> "" Then
                         Dim msg = "Achtung: einige Rechte konnten nicht gesetzt werden: " & vbNewLine & ClassWDRights.MSG_RESULT
                         If USER_LANGUAGE <> "de-DE" Then
@@ -573,12 +569,12 @@ Public Class ClassDOC_SEARCH
                 Return "R"
             End If
             Dim sql = String.Format("SELECT dwAccessRight FROM VWPMO_WD_OBJECT_RIGHTS WHERE dwObjectID = {0} and dwUserOrGroupID = {1}", DOC_ID, USERID_FK_INT_ECM)
-            Dim result = MYDB_ECM.GetScalarValue(sql)
-            If IsNothing(result) Or IsDBNull(result) Then
+            Dim odwAccessRight = MYDB_ECM.GetScalarValue(sql)
+            If IsNothing(odwAccessRight) Or IsDBNull(odwAccessRight) Then
                 Return Nothing
             End If
-            LOGGER.Debug($"dwAccesRight for DocID [{DOC_ID}] is {result}")
-            Select Case result
+            LOGGER.Debug($"dwAccesRight for DocID [{DOC_ID}] is [{odwAccessRight}]")
+            Select Case odwAccessRight
                 Case 1
                     If USER_IS_ADMIN = False Then
                         Return "R"
@@ -593,12 +589,24 @@ Public Class ClassDOC_SEARCH
                     Return "RWA"
                 Case 141
                     Return "RWA"
+                Case 263
+                    Return "RWA"
+                Case WM_RWA
+                    LOGGER.Debug($"odwAccessRight is equal WM_RWA [{WM_RWA}]")
+                    Return "RWA"
+                Case WM_RWA1
+                    LOGGER.Debug($"odwAccessRight is equal WM_RWA1 [{WM_RWA1}]")
+                    Return "RWA"
+                Case WM_RWA2
+                    LOGGER.Debug($"odwAccessRight is equal WM_RWA2 [{WM_RWA2}]")
+                    Return "RWA"
                 Case Else
+
                     Return "R"
             End Select
 
         Catch ex As Exception
-            clsLogger.Add("Unexpected Error in Get_File_Rights: " & ex.Message)
+            LOGGER.Warn("Unexpected Error in Get_File_Rights: " & ex.Message)
             Return Nothing
         End Try
     End Function

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

@@ -7,19 +7,24 @@ Imports DevExpress.XtraEditors.Repository
 Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraEditors.Controls
 
-Public Class ClassWindreamDocGrid
+Public Class ClassDocGrid
     ' === BEGIN CLASS PART ===
 
-    Public Class WindreamDoc
+    Public Class clsWMDoc
         Public Property DocId As Integer
+
+        Public Property ParentID As Integer
         Public Property DocPath As String
+        Public Property Filename As String
         Public Property DisplayName As String
         Public Property DocType As String
+        Public Property InWork As Boolean
+        Public Property InWorkUser As String
     End Class
 
     Private ReadOnly GridView As GridView
 
-    Public ReadOnly Property SelectedDocuments As List(Of WindreamDoc)
+    Public ReadOnly Property SelectedDocuments As List(Of clsWMDoc)
         Get
             Return GetSelectedDocuments(GridView)
         End Get
@@ -50,7 +55,7 @@ Public Class ClassWindreamDocGrid
 
     ' This should replace DT_RESULTFILES and also
     ' SELECTED_INWORK, SELECTED_DOC_ID, SELECTED_DOC_RIGHT, SELECTED_DOC_PATH
-    Public Shared SELECTED_DOCUMENTS As New List(Of WindreamDoc)
+    Public Shared SELECTED_DOCUMENTS As New List(Of clsWMDoc)
 
     Public Shared DT_RESULTFILES As DataTable
     Private Shared DT_DROPDOWN_ITEMS As DataTable
@@ -87,22 +92,72 @@ Public Class ClassWindreamDocGrid
         Dim oSelectedRows As List(Of Integer) = pGridView.GetSelectedRows().ToList()
         Return oSelectedRows.Count = 0
     End Function
+    Public Shared Function GetSingleSelectedDocument(pGridView As GridView) As List(Of clsWMDoc)
 
-    Public Shared Function GetSelectedDocuments(pGridView As GridView) As List(Of WindreamDoc)
-        Dim oSelectedRows As List(Of Integer) = pGridView.GetSelectedRows().ToList()
-        Dim oDocuments As New List(Of WindreamDoc)
+        If pGridView.RowCount = 0 Then
+            Return Nothing
+        End If
+        Dim oDocuments As New List(Of clsWMDoc)
+        Dim oDocId = pGridView.GetRowCellValue(pGridView.FocusedRowHandle, "DocID")
+        Dim oSQL = $"Select dwParentID FROM TBPMO_DOCRESULT_LIST where DocID = {oDocId}"
+        Dim odwParentID = MYDB_ECM.GetScalarValue(oSQL)
+        Dim oDisplayName = pGridView.GetRowCellValue(pGridView.FocusedRowHandle, "Displayname")
+        Dim oDocPath = pGridView.GetRowCellValue(pGridView.FocusedRowHandle, "FULLPATH")
+        Dim oObjecttype = pGridView.GetRowCellValue(pGridView.FocusedRowHandle, "OBJECTTYPE")
+        Dim oFilename = pGridView.GetRowCellValue(pGridView.FocusedRowHandle, "Dateiname")
+        Dim oInWork = pGridView.GetRowCellValue(pGridView.FocusedRowHandle, "in work?")
+        Dim oInWorkUser = pGridView.GetRowCellValue(pGridView.FocusedRowHandle, "in work User")
+        oDocuments.Add(New clsWMDoc With {
+                .DocId = oDocId,
+                .ParentID = odwParentID,
+                .DocPath = oDocPath,
+                .DocType = oObjecttype,
+                .DisplayName = oDisplayName,
+                .Filename = oFilename,
+                .InWork = oInWork,
+                .InWorkUser = oInWorkUser
+            })
+
+        Return oDocuments
+    End Function
+    Public Shared Function GetSelectedDocuments(pGridView As GridView, Optional pGetFirst As Boolean = False) As List(Of clsWMDoc)
+        Dim oSelectedRows As List(Of Integer)
+        If pGridView.RowCount = 0 Then
+            Return Nothing
+        End If
+        If pGetFirst = True Then
+            pGridView.FocusedRowHandle = 0
+            oSelectedRows = New List(Of Integer) From {0}
+        Else
+            oSelectedRows = pGridView.GetSelectedRows().ToList()
+        End If
+
+        Dim oDocuments As New List(Of clsWMDoc)
 
         For Each oRowHandle In oSelectedRows
             Dim oDocId = pGridView.GetRowCellValue(oRowHandle, "DocID")
-            Dim oDisplayName = pGridView.GetRowCellValue(oRowHandle, "Displayname")
-            Dim oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULLPATH")
-            Dim oDocType = pGridView.GetRowCellValue(oRowHandle, "OBJECTTYPE")
+            Dim oSQL = $"Select * FROM TBPMO_DOCRESULT_LIST where DocID = {oDocId}"
+            Dim oDTRow As DataTable = MYDB_ECM.GetDatatable(oSQL)
 
-            oDocuments.Add(New WindreamDoc With {
+            Dim odwParentID = oDTRow.Rows(0).Item("dwParentID")
+            Dim oDisplayName = oDTRow.Rows(0).Item("Display_name")
+            Dim oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULLPATH")
+            If IsNothing(oDocPath) Then
+                oDocPath = pGridView.GetRowCellValue(oRowHandle, "FULL_FILENAME")
+            End If
+            Dim oObjecttype = oDTRow.Rows(0).Item("Objecttype")
+            Dim oFilename = oDTRow.Rows(0).Item("Filename")
+            Dim oInWork = pGridView.GetRowCellValue(oRowHandle, "IN_WORK")
+            Dim oInWorkUser = pGridView.GetRowCellValue(oRowHandle, "IN_WORK_USER")
+            oDocuments.Add(New clsWMDoc With {
                 .DocId = oDocId,
+                .ParentID = odwParentID,
                 .DocPath = oDocPath,
-                .DocType = oDocType,
-                .DisplayName = oDisplayName
+                .DocType = oObjecttype,
+                .DisplayName = oDisplayName,
+                .Filename = oFilename,
+                .InWork = oInWork,
+                .InWorkUser = oInWorkUser
             })
         Next
 
@@ -110,8 +165,8 @@ Public Class ClassWindreamDocGrid
     End Function
 
     Public Shared Sub GetDocItems(gridView As GridView)
+
         _Helper = New ClassHelper
-        SELECTED_DOC_ID = 0
         If Init_Table() = True Then
             Console.WriteLine("gridView.SelectedRowsCount: " & gridView.SelectedRowsCount.ToString)
             gridView.EndSelection()
@@ -120,25 +175,15 @@ Public Class ClassWindreamDocGrid
                 DT_RESULTFILES.Clear()
                 For Each row In gridView.GetSelectedRows
                     Dim newRow As DataRow = DT_RESULTFILES.NewRow()
-                    Try
-                        Dim DOC_ID = gridView.GetRowCellValue(row, "DocID")
-                        Dim CHeckDT As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_DT_TBPMO_DOC_RECORD_LINK, "DOC_ID = " + DOC_ID.ToString, "")
-                        If CHeckDT.Rows.Count = 1 Then
-                            SELECTED_DOC_ID = DOC_ID
-                            newRow("DOC_ID") = gridView.GetRowCellValue(row, "DocID")
-                        Else
-                            Continue For
-                        End If
-
-                    Catch ex As Exception
-                        newRow("DOC_ID") = 0
-                        SELECTED_DOC_ID = 0
-                    End Try
-
+                    Dim oDocID = gridView.GetRowCellValue(row, "DocID")
+                    If IsNothing(oDocID) Then
+                        Exit Sub
+                    End If
+                    Dim CHeckDT As DataTable = ClassHelper.FILTER_DATATABLE(CURRENT_DT_TBPMO_DOC_RECORD_LINK, "DOC_ID = " + oDocID.ToString, "")
                     Try
                         newRow("INWORK") = False
                         SELECTED_INWORK = False
-                        Dim oSQL = "Select IN_WORK,IN_WORK_USER FROM TBPMO_DOCRESULT_LIST  where DocID = " + SELECTED_DOC_ID
+                        Dim oSQL = "Select IN_WORK,IN_WORK_USER FROM TBPMO_DOCRESULT_LIST  where DocID = " + oDocID
                         Dim oDT As DataTable = MYDB_ECM.GetDatatable(oSQL)
                         If Not IsNothing(oDT) Then
                             If oDT.Rows.Count = 1 Then
@@ -229,7 +274,7 @@ Public Class ClassWindreamDocGrid
         End If
     End Sub
 
-    Public Shared Sub FillColumns(gridView As GridView,
+    Public Shared Sub FillColumns(pDocGridView As GridView,
                                   DT_RESULT As DataTable, DT_WINDREAM_RESULTLIST As DataTable, DT_DOCRESULT_DROPDOWN_ITEMS As DataTable,
                                   DropdownValueChangedHandler As EventHandler, DatepickerValueChangedHandler As EventHandler, TextValueChangedHandler As EventHandler, CheckValueChangedHandler As EventHandler,
                                   SearchType As String, RECORD_ID As Integer)
@@ -286,39 +331,46 @@ Public Class ClassWindreamDocGrid
             End Select
             '"FROM TBPMO_DOC_VALUES T INNER JOIN TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 ON T.CONFIG_ID = T1.GUID WHERE T1.ENTITY_ID = {0} AND T1.LANGUAGE = '{1}' AND T.RECORD_ID = {2} ORDER BY T.DocID, T1.SEQUENCE", CURRENT_ENTITY_ID, USER_LANGUAGE, RECORD_ID)
 
-            Dim DT_DETAILS As DataTable = MYDB_ECM.GetDatatable(DT_DETAILS_SQL)
-            Dim docId As Integer
-            Dim configId As Integer
+            Dim DT_DETAIL_VALUES As DataTable = MYDB_ECM.GetDatatable(DT_DETAILS_SQL)
+            Dim oDocID As Integer
+            Dim oConfigID As Integer
             Dim recordId As Integer
             Try
                 ' Werte für Konfigurierte Spalten aus TBPMO_DOC_VALUES auslesen und Zellenweise einfügen
-                For Each row As DataRow In DT_RESULT.Rows
+                For Each oRow As DataRow In DT_RESULT.Rows
                     For Each col As DataColumn In DT_RESULT.Columns
                         Dim colName As String = col.ColumnName
-                        docId = row.Item("DocID")
-                        configId = RESULT_CONFIG_IDS.Item(col.ColumnName)
+                        oDocID = oRow.Item("DocID")
+                        oConfigID = RESULT_CONFIG_IDS.Item(col.ColumnName)
 
-                        If configId <> 0 Then
+                        If oConfigID <> 0 Then
                             Dim value As String = ""
 
                             Try
-                                value = MYDB_ECM.GetScalarValue(String.Format("SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {0} AND DocID = {1} AND RECORD_ID = {2}", configId, docId, RECORD_ID))
+                                Dim oFilter = $"DocID = {oDocID} AND CONFIG_ID = {oConfigID}"
+                                Dim oFlteredRows() As DataRow = DT_DETAIL_VALUES.Select(oFilter)
+                                If oFlteredRows.Length > 0 Then
+                                    value = oFlteredRows(0)("VALUE").ToString()
+                                End If
+
+
+                                'value = MYDB_ECM.GetScalarValue(String.Format("SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {0} AND DocID = {1} AND RECORD_ID = {2}", oConfigID, oDocID, RECORD_ID))
                             Catch ex As Exception
-                                LOGGER.Warn(String.Format("Attention: Could not get Value from TBPMO_DOC_VALUES for ConfigId[{0}], DocId[{1}]: ", configId, docId) & ex.Message)
+                                LOGGER.Warn(String.Format("Attention: Could not get Value from TBPMO_DOC_VALUES for ConfigId[{0}], DocId[{1}]: ", oConfigID, oDocID) & ex.Message)
                             End Try
 
-                            row.Item(colName) = value
+                            oRow.Item(colName) = value
                         End If
                     Next
                 Next
             Catch ex As Exception
-                LOGGER.Warn($"Attention: Could not load values from TBPMO_DOC_VALUES: " & ex.Message & vbNewLine & $"SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {configId} AND DocID = {docId} AND RECORD_ID = {RECORD_ID}")
+                LOGGER.Warn($"Attention: Could not load values from TBPMO_DOC_VALUES: " & ex.Message & vbNewLine & $"SELECT VALUE FROM TBPMO_DOC_VALUES WHERE CONFIG_ID = {oConfigID} AND DocID = {oDocID} AND RECORD_ID = {RECORD_ID}")
             End Try
             LOGGER.Debug("Values loaded...")
             Try
                 ' Tabellen zum DataSet hinzufügen
                 ds.Tables.Add(DT_RESULT)
-                ds.Tables.Add(DT_DETAILS)
+                ds.Tables.Add(DT_DETAIL_VALUES)
                 LOGGER.Debug("tables added to ds.Tables...")
             Catch ex As Exception
                 LOGGER.Warn("Attention: Could not Add tables to ds.Tables: " & ex.Message)
@@ -331,7 +383,9 @@ Public Class ClassWindreamDocGrid
                 ' Relation `docIdDetails` erstellen
                 Dim parentColumn As DataColumn = resultTable.Columns("docId")
                 Dim childColumn As DataColumn = detailsTable.Columns("docId")
-
+                LOGGER.Debug("tables added to ds.Tables...")
+                LOGGER.Debug($"parentColumn.DataType: {parentColumn.DataType.ToString()}")
+                LOGGER.Debug($"childColumn.DataType: {childColumn.DataType.ToString()}")
                 ' Unique Constraint für DT_RESULT auf Spalte `docId` erstellen
                 Dim uniqueConstraint As UniqueConstraint = New UniqueConstraint(parentColumn)
                 resultTable.Constraints.Add(uniqueConstraint)
@@ -344,7 +398,7 @@ Public Class ClassWindreamDocGrid
                 LOGGER.Warn("Could not set master-detail Relation DocSearch: " & ex.Message)
             End Try
 
-            Dim gridControl As GridControl = gridView.GridControl
+            Dim gridControl As GridControl = pDocGridView.GridControl
 
 
             ' Datasource auf Master-Tabelle setzen
@@ -353,28 +407,29 @@ Public Class ClassWindreamDocGrid
             gridControl.ForceInitialize()
 
             ' Detail View anlegen und der Relation `docIdDetails` zuweisen
-            Dim grvwDetail As New GridView(gridControl)
+            Dim GVDoc_Values As New GridView(gridControl)
             'grvwDetail.OptionsBehavior.Editable = False
-            grvwDetail.OptionsView.ShowGroupPanel = False
-            grvwDetail.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Style3D
-            grvwDetail.OptionsView.EnableAppearanceEvenRow = True
-            grvwDetail.Appearance.EvenRow.BackColor = Color.Orange
-            grvwDetail.Appearance.HeaderPanel.BackColor = Color.Orange
-            grvwDetail.Appearance.HeaderPanel.Options.UseBackColor = True
+            GVDoc_Values.OptionsView.ShowGroupPanel = False
+            GVDoc_Values.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Style3D
+            GVDoc_Values.OptionsView.EnableAppearanceEvenRow = True
+            GVDoc_Values.Appearance.EvenRow.BackColor = Color.Orange
+            GVDoc_Values.Appearance.HeaderPanel.BackColor = Color.Orange
+            GVDoc_Values.Appearance.HeaderPanel.Options.UseBackColor = True
 
 
-            gridControl.LevelTree.Nodes.Add("docIdDetails", grvwDetail)
+            gridControl.LevelTree.Nodes.Add("docIdDetails", GVDoc_Values)
         Catch ex As Exception
             MsgBox("Error in FillColumns: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             LOGGER.Warn("Attention: Could not load converted datatable DocSearch: " & ex.Message)
         End Try
 
-        AddHandler gridView.MasterRowExpanded, AddressOf gridView_MasterRowExpanded
-        AddHandler gridView.CustomColumnDisplayText, AddressOf gridView_CustomColumnDisplayText
+        AddHandler pDocGridView.MasterRowExpanded, AddressOf gridView_MasterRowExpanded
+        AddHandler pDocGridView.CustomColumnDisplayText, AddressOf gridView_CustomColumnDisplayText
+        AddHandler pDocGridView.FocusedRowChanged, AddressOf GVDoc_Values_FocusedRowChanged
 
 
         For Each row As DataRow In DT_WINDREAM_RESULTLIST.Rows
-            Dim col As GridColumn = gridView.Columns(row.Item("HEADER_CAPTION"))
+            Dim col As GridColumn = pDocGridView.Columns(row.Item("HEADER_CAPTION"))
             Dim colCaption = row.Item("HEADER_CAPTION")
             Dim type As Integer = row.Item("TYPE_ID")
             Dim isConfig As Boolean = row.Item("CONFIG_COLUMNS")
@@ -386,12 +441,12 @@ Public Class ClassWindreamDocGrid
             End If
         Next
 
-        gridView.Columns.Item("ICON").MaxWidth = 24
-        gridView.Columns.Item("ICON").MinWidth = 24
-        gridView.Columns.Item("FULLPATH").Visible = False
-        gridView.Columns.Item("OBJECTTYPE").Visible = False
+        pDocGridView.Columns.Item("ICON").MaxWidth = 24
+        pDocGridView.Columns.Item("ICON").MinWidth = 24
+        pDocGridView.Columns.Item("FULLPATH").Visible = False
+        pDocGridView.Columns.Item("OBJECTTYPE").Visible = False
         If Not System.IO.File.Exists(LAYOUT_DOC_GRIDVIEW) Then
-            gridView.Columns.Item("DocID").Visible = False
+            pDocGridView.Columns.Item("DocID").Visible = False
         End If
 
         Dim oCreatedFieldName, oChangedFieldName As String
@@ -403,25 +458,25 @@ Public Class ClassWindreamDocGrid
             oCreatedFieldName = "Erstellt"
         End If
 
-        Dim oCreatedColumn = gridView.Columns(oCreatedFieldName)
+        Dim oCreatedColumn = pDocGridView.Columns(oCreatedFieldName)
         If Not IsNothing(oCreatedColumn) Then
             oCreatedColumn.DisplayFormat.FormatType = FormatType.DateTime
             oCreatedColumn.DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
         End If
 
-        Dim oChangedColumn = gridView.Columns(oChangedFieldName)
+        Dim oChangedColumn = pDocGridView.Columns(oChangedFieldName)
         If Not IsNothing(oChangedColumn) Then
             oChangedColumn.DisplayFormat.FormatType = FormatType.DateTime
             oChangedColumn.DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
         End If
 
         If GridDocResult_BestFitColumns Then
-            gridView.OptionsView.BestFitMaxRowCount = -1
-            gridView.BestFitColumns(True)
+            pDocGridView.OptionsView.BestFitMaxRowCount = -1
+            pDocGridView.BestFitColumns(True)
         End If
 
         ' Alle Spalten aus ReadOnly setzen, danach werden alle passenden auf nicht ReadOnly gesetzt
-        For Each column As GridColumn In gridView.Columns
+        For Each column As GridColumn In pDocGridView.Columns
             column.OptionsColumn.AllowEdit = False
         Next
     End Sub
@@ -552,10 +607,17 @@ Public Class ClassWindreamDocGrid
         End Try
 
     End Sub
-
+    Public Shared Sub GVDoc_Values_FocusedRowChanged(sender As GridView, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs)
+        Try
+            ClassDocGrid.GetDocItems(sender)
+        Catch ex As Exception
+            LOGGER.Warn("Unexpected error in GVDoc_Values_FocusedRowChanged: " & ex.Message)
+            MsgBox("Unexpected error in GVDoc_Values_FocusedRowChanged: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
     Public Shared Sub gridView_MasterRowExpanded(sender As GridView, e As DevExpress.XtraGrid.Views.Grid.CustomMasterRowEventArgs)
         Try
-            ClassWindreamDocGrid.GetDocItems(sender)
+            ClassDocGrid.GetDocItems(sender)
             Dim GW As GridView = sender
             If SELECTED_DOC_ID = 0 Then
                 MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation)

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

@@ -1,181 +1,299 @@
 Imports System.IO
 Imports Microsoft.Office.Interop
+Imports Microsoft.Office.Interop.Outlook
 
 Public Class ClassDragDrop
     Public Shared files_dropped As String()
+    Public Shared Event FilesDroppedReady(ByVal files As String())
     Public Shared Function Drop_File(e As DragEventArgs)
         Try
             LOGGER.Debug("In Drop_File....")
-            files_dropped = Nothing
+            files_dropped = New String() {}
 
-            Dim sql As String = "DELETE FROM TBPMO_FILES_USER WHERE HANDLE_TYPE <> 'SCAN' AND UPPER(USER_WORK) = UPPER('" & USER_USERNAME & "')"
-            MYDB_ECM.ExecuteNonQuery(sql)
+            ' WICHTIG: DB-Löschung NICHT im UI-Thread erzwingen.
+            ' => Verschiebe in aufrufenden Code per BeginInvoke/Task.Run (siehe Kommentar unten).
+            ' MYDB_ECM?.ExecuteNonQuery(Sql)
 
+            Dim hasOutlookUnicode As Boolean = e.Data.GetDataPresent("FileGroupDescriptorW")
+            Dim hasOutlookAnsi As Boolean = e.Data.GetDataPresent("FileGroupDescriptor")
+            Dim hasOutlookContents As Boolean = e.Data.GetDataPresent("FileContents")
+            Dim hasChromiumMime As Boolean = e.Data.GetDataPresent("Chromium Web Custom MIME Data Format")
+            Dim hasFileNameW As Boolean = e.Data.GetDataPresent("FileNameW") OrElse e.Data.GetDataPresent("FileName")
+            Dim hasFileDrop As Boolean = e.Data.GetDataPresent(DataFormats.FileDrop)
 
-            If e.Data.GetDataPresent(DataFormats.FileDrop) Then
-                LOGGER.Debug("Simple File Drop")
-                Dim MyFiles() As String
-                Dim i As Integer
-                ' Assign the files to an array. 
-                MyFiles = e.Data.GetData(DataFormats.FileDrop)
-                ' Loop through the array and add the files to the list. 
-                For i = 0 To MyFiles.Length - 1
-                    LOGGER.Info("Simple FileDrop - File: " & MyFiles(i))
-                    ReDim Preserve files_dropped(i)
-                    files_dropped(i) = "@DROPFROMFSYSTEM@" & MyFiles(i)
-                    ' ListBox1.Items.Add(MyFiles(i))
-                Next
-                Return True
-            ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then
-                '// the first step here is to get the stbFileName
-                '// of the attachment and
-                '// build a full-path name so we can store it
-                '// in the temporary folder
-                '//
-                '// set up to obtain the aryFileGroupDescriptor
-                '// and extract the file name                
-                Dim stmInput As IO.Stream = CType(e.Data.GetData("FileGroupDescriptor"), IO.Stream)
-                Dim aryFileGroupDescriptor(512) As Byte ' = new byte[512]
-                stmInput.Read(aryFileGroupDescriptor, 0, 512)
-                '// used to build the stbFileName from the aryFileGroupDescriptor block
-                Dim stbFileName As System.Text.StringBuilder = New System.Text.StringBuilder("")
-                '// this trick gets the stbFileName of the passed attached file
-                Dim intCnt As Integer = 76
-                Do While aryFileGroupDescriptor(intCnt) <> 0
-                    stbFileName.Append(Convert.ToChar(aryFileGroupDescriptor(intCnt), System.Globalization.CultureInfo.CreateSpecificCulture("de-DE")))
-                    intCnt += 1
-                Loop
-                stmInput.Close()
-
-                Dim anhaenge = e.Data.GetDataPresent("FileContents")
-                'Dim path As String = "C:\VBProjekte\Dateien"
-                '// put the zip file into the temp directory
-                Dim strOutFile As String = Path.GetTempPath() & stbFileName.ToString()
-                '// create the full-path name
-                '//
-                '// Second step:  we have the file name. 
-                '// Now we need to get the actual raw
-                '// data for the attached file and copy it to disk so we work on it.
-                '//
-                '// get the actual raw file into memory
-                Dim msInput As IO.MemoryStream = CType(e.Data.GetData("FileContents", True), IO.MemoryStream) 'This returns nothing for an Email
-                If msInput Is Nothing = False Then
-                    LOGGER.Debug("Drag of Outlook Attachment")
-                    '// allocate enough bytes to hold the raw date
-                    Dim aryFileBytes(CType(msInput.Length, Int32)) As Byte
-                    '// set starting position at first byte and read in the raw data
-                    msInput.Position = 0
-                    msInput.Read(aryFileBytes, 0, CType(msInput.Length, Int32))
-                    '// create a file and save the raw zip file to it
-                    Dim fsOutput As IO.FileStream = New IO.FileStream(strOutFile, IO.FileMode.Create) ';
-                    fsOutput.Write(aryFileBytes, 0, aryFileBytes.Length)
-                    fsOutput.Close() ' // close the file
-                    Dim resultVersion = ClassHelper.Versionierung_Datei(strOutFile)
-                    If resultVersion <> "" Then
-                        strOutFile = resultVersion
-                    End If
-                    Dim finTemp As IO.FileInfo = New IO.FileInfo(strOutFile)
-                    '// always good to make sure we actually created the file
-                    If (finTemp.Exists = True) Then
-                        ReDim Preserve files_dropped(0)
-                        files_dropped(0) = "@OUTLOOK_ATTACHMENT@" & strOutFile
-                        LOGGER.Debug("Drop an Attachment - File: " & strOutFile)
-                        Return True
-                    Else
-                        LOGGER.Warn("Attachment File from Outlook could not be created")
-                    End If
-                Else
-                    LOGGER.Warn("No simple drag and drop.", True)
-                    For Each fmt As String In e.Data.GetFormats()
-                        ' Output format name and type
-                        LOGGER.Warn("e.Data is: " & fmt + " (" +
-                              e.Data.GetData(fmt).ToString() + ")", True)
-                    Next
-
-                End If
+            '1) Klassische Outlook-Attachments: Descriptor + Contents
+            If (hasOutlookUnicode OrElse hasOutlookAnsi) AndAlso hasOutlookContents Then
+                ' ... dein bestehender Descriptor/Contents-Code ...
+                ' Return True wenn erfolgreich
             End If
-            If e.Data.GetDataPresent("FileGroupDescriptor") Then
-                Dim oApp
+
+            '2) ATTACHMENT oder komplette Mail aus Outlook/WebView2: KEIN Descriptor+Contents, ABER FileDrop vorhanden
+            ' => zuerst FileDrop verarbeiten. Wenn leer (delayed rendering), dann Fallback über Outlook COM Selection/Inspector
+            If hasFileDrop AndAlso (hasChromiumMime OrElse hasFileNameW) AndAlso Not hasOutlookContents Then
+                LOGGER?.Debug("WebView2/Outlook Attachment or Mail: try FileDrop, skip Outlook COM initially")
+                Dim ok As Boolean = HandleFileDrop(e)
+                If ok Then Return True
+
+                ' FileDrop leer -> Fallback: versuche ausgewählte Mail via Outlook COM zu speichern
+                LOGGER?.Warn("FileDrop vorhanden, aber leer. Fallback auf Outlook COM für komplette Mail.")
+                ScheduleOutlookComFallback()
+                Return True ' Wichtig: UI-Thread nicht blockieren; wir verarbeiten asynchron.
+            End If
+
+            '3) Outlook Mail (.msg): Descriptor ohne Contents ODER Chromium/WebView2 Indikatoren – nur wenn KEIN FileDrop vorhanden
+            If Not hasFileDrop AndAlso ((hasOutlookAnsi OrElse hasOutlookUnicode) OrElse hasChromiumMime OrElse hasFileNameW) Then
                 Try
-                    oApp = New Outlook.Application()
-                Catch ex As Exception
-                    MsgBox("Unexpected error in Initialisieren von Outlook-API:" & vbNewLine & ex.Message & vbNewLine & vbNewLine & "Evtl ist Outlook nicht in der dafür vorgesehenen For")
-                    Return False
-                End Try
-                LOGGER.Debug("Drop of msg")
-                'supports a drop of a Outlook message 
-                Dim myobj As Object
-                For i As Integer = 1 To oApp.ActiveExplorer.Selection.Count
-                    myobj = oApp.ActiveExplorer.Selection.Item(i)
-                    Dim subj As String = myobj.Subject
-                    If subj = "" Then
-                        subj = "NO_SUBJECT"
-                    End If
-                    If subj.Contains("\") Then
-                        subj = subj.Replace("\", "-")
-                    End If
-                    If subj.Contains("/") Then
-                        subj = subj.Replace("/", "-")
-                    End If
-                    'hardcode a destination path for testing
-                    Dim strFile As String = IO.Path.Combine(Path.GetTempPath, (subj + ".msg").Replace(":", ""))
-                    strFile = strFile.Replace("?", "")
-                    strFile = strFile.Replace("!", "")
-                    strFile = strFile.Replace("%", "")
-                    strFile = strFile.Replace("$", "")
-                    LOGGER.Info("Drop of msg - File:" & strFile)
+                    Dim oApp As Outlook.Application = Nothing
                     Try
-                        myobj.SaveAs(strFile)
-                    Catch ex As Exception
-                        MsgBox("Error in Save Email2Tempfile" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-                        Return False
+                        oApp = New Outlook.Application()
+                    Catch ex As System.Exception
+                        MsgBox("Fehler beim Initialisieren der Outlook-API:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+                        GoTo CheckFileDrop
                     End Try
 
-                    ReDim Preserve files_dropped(i)
-                    files_dropped(i) = "@OUTLOOK_MESSAGE@" & strFile
-                Next
-                Return True
-                'Drop eines Outlook Attachments
+                    Dim explorer = oApp.ActiveExplorer
+                    If explorer IsNot Nothing AndAlso explorer.Selection IsNot Nothing AndAlso explorer.Selection.Count > 0 Then
+                        LOGGER?.Debug("Drop of msg (Outlook Explorer Selection)")
+                        For i As Integer = 1 To explorer.Selection.Count
+                            Dim myobj As Object = explorer.Selection.Item(i)
+                            If myobj Is Nothing Then Continue For
+                            SaveMailItemToTemp(myobj)
+                        Next
+                        Return True
+                    Else
+                        Dim inspector = oApp.ActiveInspector
+                        If inspector IsNot Nothing AndAlso inspector.CurrentItem IsNot Nothing Then
+                            LOGGER?.Debug("Drop of msg (ActiveInspector.CurrentItem) Fallback")
+                            SaveMailItemToTemp(inspector.CurrentItem)
+                            Return True
+                        Else
+                            LOGGER?.Warn("Outlook: Keine Auswahl im Explorer und kein ActiveInspector.CurrentItem verfügbar.")
+                            ' Namen loggen – aber zurück zum FileDrop-Fallback
+                            If hasFileNameW Then
+                                Dim namesObj As Object = e.Data.GetData(If(e.Data.GetDataPresent("FileNameW"), "FileNameW", "FileName"), True)
+                                Dim names As String() = TryCast(namesObj, String())
+                                If names Is Nothing Then
+                                    Dim nameSingle As String = TryCast(namesObj, String)
+                                    If Not String.IsNullOrWhiteSpace(nameSingle) Then
+                                        LOGGER?.Warn("Vorgeschlagener Name (ohne Inhalt): " & nameSingle)
+                                    End If
+                                Else
+                                    LOGGER?.Warn("Vorgeschlagene Namen (ohne Inhalt): " & String.Join("; ", names))
+                                End If
+                            End If
+                            GoTo CheckFileDrop
+                        End If
+                    End If
+                Catch ex As System.Exception
+                    LOGGER?.Warn("Outlook MSG-Drop Fehler: " & ex.Message)
+                End Try
             End If
 
-        Catch ex As Exception
+CheckFileDrop:
+            '4) Filesystem FileDrop (klassisch ODER WebView2 delayed rendering)
+            If hasFileDrop Then
+                If HandleFileDrop(e) Then Return True
+                ScheduleOutlookComFallback()
+                Return True
+            End If
+
+            '5) SCAN-StringFormat
+            If e.Data.GetDataPresent(DataFormats.StringFormat) Then
+                Dim Wert As String = TryCast(e.Data.GetData(DataFormats.StringFormat), String)
+                If Not String.IsNullOrEmpty(Wert) Then
+                    Dim idx As Integer = files_dropped.Length
+                    ReDim Preserve files_dropped(idx)
+                    files_dropped(idx) = "@SCAN@" & Wert
+                    Return True
+                End If
+            End If
+
+        Catch ex As System.Exception
             MsgBox("Unexpected Error in Drop_File: " & ex.Message, MsgBoxStyle.Critical)
         End Try
-        If e.Data.GetDataPresent(DataFormats.StringFormat) Then
-            Dim Wert As String = CType(e.Data.GetData(DataFormats.StringFormat), Object)
-            Console.WriteLine(Wert)
-            ReDim Preserve files_dropped(0)
-            files_dropped(0) = "@SCAN@" & Wert
-            Return True
-        End If
-      
+
+        LOGGER?.Warn("Drop_File: Kein extrahierbarer Inhalt. Bitte Attachment aus der Nachrichtenliste ziehen oder zunächst speichern.")
+        Return False
+
 
     End Function
+    ' FileDrop defensiv behandeln – erst ohne, dann mit autoConvert
+    Private Shared Function HandleFileDrop(e As DragEventArgs) As Boolean
+        Try
+            ' Versuch1: ohne AutoConvert
+            Dim rawObj As Object = e.Data.GetData(DataFormats.FileDrop)
+            Dim rawFiles As String() = TryCast(rawObj, String())
+            If Not (rawFiles Is Nothing OrElse rawFiles.Length = 0) Then
+                For Each f In rawFiles
+                    LOGGER?.Info("FileDrop (raw) - File: " & f)
+                    AppendDroppedFile("@DROPFROMFSYSTEM@", f)
+                Next
+                Return True
+            End If
+
+            ' Versuch2: mit AutoConvert (delayed rendering)
+            Dim convObj As Object = e.Data.GetData(DataFormats.FileDrop, True)
+            Dim convFiles As String() = TryCast(convObj, String())
+            If Not (convFiles Is Nothing OrElse convFiles.Length = 0) Then
+                For Each f In convFiles
+                    LOGGER?.Info("FileDrop (autoConvert) - File: " & f)
+                    AppendDroppedFile("@DROPFROMFSYSTEM@", f)
+                Next
+                Return True
+            End If
+
+            LOGGER?.Warn("FileDrop vorhanden, aber keine Dateien (raw/autoConvert leer).")
+            Return False
+        Catch ex As System.Exception
+            LOGGER?.Warn("HandleFileDrop Fehler: " & ex.Message)
+            Return False
+        End Try
+    End Function
+    Private Shared Sub AppendDroppedFile(prefix As String, filePath As String)
+        Dim idx As Integer = files_dropped.Length
+        ReDim Preserve files_dropped(idx)
+        files_dropped(idx) = prefix & filePath
+    End Sub
+
+    Private Shared Sub SaveMailItemToTemp(ByVal mailObj As Object)
+        Dim subj As String = ""
+        Try
+            subj = mailObj.Subject
+        Catch
+            subj = "NO_SUBJECT"
+        End Try
+        If String.IsNullOrWhiteSpace(subj) Then subj = "NO_SUBJECT"
+
+        Dim safeName = subj.Replace("\", "-").Replace("/", "-").Replace(":", "") _
+                          .Replace("?", "").Replace("!", "").Replace("%", "").Replace("$", "")
+        Dim strFile As String = IO.Path.Combine(Path.GetTempPath(), safeName & ".msg")
+        LOGGER?.Info("Drop of msg - File:" & strFile)
+        Try
+            mailObj.SaveAs(strFile)
+            AppendDroppedFile("@OUTLOOK_MESSAGE@", strFile)
+        Catch ex As System.Exception
+            MsgBox("Error in Save Email2Tempfile" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Shared Sub ScheduleOutlookComFallback()
+        Try
+            Dim t As New Threading.Thread(
+                Sub()
+                    Try
+                        Threading.Thread.Sleep(200)
+                        Dim maxRetries As Integer = 10
+                        Dim saved As Boolean = False
+                        For attempt As Integer = 1 To maxRetries
+                            If TrySaveSelectedMailViaOutlook() Then
+                                LOGGER?.Info("Outlook COM Fallback: Mail gespeichert. Versuch " & attempt)
+                                saved = True
+                                Exit For
+                            End If
+                            LOGGER?.Debug("Outlook COM Fallback: Keine Auswahl, Retry " & attempt)
+                            Threading.Thread.Sleep(200)
+                        Next
+
+                        If saved Then
+                            ' UI-Thread benachrichtigen
+                            Dim uiForm = If(System.Windows.Forms.Application.OpenForms.Count > 0, System.Windows.Forms.Application.OpenForms(0), Nothing)
+                            If uiForm IsNot Nothing Then
+                                uiForm.BeginInvoke(
+                                    Sub()
+                                        Try
+                                            RaiseEvent FilesDroppedReady(files_dropped)
+                                        Catch ex2 As System.Exception
+                                            LOGGER?.Warn("FilesDroppedReady Invoke Fehler: " & ex2.Message)
+                                        End Try
+                                    End Sub)
+                            Else
+                                ' Falls kein Form verfügbar, zumindest Event auslösen (Listener müssen ggf. selbst marshalen)
+                                RaiseEvent FilesDroppedReady(files_dropped)
+                            End If
+                        Else
+                            LOGGER?.Warn("Outlook COM Fallback: Nach Retries keine Mail gespeichert.")
+                        End If
+                    Catch ex As System.Exception
+                        LOGGER?.Warn("Outlook COM Fallback Thread Fehler: " & ex.Message)
+                    End Try
+                End Sub
+            )
+            t.IsBackground = True
+            t.SetApartmentState(Threading.ApartmentState.STA)
+            t.Start()
+        Catch ex As System.Exception
+            LOGGER?.Warn("ScheduleOutlookComFallback Fehler: " & ex.Message)
+        End Try
+    End Sub
+
+    Private Shared Function TrySaveSelectedMailViaOutlook() As Boolean
+        Try
+            Dim oApp As Outlook.Application = Nothing
+            Try
+                oApp = New Outlook.Application()
+            Catch ex As System.Exception
+                LOGGER?.Warn("Outlook COM Init fehlgeschlagen: " & ex.Message)
+                Return False
+            End Try
+
+            Dim savedAny As Boolean = False
+
+            Dim inspector = oApp.ActiveInspector
+            If inspector IsNot Nothing AndAlso inspector.CurrentItem IsNot Nothing Then
+                LOGGER?.Debug("Fallback: ActiveInspector.CurrentItem speichern")
+                SaveMailItemToTemp(inspector.CurrentItem)
+                savedAny = True
+            End If
+
+            If Not savedAny Then
+                Dim explorer = oApp.ActiveExplorer
+                If explorer IsNot Nothing AndAlso explorer.Selection IsNot Nothing AndAlso explorer.Selection.Count > 0 Then
+                    LOGGER?.Debug("Fallback: Explorer.Selection speichern")
+                    For i As Integer = 1 To explorer.Selection.Count
+                        Dim myobj As Object = explorer.Selection.Item(i)
+                        If myobj Is Nothing Then Continue For
+                        SaveMailItemToTemp(myobj)
+                        savedAny = True
+                    Next
+                End If
+            End If
+
+            Return savedAny
+        Catch ex As System.Exception
+            LOGGER?.Warn("TrySaveSelectedMailViaOutlook Fehler: " & ex.Message)
+            Return False
+        End Try
+    End Function
+
     Public Shared Sub Drag_enter(e As DragEventArgs)
         Try
             My.Settings.WD_INDEXDOKART_SAVE = ""
-            If e.Data.GetDataPresent(DataFormats.FileDrop) Then
-                e.Effect = DragDropEffects.All
-                LOGGER.Debug("DragEnter ... SimpleFileDrop")
-                'frmForm_Constructor_Main_2.tslblStatusMain_show(True, "DragEnter ... SimpleFileDrop")
-            ElseIf (e.Data.GetDataPresent("FileGroupDescriptor")) AndAlso (e.Data.GetDataPresent("FileContents")) Then
+
+            Dim hasOutlookUnicode As Boolean = e.Data.GetDataPresent("FileGroupDescriptorW")
+            Dim hasOutlookAnsi As Boolean = e.Data.GetDataPresent("FileGroupDescriptor")
+            Dim hasOutlookDescriptor As Boolean = hasOutlookUnicode OrElse hasOutlookAnsi
+
+            Dim hasChromiumMime As Boolean = e.Data.GetDataPresent("Chromium Web Custom MIME Data Format")
+            Dim hasFileNameW As Boolean = e.Data.GetDataPresent("FileNameW") OrElse e.Data.GetDataPresent("FileName")
+            Dim hasOutlookLike As Boolean = hasOutlookDescriptor OrElse hasChromiumMime OrElse hasFileNameW
+
+            Dim hasFileDrop As Boolean = e.Data.GetDataPresent(DataFormats.FileDrop)
+
+            If hasOutlookLike Then
                 e.Effect = DragDropEffects.Copy
-                'frmForm_Constructor_Main_2.tslblStatusMain_show(True, "DragEnter ... Attachment from Outlook")
-                LOGGER.Debug("DragEnter ... Attachment from Outlook")
-            ElseIf e.Data.GetDataPresent("FileGroupDescriptor") Then
-                'handle a message dragged from Outlook
+                LOGGER?.Debug("DragEnter ... Outlook/WebView2 erkannt (Descriptor/Chromium/FileNameW)")
+            ElseIf hasFileDrop Then
                 e.Effect = DragDropEffects.Copy
-                'frmForm_Constructor_Main_2.tslblStatusMain_show(True, "DragEnter ... OutlookMessage")
-                LOGGER.Debug("DragEnter ... OutlookMessage")
+                LOGGER?.Debug("DragEnter ... SimpleFileDrop")
             Else
-                'otherwise, do not handle
-                e.Effect = DragDropEffects.Copy
-                'frmForm_Constructor.tslblStatusMain_show(True, "DragEnter ... Other FileFormat")
-                LOGGER.Debug("DragEnter ... Other FileFormat")
+                e.Effect = DragDropEffects.None
+                LOGGER?.Debug("DragEnter ... Other FileFormat")
             End If
-        Catch ex As Exception
+
+            LOGGER?.Debug("DragEnter Formats: " & String.Join(", ", e.Data.GetFormats()))
+        Catch ex As System.Exception
 
         End Try
     End Sub
-   
+
 End Class

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

@@ -1,5 +1,10 @@
-Public Class ClassFileResult
-    Public Shared DocID As Integer
+'Imports DD_LIB_Standards
+Public Class ClassFileResult
+    Public Shared Property DocID As Integer
+    Public Shared Property ParentID As Integer
+    Public Shared Property FileName As String
+    Public Shared Property OldDisplayName As String
+    Public Shared Property DocumentPath As String
     Public Shared InWork As Boolean = False
     Public Shared Function Set_InWork(state As Integer, comment As String)
         Try
@@ -11,9 +16,6 @@
                 upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET Change_DateTime = GETDATE(), IN_WORK = {0}, IN_WORK_USER = '{1}', IN_WORK_COMMENT = '{2}' WHERE DocID = {3}", state, USER_USERNAME, comment, DocID)
             End If
             If MYDB_ECM.ExecuteNonQuery(upd) = True Then
-                If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                    MYDB_ECM.ExecuteNonQuery(upd)
-                End If
                 InWork = True
                 Return True
             Else
@@ -27,11 +29,8 @@
     Public Shared Function Set_Displayname(Displayname As String)
         Try
             Dim upd As String
-            upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET DISPLAY_NAME = '{0}',Change_DateTime = GETDATE() WHERE DocID = {1}", Displayname, DocID)
+            upd = String.Format("UPDATE TBPMO_DOCRESULT_LIST SET DISPLAY_NAME = '{0}',CHANGED_WHO = '{2}',Change_DateTime = GETDATE() WHERE DocID = {1}", Displayname, DocID, USER_USERNAME)
             If MYDB_ECM.ExecuteNonQuery(upd) = True Then
-                If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                    MYDB_ECM.ExecuteNonQuery(upd)
-                End If
                 Return True
             Else
                 Return False
@@ -63,7 +62,7 @@
                         Dim insert As String = String.Format("INSERT INTO TBPMO_DOC_INDICES (DocID,INDEX_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", DocID, MAN_INDEX_ID, row.Item("MAN_VALUE"), USER_USERNAME)
                         MYDB_ECM.ExecuteNonQuery(insert)
                     End If
-                 
+
                 Next
             End If
             Return True
@@ -83,12 +82,19 @@
     End Function
     Public Shared Function Delete_ResultFile(RESULT_DOC_ID, RECORD_ID, DELETE_FILE)
         Try
+            Dim oDelete = CBool(DELETE_FILE)
+            If oDelete = False Then
+                DELETE_FILE = 0
+            Else
+                DELETE_FILE = 1
+
+            End If
             Dim proc = String.Format("EXEC PRPMO_DELETE_RESULTFILE {0},{1},{2}", RESULT_DOC_ID, RECORD_ID, DELETE_FILE)
             If MYDB_ECM.ExecuteNonQuery(proc) = True Then
-                If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                    proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", RESULT_DOC_ID)
-                    MYDB_ECM.ExecuteNonQuery(proc)
-                End If
+                'If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
+                '    proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", RESULT_DOC_ID)
+                '    MYDB_ECM.ExecuteNonQuery(proc)
+                'End If
                 Return True
             Else
                 Return False

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

@@ -87,7 +87,9 @@ Public Class ClassFolderWatcher
             'Die Datei übergeben
             LOGGER.Debug("OnCreated-File:" & e.FullPath)
             If FileExistsinDropTable(CURRENT_FILENAME) = False Then
-                Insert_USER_File(e.FullPath, handleType)
+                If ClassHelper.Insert_USER_File(e.FullPath, handleType) = False Then
+                    Exit Sub
+                End If
             Else
                 Console.WriteLine("File existiert bereits")
             End If
@@ -102,7 +104,7 @@ Public Class ClassFolderWatcher
     Public Shared Function FileExistsinDropTable(Filename As String)
         Dim check As String
         Try
-            check = "SELECT COUNT(*) FROM TBPMO_FILES_USER WHERE UPPER(FILENAME2WORK) = UPPER('" & Filename & "') AND WORKED = 0"
+            check = "SELECT COUNT(*) FROM TBPMO_FILES_USER WHERE FILENAME2WORK = '" & Filename & "' AND WORKED = 0"
             Dim result = MYDB_ECM.GetScalarValue(check)
             Return result
         Catch ex As Exception
@@ -111,20 +113,10 @@ Public Class ClassFolderWatcher
         End Try
 
     End Function
-    Public Shared Function Insert_USER_File(filename As String, handleType As String)
-        Try
-            Dim filename_only As String = Path.GetFileName(filename)
-            Dim ins As String = String.Format("INSERT INTO TBPMO_FILES_USER (FILENAME2WORK, USER_WORK,HANDLE_TYPE,FILENAME_ONLY) VALUES ('{0}','{1}','{2}','{3}')", filename, USER_USERNAME, handleType, filename_only)
-            Return MYDB_ECM.ExecuteNonQuery(ins)
-        Catch ex As Exception
-            MsgBox("Unexpected Error in Insert Scan-File: " & ex.Message, MsgBoxStyle.Critical)
-            Return False
-        End Try
-    End Function
     Public Shared Function DELETE_SCAN_File(filename As String)
         Try
             Dim filename_only As String = Path.GetFileName(filename)
-            Dim del As String = String.Format("DELETE FROM TBPMO_FILES_USER WHERE UPPER(FILENAME2WORK) = UPPER('{0}')", filename)
+            Dim del As String = String.Format("DELETE FROM TBPMO_FILES_USER WHERE FILENAME2WORK = '{0}'", filename)
             Return MYDB_ECM.ExecuteNonQuery(del)
         Catch ex As Exception
             MsgBox("Unexpected Error in DELETE_SCAN_File: " & ex.Message, MsgBoxStyle.Critical)
@@ -133,7 +125,7 @@ Public Class ClassFolderWatcher
     End Function
     Public Shared Function DELETE_SCAN_File_User()
         Try
-            Dim del As String = String.Format("DELETE FROM TBPMO_FILES_USER WHERE UPPER(USER_WORK) = UPPER('{0}') AND HANDLE_TYPE = 'SCAN'", USER_USERNAME)
+            Dim del As String = String.Format("DELETE FROM TBPMO_FILES_USER WHERE USER_WORK = '{0}' AND HANDLE_TYPE = 'SCAN'", USER_USERNAME)
             Return MYDB_ECM.ExecuteNonQuery(del)
         Catch ex As Exception
             MsgBox("Unexpected Error in DELETE_SCAN_File_User: " & ex.Message, MsgBoxStyle.Critical)
@@ -143,7 +135,7 @@ Public Class ClassFolderWatcher
 
     Public Shared Function Check_Scan_Files()
         Try
-            Dim sql As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND UPPER(USER_WORK) = '{0}'", USER_USERNAME)
+            Dim sql As String = String.Format("select * from TBPMO_FILES_USER where HANDLE_TYPE = 'SCAN' and WORKED = 0 AND USER_WORK = '{0}'", USER_USERNAME)
             Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
             For Each row As DataRow In DT.Rows
                 If System.IO.File.Exists(row.Item("FILENAME2WORK")) = False Then

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

@@ -5,20 +5,27 @@ Imports System.ComponentModel
 Public Class ClassHelper
     Private Shared BW_DocPath As String
     Private Shared BW_DocID As Integer
+    Private Shared BW_ParentID As Integer
+    Private Shared BW_Filename As String
     Public Shared Function FORMAT_WM_PATH(WMpath As String)
         Try
-            Dim ochanged As Boolean = False
-            If WMpath.StartsWith("W:") Then
-                WMpath = WMpath.Replace("W:", WMPATH_PREFIX)
-                ochanged = True
-            ElseIf WMpath.StartsWith("\") Then
-                If WMpath.StartsWith(WMPATH_PREFIX) = False Then
-                    WMpath = WMPATH_PREFIX & WMpath
+            If Not IsNothing(WMpath) Then
+                Dim ochanged As Boolean = False
+                If WMpath.StartsWith("W:") Then
+                    WMpath = WMpath.Replace("W:", WMPATH_PREFIX)
                     ochanged = True
+                ElseIf WMpath.StartsWith("\") Then
+                    If WMpath.StartsWith(WMPATH_PREFIX) = False Then
+                        WMpath = WMPATH_PREFIX & WMpath
+                        ochanged = True
+                    End If
                 End If
+                LOGGER.Debug("WMpath is: " & WMpath)
+                Return WMpath
+            Else
+                Return Nothing
             End If
-            LOGGER.Debug("WMpath is: " & WMpath)
-            Return WMpath
+
         Catch ex As Exception
             Return WMpath
         End Try
@@ -169,30 +176,36 @@ Public Class ClassHelper
         Return System.Text.RegularExpressions.Regex.Replace(
           sFilename, "[?*^""<>|]", REPLACEChar)
     End Function
-    Public Shared Function File_open(RESULT_DOC_PATH As Object, DocID As String)
+    Public Shared Function File_open(RESULT_DOC_PATH As Object, DocID As String, pParentID As Integer)
         Try
+            Dim oFileName = Path.GetFileName(RESULT_DOC_PATH)
+            BW_Filename = oFileName
             RESULT_DOC_PATH = FORMAT_WM_PATH(RESULT_DOC_PATH)
+            If pParentID = 0 Then
+                Dim sql = String.Format("SELECT dwParentID FROM TBPMO_DOCRESULT_LIST WHERE DocID = {0}", DocID)
+                pParentID = MYDB_ECM.GetScalarValue(sql)
+            End If
+            If SHARE_DRIVE_ACTIVE Then
+                If RESULT_DOC_PATH.ToString.StartsWith(constWMOBJECTS) Then
+                    RESULT_DOC_PATH = RESULT_DOC_PATH.ToString.Replace(constWMOBJECTS, WMPATH_PREFIX)
+                End If
+
+
+            End If
             CURRENT_OFFICE_FILE_CHANGED = False
             If RESULT_DOC_PATH <> Nothing Then
-                If USER_GENERAL_VIEWER = "NONE" Then
-                    Dim EXT = Path.GetExtension(RESULT_DOC_PATH)
-                    EXT = EXT.Replace(".", "")
-                    Dim sql = String.Format("SELECT VIEWER FROM TBPMO_DOC_USER_VIEW WHERE USER_ID = {0} AND FILE_EXTENSION = '{1}'", USER_GUID, EXT)
-                    Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
-                    If DT.Rows.Count = 1 Then
-                        Select Case DT.Rows(0).Item("VIEWER")
-                            Case "DOC_VIEW"
-                                OPEN_DOCVIEW(RESULT_DOC_PATH, DocID)
-                        End Select
-                    Else
-                        File_SYSOPEN(RESULT_DOC_PATH, DocID)
-                    End If
-                Else
-                    Select Case USER_GENERAL_VIEWER
-                        Case "DOC-VIEW"
-                            OPEN_DOCVIEW(RESULT_DOC_PATH, DocID)
-                    End Select
-                End If
+                'Dim EXT = Path.GetExtension(RESULT_DOC_PATH)
+                'EXT = EXT.Replace(".", "")
+                '    Dim sql = String.Format("SELECT VIEWER FROM TBPMO_DOC_USER_VIEW WHERE USER_ID = {0} AND FILE_EXTENSION = '{1}'", USER_GUID, EXT)
+                '    Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
+                '    If DT.Rows.Count = 1 Then
+                '        Select Case DT.Rows(0).Item("VIEWER")
+                '            Case "DOC_VIEW"
+                '                OPEN_DOCVIEW(RESULT_DOC_PATH, DocID)
+                '        End Select
+                '    Else
+                File_SYSOPEN(RESULT_DOC_PATH, DocID, pParentID)
+                'End If
                 Return True
             Else
                 MSGBOX_Handler("ERROR", "", "Sorry, but the docpath for doc-id: " & DocID & " is nothing!")
@@ -219,33 +232,19 @@ Public Class ClassHelper
             LOGGER.Warn("Error in Open_Folder: " & ex.Message & vbNewLine & " - Path: " & RESULT_DOC_PATH & " - DocID: " & DocID)
         End Try
     End Sub
-    Public Shared Sub OPEN_DOCVIEW(Doc_Path As String, DocID As Integer)
-        Try
-            Dim DocView
-            DocView = Nothing
-            DocView = CreateObject("WMPViewXNG.Viewer")
-            ' open the viewer
-            Dim viewer_string = Doc_Path.Substring(2)
-            DocView.ViewFile(viewer_string)
-            CURRENT_DOCVIEW_PATH = viewer_string
-            CURRENT_DOCVIEW = DocView
-        Catch ex As Exception
-            MsgBox("Unexpected Error in DocView Open:" & vbNewLine & ex.Message & vbNewLine & Doc_Path & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
-            LOGGER.Warn("Error in DocView Open: " & ex.Message & vbNewLine & " - Path: " & Doc_Path & " - DocID: " & DocID)
-            File_SYSOPEN(Doc_Path, DocID)
-        End Try
-    End Sub
-    Private Shared Sub File_SYSOPEN(RESULT_DOC_PATH As Object, DocID As String)
+    Private Shared Sub File_SYSOPEN(RESULT_DOC_PATH As Object, DocID As String, pParentID As Integer)
         Try
             If RESULT_DOC_PATH <> Nothing Then
 
                 BW_DocPath = RESULT_DOC_PATH
                 BW_DocID = DocID
+                BW_ParentID = pParentID
 
                 Dim BWFileHandler As New BackgroundWorker
                 AddHandler BWFileHandler.DoWork, AddressOf BWFileHandler_DoWork
                 BWFileHandler.RunWorkerAsync()
-
+            Else
+                LOGGER.Warn("File_SYSOPEN RESULT_DOC_PATH is nothing")
             End If
         Catch ex As Exception
             MsgBox("Unexpected Error in File_SYSOPEN:" & vbNewLine & ex.Message & vbNewLine & RESULT_DOC_PATH & vbNewLine & "DocID: " & DocID, MsgBoxStyle.Critical)
@@ -255,42 +254,148 @@ Public Class ClassHelper
     End Sub
     Private Shared Sub BWFileHandler_DoWork()
         Try
+            Dim oOverrideRunPath As String = ""
+            Dim oExtension As String = Path.GetExtension(BW_DocPath).ToLower()
+
+            ' Prüfen, ob eine spezielle Anwendung für die Dateierweiterung definiert ist
+            For Each oROW As DataRow In CURRENT_TBFILE_EXTENSION_OVERRIDE.Rows
+                If oExtension.Replace(".", "") = oROW.Item("FILE_EXTENSION").ToString().ToLower() Then
+                    LOGGER.Debug($"Specific file extension override for [{oExtension}] found.")
+                    oOverrideRunPath = oROW.Item("PROCESS").ToString()
+                    Exit For
+                End If
+            Next
+
+            Dim oMyProcess As Process = Nothing
+            Dim oSql As String = ""
 
-            Dim oMyProcess = New Process()
-            Dim oExtension
-            Dim oSql
             Try
-                'Dim oPSI As New ProcessStartInfo(BW_DocPath)
-                oMyProcess.StartInfo.FileName = BW_DocPath
-                oMyProcess.StartInfo.UseShellExecute = True
-                oMyProcess.StartInfo.RedirectStandardOutput = False
-                oMyProcess.Start()
-                Dim ProcID = oMyProcess.GetCurrentProcess.Id
-                oExtension = Path.GetExtension(BW_DocPath).ToLower
-                LOGGER.Debug($"Checking oExtension [{oExtension}]...")
-                If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then
-                    oSql = $"SELECT dwVersionID FROM VWPMO_DOC_SEARCH WHERE DocID = {BW_DocID}"
-                    Dim odwVersionId = MYDB_ECM.GetScalarValue(oSql)
+                ' ###### Startinfo vorbereiten ######
+                Dim startInfo As New ProcessStartInfo()
+
+                If oOverrideRunPath <> "" Then
+                    startInfo.FileName = oOverrideRunPath
+                    startInfo.Arguments = $"""{BW_DocPath}"""
+                    LOGGER.Debug($"Opening document [{BW_DocPath}] using override application [{oOverrideRunPath}].")
+                Else
+                    startInfo.FileName = BW_DocPath
+                    LOGGER.Debug($"Opening document [{BW_DocPath}] with system default application.")
+                End If
+
+                startInfo.UseShellExecute = True
+                startInfo.RedirectStandardOutput = False
+                If oOverrideRunPath <> "" Then
+                    oMyProcess = Process.Start(startInfo)
+                Else
+                    oMyProcess = Process.Start(BW_DocPath)
+                End If
+                ' ###### Prozess starten ######
+
+
+                ' ID des gestarteten Prozesses holen (nicht den eigenen!)
+                Dim ProcID As Integer = oMyProcess.Id
+                LOGGER.Debug($"Started process ID {ProcID} for document [{BW_DocPath}].")
+
+                ' Warten, bis der Benutzer das Dokument geschlossen hat
+                oMyProcess.WaitForExit()
+
+                ' Nachbearbeitung, wenn Format bearbeitbar ist
+                oExtension = Path.GetExtension(BW_DocPath).ToLower()
+                LOGGER.Debug($"Checking if file extension [{oExtension}] may change during edit...")
+
+                If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) And oOverrideRunPath = "" Then
+                    LOGGER.Debug("Create possible Document change in TBPMO_DOC_ID_CHANGED.")
+                    Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,NEW_DOC_ID,DOC_PATH) VALUES (" &
+                                  $"{USER_GUID},'{ProcID}',9999,{BW_DocID},0,'{BW_DocPath}')"
+                    MYDB_ECM.ExecuteNonQuery(oInsert)
 
-                    Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,DOC_PATH) VALUES ({USER_GUID},'{ProcID.ToString}',{odwVersionId},{BW_DocID},'{BW_DocPath}')"
-                    MYDB_ECM.ExecuteNonQuery(oInsert)
                 End If
 
-                'oMyProcess.WaitForExit()
             Catch ex As Exception
-                LOGGER.Warn("Error in Process1.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
-                Exit Sub
+                ' Fehler im Prozessstart oder während des Wartens
+                LOGGER.Warn("Error in Process.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
+                MsgBox("Error in OpenFile: " & ex.Message & vbNewLine &
+                   "Path: " & BW_DocPath & vbNewLine & "DocID: " & BW_DocID,
+                   MsgBoxStyle.Exclamation, "Open File Error")
             End Try
 
         Catch ex As Exception
-            LOGGER.Warn("Error in Process.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
+            ' Fehler im gesamten Worker (z. B. Path nicht vorhanden)
+            LOGGER.Warn("General error in BWFileHandler_DoWork: " & ex.Message & vbNewLine &
+                    " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
+
+            ' Letzter Versuch: Öffne mit Standardprogramm
             Try
                 Process.Start(BW_DocPath)
+                LOGGER.Debug("Fallback: Document opened with default application.")
             Catch ex1 As Exception
-                LOGGER.Warn("Error in Process.Start(1): " & ex1.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
+                LOGGER.Warn("Fallback error in Process.Start(): " & ex1.Message & vbNewLine &
+                        " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
             End Try
         End Try
     End Sub
+    'Private Shared Sub BWFileHandler_DoWork()
+    '    Try
+    '        Dim oOverrideRunPath As String = ""
+    '        Dim oExtension = Path.GetExtension(BW_DocPath).ToLower
+    '        For Each oROW As DataRow In CURRENT_TBFILE_EXTENSION_OVERRIDE.Rows
+    '            If oExtension.Replace(".", "") = oROW.Item("FILE_EXTENSION") Then
+    '                LOGGER.Debug($"Specific fileextension override for extension [{oExtension}] found! ")
+    '                oOverrideRunPath = oROW.Item("PROCESS")
+    '            End If
+    '        Next
+    '        Dim oMyProcess = New Process()
+    '        Dim oSql
+    '        Try
+    '            '######
+    '            Dim startInfo As New ProcessStartInfo()
+    '            If oOverrideRunPath <> "" Then
+    '                startInfo.FileName = oOverrideRunPath
+    '                startInfo.Arguments = """" & BW_DocPath & """"
+    '                startInfo.UseShellExecute = True
+    '                startInfo.RedirectStandardOutput = False
+    '            Else
+    '                startInfo.FileName = BW_DocPath
+    '                startInfo.UseShellExecute = True
+    '                startInfo.RedirectStandardOutput = False
+    '            End If
+    '            '#####
+    '            oMyProcess.Start(startInfo)
+    '            Dim myViewerProcessID = oMyProcess.Id
+    '            oMyProcess.WaitForExit()
+    '            oExtension = Path.GetExtension(BW_DocPath).ToLower
+    '            LOGGER.Debug($"Checking oExtension [{oExtension}]...")
+    '            If FILE_FORMATS_CHANGE_DURING_EDIT.Contains(oExtension) Then
+    '                oSql = $"SELECT * FROM VWOF_DOCID_HANDLE WHERE dwParentID = {BW_ParentID} and [Filename] = '{BW_Filename}'"
+    '                Dim oDTNEWDoc As DataTable = MYDB_ECM.GetDatatable(oSql)
+
+    '                If Not IsNothing(oDTNEWDoc) Then
+    '                    If oDTNEWDoc.Rows.Count = 1 Then
+
+    '                        Dim oInsert = $"INSERT INTO TBPMO_DOC_ID_CHANGED (USER_ID,PROCESS_ID,VERSION_ID,OLD_DOC_ID,NEW_DOC_ID, DOC_PATH) VALUES (
+    '                            {USER_GUID},'{myViewerProcessID.ToString}',{oDTNEWDoc.Rows(0).Item("dwVersionID")},{BW_DocID},{oDTNEWDoc.Rows(0).Item("NewDocID")}, '{BW_DocPath}')"
+    '                        MYDB_ECM.ExecuteNonQuery(oInsert)
+    '                    End If
+
+
+    '                End If
+    '            End If
+
+    '        Catch ex As Exception
+    '            LOGGER.Warn("Error in Process1.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
+    '            MsgBox("Error in OpenFile: " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID, MsgBoxStyle.Exclamation)
+    '            Exit Sub
+    '        End Try
+
+    '    Catch ex As Exception
+    '        LOGGER.Warn("Error in Process.Start(): " & ex.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
+    '        Try
+    '            Process.Start(BW_DocPath)
+    '        Catch ex1 As Exception
+    '            LOGGER.Warn("Error in Process.Start(1): " & ex1.Message & vbNewLine & " - Path: " & BW_DocPath & " - DocID: " & BW_DocID)
+    '        End Try
+    '    End Try
+    'End Sub
     Private Shared Sub FOLDER_OPEN(PATH As Object, DocID As String)
         Try
             If PATH <> Nothing Then
@@ -332,8 +437,7 @@ Public Class ClassHelper
                     msg = "The record '" & SELECTED_RECORD_ID & "' could not be deleted. Check the log"
                 End If
                 MsgBox(msg, MsgBoxStyle.Exclamation)
-            Else
-                ClassProxy.PRPROXY_RECORD_DEL(SELECTED_RECORD_ID, CURRENT_ENTITY_ID)
+
             End If
             LOGGER.Info($"Deleted Record [{SELECTED_RECORD_ID}] Result was [{result}]: ")
             Return result
@@ -393,7 +497,7 @@ Public Class ClassHelper
     End Function
     Public Shared Sub Create_USER_FILE_TABLE()
         Try
-            Dim sql = String.Format("SELECT *, CONVERT(BIT,0) AS DELETE_FILE FROM TBPMO_FILES_USER WHERE (UPPER(USER_WORK) = UPPER('{0}')) AND WORKED = 0", USER_USERNAME)
+            Dim sql = String.Format("SELECT *, CONVERT(BIT,0) AS DELETE_FILE FROM TBPMO_FILES_USER WHERE (USER_WORK = '{0}') AND WORKED = 0", USER_USERNAME)
             CURRENT_TBPMO_FILES_USER = MYDB_ECM.GetDatatable(sql)
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error while creating User_File_Table")
@@ -444,4 +548,43 @@ Public Class ClassHelper
             Return False
         End Try
     End Function
+    Public Shared Function Insert_USER_File(pFilename As String, handleType As String)
+        Try
+            Dim filename_only As String = Path.GetFileName(pFilename)
+            CURRENT_FILE_HASH = ""
+
+            If File.Exists(pFilename) Then
+                If (pFilename.ToUpper.EndsWith(".MSG") Or pFilename.ToUpper.EndsWith(".EML")) And (handleType = "|OUTLOOK_MESSAGE|" Or handleType = "|MSGONLY|") Then
+                    CURRENT_FILE_HASH = FILESYSTEM.GetChecksumFromString(pFilename)
+                Else
+                    CURRENT_FILE_HASH = FILESYSTEM.GetChecksum(pFilename)
+                End If
+            End If
+            Dim oSQL = $"SELECT ADDED_WHO, FORMAT(ADDED_WHEN, 'dd-MM-yyyy HH:mm') AS ADDED_WHEN_STRING FROM TBPMO_DOCRESULT_LIST WHERE FILE_HASH = '{CURRENT_FILE_HASH}' ORDER BY ADDED_WHEN DESC"
+            LOGGER.Debug($"Inserting File - hash is [{CURRENT_FILE_HASH}]")
+            Dim oDTCHECK As DataTable = MYDB_ECM.GetDatatable(oSQL)
+            If Not IsNothing(oDTCHECK) Then
+                If oDTCHECK.Rows.Count >= 1 Then
+                    LOGGER.Info($"We got a file with the same hash [{CURRENT_FILE_HASH}]")
+                    Dim oUSER = oDTCHECK.Rows(0).Item(0)
+                    Dim oADDED_WHEN = oDTCHECK.Rows(0).Item(1)
+                    Dim oMSG = $"Achtung:" & vbNewLine & "Die Datei wurde bereits nach orgFLOW importiert. Anzahl: " & oDTCHECK.Rows.Count.ToString & vbNewLine &
+                    $"Importiert wann: {oADDED_WHEN}" & vbNewLine &
+                    $"Importiert wer: {oUSER}" & vbNewLine &
+                    "Wollen Sie die Datei dennoch importieren?"
+                    Dim result As MsgBoxResult
+                    result = MessageBox.Show(oMSG, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                    If result = MsgBoxResult.No Then
+                        Return False
+                    End If
+                End If
+            End If
+
+            Dim ins As String = String.Format("INSERT INTO TBPMO_FILES_USER (FILENAME2WORK, USER_WORK,HANDLE_TYPE,FILENAME_ONLY) VALUES ('{0}','{1}','{2}','{3}')", pFilename, USER_USERNAME, handleType, filename_only)
+            Return MYDB_ECM.ExecuteNonQuery(ins)
+        Catch ex As Exception
+            MsgBox("Unexpected Error in Insert file for user (TBPMO_FILES_USER): " & ex.Message, MsgBoxStyle.Critical)
+            Return False
+        End Try
+    End Function
 End Class

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

@@ -1,7 +1,6 @@
 Imports System.IO
 Imports System.Globalization
-Imports WINDREAMLib
-Imports DD_LIB_Standards
+'Imports Microsoft.Office.Interop.Word
 
 Public Class ClassImport_Windream
     Public Shared Function Import_File(QuellDatei_Path As String, DOCTYPE_ID As Integer)
@@ -12,7 +11,7 @@ Public Class ClassImport_Windream
             If Not IsNothing(DT_DOCTYPE) Then
                 Dim Targetpath As String = DT_DOCTYPE.Rows(0).Item("ZIEL_PFAD")
                 Dim Dokart As String = DT_DOCTYPE.Rows(0).Item("BEZEICHNUNG")
-                clsWindream.MY_WDOBJECTTYPE = DT_DOCTYPE.Rows(0).Item("OBJEKTTYP")
+                WMOBJECTTYPE = DT_DOCTYPE.Rows(0).Item("OBJEKTTYP")
 
                 'Den Namen der Dokumentart generieren
                 If ClassImport_Windream.Name_Generieren(DOCTYPE_ID) = False Then
@@ -21,10 +20,10 @@ Public Class ClassImport_Windream
                 End If
 
                 'Die Datei nach windream importieren
-                Dim streamresult = clsWD_SET.Stream_File(QuellDatei_Path, Targetpath)
+                Dim streamresult = WMMOD.NewFileStream(QuellDatei_Path, Targetpath, WMOBJECTTYPE)
                 If streamresult = True Then
-                    Dim sql As String = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
-                    CURRENT_DOC_ID = MYDB_ECM.GetScalarValue(SQL)
+                    Dim sql As String = String.Format("SELECT DocID FROM VWPMO_DOC_SYNC WHERE CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE()) AND FULL_FILENAME = '{0}'", CURRENT_FILEIN_WD)
+                    CURRENT_DOC_ID = MYDB_ECM.GetScalarValue(sql)
                     sql = $"SELECT * FROM TBDD_INDEX_AUTOM WHERE DOCTYPE_ID = {DOCTYPE_ID} AND ENTITY_ID = {CURRENT_ENTITY_ID}"
                     Dim dt As DataTable = MYDB_ECM.GetDatatable(sql)
                     Dim indexierung_erfolgreich As Boolean = False
@@ -44,7 +43,7 @@ Public Class ClassImport_Windream
                                 End If
                                 LOGGER.Debug("Indexvalue: " & idxvalue.ToString)
                                 Count += 1
-                                indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
+                                indexierung_erfolgreich = WMMOD.SetFileIndex(CURRENT_FILEIN_WD, indexname, idxvalue, WMOBJECTTYPE)
                                 If indexierung_erfolgreich = False Then
                                     ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in indexing '" & indexname & "') - Check logfile!")
                                     err = True
@@ -56,14 +55,14 @@ Public Class ClassImport_Windream
                                 Return False
                             End If
                             ''den Entity-Key auslesen
-                            'sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & clsWindream.MY_WDOBJECTTYPE & "')"
+                            'sql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE where Upper(object_type) = Upper('" & WMOBJECTTYPE & "')"
                             'dt = MYDB_ECM.GetDatatable(sql)
                             'If Not dt Is Nothing Then
                             '    If dt.Rows.Count = 1 Then
                             '        Dim indexname = dt.Rows(0).Item("IDXNAME_ENTITYID").ToString
                             '        Dim idxvalue = CURRENT_ENTITY_ID
                             '        LOGGER.Debug("Entity-ID: " & idxvalue.ToString)
-                            '        indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
+                            '        indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, WMOBJECTTYPE)
                             '        If indexierung_erfolgreich = False Then
                             '            err = True
                             '            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in indexing Entity-ID '" & indexname & "') - Check logfile!")
@@ -72,7 +71,7 @@ Public Class ClassImport_Windream
                             '        indexname = dt.Rows(0).Item("IDXNAME_PARENTID").ToString
                             '        idxvalue = CURRENT_PARENT_ENTITY_ID
                             '        LOGGER.Debug("Parent-ID: " & idxvalue.ToString)
-                            '        indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, clsWindream.MY_WDOBJECTTYPE)
+                            '        indexierung_erfolgreich = clsWD_SET.IndexFile(CURRENT_FILEIN_WD, indexname, idxvalue, WMOBJECTTYPE)
                             '        If indexierung_erfolgreich = False Then
                             '            err = True
                             '            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error: ", "Unexpected Error in indexing Parent-ID '" & indexname & "') - Check logfile!")
@@ -104,10 +103,12 @@ Public Class ClassImport_Windream
     End Function
 
     Public Shared Function Name_Generieren(DocTypeID As Integer)
-
+        Dim myLogger As New DigitalData.Modules.Logging.Logger
         Try
+
+            myLogger = LOGCONFIG.GetLogger()
             Dim FILE_DELIMITER, VERSION_DELIMITER, _WDOBJECTTYPE, _NewFileString As String
-            Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES where UPPER(NAME) = UPPER('Global-Indexer')"
+            Dim sql As String = "select TOP 1 VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES where NAME In ('fileFLOW', 'Global-Indexer')"
             Dim DT1 As DataTable = MYDB_ECM.GetDatatable(sql)
             FILE_DELIMITER = DT1.Rows(0).Item("FILE_DELIMITER")
             VERSION_DELIMITER = DT1.Rows(0).Item("VERSION_DELIMITER")
@@ -125,6 +126,7 @@ Public Class ClassImport_Windream
             oWMTARGET_FOLDER = oDT.Rows(0).Item("ZIEL_PFAD")
 
             sql = $"SELECT * FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE FORMVIEW_ID = {CURRENT_FORMVIEW_ID} AND DOCTYPE_ID = {DocTypeID}"
+            myLogger.Debug(sql)
             Dim oDTFW_DOCTYPES As DataTable = MYDB_ECM.GetDatatable(sql)
             Dim oDYNAMIC_FOLDER = oDTFW_DOCTYPES.Rows(0).Item("DYNAMIC_FOLDER")
             Dim oNAME_CONVENTION = oDTFW_DOCTYPES.Rows(0).Item("NAME_CONVENTION")
@@ -145,80 +147,54 @@ Public Class ClassImport_Windream
                 If oDYNAMIC_FOLDER <> String.Empty Then
                     If CREATE_FOLDER_INDEX(oDYNAMIC_FOLDER, DocTypeID) = True And CURRENT_VARIABLE_FOLDER <> "" Then
 
-                        LOGGER.Debug("After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER)
-                            LOGGER.Debug("After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER)
+                        'myLogger.Debug("After CREATE_FOLDER_INDEX - oWMTARGET_FOLDER: " & oWMTARGET_FOLDER)
+                        myLogger.Debug("After CREATE_FOLDER_INDEX - CURRENT_VARIABLE_FOLDER: " & CURRENT_VARIABLE_FOLDER)
 
-                            If oWMTARGET_FOLDER <> CURRENT_VARIABLE_FOLDER Then
+                        If oWMTARGET_FOLDER <> CURRENT_VARIABLE_FOLDER Then
+                            If CURRENT_VARIABLE_FOLDER.StartsWith("\") Then
+                                CURRENT_VARIABLE_FOLDER = CURRENT_VARIABLE_FOLDER.Substring(1)
+                            End If
                             oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_VARIABLE_FOLDER.Replace(oWMTARGET_FOLDER, "")
                         Else
                             oWMTARGET_FOLDER = CURRENT_VARIABLE_FOLDER
                         End If
 
-                        'End If
-
-                    Else
-                        MsgBox("Unexpected Error in Creating Variable Folder - Check logfile!", MsgBoxStyle.Critical)
-                        Return False
                     End If
+
+                Else
+                    MsgBox("Unexpected Error in Creating Variable Folder - Check logfile!", MsgBoxStyle.Critical)
+                    Return False
                 End If
             End If
 
-            LOGGER.Debug("oWMTARGET_FOLDER: " & oWMTARGET_FOLDER)
-                LOGGER.Debug("CURRENT_SUBFOLDER: " & CURRENT_SUBFOLDER)
+            myLogger.Debug("oWMTARGET_FOLDER: " & oWMTARGET_FOLDER)
+            myLogger.Debug("CURRENT_SUBFOLDER: " & CURRENT_SUBFOLDER)
 
 
             'Untsserordner ja oder nein
             If CURRENT_CHECK_SUBFOLDER = True And CURRENT_SUBFOLDER <> "" Then
                 oWMTARGET_FOLDER = oWMTARGET_FOLDER & "\" & CURRENT_SUBFOLDER
             End If
-            oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("\\", "\")
             If oWMTARGET_FOLDER.Contains("/") Then
-                LOGGER.Info(String.Format("Targetpath contains /-sign. / will be replaced with _"))
+                myLogger.Info(String.Format("Targetpath contains /-sign. / will be replaced with _"))
                 oWMTARGET_FOLDER = oWMTARGET_FOLDER.Replace("/", "_")
             End If
 
 
             Try
-                Select Case clsWD_GET.WD_PATH_EXISTS(oWMTARGET_FOLDER.Substring(2))
-                    Case False
-                        LOGGER.Info(String.Format("Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2)))
-                        Dim split() As String = oWMTARGET_FOLDER.Split("\")
-                        Dim Path_Combined As String = ""
-                        For Each s As String In split
-                            Path_Combined &= s & "\"
-                            If Path_Combined <> "W:\" Then
+                oWMTARGET_FOLDER = WMMOD.GetNormalizedPath(oWMTARGET_FOLDER, 0)
+                If WMMOD.TestFolderExists(oWMTARGET_FOLDER) = False Then
+                    myLogger.Info(String.Format("Targetpath ({0}) is not existing or result of WD_PATH_EXISTS was false.", oWMTARGET_FOLDER.Substring(2)))
 
-                                Dim temppath = Path_Combined.Substring(2)
-
-                                Try
-                                    temppath = Path_Combined.Substring(2).Substring(0, temppath.Length)
-
-                                    Select Case clsWD_GET.WD_PATH_EXISTS(temppath)
-                                        Case False
-
-                                            LOGGER.Debug("Trying to create folder-part: " & temppath)
-
-                                            clsWindream.MY_WDSESSION.GetNewWMObjectFS(2, temppath, 0) 'WMEntityFolder,WMObjectEditModeNoEdit)
-                                        Case -10
-                                            LOGGER.Warn("WD_PATH_EXISTS returned -10 for: " & temppath)
-                                            Return False
-                                    End Select
-                                Catch ex As Exception
-                                    If Not ex.Message.Contains("Filename exists!") Then
-                                        LOGGER.Warn(String.Format("Could not create folder-part: {0} - Complete path is: ({1})", temppath, oWMTARGET_FOLDER.Substring(2)))
-                                        LOGGER.Warn(String.Format("ErrorMessage: {0}: ", ex.Message))
-                                        Return False
-                                    End If
-                                End Try
-                            End If
-                        Next
-                    Case -10
-                        MsgBox("Attention: the folder of the doctype does not exist or there was an error while checking....", MsgBoxStyle.Critical)
+                    If WMMOD.NewFolder(oWMTARGET_FOLDER) = False Then
+                        myLogger.Warn(String.Format("Could not create folder-part: {0} - Complete path is: ({1})", oWMTARGET_FOLDER, oWMTARGET_FOLDER.Substring(2)))
                         Return False
-                End Select
+                    End If
+                End If
+
             Catch ex As Exception
                 If Not ex.Message.Contains("Filename exists!") Then
-                    LOGGER.Warn(String.Format("Could not create folder ({0}): " & ex.Message, oWMTARGET_FOLDER.Substring(2)))
+                    myLogger.Warn(String.Format("Could not create folder ({0}): " & ex.Message, oWMTARGET_FOLDER))
                     Return False
                 End If
             End Try
@@ -227,15 +203,15 @@ Public Class ClassImport_Windream
             Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
             'Namenkonvention laden
             If IsDBNull(oNAME_CONVENTION) Then
-                LOGGER.Warn("Achtung: Namenskonvention is DBNull")
+                myLogger.Warn("Achtung: Namenskonvention is DBNull")
                 oNAME_CONVENTION = Path.GetFileNameWithoutExtension(CURRENT_FILENAME)
             ElseIf oNAME_CONVENTION = String.Empty Then
-                LOGGER.Warn("Achtung: Namenskonvention is String empty")
+                myLogger.Warn("Achtung: Namenskonvention is String empty")
                 oNAME_CONVENTION = Path.GetFileNameWithoutExtension(CURRENT_FILENAME)
             End If
             'schonmal den gesamten Pfad laden
             Dim oNewWM_Filename As String = oWMTARGET_FOLDER & "\" & oNAME_CONVENTION
-            LOGGER.Debug("oNewWM_Filename: " & oNewWM_Filename)
+            myLogger.Debug("oNewWM_Filename: " & oNewWM_Filename)
 
             ' einen Regulären Ausdruck laden
             Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
@@ -245,20 +221,23 @@ Public Class ClassImport_Windream
             ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
             For Each element As System.Text.RegularExpressions.Match In elemente
 
-                LOGGER.Debug("element in RegeX: " & element.Value)
+                myLogger.Debug("element in RegeX: " & element.Value)
+                Dim oSubstring = element.Value.Substring(2, 1).ToUpper
+                '%CTRL
+                Dim oSubstr = element.Value.Substring(2, 4)
                 Select Case element.Value.Substring(2, 1).ToUpper
                     'Nur automatische Indizes auswerten
                     Case "A"
                         Dim APattern = element.Value.Substring(3, element.Value.Length - 4)
-                        Dim value As String
+                        Dim oPatternvalue As String
 
                         Select Case APattern
                             'Laufzeitvariable Record-ID
                             Case "RECORD_ID"
-                                value = CURRENT_RECORD_ID
+                                oPatternvalue = CURRENT_RECORD_ID
                             Case "DOKART"
                                 'Laufzeitvariable Dokumentartstring
-                                value = CURRENT_DOKARTSTRING
+                                oPatternvalue = CURRENT_DOKARTSTRING
                             Case Else
                                 'Ein Index der nur für die Namenkonvention herangezogen wird
                                 If APattern.StartsWith("NC_") And APattern.Contains("#") Then
@@ -269,122 +248,61 @@ Public Class ClassImport_Windream
                                         If IsNumeric(INDEX_ID) Then
                                             Dim sql_AUTOindexresult = MYDB_ECM.GetScalarValue("SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & INDEX_ID)
                                             If IsNothing(sql_AUTOindexresult) Then
-                                                LOGGER.Debug("unexpected: sql_AUTOindexresult is nothing!!")
-                                                value = ""
+                                                myLogger.Debug("unexpected: sql_AUTOindexresult is nothing!!")
+                                                oPatternvalue = ""
                                             Else
                                                 If IsDBNull(sql_AUTOindexresult) Then
-                                                    value = ""
+                                                    oPatternvalue = ""
                                                 Else
                                                     sql_AUTOindexresult = sql_AUTOindexresult.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
                                                     Dim AUTOindexresult = MYDB_ECM.GetScalarValue(sql_AUTOindexresult)
                                                     If IsNothing(AUTOindexresult) Then
-                                                        LOGGER.Warn("ATTENTION: unexpected: AUTOindexresult is nothing!!")
-                                                        LOGGER.Warn("" & sql_AUTOindexresult)
-                                                        value = ""
+                                                        myLogger.Warn("ATTENTION: unexpected: AUTOindexresult is nothing!!")
+                                                        myLogger.Warn("" & sql_AUTOindexresult)
+                                                        oPatternvalue = ""
                                                     Else
                                                         If IsDBNull(AUTOindexresult) Then
-                                                            value = ""
+                                                            oPatternvalue = ""
                                                         Else
-                                                            value = AUTOindexresult
+                                                            oPatternvalue = AUTOindexresult
                                                         End If
                                                     End If
 
                                                 End If
                                             End If
                                         Else
-                                            LOGGER.Warn("INDEX_ID is not numeric:  " & INDEX_ID.ToString & "- APattern: " & APattern)
-                                            value = ""
+                                            myLogger.Warn("INDEX_ID is not numeric:  " & INDEX_ID.ToString & "- APattern: " & APattern)
+                                            oPatternvalue = ""
                                         End If
                                     Else
-                                        LOGGER.Warn("split.Length <> 2 - APattern: " & APattern)
-                                        value = ""
+                                        myLogger.Warn("split.Length <> 2 - APattern: " & APattern)
+                                        oPatternvalue = ""
                                     End If
 
                                 ElseIf APattern.Contains("#") Then
-                                    LOGGER.Debug("element [" & APattern & "] filled with Record-Data...: ")
+                                    myLogger.Debug("element [" & APattern & "] filled with Record-Data...: ")
+
                                     Dim split() As String = APattern.Split("#")
                                     If split.Length = 2 Then
                                         Dim CONTROL_ID = split(1)
-                                        If IsNumeric(CONTROL_ID) Then
-                                            Dim CONTROLVALUE = ClassControlValues.Get_Control_Value_for_ID(CONTROL_ID, CURRENT_RECORD_ID)
-                                            If IsNothing(CONTROLVALUE) Then
-                                                Dim checktype = "SELECT CONTROL_TYPE_ID,SQL_COMMAND_1,CONNECTION_ID_1 FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID
-                                                Dim DTtype As DataTable = MYDB_ECM.GetDatatable(checktype)
-                                                If DTtype.Rows.Count = 1 Then
-                                                    Dim lblsql = DTtype.Rows(0).Item(1)
-                                                    lblsql = lblsql.ToString.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
-                                                    lblsql = lblsql.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
-                                                    lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_ENTITY_ID)
-                                                    lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
-                                                    LOGGER.Debug("variable sql will be used for convention")
-                                                    Dim result = MYDB_ECM.GetScalarValue(DTtype.Rows(0).Item(2))
-                                                    If Not IsNothing(result) Then
-                                                        value = result.ToString
-                                                    Else
-                                                        LOGGER.Warn("variable sqlresult is nothing - " & lblsql)
-                                                        value = ""
-                                                    End If
-                                                Else
-                                                    LOGGER.Warn("!!ATTENTION: NameConvention should be filled with value of Control-ID '" & CONTROL_ID & "', but result was nothing.")
-                                                    LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
-                                                    value = ""
-                                                End If
+                                        oPatternvalue = GET_CTRLData(split(1), DocTypeID, APattern)
 
-                                            Else
-                                                If IsDBNull(CONTROLVALUE) Then
-                                                    LOGGER.Warn("NameConvention should be filled with value of Control-ID '" & CONTROL_ID & "', but result was DBNULL.")
-                                                    LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
-                                                    value = ""
-                                                Else
-                                                    Dim sql1 = "SELECT * FROM TBPMO_WD_NAMECONVENTION_FORMAT WHERE ID = (SELECT TOP 1 GUID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & DocTypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID & ")"
-                                                    Dim DT_FORMAT As DataTable = MYDB_ECM.GetDatatable(sql1)
-                                                    If Not IsNothing(DT_FORMAT) Then
-                                                        If DT_FORMAT.Rows.Count > 0 Then
-                                                            Dim result
-                                                            Try
-                                                                result = (From FormatRow In DT_FORMAT.AsEnumerable
-                                                                          Select FormatRow Where FormatRow.Item("PATTERN") = APattern).Single()
-                                                            Catch ex As Exception
-
-                                                            End Try
-
-                                                            If Not IsNothing(result) Then
-                                                                Dim _rule = result.Item("FORMAT_RULE")
-                                                                If Not IsNothing(_rule) Then
-                                                                    If IsDate(CONTROLVALUE) Then
-                                                                        Dim _date As Date = CDate(CONTROLVALUE)
-                                                                        'Dim _date = CDate(Format(CONTROLVALUE, "dd-MM-yyyy"))
-                                                                        _rule = _rule.ToString.Replace("Y", "y")
-                                                                        _rule = _rule.ToString.Replace("D", "d")
-                                                                        _rule = _rule.ToString.Replace("m", "M")
-                                                                        Dim convertedvalue = _date.ToString(_rule, CultureInfo.InvariantCulture)
-                                                                        CONTROLVALUE = convertedvalue
-                                                                    End If
-                                                                End If
-                                                            End If
-                                                        End If
-                                                    End If
-
-                                                    value = CONTROLVALUE
-                                                End If
-                                            End If
-
-                                        End If
                                     End If
 
                                 End If
                         End Select
 
-                        If value <> String.Empty Then
-                            oNewWM_Filename = oNewWM_Filename.Replace(element.Value, value)
+                        If oPatternvalue <> String.Empty Then
+                            oNewWM_Filename = oNewWM_Filename.Replace(element.Value, oPatternvalue)
                             _NewFileString = oNewWM_Filename
-                            LOGGER.Debug("Actual NEWFILESTRING: " & _NewFileString)
+                            myLogger.Debug("Actual NEWFILESTRING: " & _NewFileString)
                             ' sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString
                             AnzahlIndexe += 1
                             ' sql_history_Index_Values = sql_history_Index_Values & ", '" & value & "'"
                         Else
                             err = True
                         End If
+
                     Case "V"
                         Dim datetemp As String
                         Dim _Month As String = My.Computer.Clock.LocalTime.Month
@@ -438,25 +356,41 @@ Public Class ClassImport_Windream
                         End If
                         _NewFileString = oNewWM_Filename
                     Case Else
-                        Dim msg As String
-                        msg = "In der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper
-                        If USER_LANGUAGE <> "de-DE" Then
-                            msg = "In nameconvention an element was defined which could not be replaced." & vbNewLine & "elementname: " & element.Value.ToUpper
+                        If element.Value.Substring(2, 4).ToUpper = "CTRL" Then
+                            Dim APattern = element.Value.Substring(3, element.Value.Length - 4)
+                            myLogger.Debug("element [" & element.Value & "] with Control-Data...: ")
+                            Dim split() As String = APattern.Split("#")
+                            If split.Length = 2 Then
+                                Dim CONTROL_ID = split(1)
+                                Dim oPatternvalue = GET_CTRLData(split(1), DocTypeID, APattern)
+                                oNewWM_Filename = oNewWM_Filename.Replace(element.Value, oPatternvalue)
+                            End If
+                        Else
+                            Dim msg As String
+                            msg = "In der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper
+                            If USER_LANGUAGE <> "de-DE" Then
+                                msg = "In nameconvention an element was defined which could not be replaced." & vbNewLine & "Elementname: " & element.Value.ToUpper
+                            End If
+                            myLogger.Warn(msg)
+                            MsgBox(msg, MsgBoxStyle.Exclamation, "Error in Name Convention:")
                         End If
 
-                        LOGGER.Warn(msg)
-                        MsgBox(msg, MsgBoxStyle.Exclamation, "Error in Name Convention:")
+
+
+
                 End Select
             Next
             Try
                 'ungültige Zeichen entfernen
                 oNewWM_Filename = ClassHelper.CleanFilename(oNewWM_Filename, "")
                 If oNewWM_Filename.Contains("/") Then
-                    LOGGER.Info(String.Format("DATEINAME contains /-sign. / will be replaced with _"))
+                    myLogger.Info(String.Format("DATEINAME contains /-sign. / will be replaced with _"))
                     oNewWM_Filename = oNewWM_Filename.Replace("/", "_")
                 End If
+                oNewWM_Filename = oNewWM_Filename.Replace("\\", "\")
+
             Catch ex As Exception
-                LOGGER.Warn(" - Error in Versioning file - Error: " & vbNewLine & ex.Message)
+                myLogger.Warn(" - Error in Versioning file - Error: " & vbNewLine & ex.Message)
                 MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Versioning file:")
                 err = True
             End Try
@@ -477,12 +411,95 @@ Public Class ClassImport_Windream
             End If
 
         Catch ex As Exception
-            LOGGER.Warn(" - Unexpected Error in FileName-Creating: " & vbNewLine & ex.Message)
+            myLogger.Warn(" - Unexpected Error in FileName-Creating: " & vbNewLine & ex.Message)
             MsgBox(" - Unexpected Error in FileName-Creating: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
 
     End Function
+    Private Shared Function GET_CTRLData(pInput As String, pDoctypeID As Integer, pPattern As String)
+        Try
+            Dim oReturnValue As String = ""
+            pInput = pInput.Replace("]", "")
+            If IsNumeric(pInput) Then
+                Dim CONTROLVALUE = ClassControlValues.Get_Control_Value_for_ID(pInput, CURRENT_RECORD_ID)
+                If IsNothing(CONTROLVALUE) Then
+                    Dim checktype = "SELECT CONTROL_TYPE_ID,SQL_COMMAND_1,CONNECTION_ID_1 FROM TBPMO_CONTROL WHERE GUID = " & pInput
+                    Dim DTtype As DataTable = MYDB_ECM.GetDatatable(checktype)
+                    If DTtype.Rows.Count = 1 Then
+                        Dim lblsql = DTtype.Rows(0).Item(1)
+                        Dim result
+                        If Len(lblsql) = 0 Or lblsql Is Nothing Then
+                            LOGGER.Warn("TBPMO_CONTROL.SQL is nothing")
+                            oReturnValue = ""
+                        Else
+                            lblsql = lblsql.ToString.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
+                            lblsql = lblsql.ToString.ToUpper.Replace("@RECORD-ID", CURRENT_RECORD_ID)
+                            lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY-ID", CURRENT_ENTITY_ID)
+                            lblsql = lblsql.ToString.ToUpper.Replace("@ENTITY_ID", CURRENT_ENTITY_ID)
+                            LOGGER.Debug("variable sql will be used for convention")
+                            result = MYDB_ECM.GetScalarValue(DTtype.Rows(0).Item(2))
+                        End If
+
+                        If Not IsNothing(result) Then
+                            oReturnValue = result.ToString
+                        Else
+                            LOGGER.Warn("variable sqlresult is nothing - " & lblsql)
+                            oReturnValue = ""
+                        End If
+                    Else
+                        LOGGER.Warn("!!ATTENTION: NameConvention should be filled with value of Control-ID '" & pInput & "', but result was nothing.")
+                        LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
+                        oReturnValue = ""
+                    End If
+
+                Else
+                    If IsDBNull(CONTROLVALUE) Then
+                        LOGGER.Warn("NameConvention should be filled with value of Control-ID '" & pInput & "', but result was DBNULL.")
+                        LOGGER.Warn("SQL-Command: " & CURRENT_LAST_SQL)
+                        oReturnValue = ""
+                    Else
+                        Dim sql1 = "SELECT * FROM TBPMO_WD_NAMECONVENTION_FORMAT WHERE ID = (SELECT TOP 1 GUID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE DOCTYPE_ID = " & pDoctypeID & " AND FORMVIEW_ID = " & CURRENT_FORMVIEW_ID & ")"
+                        Dim DT_FORMAT As DataTable = MYDB_ECM.GetDatatable(sql1)
+                        If Not IsNothing(DT_FORMAT) Then
+                            If DT_FORMAT.Rows.Count > 0 Then
+                                Dim result
+                                Try
+                                    result = (From FormatRow In DT_FORMAT.AsEnumerable
+                                              Select FormatRow Where FormatRow.Item("PATTERN") = pPattern).Single()
+                                Catch ex As Exception
+
+                                End Try
+
+                                If Not IsNothing(result) Then
+                                    Dim _rule = result.Item("FORMAT_RULE")
+                                    If Not IsNothing(_rule) Then
+                                        If IsDate(CONTROLVALUE) Then
+                                            Dim _date As Date = CDate(CONTROLVALUE)
+                                            'Dim _date = CDate(Format(CONTROLVALUE, "dd-MM-yyyy"))
+                                            _rule = _rule.ToString.Replace("Y", "y")
+                                            _rule = _rule.ToString.Replace("D", "d")
+                                            _rule = _rule.ToString.Replace("m", "M")
+                                            Dim convertedvalue = _date.ToString(_rule, CultureInfo.InvariantCulture)
+                                            CONTROLVALUE = convertedvalue
+                                        End If
+                                    End If
+                                End If
+                            End If
+                        End If
+
+                        oReturnValue = CONTROLVALUE
+                    End If
+                End If
+
+            End If
+            Return oReturnValue
+        Catch ex As Exception
+            LOGGER.Warn(" - Unexpected Error in GET_CTRLData: " & vbNewLine & ex.Message)
+            MsgBox("Unexpected Error in GET_CTRLData: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            Return ""
+        End Try
+    End Function
     Private Shared Function CREATE_FOLDER_INDEX(FolderConvention As String, DocTypeID As Integer)
         Try
             CURRENT_VARIABLE_FOLDER_OVERRIDE = False
@@ -509,7 +526,7 @@ Public Class ClassImport_Windream
                             Dim INDEX_ID = split(1)
                             If IsNumeric(INDEX_ID) Then
                                 Dim sql = "SELECT SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE GUID = " & INDEX_ID
-                                Dim sql_command = MYDB_ECM.GetScalarValue(SQL)
+                                Dim sql_command = MYDB_ECM.GetScalarValue(sql)
                                 If IsNothing(sql_command) Then
                                     LOGGER.Warn("unexpected: SQL_RESULT is nothing!!")
                                     LOGGER.Warn("" & sql)

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

@@ -1,7 +1,5 @@
-Imports System.ComponentModel
-Imports System.IO
-Imports DD_LIB_Standards
-Imports DevExpress.DataAccess.Native
+Imports System.IO
+Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
@@ -12,24 +10,30 @@ Public Class ClassInit
 
     Public Sub InitLoggerANDConfig()
         Try
-            LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
+            Dim oLocalUserAppDataPath As String = Application.LocalUserAppDataPath
+            LOGCONFIG = New LogConfig(LogConfig.PathType.AppData,
+                                      oLocalUserAppDataPath & "\Log", Nothing,
                                         My.Application.Info.CompanyName,
-                                        "OrgFlow")
+                                        My.Application.Info.ProductName)
             LOGGER = LOGCONFIG.GetLogger()
-            LOGGER.Info("OrgFlow started")
+            LOGGER.Info("orgFLOW started")
 
             Dim oUserAppDataPath As String = Application.UserAppDataPath
+
             Dim oLegacyAppDataPath As String = Application.UserAppDataPath
             Dim oCommonAppDataPath = Application.CommonAppDataPath
+            LOGGER.Debug($"oCommonAppDataPath: {oCommonAppDataPath}")
             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
+            If My.Settings.UseAppConfig = True Then
                 oCommonAppDataPath = oStartupPath
+                LOGGER.Info($"Achtung: Anstatt ComputerConfig wird AppConfig-/Startup-Path ({oCommonAppDataPath}) benutzt! (UseAppConfig in Appdata)")
             End If
 
             CONFIG = New ConfigManager(Of ClassConfig)(LOGCONFIG, oUserAppDataPath, oCommonAppDataPath, oStartupPath)
-            LOGGER.Info("Config loaded")
+            LOGGER.Debug("Config loaded")
+            LOGGER.Debug($"oUserAppDataPath: {oUserAppDataPath}")
+            LOGGER.Debug($"oCommonAppDataPath: {oCommonAppDataPath}")
             Try
                 If CONFIG.Config.ConnectionString <> String.Empty Then
                     LOGGER.Debug("Connection String loaded")
@@ -39,8 +43,6 @@ Public Class ClassInit
                 LOGGER.Error(ex, "Unexpected Error Getting CONFIG.TestMode or CONFIG.ConnectionStringTest")
             End Try
 
-
-
         Catch ex As Exception
             LOGGER.Error(ex)
         End Try
@@ -75,7 +77,6 @@ Public Class ClassInit
             If LoadFileExclusion() = False Then
                 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)
@@ -90,23 +91,18 @@ Public Class ClassInit
                 frmConfig_Basic.ShowDialog()
                 ' dbResult = clsDatabase.Init(MyConnectionString)
             End If
-            If ClassProxy.MyPROXYConnectionString <> String.Empty Then
-                If clsDatabase.Init(ClassProxy.MyPROXYConnectionString, True) = False Then
-                    ClassHelper.MSGBOX_Handler("ERROR", "", "Error while Initializing proxyserver - Check logfile")
-                Else
-                    Dim csb As New SqlClient.SqlConnectionStringBuilder
-                    csb.ConnectionString = ClassProxy.MyPROXYConnectionString
-                    ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("Proxy-Server {0} - Database {1} is used", csb.DataSource, csb.InitialCatalog))
-                End If
-            End If
+            'If ClassProxy.MyPROXYConnectionString <> String.Empty Then
+            '    If clsDatabase.Init(ClassProxy.MyPROXYConnectionString, True) = False Then
+            '        ClassHelper.MSGBOX_Handler("ERROR", "", "Error while Initializing proxyserver - Check logfile")
+            '    Else
+            '        Dim csb As New SqlClient.SqlConnectionStringBuilder
+            '        csb.ConnectionString = ClassProxy.MyPROXYConnectionString
+            '        ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("Proxy-Server {0} - Database {1} is used", csb.DataSource, csb.InitialCatalog))
+            '    End If
+            'End If
             If Not IsNothing(MYDB_ECM) Then
                 If MYDB_ECM.DBInitialized = False Then
-                    If clsLogger.LOGG_MSG <> String.Empty Then
-                        Throw New Exception("Error while Initializing database:" & vbNewLine & clsLogger.LOGG_MSG)
-                    Else
-                        Throw New Exception("Find more information in the logfile.")
-                    End If
-
+                    Throw New Exception("Find more information in the logfile.")
                 End If
             Else
                 Return False
@@ -171,8 +167,8 @@ Public Class ClassInit
                 Throw New Exception("Find more information in the logfile.")
             End If
 
-            Dim sql = String.Format("SELECT * FROM TBPMO_KONFIGURATION WHERE GUID = 1")
-            Dim KONFIG_DT As DataTable = MYDB_ECM.GetDatatable(sql)
+            Dim oSql = String.Format("SELECT * FROM TBPMO_KONFIGURATION WHERE GUID = 1")
+            Dim KONFIG_DT As DataTable = MYDB_ECM.GetDatatable(oSql)
             If KONFIG_DT.Rows.Count = 1 Then
                 Try
                     MY_WIKISTRING = KONFIG_DT.Rows(0).Item("WIKI_STRING")
@@ -184,37 +180,86 @@ Public Class ClassInit
                 SQL_FULLTEXT = KONFIG_DT.Rows(0).Item("SQL_FULLTEXT")
                 WMDriveLetter = KONFIG_DT.Rows(0).Item("WM_LAUFWERKBUCHSTABE")
                 WMPATH_PREFIX = KONFIG_DT.Rows(0).Item("WMPATH_PREFIX")
-                If Not WMPATH_PREFIX.ToUpper.StartsWith("\\WINDREAM\OBJECTS") Then
+
+
+                If Not WMPATH_PREFIX.ToUpper.StartsWith(constWMOBJECTS) Then
                     SHARE_DRIVE_ACTIVE = True
-                    LOGGER.Info("WM SHARE_DRIVE via TBPMO_KONFIGURATION is active")
+                    LOGGER.Info($"WM SHARE_DRIVE [{WMPATH_PREFIX}] via TBPMO_KONFIGURATION is active")
                 End If
             End If
 
-            sql = "SELECT * FROM TBDD_SQL_COMMANDS"
-            Dim oDTSQL_COMMANDS As DataTable = MYDB_ECM.GetDatatable(sql)
+            oSql = "SELECT * FROM TBDD_SQL_COMMANDS"
+            Dim oDTSQL_COMMANDS As DataTable = MYDB_ECM.GetDatatable(oSql)
             For Each oRow As DataRow In oDTSQL_COMMANDS.Rows
                 If oRow.Item("TITLE") = "ADDI_DOC_SEARCH_RECORD" Then
                     SQL_DOC_RESULT_RECORD = oRow.Item("SQL_COMMAND")
                     LOGGER.Debug("SQL_DOC_RESULT_RECORD = " + SQL_DOC_RESULT_RECORD)
-                End If
-            Next
-            sql = "SELECT * FROM TBPMO_CONTROL"
-            CURRENT_TBPMO_CONTROL = MYDB_ECM.GetDatatable(sql)
-            sql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1")
-            DT_DOCSEARCH_RESULTLIST_CONFIG = MYDB_ECM.GetDatatable(sql)
-            sql = String.Format("SELECT * FROM TBPMO_DOCSEARCH_VARIABLE_CONTROLS")
-            CURRENT_VARIABLE_CONTROLS = MYDB_ECM.GetDatatable(sql)
-            sql = String.Format("SELECT * FROM TBPMO_FORM_VIEW")
-            CURRENT_TBPMO_FORM_VIEW = MYDB_ECM.GetDatatable(sql)
-            sql = String.Format("select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID")
-            CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = MYDB_ECM.GetDatatable(sql)
-            clsCURRENT.LOG_ERRORS_ONLY = DEBUG
+                ElseIf oRow.Item("TITLE") = "OF_GLOBAL_SEARCH" Then
+                    SQL_GLOBAL_SEARCH = oRow.Item("SQL_COMMAND")
 
-            sql = String.Format("select* from TBPMO_FILE_FORMATS_CHANGE")
-            Dim oDTFF_CHANGE As DataTable = MYDB_ECM.GetDatatable(sql)
+                ElseIf oRow.Item("TITLE") = "OF_NODE_SEARCH" Then
+                    SQL_OF_NODE_SEARCH = oRow.Item("SQL_COMMAND")
+                ElseIf oRow.Item("TITLE") = "LIC_COUNT_NAMED" Then
+                    SQL_LIC_NAMED_USER = oRow.Item("SQL_COMMAND")
+                End If
+
+
+            Next
+            Try
+                oSql = "SELECT * FROM TBDD_CATALOG"
+                Dim oDTTBDD_CATALOG As DataTable = MYDB_ECM.GetDatatable(oSql)
+                For Each oRow As DataRow In oDTTBDD_CATALOG.Rows
+                    If oRow.Item("CAT_TITLE") = "DDSUPPORT_PORTAL" Then
+                        CONF_SUPPORTPORTAL = oRow.Item("CAT_STRING")
+                        LOGGER.Debug("CONF_SUPPORTPORTAL = " + CONF_SUPPORTPORTAL)
+                    ElseIf oRow.Item("CAT_TITLE") = "WM_RWA" Then
+                        WM_RWA = oRow.Item("CAT_STRING")
+                        LOGGER.Debug("WM_RWA = " + WM_RWA)
+                    ElseIf oRow.Item("CAT_TITLE") = "WM_RWA1" Then
+                        WM_RWA1 = oRow.Item("CAT_STRING")
+                        LOGGER.Debug("WM_RWA1 = " + WM_RWA1)
+                    ElseIf oRow.Item("CAT_TITLE") = "WM_RWA2" Then
+                        WM_RWA2 = oRow.Item("CAT_STRING")
+                        LOGGER.Debug("WM_RWA2 = " + WM_RWA1)
+                    ElseIf oRow.Item("CAT_TITLE") = "OF_FILESTORE_ENTITY" Then
+                        OF_FILESTORE_ENTITY = oRow.Item("CAT_STRING")
+                        Dim oSQL1 = String.Format("select A.GUID from TBPMO_FORM_CONSTRUCTOR A INNER JOIN TBPMO_FORM_CONSTRUCTOR_DETAIL B ON A.GUID = B.CONSTRUCT_ID WHERE B.FORM_ID = {0}", OF_FILESTORE_ENTITY)
+                        OF_FILESTORE_CONSTRUCTOR = MYDB_ECM.GetScalarValue(oSQL1)
+                        LOGGER.Debug(String.Format("OF_FILESTORE_ENTITY = {0}", OF_FILESTORE_ENTITY.ToString))
+                    End If
+                Next
+            Catch ex As Exception
+                LOGGER.Error(ex)
+            End Try
+
+            oSql = "SELECT * FROM TBPMO_CONTROL"
+            CURRENT_TBPMO_CONTROL = MYDB_ECM.GetDatatable(oSql)
+            oSql = "SELECT * FROM TBPMO_DOCSEARCH_RESULTLIST_CONFIG WHERE VISIBLE = 1"
+            DT_DOCSEARCH_RESULTLIST_CONFIG = MYDB_ECM.GetDatatable(oSql)
+            oSql = "SELECT * FROM TBPMO_DOCSEARCH_VARIABLE_CONTROLS"
+            CURRENT_VARIABLE_CONTROLS = MYDB_ECM.GetDatatable(oSql)
+            oSql = "SELECT * FROM TBPMO_FORM_VIEW"
+            CURRENT_TBPMO_FORM_VIEW = MYDB_ECM.GetDatatable(oSql)
+            oSql = "select T.*, T1.HEADER_CAPTION,T1.TYPE_ID ,T1.ENTITY_ID,T1.LANGUAGE from TBPMO_DOCRESULT_DROPDOWN_ITEMS T, TBPMO_DOCSEARCH_RESULTLIST_CONFIG T1 WHERE T.CONFIG_ID = T1.GUID"
+            CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS = MYDB_ECM.GetDatatable(oSql)
+            oSql = "SELECT * FROM TBFILE_EXTENSION_OVERRIDE"
+            CURRENT_TBFILE_EXTENSION_OVERRIDE = MYDB_ECM.GetDatatable(oSql)
+            oSql = String.Format("select* from TBPMO_FILE_FORMATS_CHANGE")
+            Dim oDTFF_CHANGE As DataTable = MYDB_ECM.GetDatatable(oSql)
             For Each oRow As DataRow In oDTFF_CHANGE.Rows
                 FILE_FORMATS_CHANGE_DURING_EDIT.Add(oRow.Item("FILE_EXT"))
             Next
+            oSql = "Select Top 1 * from TBPMO_WD_OBJECTTYPE"
+            Dim oDTTBPMO_WD_OBJECTTYPE = MYDB_ECM.GetDatatable(oSql)
+            If oDTTBPMO_WD_OBJECTTYPE.Rows.Count = 1 Then
+                WMOBJECTTYPE = oDTTBPMO_WD_OBJECTTYPE.Rows(0).Item("OBJECT_TYPE").ToString
+                WMINDEX_DOCTYPE = oDTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_DOCTYPE").ToString
+                WMINDEX_RELATION = oDTTBPMO_WD_OBJECTTYPE.Rows(0).Item("IDXNAME_RELATION").ToString
+            End If
+            MYGDPICTURE_LICENSE_KEY = MYDB_ECM.GetGDPictureString()
+
+            FILESYSTEM = New FilesystemEx(LOGCONFIG)
+
 
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -237,18 +282,18 @@ Public Class ClassInit
 
     Public Shared Function InitUserLogin(Optional _User As String = "")
         Try
-
+            Dim oMODULE_ACCES As Boolean = False
             If _User = "" Then
                 USER_USERNAME = Environment.UserName
             Else
                 USER_USERNAME = _User
             End If
 
-            Dim sql = String.Format("SELECT T.*, T1.IS_ADMIN FROM TBDD_USER T INNER JOIN TBDD_USER_MODULES T1 ON T.GUID = T1.USER_ID INNER JOIN TBDD_MODULES T2 ON T1.MODULE_ID = T2.GUID  
-WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
+            Dim oFNSQL = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','ORGFLOW',{1})", USER_USERNAME, CLIENT_SELECTED)
+            Dim DT_CHECKUSER_MODULE As DataTable
             LOGGER.Info("Login at: " & Now.ToString)
             LOGGER.Info("Username: " & USER_USERNAME)
-            Dim USER_DT As DataTable = MYDB_ECM.GetDatatable(sql)
+            Dim USER_DT As DataTable = MYDB_ECM.GetDatatable(oFNSQL)
             If USER_DT.Rows.Count = 0 Then
                 LOGGER.Warn(" - User '" & USER_USERNAME & "' not listed in Useradministration!")
 
@@ -257,167 +302,241 @@ WHERE (USERNAME = '{0}') AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
                 ClassHelper.InsertEssential_Log(0, "USER-ID", String.Format("User '{0}' not listed in Userconfiguration", USER_USERNAME))
                 Return False
             Else
-                Dim Right_RO As Boolean = False
-                USER_GUID = USER_DT.Rows(0).Item("GUID")
-                USERID_FK_INT_ECM = USER_DT.Rows(0).Item("USERID_FK_INT_ECM")
-                USER_WAN = USER_DT.Rows(0).Item("WAN_ENVIRONMENT")
-                USER_LANGUAGE = USER_DT.Rows(0).Item("LANGUAGE")
-                clsCURRENT.USER_LANGUAGE = USER_LANGUAGE
-                USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT")
-                USER_GENERAL_VIEWER = USER_DT.Rows(0).Item("GENERAL_VIEWER")
-                Right_RO = True
-
+                DTTBPMO_SERVICE_RIGHT_CONFIG = MYDB_ECM.GetDatatable("SELECT * FROM TBPMO_SERVICE_RIGHT_CONFIG WHERE GUID = 1")
+                WM_DOMAIN = DTTBPMO_SERVICE_RIGHT_CONFIG.Rows(0).Item("AD_DOMAIN")
+                WM_USER = DTTBPMO_SERVICE_RIGHT_CONFIG.Rows(0).Item("AD_USER")
+                WM_SERVER = DTTBPMO_SERVICE_RIGHT_CONFIG.Rows(0).Item("AD_SERVER")
+                Dim PWplainText As String
+                Dim wrapper As New ClassEncryption("!35452didalog=")
+                ' DecryptData throws if the wrong password is used.
                 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
+                    PWplainText = wrapper.DecryptData(DTTBPMO_SERVICE_RIGHT_CONFIG.Rows(0).Item("AD_USER_PW"))
                 Catch ex As Exception
-
+                    LOGGER.Warn("The Userpassword could not be decrypted")
+                    PWplainText = ""
                 End Try
+                WM_USER_PW = PWplainText
 
+                USER_GUID = USER_DT.Rows(0).Item("USER_ID")
+                LOGGER.Debug($"USER_GUID: {USER_GUID}")
+                Try
+                    USERID_FK_INT_ECM = USER_DT.Rows(0).Item("USERID_FK_INT_ECM")
+                Catch ex As Exception
+                    LOGGER.Warn("ACHTUNG - Spalte USERID_FK_INT_ECM nicht in FNDD_LOGIN_USER_MODULE enthalten ")
+                    USERID_FK_INT_ECM = 0
+                End Try
+                LOGGER.Debug($"USERID_FK_INT_ECM: {USERID_FK_INT_ECM}")
+                USER_IS_ADMIN = USER_DT.Rows(0).Item("IS_ADMIN")
+                USER_LANGUAGE = USER_DT.Rows(0).Item("USER_LANGUAGE")
+                'clsCURRENT.USER_LANGUAGE = USER_LANGUAGE
+                USER_DATE_FORMAT = USER_DT.Rows(0).Item("USER_DATE_FORMAT")
+                oMODULE_ACCES = USER_DT.Rows(0).Item("MODULE_ACCESS")
+                Dim oWORKING_MODE = USER_DT.Rows(0).Item("WORKING_MODE")
 
-                If Right_RO = False Then
-                    LOGGER.Warn("User '" & USER_USERNAME & "' not authorized for using OrgFlow!")
-                    'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
-                    Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
+                Dim oSplitWorkMode As String() = oWORKING_MODE.Split("#")
 
-                    If USER_LANGUAGE <> "de-DE" Then
-                        msg = String.Format("You are not authorized for using this module." & vbNewLine & "Please contact the admin.")
-                    End If
-                    MsgBox(msg, MsgBoxStyle.Exclamation)
-                    Return False
-                    'Me.Close()
-                Else
-                    sql = String.Format("select * from TBPMO_RIGHT_USER WHERE USER_ID = " & USER_GUID)
-                    CURRENT_TBPMO_RIGHT_USER = MYDB_ECM.GetDatatable(sql)
+                ' Use For Each loop over words and display them.
+                Dim oMode As String
+                For Each oMode In oSplitWorkMode
+                    LOGGER.Debug($"oWorkingMode Parameter: {oMode}")
 
-
-                    Init_CONN_SWITCH()
-                    DT_CLIENT_USER = MYDB_ECM.GetDatatable("SELECT T.*, T1.LICENSE_PMO, T1.CLIENT_NAME FROM TBDD_CLIENT_USER T,TBDD_CLIENT T1 WHERE T.CLIENT_ID = T1.GUID AND T.USER_ID = " & USER_GUID)
-                    If DT_CLIENT_USER.Rows.Count > 1 Then
-                        frmClientLogin.ShowDialog()
-                    ElseIf DT_CLIENT_USER.Rows.Count = 1 Then
-                        CLIENT_SELECTED = DT_CLIENT_USER.Rows(0).Item("CLIENT_ID")
-                    End If
-                    If CLIENT_SELECTED = 99 Then
-                        Dim msg = String.Format("Die Mandantenanmeldung war nicht möglich." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
-
-                        If USER_LANGUAGE <> "de-DE" Then
-                            msg = String.Format("The client-login was not possible." & vbNewLine & "Please contact the admin.")
+                    If oMode.StartsWith("WMMODE") Then
+                        WorkMode_WMMODE = oMode.Replace("WMMODE=", "")
+                        LOGGER.Debug($"oWorkmode WMMODE = [{WorkMode_WMMODE}]")
+                        If WorkMode_WMMODE = "READ" Then
+                            WM_READ_ONLY = True
+                            LOGGER.Info("WINDREAM IS CONFIGURED READ ONLY FOR USER!")
+                        ElseIf WorkMode_WMMODE = "ADD" Then
+                            WM_ADD_NO_DELETE = True
+                            LOGGER.Info("WINDREAM IS CONFIGURED AS ADD-ONLY FOR USER!")
                         End If
-                        MsgBox(msg, MsgBoxStyle.Exclamation)
-                        Return False
-                    End If
-
-                    'Am System anmelden
-                    ClassLicence.Refresh_Licence(CLIENT_SELECTED)
-                    'Am System anmelden
-                    'sql = String.Format("UPDATE TBDD_USER SET LOGGED_IN = 1, LOGGED_WHERE = '{0}' WHERE GUID = {1}", Environment.MachineName, USER_GUID)
-                    MYDB_ECM.ExecuteNonQuery(sql)
-                    sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND UPPER(MODULE)= UPPER('Record-Organizer')"
-                    If MYDB_ECM.ExecuteNonQuery(sql) = True Then
-
-                    End If
-                    Dim ConStringMain As String
-                    If clsDatabase.DB_PROXY_INITIALIZED = True Then
-                        ConStringMain = "PROXY: " & ClassProxy.MyPROXYConnectionString & " # MAIN: " & MyConnectionString
+                    ElseIf oMode.StartsWith("WM_PRAEFIX") Then
+                        WMPATH_PREFIX = oMode.Replace("WM_PRAEFIX=", "")
+                        WMPATH_via_WMA = True
+                        LOGGER.Debug($"oWorkmode WM_PRAEFIX = [{WMPATH_PREFIX}]")
+                        If Not WMPATH_PREFIX.ToUpper.StartsWith(constWMOBJECTS) Then
+                            SHARE_DRIVE_ACTIVE = True
+                            LOGGER.Info($"WM SHARE_DRIVE [{WMPATH_PREFIX}] via WORKING_MODE is active")
+                        End If
+                    ElseIf oMode = "WM_USER_LOGIN" Then
+                        LOGGER.Info($"WM_IMPERSONATE_LOGIN WILL BE SET TO False via WORKING_MODE!")
+                        WM_IMPERSONATE_LOGIN = False
                     Else
-                        ConStringMain = "Main: " & MyConnectionString
-                    End If
-                    sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,CONNECTION_STRING) VALUES ({0},{1},'Record-Organizer','{2}','{3}','{4}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString, Environment.MachineName, ConStringMain)
-                    MYDB_ECM.ExecuteNonQuery(sql)
-
-                    USER_IS_ADMIN = USER_DT.Rows(0).Item("IS_ADMIN") 'vorher RECORD_ADMIN
-                    If USER_IS_ADMIN = True Then
-                        If ESC_Hidden = True Then
-                            frmLoginUserSelect.ShowDialog()
-                            ESC_Hidden = False
-                            If USER_USERNAME <> "" Then
-                                InitUserLogin(USER_USERNAME)
-                            End If
+                        If oMode <> "0" Then
+                            LOGGER.Info($"Wrong oMode: {oMode}")
                         End If
-                    Else
-
                     End If
-                    Try
-                        If WM_READ_ONLY = True Then
-                            If SHARE_DRIVE_ACTIVE = True Then
-                                LOGGER.Info($"SHAREDRIVE IS ACTIVE = {SHARE_DRIVE_ACTIVE.ToString}")
-                            End If
+                Next
 
-                        Else
-                            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
-                                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!", "OrgFlow 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)
-                    End Try
-
-                    sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED)
-                    Dim anzahl = MYDB_ECM.GetScalarValue(sql)
-                    USERS_LOGGED_IN = CInt(anzahl)
-                    LOGGER.Info("User# logged in: " & anzahl.ToString)
-                    LOGGER.Info("LICENSE_COUNT: " & LICENSE_COUNT.ToString)
-                    '####
-
-                    If LICENSE_COUNT <= (USERS_LOGGED_IN + 1) And LICENSE_EXPIRED = False Then
-                        Dim msg = String.Format("Die Anzahl der aktuell angemeldeten User (" & USERS_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
-
-                        If USER_LANGUAGE <> "de-DE" Then
-                            msg = String.Format("The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses." & vbNewLine &
-                                                "Number of licenses: " & LICENSE_COUNT.ToString & vbNewLine & "Please contact Your admin!")
-                        End If
-                        MsgBox(msg, MsgBoxStyle.Exclamation)
-                        LOGGER.Warn("The number of logged Users (" & USERS_LOGGED_IN.ToString & ") exceeds the number of licenses (" & LICENSE_COUNT & ") ")
-                        If USER_IS_ADMIN = False Then
-                            'Anmeldung wieder herausnehmen
-                            sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Record-Organizer'"
-                            MYDB_ECM.ExecuteNonQuery(sql)
-                            LOGGER.Warn(" - logged out the user")
-                            Return False
-                        End If
-                    Else
-                        Try
-                            'Die FolderWatch starten
-                            Dim sql1 = "SELECT FOLDER_PATH FROM TBPMO_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_GUID
-                            Dim folderwatch_SCAN = MYDB_ECM.GetScalarValue(sql1)
-
-                            If Not folderwatch_SCAN Is Nothing Then
-                                CURRENT_SCAN_FOLDERWATCH = folderwatch_SCAN
-                                If FWSCAN_started = True Then
-                                    ClassFolderWatcher.StartStop_FolderWatchSCAN()
-                                End If
-                            End If
-                        Catch ex As Exception
-                            LOGGER.Warn("Unexpected Error in Init_Folderwatch: " & ex.Message, True)
-                            Return False
-                        End Try
-
-                    End If
-                    If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then
-                        SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""') "
-                    End If
-                    Dim oSQL = $"SELECT COUNT(GU.GUID) FROM	TBDD_GROUPS_USER GU INNER JOIN TBDD_GROUPS G ON GU.GROUP_ID = G.GUID WHERE G.NAME = 'ORGFLOW-Supervisor' AND GU.USER_ID = {USER_GUID}"
-                    USER_IS_SUPERVISOR = MYDB_ECM.GetScalarValue(oSQL)
-                    Return True
-                    'LabelLoggedIn.Caption = "Anzahl Angemeldete User: " & anzahl.ToString
+                If SHARE_DRIVE_ACTIVE = True And Len(oWORKING_MODE) = 0 Then
+                    LOGGER.Info("WINDREAM IS CONFIGURED READ ONLY AS No Workmode was configured and Sharedrive is active!")
+                    WM_READ_ONLY = True
+                End If
+                If USER_IS_ADMIN And SHARE_DRIVE_ACTIVE = True Then
+                    LOGGER.Info($"User configured as an admin, but SHAREDRIVE ACTIVE - So WM_READ_ONLY = False!")
+                    WM_READ_ONLY = False
                 End If
             End If
+
+
+            If oMODULE_ACCES = False Then
+                LOGGER.Warn("User '" & USER_USERNAME & "' not authorized for using OrgFlow!")
+                'MsgBox("Achtung: Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
+                Dim msg = String.Format("Sie sind nicht für die Nutzung dieses Moduls freigeschaltet." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
+
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = String.Format("You are not authorized for using this module." & vbNewLine & "Please contact the admin.")
+                End If
+                MsgBox(msg, MsgBoxStyle.Exclamation)
+                Return False
+            End If
+            'Me.Close()
+
+            oFNSQL = String.Format("select * from TBPMO_RIGHT_USER WHERE USER_ID = " & USER_GUID)
+            CURRENT_TBPMO_RIGHT_USER = MYDB_ECM.GetDatatable(oFNSQL)
+
+
+            Init_CONN_SWITCH()
+            DT_CLIENT_USER = MYDB_ECM.GetDatatable("SELECT T.*, T1.LICENSE_PMO, T1.CLIENT_NAME FROM TBDD_CLIENT_USER T,TBDD_CLIENT T1 WHERE T.CLIENT_ID = T1.GUID AND T.USER_ID = " & USER_GUID)
+            If DT_CLIENT_USER.Rows.Count > 1 Then
+                frmClientLogin.ShowDialog()
+            ElseIf DT_CLIENT_USER.Rows.Count = 1 Then
+                CLIENT_SELECTED = DT_CLIENT_USER.Rows(0).Item("CLIENT_ID")
+            End If
+            If CLIENT_SELECTED = 99 Then
+                Dim msg = String.Format("Die Mandantenanmeldung war nicht möglich." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
+
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = String.Format("The client-login was not possible." & vbNewLine & "Please contact the admin.")
+                End If
+                MsgBox(msg, MsgBoxStyle.Exclamation)
+                Return False
+            End If
+
+            'Am System anmelden
+            ClassLicence.Refresh_Licence(CLIENT_SELECTED)
+            'Am System anmelden
+            'sql = String.Format("UPDATE TBDD_USER SET LOGGED_IN = 1, LOGGED_WHERE = '{0}' WHERE GUID = {1}", Environment.MachineName, USER_GUID)
+            MYDB_ECM.ExecuteNonQuery(oFNSQL)
+            oFNSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Record-Organizer'"
+            If MYDB_ECM.ExecuteNonQuery(oFNSQL) = True Then
+
+            End If
+            Dim ConStringMain As String
+
+            ConStringMain = "Main: " & MyConnectionString
+
+            oFNSQL = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,CONNECTION_STRING) VALUES ({0},{1},'Record-Organizer','{2}','{3}','{4}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString, Environment.MachineName, ConStringMain)
+            MYDB_ECM.ExecuteNonQuery(oFNSQL)
+
+
+            If USER_IS_ADMIN = True Then
+                If ESC_Hidden = True Then
+                    frmLoginUserSelect.ShowDialog()
+                    ESC_Hidden = False
+                    If USER_USERNAME <> "" Then
+                        InitUserLogin(USER_USERNAME)
+                    End If
+                End If
+
+            End If
+
+
+
+            Try
+                If WM_READ_ONLY = False Then
+                    Try
+                        LOGGER.Debug($"Connecting to windream-Server via DigitalData.Modules.Windream.Windream...")
+                        If WM_IMPERSONATE_LOGIN = False Then
+                            WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, WM_SERVER, "", "", WM_DOMAIN)
+                        Else
+                            WMMOD = New DigitalData.Modules.Windream.Windream(LOGCONFIG, False, WMDriveLetter, WMPATH_PREFIX, True, WM_SERVER, WM_USER, WM_USER_PW, WM_DOMAIN)
+                        End If
+
+                        If IsNothing(WMMOD) Then
+                            MsgBox("Could not connect to windream! Check Your configuration", MsgBoxStyle.Exclamation)
+                        Else
+                            LOGGER.Debug($"..Successfully connected to Modules.Windream!")
+                        End If
+                    Catch ex As Exception
+                        If IsNothing(WMMOD) Then
+                            MsgBox($"Could not connect to windream [{WM_SERVER}]! Check Your configuration and inform Your admin!", MsgBoxStyle.Exclamation)
+                        End If
+                        LOGGER.Error(ex)
+                        LOGGER.Warn("Could not create the login for DigitalData.Modules.Windream.Windream! Setting WM_READ_ONLY = True")
+                        WM_READ_ONLY = True
+                    End Try
+
+                    If WMMOD.SessionLoggedin = 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!", "orgFLOW 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 WINDREAM MOD.Init: " & ex.Message)
+                MsgBox("Unexpected Error in Creating windream-Session: " & ex.Message & vbNewLine & "Please inform Your sysadmin!", MsgBoxStyle.Critical)
+            End Try
+
+
+            If SQL_LIC_NAMED_USER <> "" Then
+                SQL_LIC_NAMED_USER = SQL_LIC_NAMED_USER.Replace("@MODULE", "Record-Organizer")
+                SQL_LIC_NAMED_USER = SQL_LIC_NAMED_USER.Replace("@CLIENT", CLIENT_SELECTED.ToString)
+                oFNSQL = SQL_LIC_NAMED_USER
+            Else
+                oFNSQL = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE MODULE = 'Record-Organizer' AND CLIENT_ID = {0}", CLIENT_SELECTED)
+            End If
+
+            Dim anzahl = MYDB_ECM.GetScalarValue(oFNSQL)
+            LICENSES_USED = CInt(anzahl)
+            LOGGER.Info("NamedUser via SQL_LIC_NAMED_USER in TimeSpan: " & anzahl.ToString)
+            LOGGER.Info("LICENSE_COUNT: " & LICENSE_COUNT.ToString)
+            '####
+
+            If LICENSE_COUNT <= (LICENSES_USED) And LICENSE_EXPIRED = False Then
+                Dim msg = String.Format("Die Anzahl der aktuell verbrauchten Lizenzen (" & LICENSES_USED.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!")
+
+                If USER_LANGUAGE <> "de-DE" Then
+                    msg = String.Format("The number of USED licenses (" & LICENSES_USED.ToString & ") exceeds the number of licenses." & vbNewLine &
+                                                "Number of licenses: " & LICENSE_COUNT.ToString & vbNewLine & "Please contact Your admin!")
+                End If
+                MsgBox(msg, MsgBoxStyle.Exclamation)
+                LOGGER.Warn("The number of USED licenses (" & LICENSES_USED.ToString & ") exceeds the number of licenses (" & LICENSE_COUNT & ") ")
+                If USER_IS_ADMIN = False Then
+                    'Anmeldung wieder herausnehmen
+                    oFNSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Record-Organizer'"
+                    MYDB_ECM.ExecuteNonQuery(oFNSQL)
+                    LOGGER.Warn(" - logged out the user")
+                    Return False
+                End If
+            ElseIf LICENSE_EXPIRED = True Then
+                MsgBox("Your license has expired!" & vbNewLine & "Last valid date: " & LICENSE_DATE & vbNewLine & "Please contact your admin!", MsgBoxStyle.Exclamation)
+                oFNSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'Record-Organizer'"
+                MYDB_ECM.ExecuteNonQuery(oFNSQL)
+                Return False
+            Else
+                Try
+                    'Die FolderWatch starten
+                    Dim sql1 = "SELECT FOLDER_PATH FROM TBPMO_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_GUID
+                    Dim folderwatch_SCAN = MYDB_ECM.GetScalarValue(sql1)
+
+                    If Not folderwatch_SCAN Is Nothing Then
+                        CURRENT_SCAN_FOLDERWATCH = folderwatch_SCAN
+                        If FWSCAN_started = True Then
+                            ClassFolderWatcher.StartStop_FolderWatchSCAN()
+                        End If
+                    End If
+                Catch ex As Exception
+                    LOGGER.Warn("Unexpected Error in Init_Folderwatch: " & ex.Message, True)
+                    Return False
+                End Try
+
+            End If
+            'If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED Then
+            '    SQL_FULLTEXT = "SELECT DISTINCT [dwDocID] FROM [dbo].FullText WHERE CONTAINS([Text], '""*@FULLTEXT*""') "
+            'End If
+            Dim oSQL = $"SELECT COUNT(GU.GUID) FROM	TBDD_GROUPS_USER GU INNER JOIN TBDD_GROUPS G ON GU.GROUP_ID = G.GUID WHERE G.NAME = 'ORGFLOW-Supervisor' AND GU.USER_ID = {USER_GUID}"
+            USER_IS_SUPERVISOR = MYDB_ECM.GetScalarValue(oSQL)
+            Return True
         Catch ex As Exception
             LOGGER.Error(ex)
             LOGGER.Warn("Unexpected Error in InitUserLogin: " & ex.Message)

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

@@ -57,9 +57,9 @@ Public Class ClassJumpRecord
                 Exit Sub
             End If
             JUMP_STATE = STATE_ID
-            JUMP_RECORD_ID = recordId
+            JUMP_ID = recordId
             'OpenFormConstructor(constructorId, recordId)
-            OpenRecordView(recordId)
+            OpenRecordView()
         Catch ex As Exception
             MsgBox("Error in JumpToRecord:" & vbNewLine & ex.Message)
             Exit Sub

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

@@ -13,18 +13,22 @@ Public Class ClassLicence
 
             Dim lic As String = MYDB_ECM.GetScalarValue(sql)
             If lic = "" Then
+                LOGGER.Info($"Achtung es gibt keine Lizenz-  Prüfe SQL [{sql}]")
                 LICENSE_COUNT = 0
                 LICENSE_DATE = "1900-01-01"
                 LICENSE_DOSSIER_COUNT = 0
                 Exit Sub
             End If
             Dim licString = _lizenzManager.DecodeLicenseKey(lic)
+            LOGGER.Info("lic-String is: " & licString)
             Dim split() = licString.ToString.Split("#")
 
             If lic <> "" Then
                 LICENSE_COUNT = split(0)
             Else
+
                 LICENSE_COUNT = 0
+                LOGGER.Info($"Achtung LICENSE_COUNT wird 0 - licString: [{licString}]")
             End If
             Dim LicDATEsplit() = split(1).ToString.Split("-")
             Dim LICENSE_FILE_DATE As Date
@@ -78,7 +82,7 @@ Public Class ClassLicence
 
                 If license_Row.Item("NAME") = "Proxy-Server" Then
                     If expired = False Then
-                        LICENSE_PROXY = True
+
                     End If
                 ElseIf license_Row.Item("NAME") = "Site-AddOn" Then
                     If expired = False Then
@@ -103,7 +107,7 @@ Public Class ClassLicence
         End Try
     End Sub
 
-    Public Shared Function license_is_Valid()
+    Public Shared Function license_is_Expired()
         If LICENSE_EXPIRED Then
             MsgBox("Your license has expired!" & vbNewLine & "Last valid date: " & LICENSE_DATE & vbNewLine & "Please contact Digital Data!", MsgBoxStyle.Exclamation)
             Return False

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

@@ -6,6 +6,9 @@ Public Class ClassNodeNavigation
     Public Shared Datatable_Nodes As DataTable
     Public Shared TREEVIEW_IMAGELIST As ImageList
     Public Shared IMAGE_COLLECTION As ImageCollection
+
+
+
     Public Shared Function CreateNodeProcedure(RECORD_ID As Integer, NODE_CONFIG_ID As Integer, NODE_CAPTION As String, NODE_ID1 As String, NODE_PARENT_ID As String, ADDED_WHO As String)
         Try
             Dim connection As New SqlConnection
@@ -38,56 +41,56 @@ Public Class ClassNodeNavigation
     End Function
 
 
-    Public Shared Function CREATE_IMAGE_COLL(DT_IMAGELIST As DataTable)
-        IMAGE_COLLECTION = New ImageCollection
-        For Each row As DataRow In DT_IMAGELIST.Rows
-            Try
-                Dim bimage = row.Item("NODE_IMAGE")
-                If Not IsDBNull(bimage) Then
-                    Dim Node_image = ByteArrayToBitmap(bimage)
-                    IMAGE_COLLECTION.AddImage(Node_image, row.Item("GUID")) 'row.Item("GUID").ToString & "#" & row.Item("ENTITY_ID")
+    'Public Shared Function CREATE_IMAGE_COLL(DT_IMAGELIST As DataTable)
+    '    IMAGE_COLLECTION = New ImageCollection
+    '    For Each row As DataRow In DT_IMAGELIST.Rows
+    '        Try
+    '            Dim bimage = row.Item("NODE_IMAGE")
+    '            If Not IsDBNull(bimage) Then
+    '                Dim Node_image = ByteArrayToBitmap(bimage)
+    '                IMAGE_COLLECTION.AddImage(Node_image, row.Item("GUID")) 'row.Item("GUID").ToString & "#" & row.Item("ENTITY_ID")
 
-                End If
-            Catch ex As Exception
+    '            End If
+    '        Catch ex As Exception
 
-            End Try
+    '        End Try
 
-        Next
-    End Function
+    '    Next
+    'End Function
 
 
-    Public Shared Function Return_Node(PARENT_ID As Integer, ParentNode As TreeNode)
-        Dim expression As String
-        expression = "PARENT_GUID = " & PARENT_ID 'Einschränkung auf Type  und Parent_Guid
-        Dim foundRows() As DataRow
-        foundRows = Datatable_Nodes.Select(expression)
-        Dim q As Integer
-        For q = 0 To foundRows.GetUpperBound(0)
-            Dim ID9 = foundRows(q)("GUID")
-            Dim LevelEntity9 = foundRows(q)("ENTITY_ID")
-            Dim controlID9 = foundRows(q)("CONTROL_ID")
-            Dim nodetext9 = foundRows(q)("NODE_CAPTION")
-            Dim RECORD_ID = foundRows(q)("RECORD_ID")
-            Dim NODE_CONFIG_ID = foundRows(q)("NODE_CONFIG_ID")
-            ' Node erstellen..
-            Dim NEW_NODE As TreeNode
-            NEW_NODE = New TreeNode(nodetext9)
-            ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity9, NEW_NODE)
-            NEW_NODE.Tag = ClassNodeNavigation.CreateNODE_TAG(LevelEntity9, ID9, RECORD_ID, NODE_CONFIG_ID)
+    'Public Shared Function Return_Node(PARENT_ID As Integer, ParentNode As TreeNode)
+    '    Dim expression As String
+    '    expression = "PARENT_GUID = " & PARENT_ID 'Einschränkung auf Type  und Parent_Guid
+    '    Dim foundRows() As DataRow
+    '    foundRows = Datatable_Nodes.Select(expression)
+    '    Dim q As Integer
+    '    For q = 0 To foundRows.GetUpperBound(0)
+    '        Dim ID9 = foundRows(q)("GUID")
+    '        Dim LevelEntity9 = foundRows(q)("ENTITY_ID")
+    '        Dim controlID9 = foundRows(q)("CONTROL_ID")
+    '        Dim nodetext9 = foundRows(q)("NODE_CAPTION")
+    '        Dim RECORD_ID = foundRows(q)("RECORD_ID")
+    '        Dim NODE_CONFIG_ID = foundRows(q)("NODE_CONFIG_ID")
+    '        ' Node erstellen..
+    '        Dim NEW_NODE As TreeNode
+    '        NEW_NODE = New TreeNode(nodetext9)
+    '        ClassNodeNavigation.Check_NODE_CONFIG_ID(LevelEntity9, NEW_NODE)
+    '        NEW_NODE.Tag = ClassNodeNavigation.CreateNODE_TAG(LevelEntity9, ID9, RECORD_ID, NODE_CONFIG_ID)
 
-            Dim index = 0
-            For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
-                If img.Replace("LEVEL#ENTITY", "") = "6" & LevelEntity9.ToString Then
-                    Exit For
-                End If
-                index += 1
-            Next
-            NEW_NODE.ImageIndex = index
-            NEW_NODE.SelectedImageIndex = index
-            ' ..und einfügen
-            ParentNode.Nodes.Add(NEW_NODE)
-        Next '
-    End Function
+    '        Dim index = 0
+    '        For Each img As String In TREEVIEW_IMAGELIST.Images.Keys
+    '            If img.Replace("LEVEL#ENTITY", "") = "6" & LevelEntity9.ToString Then
+    '                Exit For
+    '            End If
+    '            index += 1
+    '        Next
+    '        NEW_NODE.ImageIndex = index
+    '        NEW_NODE.SelectedImageIndex = index
+    '        ' ..und einfügen
+    '        ParentNode.Nodes.Add(NEW_NODE)
+    '    Next '
+    'End Function
     Public Shared Sub Check_NODE_CONFIG_ID(ENTITY_ID As Integer, myTreeNode As TreeNode)
         Try
             If myTreeNode Is Nothing Then

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

@@ -20,42 +20,42 @@ Public Class ClassProxy
             Return False
         End If
     End Function
-    Public Shared Function PRPROXY_SYNC_DOC_OBJECTS()
-        If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
-            Return False
-        End If
-        Dim sel = "DECLARE	@return_value int" & vbNewLine &
-        "EXEC @return_value = [dbo].[PRPROXY_SYNC_DOC_OBJECTS]" & vbNewLine &
-        "SELECT	'Return Value' = @return_value"
-        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
-        If Not IsNothing(Result) Then
-            If Result.Rows(0).Item(0) = 0 Then
-                Return True
-            Else
-                Return False
-            End If
-        Else
-            Return False
-        End If
-    End Function
-    Public Shared Function PRPROXY_RECORD_DEL(RECID As Integer, ENTITY_ID As Integer)
-        If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
-            Return False
-        End If
-        Dim sel = String.Format("DECLARE @return_value int" & vbNewLine &
-        "EXEC @return_value = [dbo].[PRPROXY_RECORD_DEL] {0},{1} " & vbNewLine &
-        "SELECT	'Return Value' = @return_value", RECID, ENTITY_ID)
-        Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
-        If Not IsNothing(Result) Then
-            If Result.Rows(0).Item(0) = 0 Then
-                Return True
-            Else
-                Return False
-            End If
-        Else
-            Return False
-        End If
-    End Function
+    'Public Shared Function PRPROXY_SYNC_DOC_OBJECTS()
+    '    If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
+    '        Return False
+    '    End If
+    '    Dim sel = "DECLARE	@return_value int" & vbNewLine &
+    '    "EXEC @return_value = [dbo].[PRPROXY_SYNC_DOC_OBJECTS]" & vbNewLine &
+    '    "SELECT	'Return Value' = @return_value"
+    '    Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
+    '    If Not IsNothing(Result) Then
+    '        If Result.Rows(0).Item(0) = 0 Then
+    '            Return True
+    '        Else
+    '            Return False
+    '        End If
+    '    Else
+    '        Return False
+    '    End If
+    'End Function
+    'Public Shared Function PRPROXY_RECORD_DEL(RECID As Integer, ENTITY_ID As Integer)
+    '    If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
+    '        Return False
+    '    End If
+    '    Dim sel = String.Format("DECLARE @return_value int" & vbNewLine &
+    '    "EXEC @return_value = [dbo].[PRPROXY_RECORD_DEL] {0},{1} " & vbNewLine &
+    '    "SELECT	'Return Value' = @return_value", RECID, ENTITY_ID)
+    '    Dim Result As DataTable = MYDB_ECM.GetDatatable(sel)
+    '    If Not IsNothing(Result) Then
+    '        If Result.Rows(0).Item(0) = 0 Then
+    '            Return True
+    '        Else
+    '            Return False
+    '        End If
+    '    Else
+    '        Return False
+    '    End If
+    'End Function
     Public Shared Function PRPROXY_RECORD_UPD_INS(ENT_ID As Integer, RECID As Integer)
         If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
             Return False
@@ -182,19 +182,6 @@ Public Class ClassProxy
             Return False
         End If
     End Function
-    Public Shared Function IS_PROXY_BUSY()
-        If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
-            Return False
-        End If
-        Dim sql = "SELECT SYNC_RUNNING FROM TBPROXY_CONFIG WHERE GUID = 1"
-        Dim BUSY
-        BUSY = MYDB_ECM.GetScalarValue(sql)
-        If IsNothing(BUSY) Then
-            Return True
-        Else
-            Return BUSY
-        End If
-    End Function
     Public Shared Function PRPROXY_DOC_VALUES_UPD(DocID As Integer, RecId As Integer)
         If LICENSE_PROXY = False Or clsDatabase.DB_PROXY_INITIALIZED = False Then
             Return False

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

@@ -6,10 +6,7 @@
                 Exit Sub
             End If
             Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 1, IN_WORK_WHO = '{0}' WHERE GUID = {1}", USER_USERNAME, RecordId)
-            If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                MYDB_ECM.ExecuteNonQuery(SQL)
-            End If
-            MYDB_ECM.ExecuteNonQuery(Sql)
+            MYDB_ECM.ExecuteNonQuery(SQL)
         Catch ex As Exception
             MsgBox("Error in LockRecord: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -25,10 +22,7 @@
                 Exit Sub
             End If
             Dim SQL As String = String.Format("UPDATE TBPMO_RECORD SET IN_WORK = 0, IN_WORK_WHO = NULL WHERE GUID = {0}", RecordId)
-            If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                MYDB_ECM.ExecuteNonQuery(SQL)
-            End If
-            MYDB_ECM.ExecuteNonQuery(Sql)
+            MYDB_ECM.ExecuteNonQuery(SQL)
         Catch ex As Exception
             MsgBox("Error in UnlockRecord: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try

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

@@ -255,7 +255,8 @@ Public Class ClassRecordView
     Private Sub LoadValues(controlCollection As Control.ControlCollection)
         Try
             Dim controls As New List(Of Control)
-            DTValues = MYDB_ECM.GetDatatable(String.Format("SELECT * FROM  VWPMO_VALUES WHERE RECORD_ID = {0}", Me.RecordId), True)
+            Dim oValueSQL = $"SELECT * FROM  VWPMO_VALUES WHERE RECORD_ID = {Me.RecordId}"
+            DTValues = MYDB_ECM.GetDatatable(oValueSQL)
 
             ' ControlCollection in eine List<Of Control> konvertieren
             controls = controlCollection.Cast(Of Control)().ToList()

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

@@ -11,9 +11,10 @@
             RIGHT_VIEW_DOC = True
             RIGHT_DELETE_DOC = False
             RIGHT_READ_ONLY_DOC = False
-            ' Wenn Rechte pro Record defineirt wurden!!!
+            ' Wenn Rechte pro Record definiert wurden!!!
             If SQL_RECORD_AND_FILE_READ_ONLY <> "" Or SQL_DOC_READ_ONLY <> "" Then
                 If SQL_RECORD_AND_FILE_READ_ONLY <> "" Then
+                    LOGGER.Debug("ClassRightManagement...SQL_RECORD_AND_FILE_READ_ONLY EXISTING.")
                     RIGHT_RECORD_AND_FILE_READ_ONLY = ClassHelper.Check_Record_Read_only(RECORD_ID, ENTITY_ID)
                     If RIGHT_RECORD_AND_FILE_READ_ONLY = True Then
                         RIGHT_EDIT_R = False
@@ -22,6 +23,7 @@
                     End If
                 End If
                 If SQL_DOC_READ_ONLY <> "" Then
+                    LOGGER.Debug("ClassRightManagement...SQL_DOC_READ_ONLY EXISTING.")
                     RIGHT_READ_ONLY_DOC = ClassHelper.Check_File_Read_only(RECORD_ID, ENTITY_ID)
                     If RIGHT_READ_ONLY_DOC = True Then
                         RIGHT_ADD_DOC = False
@@ -42,6 +44,7 @@
 
                 'Definition der Rechte erfolgt über UserGroupstable......wenn gefüllt
                 If DT_RIGHTS_GROUP.Rows.Count > 0 And DT_RIGHTS_USER.Rows.Count = 0 Then
+                    LOGGER.Debug("ClassRightManagement...DEFINTION FOR DT_RIGHTS_GROUP!")
                     For Each row As DataRow In DT_RIGHTS_GROUP.Rows
                         RIGHT_EDIT_R = CBool(DT_RIGHTS_GROUP.Rows(0).Item(0))
                         RIGHT_ADD_R = CBool(DT_RIGHTS_GROUP.Rows(0).Item(1))
@@ -58,6 +61,7 @@
                 Else
                     'Definition der Rechte erfolgt über UserRighttable
                     If DT_RIGHTS_USER.Rows.Count = 1 Then
+                        LOGGER.Debug("ClassRightManagement...DEFINTION FOR DT_RIGHTS_USER!")
                         RIGHT_EDIT_R = CBool(DT_RIGHTS_USER.Rows(0).Item("EDIT_REC"))
                         RIGHT_ADD_R = CBool(DT_RIGHTS_USER.Rows(0).Item("ADD_REC"))
                         RIGHT_DELETE_R = CBool(DT_RIGHTS_USER.Rows(0).Item("DELETE_REC"))
@@ -66,17 +70,19 @@
                         RIGHT_VIEW_DOC = CBool(DT_RIGHTS_USER.Rows(0).Item("FILES_VISIBLE"))
                         RIGHT_DELETE_DOC = CBool(DT_RIGHTS_USER.Rows(0).Item("DELETE_DOC"))
                         RIGHT_READ_ONLY_DOC = CBool(DT_RIGHTS_USER.Rows(0).Item("READ_ONLY_DOC"))
+                    Else
+                        LOGGER.Info("ClassRightManagement...NO DEFINTION FOR GROUP- OR USER-RIGHT!")
                     End If
                 End If
             End If
 
-            LOGGER.Debug("RIGHT_EDIT_R: " & RIGHT_EDIT_R.ToString)
-                LOGGER.Debug("RIGHT_ADD_R: " & RIGHT_ADD_R.ToString)
-                LOGGER.Debug("RIGHT_DELETE_R: " & RIGHT_DELETE_R.ToString)
-                LOGGER.Debug("RIGHT_ADD_DOC: " & RIGHT_ADD_DOC.ToString)
-                LOGGER.Debug("RIGHT_VIEW_DOC: " & RIGHT_VIEW_DOC.ToString)
-                LOGGER.Debug("RIGHT_DELETE_DOC: " & RIGHT_DELETE_DOC.ToString)
-                LOGGER.Debug("RIGHT_READ_ONLY_DOC: " & RIGHT_READ_ONLY_DOC.ToString)
+            LOGGER.Debug("ClassRightManagement-RIGHT_EDIT_R: " & RIGHT_EDIT_R.ToString)
+            LOGGER.Debug("ClassRightManagement-RIGHT_ADD_R: " & RIGHT_ADD_R.ToString)
+            LOGGER.Debug("ClassRightManagement-RIGHT_DELETE_R: " & RIGHT_DELETE_R.ToString)
+            LOGGER.Debug("ClassRightManagement-RIGHT_ADD_DOC: " & RIGHT_ADD_DOC.ToString)
+            LOGGER.Debug("ClassRightManagement-RIGHT_VIEW_DOC: " & RIGHT_VIEW_DOC.ToString)
+            LOGGER.Debug("ClassRightManagement-RIGHT_DELETE_DOC: " & RIGHT_DELETE_DOC.ToString)
+            LOGGER.Debug("ClassRightManagement-RIGHT_READ_ONLY_DOC: " & RIGHT_READ_ONLY_DOC.ToString)
 
             sw.Done()
         Catch ex As Exception

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

@@ -5,7 +5,7 @@ Public Class ClassSAP
     Public Shared SAPConnectionString
     Public Shared SAP_CONNECTION As New R3Connection()
 
-    Private Shared NewDatatable As DataTable
+    Private Shared _NewDatatable As DataTable
     Public Shared Function ConnectionInit(Host As String, SysNumber As String, Username As String, PW As String, Client As String, Lang As String)
         Try
             LOGGER.Debug("")
@@ -139,30 +139,34 @@ Public Class ClassSAP
         Try
             LOGGER.Debug("Processing data package with " +
                   PackageResult.Rows.Count.ToString() + " rows")
-            If NewDatatable Is Nothing Then
-                NewDatatable = PackageResult.Clone
+            If _NewDatatable Is Nothing Then
+                _NewDatatable = PackageResult.Clone
                 LOGGER.Debug("...NewDatatable initialized!")
             End If
-            NewDatatable.Merge(PackageResult, False)
+            _NewDatatable.Merge(PackageResult, False)
             LOGGER.Debug("...Datatable merged with PackageResult!")
         Catch ex As Exception
             MsgBox(ex.Message)
             LOGGER.Error(ex)
         End Try
     End Sub
-    Public Shared Function Return_Datatable_for_Table(tablename As String, where_clause As String, Optional RowLimit As Integer = 0)
+    Public Shared Function Return_Datatable_for_Table(pTablename As String, pWhere_clause As String, pRaisIncomPack As Boolean, RowLimit As Integer)
         Try
-            Dim RESULT_TABLE As DataTable = New DataTable
-            LOGGER.Debug("Get data from SAP Table", False)
+            _NewDatatable = New DataTable
+            LOGGER.Debug("Get data from SAP Table")
             Dim oReadTable As New ERPConnect.Utils.ReadTable(SAP_CONNECTION)
-            oReadTable.PackageSize = 10000
-            oReadTable.RaiseIncomingPackageEvent = True
-            NewDatatable = Nothing
-            If where_clause <> "" Then
-                oReadTable.WhereClause = where_clause
+            If pRaisIncomPack = True Then
+                LOGGER.Debug("IncomingPackage = True")
+                oReadTable.PackageSize = 10000
+                oReadTable.RaiseIncomingPackageEvent = True
             End If
-            oReadTable.TableName = tablename
+
+            If pWhere_clause <> "" Then
+                oReadTable.WhereClause = pWhere_clause
+            End If
+            oReadTable.TableName = pTablename
             If RowLimit <> 0 Then
+                LOGGER.Debug("RowLimit included!")
                 oReadTable.RowCount = RowLimit
             End If
             LOGGER.Debug("Table.Run executing.....")
@@ -170,13 +174,13 @@ Public Class ClassSAP
             oReadTbl.Run()
 
             LOGGER.Debug("Table.Run executed")
-            RESULT_TABLE = oReadTbl.Result
-            If Not IsNothing(NewDatatable) Then
-                LOGGER.Debug($"Got [{NewDatatable.Rows.Count}] rows")
+            'RESULT_TABLE = oReadTbl.Result
+            If Not IsNothing(_NewDatatable) Then
+                LOGGER.Debug($"Got [{_NewDatatable.Rows.Count}] rows")
             End If
 
             SAP_CONNECTION.Close()
-            Return NewDatatable
+            Return _NewDatatable
         Catch ex As Exception
             LOGGER.Error(ex)
             LOGGER.Warn("Unexpected Error in SAP Table Result: " & ex.Message)

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

@@ -1,7 +1,9 @@
 Imports System.ComponentModel
+Imports System.Data.SqlClient
 Imports System.Drawing.Design
 Imports System.Windows.Forms
 Imports System.Windows.Forms.Design
+Imports DigitalData.GUIs.Common
 
 Public Class ClassSQLEditor
     Inherits UITypeEditor
@@ -14,19 +16,26 @@ Public Class ClassSQLEditor
     Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object
         'Return MyBase.EditValue(context, provider, value)
         Dim svc As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService)
-        Dim SQLSTring As String = DirectCast(value, SQLValue).Value
+        Dim SQLString As String = DirectCast(value, SQLValue).Value
 
-        'If svc IsNot Nothing AndAlso SQLSTring IsNot Nothing Then
-        '    Using Form As New frmSQLEditor()
-        '        Form.Value = SQLSTring
-        '        If svc.ShowDialog(Form) = DialogResult.OK Then
-        '            Dim sql As New SQLValue(Form.Value)
-        '            value = sql
-        '        End If
-        '    End Using
-        'End If
+        If svc IsNot Nothing AndAlso SQLString IsNot Nothing Then
+            Dim oForm2 As New DigitalData.GUIs.Common.frmSQLEditor(LOGCONFIG, MYDB_ECM) With {
+                .SQLCommand = SQLString
+            }
+
+            Dim oResult = oForm2.ShowDialog()
+            If oResult = DialogResult.OK Then
+                Dim oSql As New SQLValue(oForm2.SQLCommand)
+                value = oSql
+                SQLString = oForm2.SQLCommand
+            End If
+        End If
+        If Not IsNothing(value) Then
+            Return value
+        Else
+            Return Nothing
+        End If
 
-        Return ""
     End Function
 End Class
 

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

@@ -1,378 +0,0 @@
-Imports System.IO
-Public Class ClassUpdate
-    Public Shared MyServer_UpdatePath As String
-
-    Public Shared VERSION_SERVER = "1.0.0.0"
-    Public Shared VERSION_USER = "1.0.0.0"
-    Public Shared FORCE_UPDATE As Boolean = False
-    Public Shared UPDATE_ID As Integer
-    Public Shared ALL_USERS As Boolean = False
-    Public Shared VERSIONS_FOR_FORCE_UPDATE As String = ""
-    Public Shared FOLDER_TEMP As String
-
-    Public Shared MY_INSTALL_PATH As String
-    Public Shared DT_UPDATE_ITEMS As DataTable
-    Public Shared DT_UPDATE As DataTable
-    Public Shared ERROR_WHILE_UPDATING As Boolean = False
-
-    Public Shared UPDATE_NECESSARY As Boolean = False
-    Public Shared UPDATE_CANCELLED As Boolean = False
-    Public Shared UPDATE_ERROR As Boolean = False
-
-    Private Shared RecExe_found As Boolean = False
-    Public Shared DT_USER_DATA As DataTable
-    Private Shared USER_INFO1, USER_INFO2, USER_INFO3 As String
-    Public Shared Function Init()
-        Try
-            Dim sql = String.Format("SELECT * FROM TBDD_MODULES WHERE UPPER(NAME) = UPPER('Record-Organizer')")
-            Dim KONFIG_DT As DataTable = MYDB_ECM.GetDatatable(sql)
-            If KONFIG_DT.Rows.Count = 1 Then
-                MyServer_UpdatePath = KONFIG_DT.Rows(0).Item("VERSION_UPATE_PATH")
-                MIN_REQUIRED_VERSION = KONFIG_DT.Rows(0).Item("MIN_REQUIRED_VERSION")
-                Try
-                    DBVERSION = KONFIG_DT.Rows(0).Item("DB_VERSION")
-                Catch ex As Exception
-                    DBVERSION = "No DB Version-Config"
-                End Try
-            End If
-            sql = String.Format("Select * FROM TBDD_VERSION_UPDATE WHERE GUID = (Select MAX(GUID) FROM TBDD_VERSION_UPDATE WHERE UPPER(MODULE_NAME) = UPPER('{0}'))", "Record-Organizer")
-            DT_UPDATE = MYDB_ECM.GetDatatable(sql)
-            If Not IsNothing(DT_UPDATE) Then
-                If DT_UPDATE.Rows.Count = 1 Then
-                    UPDATE_ID = DT_UPDATE.Rows(0).Item("GUID")
-                    VERSION_SERVER = DT_UPDATE.Rows(0).Item("VERSION_NO")
-                    FORCE_UPDATE = DT_UPDATE.Rows(0).Item("FORCE_UPD")
-                    VERSIONS_FOR_FORCE_UPDATE = DT_UPDATE.Rows(0).Item("VERSION_FORCE_UPD")
-                    ALL_USERS = DT_UPDATE.Rows(0).Item("ALL_USERS")
-                    sql = String.Format("SELECT * FROM TBDD_VERSION_ITEMS WHERE UPDATE_ID = {0} AND [INFO1] IS NOT NULL ORDER BY GUID", UPDATE_ID)
-                    DT_UPDATE_ITEMS = MYDB_ECM.GetDatatable(sql)
-                    LOGGER.Info(String.Format("{0} items need to be updated!", DT_UPDATE_ITEMS.Rows.Count.ToString))
-                Else
-                    LOGGER.Info("No Updates Configured!")
-                End If
-            End If
-            Return True
-        Catch ex As Exception
-            LOGGER.Warn("Unexpected Error in ClassUpdate - Init: " & ex.Message)
-            Return False
-        End Try
-
-    End Function
-    Public Shared Function InitInstallPath()
-        Try
-            Dim readValue = My.Computer.Registry.GetValue("HKEY_CURRENT_USER\Software\Digital Data\Record Organizer", "Path", Nothing)
-            If Not IsNothing(readValue) Then
-                MY_INSTALL_PATH = readValue
-                Return True
-            Else
-                MY_INSTALL_PATH = ""
-                For Each s In Directory.GetLogicalDrives()
-                    If RecExe_found = False Then
-                        DirSearch(s)
-                    End If
-                Next
-                If RecExe_found = False Then
-                    LOGGER.Warn("Could not find the path for RecordOrganizer")
-                    Return False
-                End If
-            End If
-        Catch ex As Exception
-            LOGGER.Warn("Unexpected Error in InitInstallPath: " & ex.Message)
-            Return False
-        End Try
-    End Function
-    Private Shared Sub DirSearch(ByVal sDir As String)
-        Dim d As String
-        Dim f As String
-        Try
-            For Each d In Directory.GetDirectories(sDir)
-                If d.Contains("$Recycle") = False Or d.Contains("System Volume") = False Then
-                    If RecExe_found = False Then
-                        For Each f In Directory.GetFiles(d, "DD-OrgFlow.exe")
-                            RecExe_found = True
-                            MY_INSTALL_PATH = Path.GetDirectoryName(f)
-                            Exit Sub
-                        Next
-                    End If
-                    If RecExe_found = False Then
-                        DirSearch(d)
-                    End If
-                End If
-            Next
-        Catch excpt As System.Exception
-            LOGGER.Warn("Unexpected Error in DirSearch: " & excpt.Message)
-            MY_INSTALL_PATH = ""
-        End Try
-    End Sub
-    Public Shared Function InitUser(Optional _User As String = "")
-        Try
-            Dim sql = ""
-            USER_USERNAME = Environment.UserName
-            sql = String.Format("SELECT * FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('{0}'))", USER_USERNAME)
-            Dim USER_DT As DataTable = MYDB_ECM.GetDatatable(sql)
-            If USER_DT.Rows.Count = 0 Then
-                LOGGER.Warn(" - User '" & USER_USERNAME & "' not listed in Useradministration!")
-                'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
-                'Me.Close()
-                Dim msg = String.Format("You are not listed in the Useradministration." & vbNewLine & "Please contact the admin.")
-                MsgBox(msg, MsgBoxStyle.Exclamation)
-                Return False
-            Else
-                USER_GUID = USER_DT.Rows(0).Item("GUID")
-                USER_LANGUAGE = USER_DT.Rows(0).Item("LANGUAGE")
-                sql = String.Format("SELECT UPDATE_PATH,TEMPPATH,INFO1,INFO2,INFO3 FROM TBDD_VERSION_USER_UPDATE_PATH WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer")
-                DT_USER_DATA = MYDB_ECM.GetDatatable(sql)
-                MyServer_UpdatePath = DT_USER_DATA.Rows(0).Item("UPDATE_PATH")
-
-                sql = String.Format("SELECT CASE VERSION_CLIENT WHEN '' THEN '{3}' ELSE VERSION_CLIENT END AS VERSION_CLIENT FROM VWDD_LOGIN_USER_HISTORY WHERE GUID = (select MAX(GUID) from VWDD_LOGIN_USER_HISTORY where USER_ID = {0} AND VERSION_CLIENT <> '' AND UPPER(MACHINE_NAME) = UPPER('{1}') AND UPPER(MODULE) = UPPER('{2}'))", USER_GUID, Environment.MachineName, "Record-Organizer", VERSION_SERVER)
-                VERSION_USER = MYDB_ECM.GetScalarValue(sql)
-                If IsNothing(VERSION_USER) Then
-                    sql = String.Format("SELECT CASE VERSION_CLIENT WHEN '' THEN '{2}' ELSE VERSION_CLIENT END AS VERSION_CLIENT FROM VWDD_LOGIN_USER_HISTORY WHERE GUID = (select MAX(GUID) from VWDD_LOGIN_USER_HISTORY where USER_ID = {0} AND VERSION_CLIENT <> '' AND UPPER(MODULE) = UPPER('{1}'))", USER_GUID, "Record-Organizer", VERSION_SERVER)
-                    VERSION_USER = MYDB_ECM.GetScalarValue(sql)
-                    If IsNothing(VERSION_USER) Then
-                        VERSION_USER = "1.0.0.0"
-                    End If
-                End If
-                VERSION_USER = CInt(VERSION_USER.ToString.Replace(".", ""))
-                VERSION_SERVER = CInt(VERSION_SERVER.ToString.Replace(".", ""))
-                Return True
-            End If
-        Catch ex As Exception
-            LOGGER.Warn("Unexpected Error in InitUser_Update_Spec: " & ex.Message)
-            Return False
-        End Try
-
-    End Function
-    Public Shared Sub RUN_UPDATE()
-        Dim UPD_VC As Boolean = False
-        Dim UPD_RM As Boolean = False
-        Dim KEEP_TEMPPATH As Boolean = False
-        If DT_USER_DATA.Rows.Count <> 1 Then
-            Exit Sub
-        Else
-            USER_INFO1 = DT_USER_DATA.Rows(0).Item("INFO1")
-            USER_INFO2 = DT_USER_DATA.Rows(0).Item("INFO2")
-            USER_INFO3 = DT_USER_DATA.Rows(0).Item("INFO3")
-
-            If DT_USER_DATA.Rows(0).Item("TEMPPATH") <> "" Then
-                FOLDER_TEMP = DT_USER_DATA.Rows(0).Item("TEMPPATH")
-            Else
-                For Each Upd_item As DataRow In DT_UPDATE_ITEMS.Rows
-                    If Upd_item.Item("ITEM_INFO") = "VERSION_CHECKER.exe" Then
-                        If Not USER_INFO1.Contains(Upd_item.Item("INFO2")) Then
-                            UPD_VC = True
-
-                        End If
-                    ElseIf Upd_item.Item("ITEM_INFO") = "RecordOrganizer_RightManager.exe" Then
-                        If Not USER_INFO1.Contains(Upd_item.Item("INFO2")) Then
-                            UPD_RM = True
-                        End If
-                    End If
-                    If Not IsDBNull(Upd_item.Item("INFO3")) Then
-                        FOLDER_TEMP = Upd_item.Item("INFO3")
-                    End If
-                Next
-            End If
-        End If
-        If UPD_VC = True Or UPD_RM = True Then
-            UPDATE_NECESSARY = True
-        End If
-
-        If UPDATE_NECESSARY = False Then
-            Exit Sub
-        End If
-
-        Dim msg = "Auf dem Server liegt ein Update für ein OrgFlow-AddOn bereit!" & vbNewLine & "Wollen Sie das Update nun durchführen? Die Dauer ist abhängig von Ihrer Netzwerkverbindung!"
-        If USER_LANGUAGE <> "de-DE" Then
-            msg = "There is a new release available for an OrgFlow-AddOn!" & vbNewLine & "Would You like to install the update now? This might take some time minute(s)!"
-        End If
-        Dim result As MsgBoxResult
-        result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-        If result = MsgBoxResult.No Then
-            UPDATE_CANCELLED = True
-            Exit Sub
-        End If
-        'End If
-
-        If FOLDER_TEMP <> String.Empty Then
-            If Directory.Exists(FOLDER_TEMP) Then
-                ' GetTempFolderGuid()
-                ' If FOLDER_TEMP <> String.Empty Then
-
-                Dim error_while_copying = False
-                For Each Upd_item As DataRow In DT_UPDATE_ITEMS.Rows
-                    LOGGER.Info(String.Format("...working on item {0}: ", Upd_item.Item("ITEM_INFO")))
-
-                    If Upd_item.Item("ITEM_INFO") = "VERSION_CHECKER.exe" Then
-                        KEEP_TEMPPATH = Upd_item.Item("BIT3")
-                    End If
-
-                    If error_while_copying = True Then
-                        Exit For
-                    End If
-                    Dim tempfilename = Path.Combine(FOLDER_TEMP, Upd_item.Item("ITEM_INFO"))
-                    If File.Exists(tempfilename) Then
-                        Try
-                            Dim error_while_replacing = False
-
-                            Dim BackUpOfFileToReplace As String = MY_INSTALL_PATH & "\" & Upd_item.Item("INFO1") & Upd_item.Item("ITEM_INFO") & ".bac"
-                            BackUpOfFileToReplace = BackUpOfFileToReplace.Replace("//", "/")
-
-                            Dim sourcefile = Path.Combine(FOLDER_TEMP, Upd_item.Item("ITEM_INFO"))
-                            Dim targetfile
-                            If IsDBNull(Upd_item.Item("INFO1")) Then
-                                targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
-                            Else
-                                If Upd_item.Item("INFO1") <> String.Empty Then
-                                    targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("INFO1"), Upd_item.Item("ITEM_INFO"))
-                                Else
-                                    targetfile = Path.Combine(MY_INSTALL_PATH, Upd_item.Item("ITEM_INFO"))
-                                End If
-                            End If
-                            targetfile = targetfile.ToString.Replace("//", "/")
-                            LOGGER.Info(String.Format("...replacing targetfile '{0}': ", targetfile))
-                            Try
-                                ' Replace the file.
-                                If File.Exists(targetfile) Then
-                                    If File_Rename(targetfile, BackUpOfFileToReplace) = True Then
-                                        If File.Exists(BackUpOfFileToReplace) Then
-                                            If KEEP_TEMPPATH Then
-                                                If CopyFile(sourcefile, targetfile) = True Then
-                                                    File_Delete(BackUpOfFileToReplace)
-                                                    LOGGER.Warn(String.Format("...targetfile '{0}' was copied! ", targetfile))
-                                                    Dim updinfo
-                                                    If USER_INFO1 <> "" Then
-                                                        updinfo = USER_INFO1 & ";" & Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
-                                                    Else
-                                                        updinfo = Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
-                                                    End If
-                                                    Dim _Sql = String.Format("Update TBDD_VERSION_USER_UPDATE_PATH SET INFO1 = '{2}' WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer", updinfo)
-                                                    MYDB_ECM.ExecuteNonQuery(_Sql)
-                                                End If
-                                            Else
-                                                If MoveFile(sourcefile, targetfile) = True Then
-                                                    File_Delete(BackUpOfFileToReplace)
-                                                    LOGGER.Info(String.Format("...targetfile '{0}' was replaced! ", targetfile))
-                                                    Dim updinfo
-                                                    If USER_INFO1 <> "" Then
-                                                        updinfo = USER_INFO1 & ";" & Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
-                                                    Else
-                                                        updinfo = Upd_item.Item("INFO1") & "V" & Upd_item.Item("INFO2")
-                                                    End If
-                                                    Dim _Sql = String.Format("Update TBDD_VERSION_USER_UPDATE_PATH SET INFO1 = '{2}' WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer", updinfo)
-                                                    MYDB_ECM.ExecuteNonQuery(_Sql)
-                                                Else
-                                                    LOGGER.Warn(String.Format("MoveFile was not successfull! BackupFile will be activated!"))
-                                                    'Verschieben hat nicht geklappt also die Backupdatei wieder umbenennen!
-                                                    File_Rename(BackUpOfFileToReplace, targetfile)
-                                                End If
-                                            End If
-
-                                        End If
-
-                                    End If
-                                Else
-
-                                End If
-
-
-                            Catch ex As Exception
-                                LOGGER.Warn(String.Format("Error while copying file {0} to {1}: " & ex.Message, sourcefile, targetfile))
-                                error_while_replacing = True
-                                UPDATE_ERROR = True
-                            End Try
-
-
-
-                        Catch ex As Exception
-                            LOGGER.Warn(String.Format("Unexpected Error in Replace_Files: {0}", ex.Message))
-                            UPDATE_ERROR = True
-                        End Try
-                    End If
-
-                Next
-
-                Dim upd = String.Format("Update TBDD_VERSION_USER_UPDATE_PATH SET TEMPPATH = '' WHERE USER_ID = {0} AND UPPER(MODULE_NAME) = UPPER('{1}')", USER_GUID, "Record-Organizer")
-                MYDB_ECM.ExecuteNonQuery(upd)
-                Try
-                    If KEEP_TEMPPATH = False Then
-                        'Delete the tempfolder and all data
-                        System.IO.Directory.Delete(FOLDER_TEMP, True)
-                    Else
-                        LOGGER.Info(String.Format("TEMP FOLDER SHALL BE KEPT..."))
-                    End If
-
-                Catch ex As Exception
-
-                End Try
-                'Else
-                '    Logger.Warn(String.Format("The temporaryFolder could not be created!"))
-                'End If
-            Else
-                LOGGER.Warn(String.Format("The Updatepath '{0}'is not accessible or does not exist", MyServer_UpdatePath))
-            End If
-        Else
-            LOGGER.Warn(String.Format("NO ACTION: the Updatepath is empty"))
-        End If
-
-    End Sub
-    Private Shared Function GetTempFolderGuid() As String
-        Try
-            Dim folder As String = Path.Combine(Path.GetTempPath, Guid.NewGuid.ToString)
-            If Not Directory.Exists(folder) Then
-                Directory.CreateDirectory(folder)
-            End If
-            FOLDER_TEMP = folder
-        Catch ex As Exception
-            LOGGER.Warn(String.Format("Error while Creating tempfolder: " & ex.Message))
-        End Try
-
-    End Function
-    Private Shared Function File_Rename(targetfile As String, Renamefilestring As String)
-        Try
-            Renamefilestring = Renamefilestring.Replace("\\", "\")
-            If File.Exists(Renamefilestring) Then
-
-                If File_Delete(Renamefilestring) = False Then
-                    Return False
-                End If
-            End If
-            Rename(targetfile, Renamefilestring)
-            Return True
-        Catch ex As Exception
-            LOGGER.Warn(String.Format("ClassUpdate - Unexpected Error in File_Rename: " & "OldPath '{0}'" & "NewPath '{1}'" & "ERROR: {2}", targetfile, Renamefilestring, ex.Message))
-            UPDATE_ERROR = True
-            Return False
-        End Try
-    End Function
-    Private Shared Function File_Delete(deletefile As String)
-        Try
-            File.Delete(deletefile)
-            Return True
-        Catch ex As Exception
-            LOGGER.Warn(String.Format("Unexpected Error in File_Delete: " & vbNewLine & "deletefile '{0}'" & vbNewLine & "ERROR: {2}", deletefile, ex.Message))
-            UPDATE_ERROR = True
-            Return False
-        End Try
-    End Function
-    Private Shared Function MoveFile(sourcefile As String, targetfile As String)
-        Try
-            File.Move(sourcefile, targetfile)
-            Return True
-        Catch ex As Exception
-            LOGGER.Warn(String.Format("Unexpected Error in MoveFile: sourcefile '{0}', targetfile '{1}' - ERROR: {2}", sourcefile, targetfile, ex.Message))
-            UPDATE_ERROR = True
-            Return False
-        End Try
-    End Function
-    Private Shared Function CopyFile(sourcefile As String, destfile As String)
-        Try
-            File.Copy(sourcefile, destfile, True)
-            Return True
-        Catch ex As Exception
-            LOGGER.Warn(String.Format("Unexpected Error in CopyFile: sourcefile '{0}', destfile '{1}' - ERROR: {2}", sourcefile, destfile, ex.Message))
-            UPDATE_ERROR = True
-            Return False
-        End Try
-    End Function
-End Class

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

@@ -1,5 +1,5 @@
 Imports WINDREAMLib
-Imports DD_LIB_Standards
+'Imports DD_LIB_Standards
 Public Class ClassWDRights
 #Region "+++++ Konstanten +++++"
     Const REL_Document_AccessRight = "AccessRight"
@@ -42,12 +42,9 @@ Public Class ClassWDRights
             AD_DOMAIN = DT_KONFIG.Rows(0).Item("AD_DOMAIN")
             AD_USER = DT_KONFIG.Rows(0).Item("AD_USER")
             WD_RIGHT_ADMIN = DT_KONFIG.Rows(0).Item("WD_RIGHT")
-            If clsDatabase.DB_PROXY_INITIALIZED = True And ClassProxy.MyLinkedServer <> String.Empty Then
-                LOGGER.Info("User configured a proxy: " & ClassProxy.MyLinkedServer)
-                AD_SERVER = ClassProxy.MyLinkedServer
-            Else
-                AD_SERVER = DT_KONFIG.Rows(0).Item("AD_SERVER")
-            End If
+
+            AD_SERVER = DT_KONFIG.Rows(0).Item("AD_SERVER")
+
 
             Dim PWplainText As String
             Dim wrapper As New ClassEncryption("!35452didalog=")
@@ -67,13 +64,12 @@ Public Class ClassWDRights
             Return False
         End Try
     End Function
-    Public Shared Function Doc_Renew_Rights(doc_id As Integer, reldocpath As String, deleterights As Boolean) As Boolean
+    Public Shared Function Doc_Renew_Rights(oWMObject As WMObject, doc_id As Integer, reldocpath As String, deleterights As Boolean) As Boolean
         Try
             LOGGER.Debug(String.Format("Working on rights for file: {0}", reldocpath))
             Dim DT_USER_RIGHT As DataTable
             Dim DT_GROUP_RIGHT As DataTable
             Dim oSession
-            Dim oWMObject As WINDREAMLib.WMObject
             Dim UserGroupRelation
             Dim UserOrGroup
             Dim oUSer
@@ -81,7 +77,7 @@ Public Class ClassWDRights
 
             Try
                 'Dedizierte Session herstellen
-                oSession = GetWMSessionAsUser(AD_DOMAIN, AD_SERVER, AD_USER, AD_USER_PW)
+                oSession = GetWMSessionAsUser(WM_DOMAIN, WM_SERVER, WM_USER, WM_USER_PW)
             Catch ex As Exception
                 Dim msg = "Error in Doc_Renew_Rights-GetWMSessionAsUser : " & ex.Message
                 LOGGER.Warn(msg)
@@ -90,27 +86,18 @@ Public Class ClassWDRights
 
             If Not IsNothing(oSession) Then
                 LOGGER.Debug("Session created.")
-                Dim sql = String.Format("SELECT * FROM [dbo].[FNPMO_GET_RIGHTS_FOR_DOC] ({0}) where USER_OR_GROUP = 'USER'", doc_id)
-                DT_USER_RIGHT = MYDB_ECM.GetDatatable(sql)
-                sql = String.Format("SELECT * FROM [dbo].[FNPMO_GET_RIGHTS_FOR_DOC] ({0}) where USER_OR_GROUP = 'GROUP'", doc_id)
-                DT_GROUP_RIGHT = MYDB_ECM.GetDatatable(sql)
+                Dim oSql = String.Format("SELECT * FROM [dbo].[FNOF_GET_RIGHTS_FOR_DOC] ({0}) where USER_OR_GROUP = 'USER'", doc_id)
+                DT_USER_RIGHT = MYDB_ECM.GetDatatable(oSql)
+                oSql = String.Format("SELECT * FROM [dbo].[FNOF_GET_RIGHTS_FOR_DOC] ({0}) where USER_OR_GROUP = 'GROUP'", doc_id)
+                DT_GROUP_RIGHT = MYDB_ECM.GetDatatable(oSql)
                 If IsNothing(DT_USER_RIGHT) Then
                     Dim msg = "Error while receiving rights for DocID"
-                    clsLogger.Add(msg)
+                    LOGGER.Warn(msg)
                     Return False
                 Else
                     LOGGER.Debug(String.Format("Amount of Userrights: {0}", DT_USER_RIGHT.Rows.Count))
                 End If
                 LOGGER.Debug(String.Format("Amount of Grouprights: {0}", DT_GROUP_RIGHT.Rows.Count))
-                Try
-                    'Object definieren
-                    oWMObject = oSession.GetWMObjectByPath(1, reldocpath)
-                    LOGGER.Debug("Object created.")
-                Catch ex As Exception
-                    Dim msg = "Error GetWMObjectByPath: (FDSR) " & reldocpath & vbNewLine & Err.Description
-                    LOGGER.Warn(msg)
-                    Return False
-                End Try
                 Dim lret
                 Try
                     ' Objekt muss zur Rechteänderung gelockt werden
@@ -140,6 +127,11 @@ Public Class ClassWDRights
                 End If
                 '############################# Rechte löschen ################################################################################
                 '#############################################################################################################################
+
+                If Not (DT_USER_RIGHT.Rows.Count > 0 Or DT_GROUP_RIGHT.Rows.Count > 0) Then
+                    LOGGER.Warn("ONLY FOLDERRIGHTS WILL BE USED, AS NO RIGHTS WERE FOUND!")
+                    Return True
+                End If
                 If deleterights = True Then
                     LOGGER.Debug("rights for document will now be deleted.")
                     'Erst einmal alle anderen Rechte löschen
@@ -164,7 +156,7 @@ Public Class ClassWDRights
                         Else
                             _msg = "Right for User: '" & UserOrGroup.aName & "'"""
                         End If
-                        LOGGER.Debug(String.Format("[{0}] will now be deleted.", _msg))
+                        LOGGER.Debug(String.Format("[{0}] will now be deleted ...", _msg))
                         If Err.Number <> 0 Then
                             Dim msg = "Error in setting UserGroupRelation - Err.Number: " & Err.Number & vbCrLf & Err.Description
                             LOGGER.Warn(msg)
@@ -182,9 +174,10 @@ Public Class ClassWDRights
                         End Try
                         i += 1
                         _msg = _msg.Replace(" '", "")
-                        LOGGER.Debug(String.Format("{0} was deleted.", _msg))
+                        LOGGER.Debug(String.Format("{0} has been deleted!", _msg))
                     Next
-                    LOGGER.Debug("All rights for doc were deleted....")
+                    LOGGER.Debug("All rights for doc were deleted!")
+                    LOGGER.Debug("================================")
                 End If
 
                 Err.Clear()
@@ -192,85 +185,87 @@ Public Class ClassWDRights
                 ' dann muss mindestens EIN Rechteträger mit dem Recht zur Rechteänderung 
                 ' wieder zugefügt werden!!!!! Dies ist der OrgFlow-Right User!
                 'Für jeden User das Recht einzeln hinzufügen
+                LOGGER.Debug("Nun hinzufügen von User-Rechten ...")
                 For Each User_Row As DataRow In DT_USER_RIGHT.Rows
-                    Dim fileright 'Recht als Integer
-                    Dim StringUserRight
+                    Dim ofilerightfromFunc 'Recht als Integer
+                    Dim oFileRightString
+                    oFileRightString = AD_DOMAIN & "\" & User_Row.Item("USR_NAME")
+                    ofilerightfromFunc = User_Row.Item("USR_RIGHT")
                     Try
-                        StringUserRight = AD_DOMAIN & "\" & User_Row.Item("USR_NAME")
-                        fileright = User_Row.Item("USR_RIGHT")
-                        LOGGER.Debug(String.Format("Working on right for user-right: {0}-{1}", StringUserRight, fileright))
+                        LOGGER.Debug(String.Format("Working on right for user-right: {0}-{1}", oFileRightString, ofilerightfromFunc))
                         Try
                             ' User holen
-                            oUSer = oSession.GetWMObjectByName(WMEntityUser, StringUserRight)
+                            oUSer = oSession.GetWMObjectByName(WMEntityUser, oFileRightString)
                             LOGGER.Debug("got oUSer...")
                         Catch ex As Exception
-                            Dim msg = String.Format("Could not create windream-Usersession for user '{0}' - check whether user is part of windream-group!", StringUserRight)
+                            Dim msg = String.Format("Could not create windream-Usersession for user '{0}' - check whether user is part of windream-group!", oFileRightString)
                             LOGGER.Warn(msg)
                             MSG_RESULT &= msg & vbNewLine
                             Continue For
                         End Try
                         If Not IsNothing(oUSer) Then
                             Try
-                                AccessRights.Insert2(oUSer, fileright) 'WMAccessRightAllRights)
-                                LOGGER.Debug("Right was set...")
+                                AccessRights.Insert2(oUSer, ofilerightfromFunc) 'WMAccessRightAllRights)
+                                LOGGER.Debug("==> Right was set!")
                             Catch ex As Exception
-                                Dim msg = String.Format("Could not set right for user {0} - AccessRights.Insert2: {1}", StringUserRight, ex.Message)
+                                Dim msg = String.Format("Could not set right for user {0} - AccessRights.Insert2: {1}", oFileRightString, ex.Message)
+                                LOGGER.Warn(msg)
+                                Continue For
+                            End Try
+                        End If
+
+                    Catch ex As Exception
+                        Dim _right
+                        Select Case ofilerightfromFunc
+                            Case WMAccessRightRead
+                                _right = "READ"
+                            Case WMAccessRightWrite
+                                _right = "WRITE"
+                            Case WMAccessRightAdmin
+                                _right = "ADMIN"
+                            Case WMAccessRightAllRights
+                                _right = "ALL RIGHTS"
+                            Case WMAccessRightReadWrite
+                                _right = "READ WRITE"
+                        End Select
+                        MSG_RESULT &= String.Format("Error while working on RightChange:" & vbNewLine & "Fileright: {0}" & vbNewLine & "User: {1} " & vbNewLine & "File: {2}", _right, oFileRightString, reldocpath) & vbNewLine
+                        LOGGER.Warn(ex.Message)
+                        End Try
+                    Next
+
+
+                'Für jede Gruppe das Recht einzeln hinzufügen
+                LOGGER.Debug("Nun hinzufügen von Gruppen-Rechten ...")
+                For Each Group_Row As DataRow In DT_GROUP_RIGHT.Rows
+                    Dim fileright 'Recht als Integer
+                    Dim StringGroupRight
+                    Dim _oGroup
+                    Try
+                        StringGroupRight = AD_DOMAIN & "\" & Group_Row.Item("USR_NAME")
+                        fileright = Group_Row.Item("USR_RIGHT")
+                        LOGGER.Debug(String.Format("Working on right for group-right: {0}-{1} ...", StringGroupRight, fileright))
+                        Try
+                            ' User holen
+                            _oGroup = oSession.GetWMObjectByName(WMEntityGroups, StringGroupRight)
+
+                            LOGGER.Debug("got Group...")
+                        Catch ex As Exception
+                            Dim msg = String.Format("Could not create windream-Usersession for group '{0}' - check whether group exists in windream!", StringGroupRight)
+                            LOGGER.Warn(msg)
+                            MSG_RESULT &= msg & vbNewLine
+                            Continue For
+                        End Try
+                        If Not IsNothing(_oGroup) Then
+                            Try
+                                AccessRights.Insert2(_oGroup, fileright) 'WMAccessRightAllRights)
+                                LOGGER.Debug("==> Right was set!")
+                            Catch ex As Exception
+                                Dim msg = String.Format("Could not set right for docID: {0} group {1} - AccessRights.Insert2: {2}", doc_id, StringGroupRight, ex.Message)
                                 LOGGER.Warn(msg)
                                 Continue For
                             End Try
                         End If
 
-                    Catch ex As Exception
-                        Dim _right
-                        Select Case fileright
-                            Case WMAccessRightRead
-                                _right = "READ"
-                            Case WMAccessRightWrite
-                                _right = "WRITE"
-                            Case WMAccessRightAdmin
-                                _right = "ADMIN"
-                            Case WMAccessRightAllRights
-                                _right = "ALL RIGHTS"
-                            Case WMAccessRightReadWrite
-                                _right = "READ WRITE"
-                        End Select
-                        MSG_RESULT &= String.Format("Error while working on RightChange:" & vbNewLine & "Fileright: {0}" & vbNewLine & "User: {1} " & vbNewLine & "File: {2}", _right, StringUserRight, reldocpath) & vbNewLine
-                        LOGGER.Warn(ex.Message)
-                    End Try
-                Next
-
-                'Für jede Gruppe das Recht einzeln hinzufügen
-
-                For Each Group_Row As DataRow In DT_GROUP_RIGHT.Rows
-                    Dim fileright 'Recht als Integer
-                    Dim StringGroupRight
-                    Dim _oGroup
-                    Try
-                        StringGroupRight = AD_DOMAIN & "\" & Group_Row.Item("USR_NAME")
-                        fileright = Group_Row.Item("USR_RIGHT")
-                        LOGGER.Debug(String.Format("Working on right for group-right: {0}-{1}", StringGroupRight, fileright))
-                        Try
-                            ' User holen
-                            _oGroup = oSession.GetWMObjectByName(WMEntityGroups, StringGroupRight)
-
-                            LOGGER.Debug("got Group...")
-                        Catch ex As Exception
-                            Dim msg = String.Format("Could not create windream-Usersession for group '{0}' - check whether group exists in windream!", StringGroupRight)
-                            clsLogger.Add(msg)
-                            MSG_RESULT &= msg & vbNewLine
-                            Continue For
-                        End Try
-                        If Not IsNothing(_oGroup) Then
-                            Try
-                                AccessRights.Insert2(_oGroup, fileright) 'WMAccessRightAllRights)
-                                LOGGER.Debug("Right was set...")
-                            Catch ex As Exception
-                                Dim msg = String.Format("Could not set right for docID: {0} group {1} - AccessRights.Insert2: {2}", doc_id, StringGroupRight, ex.Message)
-                                clsLogger.Add(msg)
-                                Continue For
-                            End Try
-                        End If
-
                     Catch ex As Exception
                         Dim _right
                         Select Case fileright
@@ -286,7 +281,7 @@ Public Class ClassWDRights
                                 _right = "READ WRITE"
                         End Select
                         MSG_RESULT &= String.Format("Error while working on RightChange2:" & vbNewLine & "Fileright: {0}" & vbNewLine & "Group: {1} " & vbNewLine & "File: {2}", _right, StringGroupRight, reldocpath) & vbNewLine
-                        clsLogger.Add(ex.Message)
+                        LOGGER.Warn(ex.Message)
                     End Try
                 Next
 

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

@@ -0,0 +1,36 @@
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Logging
+
+Public Class ClassNodeCommands
+    Inherits BaseClass
+
+    Private ReadOnly Database As MSSQLServer
+
+    Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer)
+        MyBase.New(pLogConfig)
+        Database = pDatabase
+    End Sub
+
+    Public Async Function LoadNodes(pEntityId As Integer) As Task(Of DataTable)
+        Dim oStructureNodeSql = $"SELECT 
+                T.GUID,
+                T.RECORD_ID,
+                T.NODE_CONFIG_ID,
+                T.NODE_CAPTION,
+                T.ID1, 
+                T.BACK_COLOR,
+                T.PARENT_GUID,
+                T.SEQUENCE,
+                T.TYPE_NODE,
+                T.CREATE_RECORD,
+                T.NAVIGATION_PATH
+             FROM 
+                VWPMO_STRUCTURE_NODES T 
+            INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID 
+            WHERE T.ENTITY_ID = {pEntityId}"
+        Dim oTable = Await Database.GetDatatableAsync(oStructureNodeSql)
+
+        Return oTable
+    End Function
+End Class

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

@@ -1,5 +1,5 @@
 Imports System.Data.SqlClient
-Imports DD_LIB_Standards
+'Imports DD_LIB_Standards'
 
 Public Class ClassRecordCommands
     Public Shared Function CreateRecordProcedure(formId As Integer)
@@ -21,12 +21,12 @@ Public Class ClassRecordCommands
                 connection.Close()
 
                 Dim GUID As Integer = cmd.Parameters("@pRESULT").Value
-                If GUID > 0 And clsDatabase.DB_PROXY_INITIALIZED = True Then
-                    If ClassProxy.PRPROXY_RECORD_UPD_INS(formId, GUID) = True Then
-                        ClassProxy.PRPROXY_CONTROL_VALUE_RENEW(GUID)
-                    End If
+                'If GUID > 0 And clsDatabase.DB_PROXY_INITIALIZED = True Then
+                '    If ClassProxy.PRPROXY_RECORD_UPD_INS(formId, GUID) = True Then
+                '        ClassProxy.PRPROXY_CONTROL_VALUE_RENEW(GUID)
+                '    End If
 
-                End If
+                'End If
                 Return GUID
             End Using
         Catch ex As Exception
@@ -42,7 +42,7 @@ Public Class ClassRecordCommands
         Return MYDB_ECM.ExecuteNonQuery(Sql)
     End Function
     Public Shared Function GetLastRecord()
-        Dim SQL = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = {0} AND UPPER(ADDED_WHO) = UPPER('{1}') AND DELETED = 0", CURRENT_ENTITY_ID, USER_USERNAME)
+        Dim SQL = String.Format("SELECT MAX(GUID) FROM TBPMO_RECORD where PARENT_RECORD = 0 AND FORM_ID = {0} AND ADDED_WHO = '{1}' AND DELETED = 0", CURRENT_ENTITY_ID, USER_USERNAME)
         Return MYDB_ECM.GetScalarValue(SQL)
     End Function
 

app/DD-Record-Organizer/Classes/Controls/ClassControlCommands.vb

@@ -76,7 +76,7 @@
 
     Public Shared Function GetControlGuid(name As String)
         Try
-            Dim sql = "SELECT GUID FROM TBPMO_CONTROL WHERE UPPER(NAME) = UPPER('" & name & "')"
+            Dim sql = "SELECT GUID FROM TBPMO_CONTROL WHERE NAME = '" & name & "'"
             Return MYDB_ECM.ExecuteNonQuery(sql)
         Catch ex As Exception
             Return -1

app/DD-Record-Organizer/Classes/Controls/ClassControlCommandsUI.vb

@@ -1,6 +1,6 @@
 
 Imports DD_Record_Organizer.ClassControlBuilder
-Imports DD_LIB_Standards
+'Imports DD_LIB_Standards
 Imports System.Data.SqlClient
 
 Public Class ClassControlCommandsUI
@@ -393,10 +393,10 @@ Public Class ClassControlCommandsUI
     End Sub
 
     Private Sub UpsertImage(ControlID As Integer, RecordID As Integer, image As Bitmap)
-        Dim existsSQL As String = "SELECT GUID FROM TBPMO_CONTROL_IMAGE WHERE CONTROL_ID = " & ControlID & " AND RECORD_ID = " & RecordID
-        Dim exists = MYDB_ECM.ExecuteNonQuery(existsSQL)
+        Dim existsSQL As String = "SELECT COALESCE(MAX(GUID),0) FROM TBPMO_CONTROL_IMAGE WHERE CONTROL_ID = " & ControlID & " AND RECORD_ID = " & RecordID
+        Dim exists = MYDB_ECM.GetScalarValue(existsSQL)
 
-        If IsNothing(exists) Then
+        If exists = 0 Then
             InsertImage(ControlID, RecordID, image)
         Else
             UpdateImage(ControlID, RecordID, image)
@@ -503,8 +503,6 @@ Public Class ClassControlCommandsUI
         Try
             Dim _error As Boolean = False
             Dim sw As New SW("UpdateAllControls")
-            Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", USER_USERNAME.ToUpper)
-            MYDB_ECM.ExecuteNonQuery(del)
             CURRENT_CHANGE_STEP += 1
             Dim sel = String.Format("SELECT RECORD_ID, CONTROL_ID FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordID)
             Dim VALUE_EXISTS_DT As DataTable = MYDB_ECM.GetDatatable(sel)
@@ -578,9 +576,7 @@ Public Class ClassControlCommandsUI
 
                         Dim sql As String = $"DELETE FROM TBPMO_CONTROL_VALUE WHERE RECORD_ID = {RecordID} AND CONTROL_ID = {CONTROL_ID}"
                         If MYDB_ECM.ExecuteNonQuery(sql) = True Then
-                            If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then
-                                MYDB_ECM.ExecuteNonQuery(sql, True)
-                            End If
+
                         End If
 
                     Else
@@ -647,7 +643,7 @@ Public Class ClassControlCommandsUI
                 MYDB_ECM.ExecuteNonQuery(String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1} AND VALUE = '{2}'", ControlId, RecordId, v))
                 ' ClassProxy.PRPROXY_CONTROL_DEL(RecordId, CURRENT_ENTITY_ID, ControlId)
             Next
-            ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, ControlId, RecordId, "")
+            'ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, ControlId, RecordId, "")
         Catch ex As Exception
             MsgBox("Error in UpdateMultipleValues:" & vbNewLine & ex.Message)
         End Try
@@ -689,7 +685,7 @@ Public Class ClassControlCommandsUI
             Case "CheckedListBoxControl"
                 Dim chklbx As DevExpress.XtraEditors.CheckedListBoxControl
                 chklbx = DirectCast(ctrl, DevExpress.XtraEditors.CheckedListBoxControl)
-                Dim SQL_COMAMND = MYDB_ECM.ExecuteNonQuery("SELECT UPPER(SQL_COMMAND_1) FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID)
+                Dim SQL_COMAMND = MYDB_ECM.ExecuteNonQuery("SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID)
 
                 'TODO: Wenn keine Datasource vorhanden, angecheckte einträge als string speichern
                 If IsNothing(chklbx.DataSource) Then
@@ -792,7 +788,7 @@ Public Class ClassControlCommandsUI
                 Dim chk_grid As DevExpress.XtraGrid.GridControl
                 chk_grid = DirectCast(ctrl, DevExpress.XtraGrid.GridControl)
                 Dim gridview As DevExpress.XtraGrid.Views.Grid.GridView = chk_grid.MainView
-                Dim SQL_COMAMND = MYDB_ECM.ExecuteNonQuery("SELECT UPPER(SQL_COMMAND_1) FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID)
+                Dim SQL_COMAMND = MYDB_ECM.ExecuteNonQuery("SELECT SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE GUID = " & CONTROL_ID)
 
                 Dim result As New List(Of String)
                 Dim result_string As String
@@ -904,9 +900,6 @@ Public Class ClassControlCommandsUI
                     cmd.ExecuteNonQuery()
                     connection.Close()
                     _result = cmd.Parameters("@pRESULT").Value
-                    If _result = 1 And clsDatabase.DB_PROXY_INITIALIZED = True Then
-                        ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value)
-                    End If
                     Return _result
                 End Using
             Else
@@ -926,15 +919,15 @@ Public Class ClassControlCommandsUI
             If Not IsNothing(converted_value) Then
                 converted_value = converted_value.Replace("'", "´")
                 Dim ins As String = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0}, {1}, '{2}', '{3}')", ControlID, RecordID, converted_value, AddedWho)
-                If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then
-                    If MYDB_ECM.ExecuteNonQuery(ins) = True Then
-                        Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value)
-                    Else
-                        Return False
-                    End If
-                Else
-                    Return MYDB_ECM.ExecuteNonQuery(ins)
-                End If
+                'If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then
+                '    If MYDB_ECM.ExecuteNonQuery(ins) = True Then
+                '        Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value)
+                '    Else
+                '        Return False
+                '    End If
+                'Else
+                Return MYDB_ECM.ExecuteNonQuery(ins)
+                'End If
             Else
                 Return False
             End If
@@ -956,15 +949,8 @@ Public Class ClassControlCommandsUI
             If ControlID = 279 Or ControlID = 745 Then
                 LOGGER.Warn(upd)
             End If
-            If LICENSE_PROXY = True Or clsDatabase.DB_PROXY_INITIALIZED = True Then
-                If MYDB_ECM.ExecuteNonQuery(upd) = True Then
-                    Return ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(ENTITY_ID, ControlID, RecordID, converted_value)
-                Else
-                    Return False
-                End If
-            Else
-                Return MYDB_ECM.ExecuteNonQuery(upd)
-            End If
+            Return MYDB_ECM.ExecuteNonQuery(upd)
+
         Catch ex As Exception
             LOGGER.Warn("Unerwarteter Fehler in UpdateControlValue: " & ex.Message)
             Return False

app/DD-Record-Organizer/Classes/Controls/ClassControlValues.vb

@@ -155,6 +155,10 @@ Public Class ClassControlValues
         Try
             Dim sw As New SW("LoadControlValues1")
 
+            If RecordId = 0 Then
+                Exit Sub
+            End If
+
             'Dim SQL As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE VALUE <> '' AND RECORD_ID = {0}", RecordId)
             Dim SQL As String = String.Format("SELECT * FROM VWPMO_VALUES WHERE RECORD_ID = {0}", RecordId)
             Dim DT_ControlValues As DataTable = MYDB_ECM.GetDatatable(SQL)

app/DD-Record-Organizer/Classes/NodeNavigation/ClassDoctypeChange.vb

@@ -0,0 +1,29 @@
+'mports DD_LIB_Standards
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
+
+Public Class ClassDoctypeChangeDEL
+    Inherits BaseClass
+
+    Public Sub New(pLogConfig As LogConfig)
+        MyBase.New(pLogConfig)
+    End Sub
+
+    Public Function ChangeDocType(pFilePaths As List(Of String), pNewDocTypeName As String, pObjectType As String) As Boolean
+        Try
+            For Each oPath As String In pFilePaths
+                Dim oResult As Boolean = WMMOD.SetFileIndex(oPath, "String 37", pNewDocTypeName, pObjectType)
+                If oResult = True Then
+                    Logger.Debug("Successfully set doctype of file [{0}] to [{1}]", oPath, pNewDocTypeName)
+                Else
+                    Logger.Warn("Could not set doctype of file [{0}]!", pNewDocTypeName)
+                End If
+            Next
+
+            Return True
+        Catch ex As Exception
+            Logger.Error(ex)
+
+        End Try
+    End Function
+End Class

app/DD-Record-Organizer/Classes/NodeNavigation/ClassNodeCreator.vb

@@ -0,0 +1,48 @@
+Imports DevExpress.Utils
+Imports DevExpress.XtraTreeList.Nodes
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
+
+Public Class ClassNodeCreator
+    Inherits BaseClass
+
+    Private ReadOnly _ImageList As ImageCollection
+
+    Public Sub New(pLogConfig As LogConfig, pImageList As ImageCollection)
+        MyBase.New(pLogConfig)
+        _ImageList = pImageList
+    End Sub
+
+    Public Function AddNode(pEntityId As Integer, pNodeCaption As String, pParentNodeId As Integer, pNodeConfigId As Integer, pCreateRecord As Boolean) As Boolean
+
+        Dim oRecordId
+
+        ' If a record should be created, do it.
+        ' Otherwise we set the record id to 0.
+        If pCreateRecord Then
+            ' Create a new Record in the given Entity
+            oRecordId = ClassRecordCommands.CreateRecordProcedure(pEntityId)
+            If oRecordId = 0 Then
+                Logger.Warn("Could not create a record. Exiting.")
+                Return False
+            End If
+        Else
+            ' Zero will be handled by CreateNodeProcedure
+            oRecordId = 0
+        End If
+
+        ' Update the proxy?
+        'ClassProxy.PRPROXY_RECORD_UPD_INS(pEntityId, oRecordId)
+
+        ' Create the Node in the Database
+        Dim oNodeIdentifier = $"CONFIG {oRecordId}-{pNodeConfigId}"
+        Dim oNodeId = ClassNodeNavigation.CreateNodeProcedure(oRecordId, pNodeConfigId, pNodeCaption, oNodeIdentifier, pParentNodeId, USER_USERNAME)
+
+        If oNodeId = 0 Then
+            Logger.Warn("Node could not be created in database. Exiting.")
+            Return False
+        End If
+
+        Return True
+    End Function
+End Class

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

@@ -50989,8 +50989,7 @@ Namespace DD_DMSDataSetTableAdapters
                 "F_USER_EXCLUSIV"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                               WHERE        (WF_TASK_ID NOT IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                                                             (SELECT        WF_"& _ 
                 "TASK_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                                                               FROM    "& _ 
                 "        VWPMO_WF_USER_EXCLUSIV AS VWPMO_WF_USER_EXCLUSIV_1"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                    "& _ 
-                "                                           WHERE        (UPPER(USERNAME) = UPPER"& _ 
-                "(@USER))))))"
+                "                                           WHERE        (USERNAME = @USER)))))"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANGUAGE", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -51011,8 +51010,8 @@ Namespace DD_DMSDataSetTableAdapters
                 "F_USER_EXCLUSIV"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                               WHERE        (WF_TASK_ID NOT IN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                                                             (SELECT        WF_"& _ 
                 "TASK_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                                                               FROM    "& _ 
                 "        VWPMO_WF_USER_EXCLUSIV AS VWPMO_WF_USER_EXCLUSIV_1"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                    "& _ 
-                "                                           WHERE        (UPPER(USERNAME) = UPPER"& _ 
-                "(@USER)))))) AND (RECORD_ID = @RECORD_ID)"
+                "                                           WHERE        (USERNAME = @USER))))) A"& _ 
+                "ND (RECORD_ID = @RECORD_ID)"
             Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANGUAGE", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))

app/DD-Record-Organizer/DD_DMSDataSet.xsd

@@ -2915,7 +2915,7 @@ WHERE        (WF_TASK_ID NOT IN
                                WHERE        (WF_TASK_ID NOT IN
                                                              (SELECT        WF_TASK_ID
                                                                FROM            VWPMO_WF_USER_EXCLUSIV AS VWPMO_WF_USER_EXCLUSIV_1
-                                                               WHERE        (UPPER(USERNAME) = UPPER(@USER))))))</CommandText>
+                                                               WHERE        (USERNAME = @USER)))))</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="LANGUAGE" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@LANGUAGE" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="USER" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@USER" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -2967,7 +2967,7 @@ WHERE        (WF_TASK_ID NOT IN
                                WHERE        (WF_TASK_ID NOT IN
                                                              (SELECT        WF_TASK_ID
                                                                FROM            VWPMO_WF_USER_EXCLUSIV AS VWPMO_WF_USER_EXCLUSIV_1
-                                                               WHERE        (UPPER(USERNAME) = UPPER(@USER)))))) AND (RECORD_ID = @RECORD_ID)</CommandText>
+                                                               WHERE        (USERNAME = @USER))))) AND (RECORD_ID = @RECORD_ID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="LANGUAGE" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@LANGUAGE" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="USER" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@USER" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />

app/DD-Record-Organizer/DD_ECMAdmin.xsc

@@ -9,11 +9,9 @@
     <TableUISetting Name="TBPMO_FORM_CONSTRUCTOR">
       <ColumnUISettings>
         <ColumnUISetting Name="NODE_NAVIGATION">
-          <ControlSettings>
-            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
+          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
               <BindableControlInfo Name="CheckBox" Type="System.Windows.Forms.CheckBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting>
-          </ControlSettings>
+            </ControlSetting></ControlSettings>
         </ColumnUISetting>
       </ColumnUISettings>
     </TableUISetting>
@@ -59,5 +57,30 @@
         </ColumnUISetting>
       </ColumnUISettings>
     </TableUISetting>
+    <TableUISetting Name="VWPMO_RIGHT_GROUP">
+      <ColumnUISettings>
+        <ColumnUISetting Name="ID">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
+              <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+            </ControlSetting>
+          </ControlSettings>
+        </ColumnUISetting>
+        <ColumnUISetting Name="ADDED_WHEN">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
+              <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+            </ControlSetting>
+          </ControlSettings>
+        </ColumnUISetting>
+        <ColumnUISetting Name="CHANGED_WHEN">
+          <ControlSettings>
+            <ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form">
+              <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+            </ControlSetting>
+          </ControlSettings>
+        </ColumnUISetting>
+      </ColumnUISettings>
+    </TableUISetting>
   </TableUISettings>
 </DataSetUISetting>

app/DD-Record-Organizer/DD_ECMAdmin.xss

@@ -4,29 +4,30 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-19" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-19" ViewPortY="-26" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR" ZOrder="5" X="-8" Y="141" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR_DETAIL" ZOrder="20" X="386" Y="39" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="18" X="867" Y="324" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:VWTEMPQUICKVIEW" ZOrder="16" X="1497" Y="511" Height="172" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
-    <Shape ID="DesignTable:TBWH_ENTITIES" ZOrder="15" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBWH_USER_GROUPS" ZOrder="14" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBPMO_SAP_FUBA" ZOrder="12" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:USER_RIGHTS" ZOrder="2" X="567" Y="383" Height="305" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBPMO_DOCSEARCH_RESULTLIST_CONFIG" ZOrder="9" X="1048" Y="-5" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:VWDD_LOGIN_USER_HISTORY" ZOrder="8" X="1173" Y="480" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_ID" ZOrder="7" X="1424" Y="2" Height="115" Width="418" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:TBPMO_LOG_ESSENTIALS" ZOrder="6" X="310" Y="616" Height="210" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:TBPMO_DOCRESULT_DROPDOWN_ITEMS" ZOrder="4" X="722" Y="13" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
-    <Shape ID="DesignTable:TBDD_GROUPS" ZOrder="1" X="241" Y="533" Height="286" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:DT_VORSCHAU" ZOrder="17" X="1342" Y="401" Height="48" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
-    <Shape ID="DesignTable:TBAD_Users" ZOrder="13" X="365" Y="384" Height="144" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TBWH_Users1" ZOrder="11" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBWH_Users2" ZOrder="10" X="794" Y="145" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR" ZOrder="6" X="-8" Y="141" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:TBPMO_FORM_CONSTRUCTOR_DETAIL" ZOrder="21" X="386" Y="39" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="19" X="867" Y="324" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VWTEMPQUICKVIEW" ZOrder="17" X="1497" Y="511" Height="172" Width="267" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:TBWH_ENTITIES" ZOrder="16" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBWH_USER_GROUPS" ZOrder="15" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBPMO_SAP_FUBA" ZOrder="13" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:USER_RIGHTS" ZOrder="3" X="567" Y="383" Height="305" Width="210" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPMO_DOCSEARCH_RESULTLIST_CONFIG" ZOrder="10" X="1048" Y="-5" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VWDD_LOGIN_USER_HISTORY" ZOrder="9" X="1173" Y="480" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBPMO_DOCSEARCH_RESULTLIST_CONFIG_TYPE_ID" ZOrder="8" X="1424" Y="2" Height="115" Width="418" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:TBPMO_LOG_ESSENTIALS" ZOrder="7" X="310" Y="616" Height="210" Width="293" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:TBPMO_DOCRESULT_DROPDOWN_ITEMS" ZOrder="5" X="722" Y="13" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:TBDD_GROUPS" ZOrder="2" X="241" Y="533" Height="286" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:DT_VORSCHAU" ZOrder="18" X="1342" Y="401" Height="48" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
+    <Shape ID="DesignTable:TBAD_Users" ZOrder="14" X="365" Y="384" Height="144" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:TBWH_Users1" ZOrder="12" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBWH_Users2" ZOrder="11" X="794" Y="145" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:VWPMO_RIGHT_GROUP" ZOrder="1" X="831" Y="661" Height="305" Width="284" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="19" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_FORM_CONSTRUCTOR_DETAIL_CONSTRUCT_ID" ZOrder="20" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>292</X>
@@ -38,7 +39,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBPMO_DOCRESULT_DROPDOWN_ITEMSCONFIG_ID" ZOrder="3" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBPMO_DOCRESULT_DROPDOWN_ITEMSCONFIG_ID" ZOrder="4" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>1048</X>

app/DD-Record-Organizer/MailLicense.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<License>
+  <Id>4dc5ef40-f1a9-468b-994c-b7ed600ad878</Id>
+  <ProductName>Mail.dll</ProductName>
+  <SubscriptionUntil>2022-07-29</SubscriptionUntil>
+  <RegisteredTo>Digital Data GmbH</RegisteredTo>
+  <LicenseType>single developer</LicenseType>
+  <BuyerName>Digital Data GmbH</BuyerName>
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+      <Reference URI="">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+        <DigestValue>75MRtl4ipYelIZYlpT8O7QDX9Zc=</DigestValue>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue>Raxfkz6DfQVs/sMvH+F2nH0eHXD8FoUFSdP3t7AgBUdpABJQx86srlyuMSEhXPlc1THCqPouEVob4RsWnd9OXvTiPPSOUSK9zuNG6uz93KLAhpSD5PraAgBCF4jwZArlAp7aCNfZpHqQ3w6TRHS+CfravUU0AHHG3MZ1ZcRkGuo=</SignatureValue>
+  </Signature>
+</License>

app/DD-Record-Organizer/ModuleHelperMethods.vb

@@ -251,10 +251,8 @@ Module ModuleHelperMethods
 
     End Sub
 
-    Public Sub OpenRecordView(recordId)
+    Public Sub OpenRecordView()
         Try
-            JUMP_RECORD_ID = recordId
-
             Dim frm As New frmRecordView()
             'frm.MdiParent = MAIN_FORM
             frm.Show()
@@ -264,8 +262,15 @@ Module ModuleHelperMethods
 
     End Sub
 
-    Public Sub OpenFormConstructor(id As Integer, NodeNav As Boolean, EntityID As Int16, Optional recordId As Integer = -1)
+    Public Sub OpenFormConstructor(id As Integer, NodeNav As Boolean, EntityID As Int16, Optional pJumpID As Integer = -1)
         Try
+
+            If pJumpID <> -1 Then
+                ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
+                JUMP_ID = pJumpID
+            End If
+
+
             If CURRENT_OPEN_CONSTRUCTOR_FORMS.Contains(id) Then
                 Dim frm1 As New frmConstructor_Main
                 frm1.Tag = id
@@ -277,6 +282,14 @@ Module ModuleHelperMethods
                         If frmCollection.Item(i).WindowState = FormWindowState.Minimized Then
                             frmCollection.Item(i).WindowState = FormWindowState.Normal
                         End If
+                        CURRENT_CONSTRUCTOR_ID = id
+                        CURRENT_OPEN_CONSTRUCTOR_FORMS.Add(id)
+                        If pJumpID <> -1 Then
+                            ' Nur ausführen, wenn das Form tatsächlich JumptoNode unterstützt
+                            If TypeOf frmCollection.Item(i) Is frmNodeNavigation Then
+                                DirectCast(frmCollection.Item(i), frmNodeNavigation).JumptoNode()
+                            End If
+                        End If
                         Exit Sub
                     End If
                 Next i
@@ -287,8 +300,8 @@ Module ModuleHelperMethods
             CURRENT_OPEN_CONSTRUCTOR_FORMS.Add(id)
 
             If NodeNav Then
-                Dim frmNN As New frmNodeNavigation(EntityID, CURRENT_CONSTRUCTOR_ID)
-                frmNN.Tag = id
+                Dim frmNodeNav As New frmNodeNavigation(EntityID, CURRENT_CONSTRUCTOR_ID)
+                frmNodeNav.Tag = id
                 If My.Settings.EntFormsChild = True Then
                     Dim activeChild1 As Form = MAIN_FORM.ActiveMdiChild
                     If activeChild1 IsNot Nothing Then
@@ -297,15 +310,15 @@ Module ModuleHelperMethods
                 End If
 
 
-                If recordId <> -1 Then
-                    ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
-                    JUMP_RECORD_ID = recordId
-                End If
                 If My.Settings.EntFormsChild = True Then
-                    frmNN.MdiParent = MAIN_FORM
+                    frmNodeNav.MdiParent = MAIN_FORM
+                End If
+
+                frmNodeNav.Show()
+                If pJumpID <> -1 Then
+                    frmNodeNav.JumptoNode()
                 End If
 
-                frmNN.Show()
             Else
                 Dim frm As New frmConstructor_Main()
                 frm.Tag = id
@@ -317,9 +330,9 @@ Module ModuleHelperMethods
                 End If
 
 
-                If recordId <> -1 Then
+                If pJumpID <> -1 Then
                     ' Wenn JUMP_RECORD_ID gesetzt wurde, wird zu diesem Record gesprungen
-                    JUMP_RECORD_ID = recordId
+                    JUMP_ID = pJumpID
                 End If
                 If My.Settings.EntFormsChild = True Then
                     frm.MdiParent = MAIN_FORM
@@ -429,17 +442,7 @@ Module ModuleHelperMethods
         End Try
 
     End Sub
-    Public Sub OpenWindream_Files()
-        Dim frm As New frmWM_Import_Doc_Record
-        frm.MdiParent = MAIN_FORM
 
-        Dim activeChild As Form = MAIN_FORM.ActiveMdiChild
-        If activeChild IsNot Nothing Then
-            activeChild.WindowState = FormWindowState.Normal
-        End If
-
-        frm.Show()
-    End Sub
     Public Sub OpenWiedervorlage()
         Dim frm As New frmFollowUp
         frm.MdiParent = MAIN_FORM

app/DD-Record-Organizer/ModuleMySettings.vb

@@ -1,16 +1,15 @@
 Imports System.IO
 Imports System.Xml
-Imports DD_LIB_Standards
 Imports DevExpress.LookAndFeel
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Windream
 
 Module ModuleMySettings
+    Public Const constWMOBJECTS = "\\WINDREAM\OBJECTS"
     Public PATH_FileExclusions As String = Path.Combine(Application.UserAppDataPath(), "FileExclusions.xml")
     Dim ConfigPath As String = Path.Combine(Application.UserAppDataPath(), "UserConfig2.xml")
 
     Public MyConnectionString As String = ""
-    Public MyFormsDesign As String = ""
 
     Public DEBUG As Boolean = False
     Public Sett_TaskOverviewKeepInFront As Boolean = True
@@ -21,10 +20,23 @@ Module ModuleMySettings
     Public WD_GROUP1 As String
     Public WD_UNICODE As Boolean = False
     Public WMDriveLetter As String
-    Public WMPATH_PREFIX As String
+    Public WMPATH_PREFIX As String = ""
+    Public WMOBJECTTYPE As String = ""
+    Public WMINDEX_DOCTYPE As String = ""
+    Public WMINDEX_RELATION As String = ""
+    Public WMPATH_via_WMA As Boolean = False
+    Public DTTBPMO_SERVICE_RIGHT_CONFIG As DataTable
     Public WMMOD As Windream
+    Public CURRENT_WM_OBJECT As WINDREAMLib.WMObject
     Public SHARE_DRIVE_ACTIVE As Boolean = False
+    Public WorkMode_WMMODE As String = "NORMAL"
     Public WM_READ_ONLY As Boolean = False
+    Public WM_ADD_NO_DELETE As Boolean = False
+    Public WM_SERVER As String = ""
+    Public WM_DOMAIN As String = ""
+    Public WM_USER As String = ""
+    Public WM_USER_PW As String = ""
+    Public WM_IMPERSONATE_LOGIN As Boolean = True
     Public GridDocResult_BestFitColumns As Boolean = True
     Public SQL_FULLTEXT As String
     Public CAPTION_CONFIRMATION As String = "Bestätigung"
@@ -43,7 +55,7 @@ Module ModuleMySettings
 
     Public USER_IS_ADMIN = False
     Public USER_IS_SUPERVISOR = False
-    Public USERS_LOGGED_IN = 0
+    Public LICENSES_USED = 0
 
     Public USER_USERNAME As String
     Public USER_PERSONIFIED_TEST As Boolean = False
@@ -51,18 +63,27 @@ Module ModuleMySettings
     Public USERID_FK_INT_ECM = 0
     Public USER_LANGUAGE As String = "de-DE"
     Public USER_DATE_FORMAT As String
-    Public USER_GENERAL_VIEWER As String
-    Public USER_WAN As Boolean = False
+
 
     Public DT_CLIENT_USER As DataTable
     Public CLIENT_SELECTED As Integer = 99
+
+
     'Public USER_CLIENTS_COMMA_SEPERATED As String
     Public FWSCAN_started As Boolean = False
 
     Public LOGCONFIG As LogConfig
     Public LOGGER As Logger
 
+    Public WM_RWA As String = ""
+    Public WM_RWA1 As String = ""
+    Public WM_RWA2 As String = ""
+
+    Public OF_FILESTORE_ENTITY As Integer = 0
+    Public OF_FILESTORE_CONSTRUCTOR As Integer = 0
+
     Dim rowresult As String = ""
+    Public MYGDPICTURE_LICENSE_KEY As String = ""
     Public Function LoadFileExclusion()
         Dim rowresult As String = ""
         Try
@@ -188,15 +209,12 @@ Module ModuleMySettings
                                 connstring = Row.Item("Value").ToString
                             End If
 
-                            ClassProxy.MyPROXYConnectionString = connstring
-                        Else
-                            ClassProxy.MyPROXYConnectionString = ""
                         End If
                     Case "MyLinkedServer"
-                        ClassProxy.MyLinkedServer = Row.Item("Value")
+                        'ClassProxy.MyLinkedServer = Row.Item("Value")
                     Case "LogErrorsOnly"
                         DEBUG = CBool(Row.Item("Value"))
-                        clsCURRENT.LOG_ERRORS_ONLY = DEBUG
+                        'DD_LIB_Standards.clsCURRENT.LOG_ERRORS_ONLY = DEBUG
                         LOGCONFIG.Debug = DEBUG
                     Case "Sett_TaskOverviewKeepInFront"
                         Sett_TaskOverviewKeepInFront = CBool(Row.Item("Value"))
@@ -220,10 +238,6 @@ Module ModuleMySettings
                         Else
                             MY_ADDON_PATH = Row.Item("Value")
                         End If
-                    Case "MyFormsDesign"
-                        If Row.Item("Value") <> String.Empty Then
-                            MyFormsDesign = Row.Item("Value")
-                        End If
                     Case "GridDocResult_BestFitColumns"
                         GridDocResult_BestFitColumns = CBool(Row.Item("Value"))
 
@@ -279,13 +293,6 @@ Module ModuleMySettings
                 DT.Rows.Add(newRow)
                 DT.WriteXml(ConfigPath)
             End If
-            If rowresult.Contains("MyFormsDesign") = False Then
-                Dim newRow As DataRow = DT.NewRow()
-                newRow("ConfigName") = "MyFormsDesign"
-                newRow("Value") = ""
-                DT.Rows.Add(newRow)
-                DT.WriteXml(ConfigPath)
-            End If
             If rowresult.Contains("GridDocResult_BestFitColumns") = False Then
                 Dim newRow As DataRow = DT.NewRow()
                 newRow("ConfigName") = "GridDocResult_BestFitColumns"

app/DD-Record-Organizer/ModuleRuntimeVariables.vb

@@ -1,4 +1,5 @@
-Imports DigitalData.Modules.Config
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Database
 
 Module ModuleRuntimeVariables
@@ -6,7 +7,7 @@ Module ModuleRuntimeVariables
 
     Public ESC_Hidden As Boolean = False
 
-    Public MIN_REQUIRED_VERSION As String
+    Public MIN_REQUIRED_VERSION As String = "1.0.0.0"
 
     Public MAIN_FORM As frmMain = Nothing
     Public ERROR_INIT = "NONE"
@@ -47,6 +48,7 @@ Module ModuleRuntimeVariables
     Public CURRENT_CONTROL_ID As Integer
     Public CURRENT_RECORD_ID As Integer
     Public CURRENT_NODE_GUID As Integer
+    Public CURRENT_NODEID As Integer
 
     Public CURRENT_CHANGE_STEP As Integer = 0
 
@@ -60,6 +62,7 @@ Module ModuleRuntimeVariables
     Public CURRENT_CONSTRUCTOR_DETAIL_ID As Integer
     Public CURRENT_FILEID As Integer
     Public CURRENT_FILENAME As String
+    Public CURRENT_FILE_HASH As String = ""
     Public CURRENT_OFFICE_FILE_CHANGED As Boolean = False
     Public CURRENT_NEWFILENAME As String
     Public CURRENT_CONTROL_DOCTYPE_MATCH As String = ""
@@ -85,7 +88,7 @@ Module ModuleRuntimeVariables
     Public BOOLEAN1 As Boolean = False
 
     Public JUMP_STATE As Integer
-    Public JUMP_RECORD_ID As Integer
+    Public JUMP_ID As Long
 
     Public TEMP_FILES As List(Of String) = New List(Of String)
     Public FILE_FORMATS_CHANGE_DURING_EDIT As List(Of String) = New List(Of String)
@@ -94,7 +97,7 @@ Module ModuleRuntimeVariables
     Public LICENSE_COUNT As Integer = 0
     Public LICENSE_DOSSIER_COUNT As Integer = 0
     Public LICENSE_SAP_Connect As Boolean = False
-    Public LICENSE_PROXY As Boolean = False
+    'Public LICENSE_PROXY As Boolean = False
     Public LICENSE_SITE As Boolean = False
     Public LICENSE_DATE As Date
     Public DT_LICENSE_ADDONS As DataTable
@@ -114,6 +117,8 @@ Module ModuleRuntimeVariables
     Public CURRENT_VARIABLE_CONTROLS As DataTable
     Public CURRENT_TBPMO_FORM_VIEW As DataTable
     Public CURRENT_TBPMO_DOCRESULT_DROPDOWN_ITEMS As DataTable
+    Public CURRENT_TBFILE_EXTENSION_OVERRIDE As DataTable
+
     Public CURRENT_TBPMO_RIGHT_USER As DataTable
 
     Public CURRENT_RECORD_ENABLED As Boolean = False
@@ -196,7 +201,14 @@ Module ModuleRuntimeVariables
     Public CURRENT_FILE_RIGHT As String
 
     Public SQL_DOC_RESULT_RECORD As String = ""
+    Public SQL_GLOBAL_SEARCH As String = ""
+    Public SQL_OF_NODE_SEARCH As String = ""
+    Public SQL_LIC_NAMED_USER As String = ""
+    Public SQL_LIC_NAMED_USER_WITH_PATTERN As String = ""
+    Public CONF_SUPPORTPORTAL As String = "https://www.digitaldata.works/Support'"
+
+    Public Property FILESYSTEM As FilesystemEx
 
     Public CURRENT_DT_TBPMO_DOC_RECORD_LINK As DataTable
-    Public MYDB_ECM As MSSQLServer
+    Public Property MYDB_ECM As MSSQLServer
 End Module

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

@@ -34,5 +34,11 @@ Namespace My
         Protected Overrides Sub OnCreateMainForm()
             Me.MainForm = Global.DD_Record_Organizer.frmMain
         End Sub
+        
+        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
+        Protected Overrides Function OnInitialize(ByVal commandLineArgs As System.Collections.ObjectModel.ReadOnlyCollection(Of String)) As Boolean
+            Me.MinimumSplashScreenDisplayTime = 0
+            Return MyBase.OnInitialize(commandLineArgs)
+        End Function
     End Class
 End Namespace

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

@@ -10,12 +10,12 @@ Imports System.Runtime.InteropServices
 
 ' Die Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("Digital Data - OrgFlow")>
+<Assembly: AssemblyTitle("Digital Data - orgFLOW")>
 <Assembly: AssemblyDescription("")> 
 <Assembly: AssemblyCompany("Digital Data")>
-<Assembly: AssemblyProduct("OrgFlow")>
-<Assembly: AssemblyCopyright("Copyright @")>
-<Assembly: AssemblyTrademark("")> 
+<Assembly: AssemblyProduct("orgFLOW")>
+<Assembly: AssemblyCopyright("Copyright 2025")>
+<Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)> 
 
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("3.0.0.0")>
+<Assembly: AssemblyVersion("3.6.0.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", "17.3.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -260,23 +260,20 @@ Namespace My
          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")>  _
+            ";User ID=sa;Password=dd;Encrypt=True;TrustServerCertificate=True")>  _
         Public ReadOnly Property DD_DMSConnectionString() As String
             Get
                 Return CType(Me("DD_DMSConnectionString"),String)
             End Get
         End Property
         
-        <Global.System.Configuration.UserScopedSettingAttribute(),  _
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
          Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
-        Public Property UseAppConfigConString() As Boolean
+        Public ReadOnly Property UseAppConfig() As Boolean
             Get
-                Return CType(Me("UseAppConfigConString"),Boolean)
+                Return CType(Me("UseAppConfig"),Boolean)
             End Get
-            Set
-                Me("UseAppConfigConString") = value
-            End Set
         End Property
         
         <Global.System.Configuration.UserScopedSettingAttribute(),  _

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

@@ -53,12 +53,12 @@
     <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;ConnectionString&gt;Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=True;TrustServerCertificate=True&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>
+      <Value Profile="(Default)">Data Source=172.24.12.44\MERCER;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=True;TrustServerCertificate=True</Value>
     </Setting>
-    <Setting Name="UseAppConfigConString" Type="System.Boolean" Scope="User">
+    <Setting Name="UseAppConfig" Type="System.Boolean" Scope="Application">
       <Value Profile="(Default)">False</Value>
     </Setting>
     <Setting Name="EntFormsChild" Type="System.Boolean" Scope="User">

app/DD-Record-Organizer/My Project/licenses.licx

@@ -1,5 +1,13 @@
-DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

app/DD-Record-Organizer/OrgFlow.ruleset

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="New Rule Set" Description=" " ToolsVersion="17.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1823" Action="Warning" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
+    <Rule Id="C6259" Action="Warning" />
+  </Rules>
+</RuleSet>

app/DD-Record-Organizer/OrgFlow.vbproj

@@ -8,10 +8,10 @@
     <OutputType>WinExe</OutputType>
     <StartupObject>DD_Record_Organizer.My.MyApplication</StartupObject>
     <RootNamespace>DD_Record_Organizer</RootNamespace>
-    <AssemblyName>OrgFlow</AssemblyName>
+    <AssemblyName>orgFLOW</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
@@ -29,15 +29,17 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <DefineDebug>true</DefineDebug>
     <DefineTrace>true</DefineTrace>
     <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>OrgFlow.xml</DocumentationFile>
+    <DocumentationFile>orgFLOW.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -47,7 +49,7 @@
     <DefineTrace>true</DefineTrace>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>OrgFlow.xml</DocumentationFile>
+    <DocumentationFile>orgFLOW.xml</DocumentationFile>
     <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -68,14 +70,34 @@
   <PropertyGroup>
     <ApplicationIcon>ORGFLOW_Icon_256x256.ico</ApplicationIcon>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <DefineDebug>true</DefineDebug>
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DocumentationFile>orgFLOW.xml</DocumentationFile>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DefineTrace>true</DefineTrace>
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DocumentationFile>orgFLOW.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
     <Reference Include="CommandLine">
       <HintPath>..\..\3rdparty\lib\Commandline\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="DD_LIB_Standards, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll</HintPath>
-    </Reference>
     <Reference Include="DD_Rights">
       <HintPath>..\..\..\DDLibraries\app\DD_Libraries\bin\Debug\DD_Rights.dll</HintPath>
     </Reference>
@@ -85,6 +107,7 @@
     <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="DevExpress.Dialogs.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Map.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -127,6 +150,7 @@
     <Reference Include="DevExpress.XtraCharts.v21.2.Wizard, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
@@ -169,26 +193,42 @@
     <Reference Include="DevExpress.XtraWizard.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.GUIs.Common">
+      <HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Base">
-      <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Windream, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Encryption">
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Windream, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
+      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
     </Reference>
     <Reference Include="DLLLicenseManager">
       <HintPath>..\..\lib\DLLLicenseManager.dll</HintPath>
     </Reference>
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
+    </Reference>
     <Reference Include="ERPConnect35">
       <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\ERPConnect35.dll</HintPath>
     </Reference>
@@ -211,6 +251,15 @@
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Mail">
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Limilabs\Mail.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Office.Interop.Outlook, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -220,18 +269,46 @@
     <Reference Include="Microsoft.Office.Interop.Word, Version=15.0.0.0, Culture=neutral, PublicKeyToken=71e9bce111e9429c, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+    </Reference>
     <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
+    </Reference>
     <Reference Include="Oracle.ManagedDataAccess, Version=4.121.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\3rdparty\lib\Oracle Managed Data Access\Oracle.ManagedDataAccess.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationCore" />
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
+      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
+    </Reference>
     <Reference Include="System">
       <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.6.1\System.dll</HintPath>
     </Reference>
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
     <Reference Include="System.Deployment" />
@@ -239,11 +316,51 @@
     <Reference Include="System.DirectoryServices.AccountManagement" />
     <Reference Include="System.DirectoryServices.Protocols" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Formats.Asn1, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll</HintPath>
+    </Reference>
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Windows.Forms" />
@@ -252,6 +369,7 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="UIAutomationClient" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Import Include="Microsoft.VisualBasic" />
@@ -269,6 +387,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" />
@@ -291,18 +410,18 @@
     <Compile Include="Classes\ClassMoreMetadata.vb" />
     <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" />
     <Compile Include="Classes\ClassSAP.vb" />
     <Compile Include="Classes\ClassDOC_SEARCH.vb" />
-    <Compile Include="Classes\ClassUpdate.vb" />
     <Compile Include="Classes\ClassUser.vb" />
     <Compile Include="Classes\ClassWDRights.vb" />
-    <Compile Include="Classes\ClassWindreamDocGrid.vb" />
+    <Compile Include="Classes\ClassDocGrid.vb" />
     <Compile Include="Classes\ClassWorkflow.vb" />
+    <Compile Include="Classes\NodeNavigation\ClassDoctypeChange.vb" />
+    <Compile Include="Classes\NodeNavigation\ClassNodeCreator.vb" />
     <Compile Include="DD_DMSDataSet.Designer.vb">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -317,6 +436,12 @@
     <Compile Include="frmCalendarEntity.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmChangeDocType.Designer.vb">
+      <DependentUpon>frmChangeDocType.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmChangeDocType.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmChooseParentRecord.Designer.vb">
       <DependentUpon>frmChooseParentRecord.vb</DependentUpon>
     </Compile>
@@ -401,12 +526,24 @@
     <Compile Include="frmMessageBox.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmNewNode.Designer.vb">
+      <DependentUpon>frmNewNode.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmNewNode.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmNewVariant.Designer.vb">
       <DependentUpon>frmNewVariant.vb</DependentUpon>
     </Compile>
     <Compile Include="frmNewVariant.vb">
       <SubType>Form</SubType>
     </Compile>
+    <Compile Include="frmNodeConfigAdd.Designer.vb">
+      <DependentUpon>frmNodeConfigAdd.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmNodeConfigAdd.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmNodeNavigation.Designer.vb">
       <DependentUpon>frmNodeNavigation.vb</DependentUpon>
     </Compile>
@@ -473,12 +610,6 @@
     <Compile Include="frmWM_FulltextChoice.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmWM_Import_Doc_Record.Designer.vb">
-      <DependentUpon>frmWM_Import_Doc_Record.vb</DependentUpon>
-    </Compile>
-    <Compile Include="frmWM_Import_Doc_Record.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="Classes\ClassStaticListEditor.vb" />
     <Compile Include="frmRecordView.Designer.vb">
       <DependentUpon>frmRecordView.vb</DependentUpon>
@@ -522,9 +653,9 @@
     <Compile Include="Classes\ClassDragDrop.vb" />
     <Compile Include="Classes\ClassEmail.vb" />
     <Compile Include="Classes\ClassEncryption.vb" />
-    <Compile Include="Classes\ClassFormCommands.vb" />
-    <Compile Include="Classes\ClassFunctionCommands.vb" />
-    <Compile Include="Classes\ClassFunctionCommandsUI.vb" />
+    <Compile Include="Classes\Commands\ClassFormCommands.vb" />
+    <Compile Include="Classes\Commands\ClassFunctionCommands.vb" />
+    <Compile Include="Classes\Commands\ClassFunctionCommandsUI.vb" />
     <Compile Include="Classes\ClassHelper.vb" />
     <Compile Include="Classes\ClassImport_Windream.vb" />
     <Compile Include="Classes\ClassInit.vb" />
@@ -738,12 +869,6 @@
     <Compile Include="frmUserKonfig.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmWM_EntityImport.Designer.vb">
-      <DependentUpon>frmWM_EntityImport.vb</DependentUpon>
-    </Compile>
-    <Compile Include="frmWM_EntityImport.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="frmWM_IndexFile.Designer.vb">
       <DependentUpon>frmWM_IndexFile.vb</DependentUpon>
     </Compile>
@@ -762,12 +887,6 @@
     <Compile Include="frmFollowUp.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmWMView_Config.Designer.vb">
-      <DependentUpon>frmWMView_Config.vb</DependentUpon>
-    </Compile>
-    <Compile Include="frmWMView_Config.vb">
-      <SubType>Form</SubType>
-    </Compile>
     <Compile Include="ModuleHelperMethods.vb" />
     <Compile Include="ModuleMySettings.vb" />
     <Compile Include="ModuleRuntimeVariables.vb" />
@@ -792,6 +911,9 @@
     <EmbeddedResource Include="frmCalendarEntity.resx">
       <DependentUpon>frmCalendarEntity.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmChangeDocType.resx">
+      <DependentUpon>frmChangeDocType.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmChooseParentRecord.en-US.resx">
       <DependentUpon>frmChooseParentRecord.vb</DependentUpon>
     </EmbeddedResource>
@@ -806,6 +928,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmConstructorDesigner.en.resx">
       <DependentUpon>frmConstructorDesigner.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmConstructor_Main.aa.resx">
       <DependentUpon>frmConstructor_Main.vb</DependentUpon>
@@ -825,6 +948,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmDocSearchResult.resx">
       <DependentUpon>frmDocSearchResult.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmDoc_Links.resx">
       <DependentUpon>frmDoc_Links.vb</DependentUpon>
@@ -847,9 +971,11 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmLicense.en-US.resx">
       <DependentUpon>frmLicense.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmLicense_User.en-US.resx">
       <DependentUpon>frmLicense_User.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmLicense_User.resx">
       <DependentUpon>frmLicense_User.vb</DependentUpon>
@@ -859,6 +985,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmMain.de-DE.resx">
       <DependentUpon>frmMain.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmMass_Change.en-US.resx">
       <DependentUpon>frmMass_Change.vb</DependentUpon>
@@ -869,14 +996,21 @@
     <EmbeddedResource Include="frmMessageBox.resx">
       <DependentUpon>frmMessageBox.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmNewNode.resx">
+      <DependentUpon>frmNewNode.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmNewVariant.en-US.resx">
       <DependentUpon>frmNewVariant.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="frmNewVariant.resx">
       <DependentUpon>frmNewVariant.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmNodeConfigAdd.resx">
+      <DependentUpon>frmNodeConfigAdd.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmNodeNavigation.resx">
       <DependentUpon>frmNodeNavigation.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmRecordView.en-US.resx">
       <DependentUpon>frmRecordView.vb</DependentUpon>
@@ -896,6 +1030,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmGlobalSearch.resx">
       <DependentUpon>frmGlobalSearch.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmStaticListEditor.en-US.resx">
       <DependentUpon>frmStaticListEditor.vb</DependentUpon>
@@ -908,6 +1043,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmStructureNodeConfig.resx">
       <DependentUpon>frmStructureNodeConfig.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmTreeSearchResult.en-US.resx">
       <DependentUpon>frmTreeSearchResult.vb</DependentUpon>
@@ -930,9 +1066,6 @@
     <EmbeddedResource Include="frmWM_FulltextChoice.resx">
       <DependentUpon>frmWM_FulltextChoice.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmWM_Import_Doc_Record.resx">
-      <DependentUpon>frmWM_Import_Doc_Record.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmRecordView.resx">
       <DependentUpon>frmRecordView.vb</DependentUpon>
       <SubType>Designer</SubType>
@@ -986,6 +1119,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmConstructorDesigner.en-US.resx">
       <DependentUpon>frmConstructorDesigner.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmConstructorDesigner.resx">
       <DependentUpon>frmConstructorDesigner.vb</DependentUpon>
@@ -1154,12 +1288,6 @@
       <DependentUpon>frmUserKonfig.vb</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmWM_EntityImport.en-US.resx">
-      <DependentUpon>frmWM_EntityImport.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmWM_EntityImport.resx">
-      <DependentUpon>frmWM_EntityImport.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="frmWM_IndexFile.en-US.resx">
       <DependentUpon>frmWM_IndexFile.vb</DependentUpon>
     </EmbeddedResource>
@@ -1178,12 +1306,6 @@
       <DependentUpon>frmFollowUp.vb</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmWMView_Config.en-US.resx">
-      <DependentUpon>frmWMView_Config.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="frmWMView_Config.resx">
-      <DependentUpon>frmWMView_Config.vb</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="My Project\Resources.resx">
       <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
@@ -1236,6 +1358,7 @@
     <None Include="DD_ECMAdmin.xss">
       <DependentUpon>DD_ECMAdmin.xsd</DependentUpon>
     </None>
+    <None Include="frmScanFiles.resx.bak" />
     <None Include="My Project\app.manifest" />
     <None Include="My Project\Application.myapp">
       <Generator>MyApplicationCodeGenerator</Generator>
@@ -1250,6 +1373,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="OrgFlow.ruleset" />
     <None Include="packages.config" />
     <None Include="Resources\database_go.png" />
   </ItemGroup>
@@ -1602,6 +1726,9 @@
     <None Include="Resources\base_globe_32.png" />
     <None Include="Resources\1480524473_1.png" />
     <None Include="Resources\arrow_open_16xLG.png" />
+    <None Include="MailLicense.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="ORGFLOW_Icon_16x16.ico" />
     <Content Include="ORGFLOW_Icon_256x256.ico" />
     <Content Include="Resources\cube.ico" />
@@ -1634,6 +1761,17 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
+  </Target>
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

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

@@ -75,7 +75,6 @@ Partial Class frmAbout
         '
         'PictureBox1
         '
-        Me.PictureBox1.BackgroundImage = Global.DD_Record_Organizer.My.Resources.Resources.DD_Icons_ADDI
         resources.ApplyResources(Me.PictureBox1, "PictureBox1")
         Me.PictureBox1.Name = "PictureBox1"
         Me.PictureBox1.TabStop = False

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

@@ -0,0 +1,174 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmChangeDocType
+    Inherits DevExpress.XtraEditors.XtraForm
+
+    'Form overrides dispose to clean up the component list.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        If disposing AndAlso components IsNot Nothing Then
+            components.Dispose()
+        End If
+        MyBase.Dispose(disposing)
+    End Sub
+
+    'Required by the Windows Form Designer
+    Private components As System.ComponentModel.IContainer
+
+    'NOTE: The following procedure is required by the Windows Form Designer
+    'It can be modified using the Windows Form Designer.  
+    'Do not modify it using the code editor.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmChangeDocType))
+        Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
+        Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.cmbDocType = New DevExpress.XtraEditors.ComboBoxEdit()
+        Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton()
+        Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem()
+        Me.EmptySpaceItem2 = New DevExpress.XtraLayout.EmptySpaceItem()
+        Me.txtDocuments = New DevExpress.XtraEditors.TextEdit()
+        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
+        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.LayoutControl1.SuspendLayout()
+        CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.cmbDocType.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.txtDocuments.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'LayoutControl1
+        '
+        Me.LayoutControl1.Controls.Add(Me.cmbDocType)
+        Me.LayoutControl1.Controls.Add(Me.SimpleButton1)
+        Me.LayoutControl1.Controls.Add(Me.txtDocuments)
+        Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.LayoutControl1.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControl1.Name = "LayoutControl1"
+        Me.LayoutControl1.Root = Me.Root
+        Me.LayoutControl1.Size = New System.Drawing.Size(431, 131)
+        Me.LayoutControl1.TabIndex = 0
+        Me.LayoutControl1.Text = "LayoutControl1"
+        '
+        'Root
+        '
+        Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
+        Me.Root.GroupBordersVisible = False
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem1, Me.EmptySpaceItem1, Me.EmptySpaceItem2, Me.LayoutControlItem3})
+        Me.Root.Name = "Root"
+        Me.Root.Size = New System.Drawing.Size(431, 131)
+        Me.Root.TextVisible = False
+        '
+        'cmbDocType
+        '
+        Me.cmbDocType.Location = New System.Drawing.Point(114, 36)
+        Me.cmbDocType.Name = "cmbDocType"
+        Me.cmbDocType.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.cmbDocType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor
+        Me.cmbDocType.Size = New System.Drawing.Size(305, 20)
+        Me.cmbDocType.StyleController = Me.LayoutControl1
+        Me.cmbDocType.TabIndex = 5
+        '
+        'LayoutControlItem2
+        '
+        Me.LayoutControlItem2.Control = Me.cmbDocType
+        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 24)
+        Me.LayoutControlItem2.Name = "LayoutControlItem2"
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(411, 24)
+        Me.LayoutControlItem2.Text = "Neue Dokumentart"
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(90, 13)
+        '
+        'SimpleButton1
+        '
+        Me.SimpleButton1.DialogResult = System.Windows.Forms.DialogResult.OK
+        Me.SimpleButton1.Location = New System.Drawing.Point(299, 97)
+        Me.SimpleButton1.Name = "SimpleButton1"
+        Me.SimpleButton1.Size = New System.Drawing.Size(120, 22)
+        Me.SimpleButton1.StyleController = Me.LayoutControl1
+        Me.SimpleButton1.TabIndex = 6
+        Me.SimpleButton1.Text = "OK"
+        '
+        'LayoutControlItem1
+        '
+        Me.LayoutControlItem1.Control = Me.SimpleButton1
+        Me.LayoutControlItem1.Location = New System.Drawing.Point(287, 85)
+        Me.LayoutControlItem1.Name = "LayoutControlItem1"
+        Me.LayoutControlItem1.Size = New System.Drawing.Size(124, 26)
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem1.TextVisible = False
+        '
+        'EmptySpaceItem1
+        '
+        Me.EmptySpaceItem1.AllowHotTrack = False
+        Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 85)
+        Me.EmptySpaceItem1.Name = "EmptySpaceItem1"
+        Me.EmptySpaceItem1.Size = New System.Drawing.Size(287, 26)
+        Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0)
+        '
+        'EmptySpaceItem2
+        '
+        Me.EmptySpaceItem2.AllowHotTrack = False
+        Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 48)
+        Me.EmptySpaceItem2.Name = "EmptySpaceItem2"
+        Me.EmptySpaceItem2.Size = New System.Drawing.Size(411, 37)
+        Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0)
+        '
+        'txtDocuments
+        '
+        Me.txtDocuments.Location = New System.Drawing.Point(114, 12)
+        Me.txtDocuments.Name = "txtDocuments"
+        Me.txtDocuments.Properties.ReadOnly = True
+        Me.txtDocuments.Size = New System.Drawing.Size(305, 20)
+        Me.txtDocuments.StyleController = Me.LayoutControl1
+        Me.txtDocuments.TabIndex = 7
+        '
+        'LayoutControlItem3
+        '
+        Me.LayoutControlItem3.Control = Me.txtDocuments
+        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem3.Name = "LayoutControlItem3"
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(411, 24)
+        Me.LayoutControlItem3.Text = "Dokument"
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(90, 13)
+        '
+        'frmChangeDocType
+        '
+        Me.AcceptButton = Me.SimpleButton1
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(431, 131)
+        Me.Controls.Add(Me.LayoutControl1)
+        Me.IconOptions.SvgImage = CType(resources.GetObject("frmChangeDocType.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.Name = "frmChangeDocType"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent
+        Me.Text = "Dokumentart ändern"
+        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.LayoutControl1.ResumeLayout(False)
+        CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.cmbDocType.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.EmptySpaceItem2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.txtDocuments.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl
+    Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup
+    Friend WithEvents cmbDocType As DevExpress.XtraEditors.ComboBoxEdit
+    Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem
+    Friend WithEvents EmptySpaceItem2 As DevExpress.XtraLayout.EmptySpaceItem
+    Friend WithEvents txtDocuments As DevExpress.XtraEditors.TextEdit
+    Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
+End Class

app/DD-Record-Organizer/frmChangeDocType.resx

@@ -117,54 +117,23 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="CheckBoxWD_ShowDocs.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="CheckBoxWD_ShowDocs.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 12</value>
-  </data>
-  <data name="CheckBoxWD_ShowDocs.Size" type="System.Drawing.Size, System.Drawing">
-    <value>122, 19</value>
-  </data>
-  <data name="CheckBoxWD_ShowDocs.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="CheckBoxWD_ShowDocs.Text" xml:space="preserve">
-    <value>DocView anzeigen</value>
-  </data>
-  <data name="&gt;&gt;CheckBoxWD_ShowDocs.Name" xml:space="preserve">
-    <value>CheckBoxWD_ShowDocs</value>
-  </data>
-  <data name="&gt;&gt;CheckBoxWD_ShowDocs.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;CheckBoxWD_ShowDocs.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;CheckBoxWD_ShowDocs.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>7, 15</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>436, 161</value>
-  </data>
-  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Konfiguration der Userspezifischen windream-Ansicht</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>frmwindreamView_Config</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="frmChangeDocType.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHECAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTXVsdGlwbGVfRG9jdW1lbnRzIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91
+        bmQ6bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDoj
+        NzI3MjcyO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTMxLDhoLTVWNWMwLTAuNS0wLjUtMS0xLTFoLTVW
+        MWMwLTAuNS0wLjUtMS0xLTFIMUMwLjUsMCwwLDAuNSwwLDF2MjJjMCwwLjUsMC41LDEsMSwxaDV2M2Mw
+        LDAuNSwwLjUsMSwxLDEgIGg1djNjMCwwLjUsMC41LDEsMSwxaDE4YzAuNSwwLDEtMC41LDEtMVY5QzMy
+        LDguNSwzMS41LDgsMzEsOHogTTYsNXYxN0gyVjJoMTZ2Mkg3QzYuNSw0LDYsNC41LDYsNXogTTEyLDl2
+        MTdIOFY2aDE2djJIMTMgIEMxMi41LDgsMTIsOC41LDEyLDl6IE0zMCwzMEgxNFYxMGgxNlYzMHoiIGNs
+        YXNzPSJCbGFjayIgLz4NCjwvc3ZnPgs=
+</value>
   </data>
 </root>

app/DD-Record-Organizer/frmChangeDocType.vb

@@ -0,0 +1,32 @@
+Public Class frmChangeDocType
+    Public Property SelectedDocType As DocType
+    Public Property DocTypes As List(Of DocType)
+    Public Property FileNames As List(Of String)
+
+
+    Private Sub frmChangeDocType_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        cmbDocType.Properties.Items.AddRange(DocTypes)
+        Dim oTitle = "Dateien"
+        If USER_LANGUAGE <> "de-DE" Then
+            oTitle = "Documents"
+        End If
+        If FileNames.Count = 1 Then
+            txtDocuments.EditValue = FileNames.First()
+        Else
+            txtDocuments.EditValue = $"{FileNames.Count} {oTitle}"
+        End If
+    End Sub
+
+    Public Class DocType
+        Public Property Name As String
+        Public Property Id As Integer
+
+        Public Overrides Function ToString() As String
+            Return Name
+        End Function
+    End Class
+
+    Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click
+        SelectedDocType = cmbDocType.EditValue
+    End Sub
+End Class

app/DD-Record-Organizer/frmChooseParentRecord.resx.bak

@@ -183,8 +183,8 @@
   <data name="btnAddLink.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Bottom, Right</value>
   </data>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.2">
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
     <value>None</value>
   </data>
   <data name="GridView.Appearance.EvenRow.FontSizeDelta" type="System.Int32, mscorlib">
@@ -233,7 +233,7 @@
     <value>Top, Left</value>
   </data>
   <data name="&gt;&gt;GridView.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -247,8 +247,8 @@
   <data name="&gt;&gt;btnAddLink.Type" xml:space="preserve">
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <assembly alias="DevExpress.XtraEditors.v15.2" name="DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v15.2">
+  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v19.2">
     <value>Center</value>
   </data>
   <data name="btncancel.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
@@ -725,7 +725,7 @@
     <value>1</value>
   </data>
   <data name="&gt;&gt;GridControl.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
     <value>0</value>
@@ -739,8 +739,8 @@
   <data name="GridControl.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
     <value />
   </data>
-  <assembly alias="DevExpress.Data.v15.2" name="DevExpress.Data.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v15.2">
+  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
     <value>Default</value>
   </data>
   <data name="GridControl.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">

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

@@ -22,15 +22,10 @@ Partial Class frmConfig_Basic
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConfig_Basic))
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.TabControl1 = New System.Windows.Forms.TabControl()
         Me.TabPage1 = New System.Windows.Forms.TabPage()
-        Me.lblLinkedServer = New System.Windows.Forms.Label()
-        Me.txtLinkedServer = New System.Windows.Forms.TextBox()
-        Me.btndeleteProxy = New System.Windows.Forms.Button()
-        Me.rbConn_Proxy = New System.Windows.Forms.RadioButton()
-        Me.rbConnDefault = New System.Windows.Forms.RadioButton()
         Me.chkbxUserAut = New System.Windows.Forms.CheckBox()
         Me.Label5 = New System.Windows.Forms.Label()
         Me.cmbDatenbank = New System.Windows.Forms.ComboBox()
@@ -44,7 +39,6 @@ Partial Class frmConfig_Basic
         Me.txtPasswort = New System.Windows.Forms.TextBox()
         Me.BtnConnect = New System.Windows.Forms.Button()
         Me.TabPage2 = New System.Windows.Forms.TabPage()
-        Me.Button4 = New System.Windows.Forms.Button()
         Me.GroupBox5 = New System.Windows.Forms.GroupBox()
         Me.Label11 = New System.Windows.Forms.Label()
         Me.Label10 = New System.Windows.Forms.Label()
@@ -56,6 +50,7 @@ Partial Class frmConfig_Basic
         Me.Button3 = New System.Windows.Forms.Button()
         Me.cmbLanguage = New System.Windows.Forms.ComboBox()
         Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+        Me.CheckBox2 = New System.Windows.Forms.CheckBox()
         Me.Label7 = New System.Windows.Forms.Label()
         Me.cmbConstructor = New System.Windows.Forms.ComboBox()
         Me.CheckBox1 = New System.Windows.Forms.CheckBox()
@@ -73,9 +68,10 @@ Partial Class frmConfig_Basic
         Me.Label8 = New System.Windows.Forms.Label()
         Me.btnstartstop2 = New System.Windows.Forms.Button()
         Me.TabPage4 = New System.Windows.Forms.TabPage()
+        Me.Label6 = New System.Windows.Forms.Label()
+        Me.Button4 = New System.Windows.Forms.Button()
+        Me.txtCreateWMFolder = New System.Windows.Forms.TextBox()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
-        Me.Button7 = New System.Windows.Forms.Button()
-        Me.RadioButton3 = New System.Windows.Forms.RadioButton()
         Me.rbGruppe = New System.Windows.Forms.RadioButton()
         Me.rbUser = New System.Windows.Forms.RadioButton()
         Me.txtObjectExists = New System.Windows.Forms.TextBox()
@@ -83,7 +79,7 @@ Partial Class frmConfig_Basic
         Me.btncheckWDFolderexists = New System.Windows.Forms.Button()
         Me.txtwdFolder = New System.Windows.Forms.TextBox()
         Me.Label12 = New System.Windows.Forms.Label()
-        Me.CheckBox2 = New System.Windows.Forms.CheckBox()
+        Me.CheckBox_ForceTemporaryMode = New System.Windows.Forms.CheckBox()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         Me.TabPage2.SuspendLayout()
@@ -109,11 +105,6 @@ Partial Class frmConfig_Basic
         '
         'TabPage1
         '
-        Me.TabPage1.Controls.Add(Me.lblLinkedServer)
-        Me.TabPage1.Controls.Add(Me.txtLinkedServer)
-        Me.TabPage1.Controls.Add(Me.btndeleteProxy)
-        Me.TabPage1.Controls.Add(Me.rbConn_Proxy)
-        Me.TabPage1.Controls.Add(Me.rbConnDefault)
         Me.TabPage1.Controls.Add(Me.chkbxUserAut)
         Me.TabPage1.Controls.Add(Me.Label5)
         Me.TabPage1.Controls.Add(Me.cmbDatenbank)
@@ -130,36 +121,6 @@ Partial Class frmConfig_Basic
         Me.TabPage1.Name = "TabPage1"
         Me.TabPage1.UseVisualStyleBackColor = True
         '
-        'lblLinkedServer
-        '
-        resources.ApplyResources(Me.lblLinkedServer, "lblLinkedServer")
-        Me.lblLinkedServer.Name = "lblLinkedServer"
-        '
-        'txtLinkedServer
-        '
-        resources.ApplyResources(Me.txtLinkedServer, "txtLinkedServer")
-        Me.txtLinkedServer.Name = "txtLinkedServer"
-        '
-        'btndeleteProxy
-        '
-        resources.ApplyResources(Me.btndeleteProxy, "btndeleteProxy")
-        Me.btndeleteProxy.Name = "btndeleteProxy"
-        Me.btndeleteProxy.UseVisualStyleBackColor = True
-        '
-        'rbConn_Proxy
-        '
-        resources.ApplyResources(Me.rbConn_Proxy, "rbConn_Proxy")
-        Me.rbConn_Proxy.Name = "rbConn_Proxy"
-        Me.rbConn_Proxy.UseVisualStyleBackColor = True
-        '
-        'rbConnDefault
-        '
-        resources.ApplyResources(Me.rbConnDefault, "rbConnDefault")
-        Me.rbConnDefault.Checked = True
-        Me.rbConnDefault.Name = "rbConnDefault"
-        Me.rbConnDefault.TabStop = True
-        Me.rbConnDefault.UseVisualStyleBackColor = True
-        '
         'chkbxUserAut
         '
         resources.ApplyResources(Me.chkbxUserAut, "chkbxUserAut")
@@ -232,7 +193,7 @@ Partial Class frmConfig_Basic
         '
         'TabPage2
         '
-        Me.TabPage2.Controls.Add(Me.Button4)
+        Me.TabPage2.Controls.Add(Me.CheckBox_ForceTemporaryMode)
         Me.TabPage2.Controls.Add(Me.GroupBox5)
         Me.TabPage2.Controls.Add(Me.GroupBox1)
         Me.TabPage2.Controls.Add(Me.GroupBox4)
@@ -245,13 +206,6 @@ Partial Class frmConfig_Basic
         Me.TabPage2.Name = "TabPage2"
         Me.TabPage2.UseVisualStyleBackColor = True
         '
-        'Button4
-        '
-        Me.Button4.Image = Global.DD_Record_Organizer.My.Resources.Resources.email_go
-        resources.ApplyResources(Me.Button4, "Button4")
-        Me.Button4.Name = "Button4"
-        Me.Button4.UseVisualStyleBackColor = True
-        '
         'GroupBox5
         '
         Me.GroupBox5.Controls.Add(Me.Label11)
@@ -328,6 +282,15 @@ Partial Class frmConfig_Basic
         Me.GroupBox3.Name = "GroupBox3"
         Me.GroupBox3.TabStop = False
         '
+        'CheckBox2
+        '
+        resources.ApplyResources(Me.CheckBox2, "CheckBox2")
+        Me.CheckBox2.Checked = Global.DD_Record_Organizer.My.MySettings.Default.EntFormsChild
+        Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked
+        Me.CheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.DD_Record_Organizer.My.MySettings.Default, "EntFormsChild", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
+        Me.CheckBox2.Name = "CheckBox2"
+        Me.CheckBox2.UseVisualStyleBackColor = True
+        '
         'Label7
         '
         resources.ApplyResources(Me.Label7, "Label7")
@@ -401,8 +364,8 @@ Partial Class frmConfig_Basic
         '
         'DataGridView1
         '
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Aqua
-        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Aqua
+        Me.DataGridView1.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         resources.ApplyResources(Me.DataGridView1, "DataGridView1")
         Me.DataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.DataGridView1.Name = "DataGridView1"
@@ -439,6 +402,9 @@ Partial Class frmConfig_Basic
         '
         'TabPage4
         '
+        Me.TabPage4.Controls.Add(Me.Label6)
+        Me.TabPage4.Controls.Add(Me.Button4)
+        Me.TabPage4.Controls.Add(Me.txtCreateWMFolder)
         Me.TabPage4.Controls.Add(Me.GroupBox2)
         Me.TabPage4.Controls.Add(Me.btncheckWDFolderexists)
         Me.TabPage4.Controls.Add(Me.txtwdFolder)
@@ -447,10 +413,24 @@ Partial Class frmConfig_Basic
         Me.TabPage4.Name = "TabPage4"
         Me.TabPage4.UseVisualStyleBackColor = True
         '
+        'Label6
+        '
+        resources.ApplyResources(Me.Label6, "Label6")
+        Me.Label6.Name = "Label6"
+        '
+        'Button4
+        '
+        resources.ApplyResources(Me.Button4, "Button4")
+        Me.Button4.Name = "Button4"
+        Me.Button4.UseVisualStyleBackColor = True
+        '
+        'txtCreateWMFolder
+        '
+        resources.ApplyResources(Me.txtCreateWMFolder, "txtCreateWMFolder")
+        Me.txtCreateWMFolder.Name = "txtCreateWMFolder"
+        '
         'GroupBox2
         '
-        Me.GroupBox2.Controls.Add(Me.Button7)
-        Me.GroupBox2.Controls.Add(Me.RadioButton3)
         Me.GroupBox2.Controls.Add(Me.rbGruppe)
         Me.GroupBox2.Controls.Add(Me.rbUser)
         Me.GroupBox2.Controls.Add(Me.txtObjectExists)
@@ -459,19 +439,6 @@ Partial Class frmConfig_Basic
         Me.GroupBox2.Name = "GroupBox2"
         Me.GroupBox2.TabStop = False
         '
-        'Button7
-        '
-        resources.ApplyResources(Me.Button7, "Button7")
-        Me.Button7.Name = "Button7"
-        Me.Button7.UseVisualStyleBackColor = True
-        '
-        'RadioButton3
-        '
-        resources.ApplyResources(Me.RadioButton3, "RadioButton3")
-        Me.RadioButton3.Name = "RadioButton3"
-        Me.RadioButton3.TabStop = True
-        Me.RadioButton3.UseVisualStyleBackColor = True
-        '
         'rbGruppe
         '
         resources.ApplyResources(Me.rbGruppe, "rbGruppe")
@@ -513,14 +480,11 @@ Partial Class frmConfig_Basic
         resources.ApplyResources(Me.Label12, "Label12")
         Me.Label12.Name = "Label12"
         '
-        'CheckBox2
+        'CheckBox_ForceTemporaryMode
         '
-        resources.ApplyResources(Me.CheckBox2, "CheckBox2")
-        Me.CheckBox2.Checked = Global.DD_Record_Organizer.My.MySettings.Default.EntFormsChild
-        Me.CheckBox2.CheckState = System.Windows.Forms.CheckState.Checked
-        Me.CheckBox2.DataBindings.Add(New System.Windows.Forms.Binding("Checked", Global.DD_Record_Organizer.My.MySettings.Default, "EntFormsChild", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
-        Me.CheckBox2.Name = "CheckBox2"
-        Me.CheckBox2.UseVisualStyleBackColor = True
+        resources.ApplyResources(Me.CheckBox_ForceTemporaryMode, "CheckBox_ForceTemporaryMode")
+        Me.CheckBox_ForceTemporaryMode.Name = "CheckBox_ForceTemporaryMode"
+        Me.CheckBox_ForceTemporaryMode.UseVisualStyleBackColor = True
         '
         'frmConfig_Basic
         '
@@ -589,13 +553,7 @@ Partial Class frmConfig_Basic
     Friend WithEvents Label11 As System.Windows.Forms.Label
     Friend WithEvents Label10 As System.Windows.Forms.Label
     Friend WithEvents txtTask_Popup As System.Windows.Forms.TextBox
-    Friend WithEvents Button4 As System.Windows.Forms.Button
     Friend WithEvents chkSubfolder As System.Windows.Forms.CheckBox
-    Friend WithEvents rbConn_Proxy As System.Windows.Forms.RadioButton
-    Friend WithEvents rbConnDefault As System.Windows.Forms.RadioButton
-    Friend WithEvents btndeleteProxy As System.Windows.Forms.Button
-    Friend WithEvents lblLinkedServer As System.Windows.Forms.Label
-    Friend WithEvents txtLinkedServer As System.Windows.Forms.TextBox
     Friend WithEvents TabPage4 As System.Windows.Forms.TabPage
     Friend WithEvents btncheckWDFolderexists As System.Windows.Forms.Button
     Friend WithEvents txtwdFolder As System.Windows.Forms.TextBox
@@ -604,11 +562,13 @@ Partial Class frmConfig_Basic
     Friend WithEvents Button5 As Button
     Friend WithEvents cmbDesign As ComboBox
     Friend WithEvents GroupBox2 As GroupBox
-    Friend WithEvents RadioButton3 As RadioButton
     Friend WithEvents rbGruppe As RadioButton
     Friend WithEvents rbUser As RadioButton
     Friend WithEvents txtObjectExists As TextBox
     Friend WithEvents Button6 As Button
-    Friend WithEvents Button7 As Button
     Friend WithEvents CheckBox2 As CheckBox
+    Friend WithEvents Label6 As Label
+    Friend WithEvents Button4 As Button
+    Friend WithEvents txtCreateWMFolder As TextBox
+    Friend WithEvents CheckBox_ForceTemporaryMode As CheckBox
 End Class

app/DD-Record-Organizer/frmConfig_Basic.vb

@@ -1,10 +1,8 @@
 Imports System.Threading
 Imports System.Globalization
 Imports DevExpress.LookAndFeel
-Imports DD_LIB_Standards
-Imports System.IO
-Imports DevExpress.XtraCharts.Native
 Imports DigitalData.Modules.Database
+Imports Microsoft.Office.Interop.Word
 
 Public Class frmConfig_Basic
     Private _Helper As New ClassHelper
@@ -14,9 +12,9 @@ Public Class frmConfig_Basic
         Try
             Dim con As String
             If chkbxUserAut.Checked Then
-                con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";Trusted_Connection=True;Application Name=DD ADDI-Client"
+                con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";Trusted_Connection=True;Application Name=DD OrgFLOW-Client"
             Else
-                con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & Me.txtPasswort.Text & ";Application Name=DD ADDI-Client"
+                con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & Me.txtPasswort.Text & ";Application Name=DD OrgFLOW-Client"
             End If
 
 
@@ -35,14 +33,11 @@ Public Class frmConfig_Basic
             If result = MsgBoxResult.Yes Then
                 CONNECTION_CHANGED = True
                 'Set the construction string
-                If rbConnDefault.Checked Then
-                    MyConnectionString = con
-                    MYDB_ECM = New MSSQLServer(LOGCONFIG, MyConnectionString)
 
-                Else
-                    ClassProxy.MyPROXYConnectionString = con
-                    clsDatabase.Init(MyConnectionString, True)
-                End If
+                MyConnectionString = con
+                MYDB_ECM = New MSSQLServer(LOGCONFIG, MyConnectionString)
+
+
                 My.Settings.Save()
 
                 If chkbxUserAut.Checked = False Then
@@ -51,13 +46,10 @@ Public Class frmConfig_Basic
                     Dim pw As String = cipherText
                     con = "Server=" & Me.txtServer.Text & ";Database=" & Me.cmbDatenbank.Text & ";User Id=" & Me.txtUser.Text & ";Password=" & pw & ";"
                 End If
-                If rbConnDefault.Checked Then
-                    CONFIG.Config.ConnectionString = con
-                    CONFIG.Save(ForceAll:=True)
-                    ' SaveMySettingsValue("MyConnectionString", con, "ConfigMain")
-                Else
-                    SaveMySettingsValue("MyProxyConnectionString", con, "ConfigMain")
-                End If
+                CONFIG.Config.ConnectionString = con
+                CONFIG.Save(ForceAll:=True)
+                ' SaveMySettingsValue("MyConnectionString", con, "ConfigMain")
+
                 Dim csb As New SqlClient.SqlConnectionStringBuilder
                 csb.ConnectionString = MYDB_ECM.CurrentConnectionString
                 Dim constr = connection.ConnectionString
@@ -117,11 +109,7 @@ Public Class frmConfig_Basic
     End Sub
     Private Sub frmConfig_Basic_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         _Helper = New ClassHelper
-        If LICENSE_PROXY = True Then
-            Me.rbConn_Proxy.Visible = True
-        Else
-            Me.rbConn_Proxy.Visible = False
-        End If
+
         If Not MyConnectionString = String.Empty Then
             CONNECTION_CHANGED = False
             'Try
@@ -151,12 +139,12 @@ Public Class frmConfig_Basic
 
 
             Dim sql As String = "SELECT 0,'' UNION ALL SELECT T.GUID, T.FORM_TITLE FROM TBPMO_FORM_CONSTRUCTOR T"
-            Dim DT As DataTable = MYDB_ECM.GetDatatable(sql)
-            If DT.Rows.Count > 0 Then
+            Dim oDT As Data.DataTable = MYDB_ECM.GetDatatable(sql)
+            If oDT.Rows.Count > 0 Then
                 cmbConstructor.Enabled = True
-                cmbConstructor.DataSource = DT
-                cmbConstructor.DisplayMember = DT.Columns(1).ColumnName
-                cmbConstructor.ValueMember = DT.Columns(0).ColumnName
+                cmbConstructor.DataSource = oDT
+                cmbConstructor.DisplayMember = oDT.Columns(1).ColumnName
+                cmbConstructor.ValueMember = oDT.Columns(0).ColumnName
                 If Sett_ConstructorStart <> 0 Then
                     cmbConstructor.SelectedValue = Sett_ConstructorStart
                 End If
@@ -165,7 +153,7 @@ Public Class frmConfig_Basic
                 cmbConstructor.Enabled = False
             End If
 
-            cmbDesign.Text = MyFormsDesign
+            cmbDesign.Text = CONFIG.Config.FormsDesign
 
             'Catch ex As Exception
             '    MsgBox("Fehler in FormLoad: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -178,12 +166,18 @@ Public Class frmConfig_Basic
     Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
         ' Specify that the link was visited.
         Me.LinkLabel1.LinkVisited = True
-        ' Navigate to a URL.
-        System.Diagnostics.Process.Start("http://www.didalog.de/Support")
+        Try
+            ' Navigate to a URL.
+            System.Diagnostics.Process.Start(CONF_SUPPORTPORTAL)
+        Catch ex As Exception
+            MsgBox(ex.Message)
+            Me.LinkLabel1.LinkVisited = False
+        End Try
+
     End Sub
 
     Private Sub btnApplicationFolder_Click(sender As Object, e As EventArgs) Handles btnApplicationFolder.Click
-        Process.Start(Application.UserAppDataPath())
+        Process.Start(System.Windows.Forms.Application.UserAppDataPath())
     End Sub
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
@@ -194,7 +188,6 @@ Public Class frmConfig_Basic
     Private Sub chkLogErrorsOnly_CheckedChanged(sender As Object, e As EventArgs) Handles chkLogErrorsOnly.CheckedChanged
         DEBUG = chkLogErrorsOnly.Checked
         SaveMySettingsValue("LogErrorsOnly", DEBUG, "ConfigMain")
-        clsCURRENT.LOG_ERRORS_ONLY = DEBUG
         LOGCONFIG.Debug = DEBUG
 
     End Sub
@@ -220,8 +213,9 @@ Public Class frmConfig_Basic
         Select Case TabControl1.SelectedIndex
             Case 1
                 cmbLanguage.SelectedIndex = cmbLanguage.FindStringExact(USER_LANGUAGE)
+                CheckBox_ForceTemporaryMode.Checked = CONFIG.Config.Viewer_ForceTemporaryMode
             Case 2
-                Dim DTSCAN_folderwatch As DataTable = MYDB_ECM.GetDatatable("SELECT FOLDER_PATH,SUBDIRECTORIES FROM TBPMO_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_GUID)
+                Dim DTSCAN_folderwatch As Data.DataTable = MYDB_ECM.GetDatatable("SELECT FOLDER_PATH,SUBDIRECTORIES FROM TBPMO_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & USER_GUID)
                 If Not DTSCAN_folderwatch Is Nothing Then
                     If DTSCAN_folderwatch.Rows.Count = 1 Then
                         CURRENT_SCAN_FOLDERWATCH = DTSCAN_folderwatch.Rows(0).Item(0)
@@ -295,14 +289,14 @@ Public Class frmConfig_Basic
             End If
 
             Dim folderwatch = MYDB_ECM.GetScalarValue("SELECT GUID FROM TBPMO_FOLDERWATCH_USER WHERE USER_ID = " & USER_GUID & " AND FOLDER_TYPE = 'SCAN'")
-            Dim sql As String
+            Dim oSql As String
             If folderwatch Is Nothing And mypath <> "" Then
-                sql = "INSERT INTO TBPMO_FOLDERWATCH_USER (USER_ID, FOLDER_PATH, FOLDER_TYPE,SUBDIRECTORIES, ADDED_WHO) VALUES (" & USER_GUID & ",'" & mypath & "','SCAN', " & _SUBDIRECTORIES & ",'" & USER_USERNAME & "')"
+                oSql = "INSERT INTO TBPMO_FOLDERWATCH_USER (USER_ID, FOLDER_PATH, FOLDER_TYPE,SUBDIRECTORIES, ADDED_WHO) VALUES (" & USER_GUID & ",'" & mypath & "','SCAN', " & _SUBDIRECTORIES & ",'" & USER_USERNAME & "')"
             Else
-                sql = "UPDATE TBPMO_FOLDERWATCH_USER SET FOLDER_PATH = '" & mypath & "', SUBDIRECTORIES = " & _SUBDIRECTORIES & ", CHANGED_WHO = '" & USER_USERNAME & "' where GUID = " & folderwatch
+                oSql = "UPDATE TBPMO_FOLDERWATCH_USER SET FOLDER_PATH = '" & mypath & "', SUBDIRECTORIES = " & _SUBDIRECTORIES & ", CHANGED_WHO = '" & USER_USERNAME & "' where GUID = " & folderwatch
             End If
-            If MYDB_ECM.ExecuteNonQuery(sql) Then
-                Dim DT As DataTable = MYDB_ECM.GetDatatable("SELECT FOLDER_PATH, SUBDIRECTORIES FROM TBPMO_FOLDERWATCH_USER WHERE USER_ID = " & USER_GUID & " AND FOLDER_TYPE = 'SCAN'")
+            If MYDB_ECM.ExecuteNonQuery(oSql) Then
+                Dim DT As Data.DataTable = MYDB_ECM.GetDatatable("SELECT FOLDER_PATH, SUBDIRECTORIES FROM TBPMO_FOLDERWATCH_USER WHERE USER_ID = " & USER_GUID & " AND FOLDER_TYPE = 'SCAN'")
 
                 CURRENT_SCAN_FOLDERWATCH = DT.Rows(0).Item(0)
                 CURRENT_SCAN_FOLDERWATCH_SD = DT.Rows(0).Item(1)
@@ -419,12 +413,7 @@ Public Class frmConfig_Basic
 
     End Sub
 
-    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
-        If email.Send_Log_Mail("<b> Log-/SupportMail Org-Flow.</b> <p>",
-                             "Support-Mail OrgFlow", "support@didalog.de", "mail.triplew.de", "support@didalog.de", "ddemail40", "support-flow@digitaldata.works") = True Then
-            MsgBox("Log Mail was sent to Digital Data!", MsgBoxStyle.Information, "Success!")
-        End If
-    End Sub
+
 
     Private Sub txtScanFolderWatch_TextChanged(sender As Object, e As EventArgs) Handles txtScanFolderWatch.TextChanged
         CheckScanFolder(txtScanFolderWatch.Text, chkSubfolder.Checked)
@@ -438,23 +427,41 @@ Public Class frmConfig_Basic
 
     End Sub
 
-    Private Sub rbConn_Proxy_CheckedChanged(sender As Object, e As EventArgs) Handles rbConn_Proxy.CheckedChanged
-        If rbConn_Proxy.Checked Then
-            Display_Proxy_String()
-            Me.lblLinkedServer.Visible = True
-            Me.txtLinkedServer.Visible = True
-            txtLinkedServer.Text = ClassProxy.MyLinkedServer
-        Else
-            Me.lblLinkedServer.Visible = False
-            Me.txtLinkedServer.Visible = False
-        End If
-    End Sub
-    Sub Display_Proxy_String()
-        If clsDatabase.DB_PROXY_INITIALIZED And ClassProxy.MyPROXYConnectionString <> String.Empty Then
-            Dim csb As New SqlClient.SqlConnectionStringBuilder
-            csb.ConnectionString = ClassProxy.MyPROXYConnectionString
 
-            Dim constr = ClassProxy.MyPROXYConnectionString
+    'Sub Display_Proxy_String()
+    '    If clsDatabase.DB_PROXY_INITIALIZED And ClassProxy.MyPROXYConnectionString <> String.Empty Then
+    '        Dim csb As New SqlClient.SqlConnectionStringBuilder
+    '        csb.ConnectionString = ClassProxy.MyPROXYConnectionString
+
+    '        Dim constr = ClassProxy.MyPROXYConnectionString
+    '        If Not constr.Contains("Trusted") Then
+    '            constr = constr.Replace(csb.Password, "XXXXX")
+    '            txtUser.Text = csb.UserID
+    '            chkbxUserAut.Checked = False
+    '        Else
+    '            chkbxUserAut.Checked = True
+    '        End If
+
+    '        Try
+    '            txtServer.Text = csb.DataSource
+    '            cmbDatenbank.Text = csb.InitialCatalog
+    '        Catch ex As Exception
+
+    '        End Try
+
+    '        Me.txtActualConnection.Text = constr
+    '        btndeleteProxy.Visible = True
+    '    Else
+    '        Me.txtActualConnection.Text = ""
+    '        btndeleteProxy.Visible = False
+    '    End If
+    'End Sub
+    Private Sub rbConnDefault_CheckedChanged(sender As Object, e As EventArgs)
+        If MyConnectionString <> String.Empty Then
+            Dim csb As New SqlClient.SqlConnectionStringBuilder
+            csb.ConnectionString = MYDB_ECM.CurrentConnectionString
+
+            Dim constr = MYDB_ECM.CurrentConnectionString
             If Not constr.Contains("Trusted") Then
                 constr = constr.Replace(csb.Password, "XXXXX")
                 txtUser.Text = csb.UserID
@@ -471,57 +478,15 @@ Public Class frmConfig_Basic
             End Try
 
             Me.txtActualConnection.Text = constr
-            btndeleteProxy.Visible = True
-        Else
-            Me.txtActualConnection.Text = ""
-            btndeleteProxy.Visible = False
         End If
-    End Sub
-    Private Sub rbConnDefault_CheckedChanged(sender As Object, e As EventArgs) Handles rbConnDefault.CheckedChanged
-        If rbConnDefault.Checked Then
-            If MyConnectionString <> String.Empty Then
-                Dim csb As New SqlClient.SqlConnectionStringBuilder
-                csb.ConnectionString = MYDB_ECM.CurrentConnectionString
 
-                Dim constr = MYDB_ECM.CurrentConnectionString
-                If Not constr.Contains("Trusted") Then
-                    constr = constr.Replace(csb.Password, "XXXXX")
-                    txtUser.Text = csb.UserID
-                    chkbxUserAut.Checked = False
-                Else
-                    chkbxUserAut.Checked = True
-                End If
-
-                Try
-                    txtServer.Text = csb.DataSource
-                    cmbDatenbank.Text = csb.InitialCatalog
-                Catch ex As Exception
-
-                End Try
-
-                Me.txtActualConnection.Text = constr
-            End If
-        End If
-    End Sub
-
-    Private Sub btndeleteProxy_Click(sender As Object, e As EventArgs) Handles btndeleteProxy.Click
-        SaveMySettingsValue("MyProxyConnectionString", "", "ConfigMain")
-        ClassProxy.MyPROXYConnectionString = ""
-        clsDatabase.DB_PROXY_INITIALIZED = False
-        Me.txtActualConnection.Text = ""
-        CONNECTION_CHANGED = True
-    End Sub
-
-    Private Sub txtLinkedServer_Leave(sender As Object, e As EventArgs) Handles txtLinkedServer.Leave
-        SaveMySettingsValue("MyLinkedServer", txtLinkedServer.Text, "ConfigMain")
-        ClassProxy.MyLinkedServer = txtLinkedServer.Text
     End Sub
 
     Private Sub btncheckWDFolderexists_Click(sender As Object, e As EventArgs) Handles btncheckWDFolderexists.Click
-        If txtwdFolder.Text <> String.Empty And clsWindream.SESSION_CREATED = True Then
-            Dim folderpath = _Helper.FORMAT_WM_PATH(txtwdFolder.Text)
+        If txtwdFolder.Text <> String.Empty And WMMOD.SessionLoggedin Then
+            Dim folderpath = txtwdFolder.Text '_Helper.FORMAT_WM_PATH(txtwdFolder.Text)
 
-            If clsWD_GET.WD_PATH_EXISTS(folderpath) Then
+            If WMMOD.TestFolderExists(folderpath) Then
                 MsgBox("Folder exists in windream!")
             Else
                 MsgBox("Folder is not existing in windream!", MsgBoxStyle.Critical)
@@ -536,38 +501,26 @@ Public Class frmConfig_Basic
     Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
         If cmbDesign.SelectedIndex <> -1 Then
             UserLookAndFeel.Default.SetSkinStyle(cmbDesign.Text)
-            SaveMySettingsValue("MyFormsDesign", cmbDesign.Text, "ConfigMain")
+            CONFIG.Config.FormsDesign = cmbDesign.Text
+            CONFIG.Save()
         End If
-
-    End Sub
-
-    Private Sub cmbLanguage_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbLanguage.SelectedIndexChanged
-
     End Sub
 
     Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
-        Dim exists
+        Dim oExists = False
         If rbUser.Checked Then
-            exists = clsWD_GET.WM_USER_EXISTS(txtObjectExists.Text)
+            oExists = WMMOD.TestUserExists(txtObjectExists.Text)
         ElseIf rbGruppe.Checked Then
-            exists = clsWD_GET.WM_GROUP_EXISTS(txtObjectExists.Text)
+            oExists = WMMOD.TestGroupExists(txtObjectExists.Text)
         End If
-        If exists = True Then
+        If oExists = True Then
             MsgBox("Object exists in windream!")
         Else
             MsgBox("Object is not existing in windream!", MsgBoxStyle.Critical)
         End If
     End Sub
 
-    Private Sub Button7_Click(sender As Object, e As EventArgs) Handles Button7.Click
-        Dim group
-        If rbGruppe.Checked Then
-            group = clsWD_GET.GET_WM_GROUP_OBJECT(txtObjectExists.Text)
-            If Not IsNothing(group) Then
-                MsgBox("GROUP.NAME: " & group.aname)
-            End If
-        End If
-    End Sub
+
 
     Private Sub CheckBoxGridDocResult_BestFitColumns_CheckedChanged(sender As Object, e As EventArgs)
         If formloaded = False Then Exit Sub
@@ -578,4 +531,23 @@ Public Class frmConfig_Basic
     Private Sub frmConfig_Basic_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
         My.Settings.Save()
     End Sub
+
+    Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
+
+        If txtCreateWMFolder.Text <> String.Empty And WMMOD.SessionLoggedin Then
+            Dim folderpath = txtCreateWMFolder.Text
+
+            If WMMOD.NewFolder(folderpath) Then
+                MsgBox("Folder Created in windream!")
+            Else
+                MsgBox("Folder could not be created!", MsgBoxStyle.Critical)
+            End If
+        End If
+    End Sub
+
+
+    Private Sub CheckBox_ForceTemporaryMode_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox_ForceTemporaryMode.CheckedChanged
+        CONFIG.Config.Viewer_ForceTemporaryMode = CheckBox_ForceTemporaryMode.Checked
+        CONFIG.Save()
+    End Sub
 End Class

app/DD-Record-Organizer/frmConstructorDesigner.en-US.resx.bak

@@ -599,8 +599,8 @@ selected clients</value>
   <data name="lblSave.Text" xml:space="preserve">
     <value>Record saved!</value>
   </data>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4yLCBWZXJzaW9uPTE1LjIu
         OS4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT

app/DD-Record-Organizer/frmConstructorDesigner.en.resx.bak

@@ -296,8 +296,8 @@
         lQAAAABJRU5ErkJggg==
 </value>
   </data>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4xLCBWZXJzaW9uPTE1LjEu
         Ny4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFFT

app/DD-Record-Organizer/frmConstructorDesigner.vb

@@ -215,7 +215,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.GUID NOT IN (SELECT USER_ID FROM TBPMO_CONSTR
             Dim CONSTR_ID As Integer = CONSTRUCTOR_IDTextBox.Text
 
             Dim sel_sql = String.Format("SELECT *, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), FORM_VIEW_ID), {1}) AS 'CAPTION' " &
-                            "from VWPMO_CONSTRUCTOR_FORMS WHERE FORM_TYPE_ID IN (1,4) AND PARENT_ID = 0 AND CONSTRUCT_ID = {2} AND SCREEN_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CONSTR_ID, CURRENT_SCREEN_ID)
+                            "from VWPMO_CONSTRUCTOR_FORMS WHERE (FORM_TYPE_ID IN (1,4) OR FORM_TYPE = 'Personal file') AND PARENT_ID = 0 AND CONSTRUCT_ID = {2} AND SCREEN_ID = {3} ORDER BY SEQUENCE", USER_LANGUAGE, CURRENT_SCREEN_ID, CONSTR_ID, CURRENT_SCREEN_ID)
 
             Dim DT As DataTable = MYDB_ECM.GetDatatable(sel_sql)
             If DT.Rows.Count >= 1 Then

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

@@ -432,9 +432,9 @@ Partial Class frmConstructor_Main
         'tstxtRenameNode
         '
         Me.tstxtRenameNode.BackColor = System.Drawing.SystemColors.Control
-        resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode")
         Me.tstxtRenameNode.ForeColor = System.Drawing.SystemColors.ControlText
         Me.tstxtRenameNode.Name = "tstxtRenameNode"
+        resources.ApplyResources(Me.tstxtRenameNode, "tstxtRenameNode")
         '
         'tsmiNodeNew
         '
@@ -450,8 +450,8 @@ Partial Class frmConstructor_Main
         'tsmINewText
         '
         Me.tsmINewText.BackColor = System.Drawing.Color.Yellow
-        resources.ApplyResources(Me.tsmINewText, "tsmINewText")
         Me.tsmINewText.Name = "tsmINewText"
+        resources.ApplyResources(Me.tsmINewText, "tsmINewText")
         '
         'ToolStripSeparator15
         '
@@ -1322,8 +1322,8 @@ Partial Class frmConstructor_Main
         'CMDoc_TextBoxRenameFile
         '
         Me.CMDoc_TextBoxRenameFile.BackColor = System.Drawing.Color.Orange
-        resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile")
         Me.CMDoc_TextBoxRenameFile.Name = "CMDoc_TextBoxRenameFile"
+        resources.ApplyResources(Me.CMDoc_TextBoxRenameFile, "CMDoc_TextBoxRenameFile")
         '
         'DisplaynameUmbenennenToolStripMenuItem
         '
@@ -1334,8 +1334,8 @@ Partial Class frmConstructor_Main
         'CMDoc_TextBoxRenameDisplay
         '
         Me.CMDoc_TextBoxRenameDisplay.BackColor = System.Drawing.Color.DarkOrange
-        resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay")
         Me.CMDoc_TextBoxRenameDisplay.Name = "CMDoc_TextBoxRenameDisplay"
+        resources.ApplyResources(Me.CMDoc_TextBoxRenameDisplay, "CMDoc_TextBoxRenameDisplay")
         '
         'ToolStripSeparator22
         '

app/DD-Record-Organizer/frmConstructor_Main.resx

@@ -210,9 +210,6 @@
   <data name="ToolStripSeparator24.Size" type="System.Drawing.Size, System.Drawing">
     <value>221, 6</value>
   </data>
-  <data name="tstxtRenameNode.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
   <data name="tstxtRenameNode.Size" type="System.Drawing.Size, System.Drawing">
     <value>200, 23</value>
   </data>
@@ -235,9 +232,6 @@
   <data name="SdsdToolStripMenuItem.Text" xml:space="preserve">
     <value>Knotentext:</value>
   </data>
-  <data name="tsmINewText.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
   <data name="tsmINewText.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 23</value>
   </data>
@@ -1022,9 +1016,6 @@
   <data name="BindingNavigatorPositionItem.AutoSize" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="BindingNavigatorPositionItem.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
   <data name="BindingNavigatorPositionItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>50, 23</value>
   </data>
@@ -1239,7 +1230,7 @@
     <value>0, 0</value>
   </data>
   <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 264</value>
+    <value>1201, 254</value>
   </data>
   <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -1257,7 +1248,7 @@
     <value>0</value>
   </data>
   <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 264</value>
+    <value>1201, 254</value>
   </data>
   <data name="TabWindream.Text" xml:space="preserve">
     <value>Dateien</value>
@@ -1889,7 +1880,7 @@
     <value>0, 0</value>
   </data>
   <data name="TreeListDevexpress.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 254</value>
+    <value>1201, 264</value>
   </data>
   <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>301, 17</value>
@@ -1918,7 +1909,7 @@
     <value>0</value>
   </data>
   <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1201, 254</value>
+    <value>1201, 264</value>
   </data>
   <data name="XtraTabPage1.Text" xml:space="preserve">
     <value>NodeNavigation(beta)</value>
@@ -2120,9 +2111,6 @@
   <data name="docCM_Showlinks.Text" xml:space="preserve">
     <value>Verknüpfungen anzeigen</value>
   </data>
-  <data name="CMDoc_TextBoxRenameFile.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
   <data name="CMDoc_TextBoxRenameFile.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 23</value>
   </data>
@@ -2135,9 +2123,6 @@
   <data name="NeuToolStripMenuItem.Text" xml:space="preserve">
     <value>Dateinamen umbenennen</value>
   </data>
-  <data name="CMDoc_TextBoxRenameDisplay.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
   <data name="CMDoc_TextBoxRenameDisplay.Size" type="System.Drawing.Size, System.Drawing">
     <value>152, 23</value>
   </data>

app/DD-Record-Organizer/frmConstructor_Main.vb

@@ -9,11 +9,11 @@ Imports DevExpress.XtraScheduler
 Imports System.Text
 Imports System.IO
 
-Imports WINDREAMLib
+'Imports WINDREAMLib
 Imports System.Runtime.InteropServices
-Imports DD_Rights
-Imports DD_LIB_Standards
-Imports DevExpress.LookAndFeel
+'Imports DD_Rights
+'Imports DD_LIB_Standards
+'Imports DevExpress.LookAndFeel
 Imports System.ComponentModel
 Imports System.Threading
 Imports DevExpress.XtraTreeList
@@ -312,10 +312,10 @@ Public Class frmConstructor_Main
                 FormDesignerToolStripMenuItem.Visible = False
             End If
 
-            If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                SQL = "SELECT * FROM TBPROXY_SYNC_ENTITY"
-                DT_PROXY_ENTITY = MYDB_ECM.GetDatatable(SQL)
-            End If
+            'If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
+            '    SQL = "SELECT * FROM TBPROXY_SYNC_ENTITY"
+            '    DT_PROXY_ENTITY = MYDB_ECM.GetDatatable(SQL)
+            'End If
 
             ClassWindowLocation.LoadFormLocationSize(Me, CONSTRUCTORID, CURRENT_SCREEN_ID, "CONSTRUCTOR_MAIN")
             ' VWPMO_WF_USER_ACTIVETableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString
@@ -328,37 +328,37 @@ Public Class frmConstructor_Main
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, "Error in Loading Form part 1")
         End Try
         Try
-            If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                If DT_VWPMO_CONSTRUCTOR_FORMS.Rows.Count = 0 Then
-                    ClassHelper.MSGBOX_Handler("ERROR", "Missing Proxy-Configuration", String.Format("Attention: You are using Proxy-Server with synchronized data:" & vbNewLine &
-                                                                                                           "Actually there is no data for this view synchronized or configured! Please inform Digital Data!" & vbNewLine &
-                                                                                                           "View will now be terminated!"))
-                    ERROR_FORM_LOAD = True
-                    Exit Sub
-                Else
-                    Dim Entity_Exists As Boolean = False
-                    Dim Entity_Name As String
-                    For Each Constr_row As DataRow In DT_VWPMO_CONSTRUCTOR_FORMS.Rows
-                        Entity_Name = Constr_row.Item("FORM_TITLE")
-                        Dim Constr_FORM = Constr_row.Item("FORM_ID")
-                        ENTITY_ID = Constr_row.Item("FORM_ID")
-                        CURRENT_ENTITY_ID = ENTITY_ID
-                        Dim expression As String = String.Format("ENTITY_ID = {0}", Constr_FORM)
-                        Dim matchingRows() As DataRow = DT_PROXY_ENTITY.Select(expression)
-                        'Prüfen ob Form in Config Proxy vorhanden
-                        For Each matchingRow As DataRow In matchingRows
-                            Entity_Exists = True
-                        Next
-                        If Entity_Exists = False Then
-                            ClassHelper.MSGBOX_Handler("ERROR", "Missing Proxy-Configuration", String.Format("Attention: You are using Proxy-Server with synchronized data:" &
-                                                                                                              "The entity '{0}' used in this view is not configured for Your proxy-server! Please inform Digital Data!" &
-                                                                                                              "View will now be terminated!", Entity_Name))
-                            ERROR_FORM_LOAD = True
-                            Exit Sub
-                        End If
-                    Next
-                End If
-            End If
+            'If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
+            '    If DT_VWPMO_CONSTRUCTOR_FORMS.Rows.Count = 0 Then
+            '        ClassHelper.MSGBOX_Handler("ERROR", "Missing Proxy-Configuration", String.Format("Attention: You are using Proxy-Server with synchronized data:" & vbNewLine &
+            '                                                                                               "Actually there is no data for this view synchronized or configured! Please inform Digital Data!" & vbNewLine &
+            '                                                                                               "View will now be terminated!"))
+            '        ERROR_FORM_LOAD = True
+            '        Exit Sub
+            '    Else
+            '        Dim Entity_Exists As Boolean = False
+            '        Dim Entity_Name As String
+            '        For Each Constr_row As DataRow In DT_VWPMO_CONSTRUCTOR_FORMS.Rows
+            '            Entity_Name = Constr_row.Item("FORM_TITLE")
+            '            Dim Constr_FORM = Constr_row.Item("FORM_ID")
+            '            ENTITY_ID = Constr_row.Item("FORM_ID")
+            '            CURRENT_ENTITY_ID = ENTITY_ID
+            '            Dim expression As String = String.Format("ENTITY_ID = {0}", Constr_FORM)
+            '            Dim matchingRows() As DataRow = DT_PROXY_ENTITY.Select(expression)
+            '            'Prüfen ob Form in Config Proxy vorhanden
+            '            For Each matchingRow As DataRow In matchingRows
+            '                Entity_Exists = True
+            '            Next
+            '            If Entity_Exists = False Then
+            '                ClassHelper.MSGBOX_Handler("ERROR", "Missing Proxy-Configuration", String.Format("Attention: You are using Proxy-Server with synchronized data:" &
+            '                                                                                                  "The entity '{0}' used in this view is not configured for Your proxy-server! Please inform Digital Data!" &
+            '                                                                                                  "View will now be terminated!", Entity_Name))
+            '                ERROR_FORM_LOAD = True
+            '                Exit Sub
+            '            End If
+            '        Next
+            '    End If
+            'End If
 
             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))
 
@@ -1417,7 +1417,7 @@ Public Class frmConstructor_Main
                 LOGGER.Debug($"NODES: StructureNodes-Count (asyn.newTreeviewc): {async.newTreeview.Nodes.Count}")
                 MyTreeview = async.newTreeview
             Catch ex As Exception
-                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Async NodeBuild", ex.Message & vbNewLine & "ADDI will try an alternative method!", ex.StackTrace)
+                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Async NodeBuild", ex.Message & vbNewLine & "orgFLOW will try an alternative method!", ex.StackTrace)
                 MyTreeview = ClassNodeNavigation.CreateTreeViewNodes(DT_TREEVIEW_NODES_ALL, TREEVIEW_IMAGELIST)
             End Try
 
@@ -1919,7 +1919,7 @@ Public Class frmConstructor_Main
 
     Private Sub tsButtonAdd_Click(sender As Object, e As EventArgs) Handles tsButtonAdd.Click
         If USER_PERSONIFIED_TEST = True Then
-            ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using ADDI in personified mode! Adding records is not allowed!")
+            ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using orgFLOW in personified mode! Adding records is not allowed!")
             Exit Sub
         End If
         'If ClassProxy.IS_PROXY_BUSY = True Then
@@ -1987,12 +1987,12 @@ Public Class frmConstructor_Main
                     CURRENT_RECORD_ID = NEW_RECORD_ID
                     RECORD_ID = NEW_RECORD_ID
                     SELECTED_RECORD_ID = NEW_RECORD_ID
-                    ClassProxy.PRPROXY_RECORD_UPD_INS(ENTITY_ID, SELECTED_RECORD_ID)
+
                     If PARENT_ENTITYID > 0 And PARENT_RECORDID > 0 Then
                         If ClassRecordCommands.ConnectRecord(PARENT_RECORDID, CURRENT_RECORD_ID, "INSERT RECORD") = False Then
                             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "In Connecting Record - Check the log!")
-                        Else
-                            ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, CURRENT_RECORD_ID)
+                            'Else
+                            '    ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, CURRENT_RECORD_ID)
                         End If
                     End If
 
@@ -2089,7 +2089,7 @@ Public Class frmConstructor_Main
                     ActivateAllTabs()
                 End If
 
-                ClassProxy.PRPROXY_RECORD_UPD_INS(CURRENT_ENTITY_ID, CURRENT_RECORD_ID)
+                'ClassProxy.PRPROXY_RECORD_UPD_INS(CURRENT_ENTITY_ID, CURRENT_RECORD_ID)
             End If
 
             Dim recid As Integer
@@ -2219,7 +2219,7 @@ Public Class frmConstructor_Main
     Sub Delete_Record()
         RECORD_ID = SELECTED_RECORD_ID
         If USER_PERSONIFIED_TEST = True Then
-            ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using ADDI in personified mode! Deleting records is not allowed!")
+            ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using orgFLOW in personified mode! Deleting records is not allowed!")
             Exit Sub
         End If
         'If ClassProxy.IS_PROXY_BUSY = True Then
@@ -2338,8 +2338,6 @@ Public Class frmConstructor_Main
         'DeactivateTabs()
 
         CURRENT_CHANGE_STEP += 1
-        Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE_CHANGE_HISTORY WHERE UPPER(ADDED_WHO) = '{0}'", USER_USERNAME.ToUpper)
-        MYDB_ECM.ExecuteNonQuery(del)
         Lock_RecordControls(False)
         Me.tsButtonAdd.Enabled = False
         Me.tsButtonSave.Enabled = True
@@ -2815,9 +2813,6 @@ Public Class frmConstructor_Main
 
                     CURRENT_SQL_AUTO_VALUES_DT = DT_AUTOVALUES
 
-                    If USER_WAN = True Then
-
-                    End If
                     Try
                         Dim primaryKey(1) As DataColumn
                         primaryKey(0) = CURRENT_DT_ENTITY_RECORDS.Columns("Record-ID")
@@ -3161,12 +3156,12 @@ Public Class frmConstructor_Main
                     'Die neue Record-ID setzen
                     RECORD_ID = GRP_SINGLE_REC
                     SELECTED_RECORD_ID = RECORD_ID
-                    ClassProxy.PRPROXY_RECORD_UPD_INS(CURRENT_ENTITY_ID, SELECTED_RECORD_ID)
+                    ' ClassProxy.PRPROXY_RECORD_UPD_INS(CURRENT_ENTITY_ID, SELECTED_RECORD_ID)
                     If ClassRecordCommands.ConnectRecord(PARENT_RECORD_ID, RECORD_ID, "PARENT_LINK (Group/Single-Record) for Entity " & ENTITY_ID.ToString) = False Then
                         MsgBox("Unexpected Error in Connecting Record. Check log", MsgBoxStyle.Critical)
                         Return False
-                    Else
-                        ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, RECORD_ID)
+                        'Else
+                        '    ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, RECORD_ID)
                     End If
                 Else
                     Return False
@@ -3531,7 +3526,7 @@ Public Class frmConstructor_Main
         If USER_LANGUAGE = "de-DE" Then
             stg = "Es gab ein unerwartetes Problem beim Laden der Control-Values! Wollen Sie versuchen die Daten erneut zu laden?" & vbNewLine & "'Nein' beendet die Sicht für einen manuellen Neustart!"
         Else
-            stg = "ADDI encountered an unexpected error while loading the control values for the record! Do You want to try to relaod the entity data?" & vbNewLine & "No is terminating the entity-form to restart it manually!"
+            stg = "orgFLOW encountered an unexpected error while loading the control values for the record! Do You want to try to relaod the entity data?" & vbNewLine & "No is terminating the entity-form to restart it manually!"
         End If
         result = MessageBox.Show(stg, "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result = MsgBoxResult.Yes Then
@@ -3711,7 +3706,7 @@ Public Class frmConstructor_Main
                     Dim sw As New SW("Check_windream_Show")
 
                     Try
-                        If clsWindream.Create_Session = True Then
+                        If WMMOD.SessionReconnect = True Then
                             windream_inited = True
                         End If
                     Catch ex As Exception
@@ -3769,7 +3764,7 @@ Public Class frmConstructor_Main
                                         End If
                                         MsgBox(msg, MsgBoxStyle.Critical, "Attention:")
                                     Else
-                                        If clsWD_SET.Delete_WDFile(path) Then
+                                        If WMMOD.RemoveFile(path) Then
                                             ClassHelper.InsertEssential_Log(DOC_ID, "DOC-ID", "FILE DELETED BY USER")
                                         End If
                                     End If
@@ -3795,9 +3790,9 @@ Public Class frmConstructor_Main
             Dim oSQL = $"SELECT ENTITY_DOC_SEARCH FROM TBPMO_FORM WHERE GUID = {ENTITY_ID}"
             CURRENT_DOCSEARCH_SQL = MYDB_ECM.ExecuteNonQuery(oSQL)
             If CURRENT_DOCSEARCH_SQL <> String.Empty Then
-                Dim oText = $"Die Entität-weite Suche wird im Hintergrund ausgeführt und angezeigt sobald sie fertig ist."
+                Dim oText = $"Die Sicht-weite Suche wird im Hintergrund ausgeführt und angezeigt sobald sie fertig ist."
                 If USER_LANGUAGE <> "de-De" Then
-                    oText = $"The entity-wide search will be started in background. The result will be displayed when ready."
+                    oText = $"The view-wide search will be started in background. The result will be displayed when ready."
                 End If
                 MsgBox(oText, vbOKOnly, "Information")
 
@@ -3809,9 +3804,9 @@ Public Class frmConstructor_Main
 
 
                 If USER_LANGUAGE <> "de-DE" Then
-                    CURRENT_DOCSEARCH_CAPTION = "Entity-wide search"
+                    CURRENT_DOCSEARCH_CAPTION = "view-wide search"
                 Else
-                    CURRENT_DOCSEARCH_CAPTION = "Entitätssuche"
+                    CURRENT_DOCSEARCH_CAPTION = "Sicht-Suche"
                 End If
                 Dim myformThread = New Thread(Sub()
                                                   Using frm As New frmDocSearchResult
@@ -3819,6 +3814,7 @@ Public Class frmConstructor_Main
 
                                                   End Using
                                               End Sub)
+                myformThread.SetApartmentState(ApartmentState.STA)
                 myformThread.Start()
             Else
                 MsgBox("Please config the entity-search properly! " & vbNewLine & oSQL, vbOKOnly, "Information")
@@ -3890,9 +3886,9 @@ Public Class frmConstructor_Main
                         Else
                             Entitystring = selnode.Text
                         End If
-                        msg = "Dateien für Entität: " & Entitystring
+                        msg = "Dateien für Sicht: " & Entitystring
                         If USER_LANGUAGE <> "de-DE" Then
-                            msg = "files for entity: " & Entitystring
+                            msg = "files for view: " & Entitystring
                         End If
                         msg &= " (" & DT_RESULT.Rows.Count.ToString & ")"
                     ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then
@@ -3942,7 +3938,7 @@ Public Class frmConstructor_Main
                             LOGGER.Info($"RUN_WDSEARCH_GRID - DT_DOCRESULT_DROPDOWN_ITEMS [{DT_DOCRESULT_DROPDOWN_ITEMS.Rows.Count}]!")
                         End If
 
-                        ClassWindreamDocGrid.FillColumns(
+                        ClassDocGrid.FillColumns(
                            GridViewDoc_Search,
                            DT_RESULT,
                            DT_WINDREAM_COLUMNS_GRID,
@@ -3967,9 +3963,9 @@ Public Class frmConstructor_Main
                         Else
                             Entitystring = selnode.Text
                         End If
-                        msg = "Keine Dateien für Entität: " & Entitystring & " gefunden"
+                        msg = "Keine Dateien für Sicht: " & Entitystring & " gefunden"
                         If USER_LANGUAGE <> "de-DE" Then
-                            msg = "No files found for entity: " & Entitystring
+                            msg = "No files found for View: " & Entitystring
                         End If
                     ElseIf CURRENT_SEARCH_TYPE = "RECORD" Then
                         If NODE_NAVIGATION Then
@@ -4021,7 +4017,7 @@ Public Class frmConstructor_Main
     End Function
     Private Sub OnCBSelectedValueChanged(sender As Object, e As EventArgs)
         Try
-            Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
+            Dim docId As Integer = ClassDocGrid.SELECTED_DOC_ID
             If docId = 0 Then
                 MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation)
                 Exit Sub
@@ -4030,7 +4026,7 @@ Public Class frmConstructor_Main
             Dim ComboBox As ComboBoxEdit = sender
             'Dim ItemComboBox As RepositoryItemComboBox
             'ItemComboBox = sender
-            Dim item As ClassWindreamDocGrid.WindreamDocGridComboboxItem = ComboBox.SelectedItem
+            Dim item As ClassDocGrid.WindreamDocGridComboboxItem = ComboBox.SelectedItem
             Dim value As String = item.Value
             If value.ToUpper = "Not displayable in Group-Search".ToUpper Then
                 Exit Sub
@@ -4042,8 +4038,8 @@ Public Class frmConstructor_Main
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE_UPD_INS {0}, {1}, {2}, '{3}', '{4}'", docId, RECORD_ID, configId, value, user)
             If MYDB_ECM.ExecuteNonQuery(Sql) = False Then
                 MsgBox("The Update-Command was not successful! Check the log!",, MsgBoxStyle.Critical)
-            Else
-                ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, RECORD_ID)
+                'Else
+                '    ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, RECORD_ID)
             End If
 
         Catch ex As Exception
@@ -4080,7 +4076,7 @@ Public Class frmConstructor_Main
             Dim detailRow As DataRowView = detailView.GetRow(detailView.FocusedRowHandle)
             Dim configid = detailRow.Item("CONFIG_ID")
 
-            Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
+            Dim docId As Integer = ClassDocGrid.SELECTED_DOC_ID
             If docId = 0 Then
                 MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation)
                 Exit Sub
@@ -4091,8 +4087,8 @@ Public Class frmConstructor_Main
 
             If MYDB_ECM.ExecuteNonQuery(Sql) = False Then
                 ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (date): " & vbNewLine & "Check the log for further information!")
-            Else
-                ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, RECORD_ID)
+                'Else
+                '    ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, RECORD_ID)
             End If
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnDateSelectedValueChanged: ", ex.Message)
@@ -4115,7 +4111,7 @@ Public Class frmConstructor_Main
             Dim detailRow As DataRowView = detailView.GetRow(detailView.FocusedRowHandle)
             Dim configid = detailRow.Item("CONFIG_ID")
 
-            Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
+            Dim docId As Integer = ClassDocGrid.SELECTED_DOC_ID
             If docId = 0 Then
                 MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation)
                 Exit Sub
@@ -4125,8 +4121,8 @@ Public Class frmConstructor_Main
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE_UPD_INS {0}, {1}, {2},'{3}','{4}'", docId, RECORD_ID, configid, value, user)
             If MYDB_ECM.ExecuteNonQuery(Sql) = False Then
                 ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (textbox): " & vbNewLine & "Check the log for further information!")
-            Else
-                ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, RECORD_ID)
+                'Else
+                '    ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, RECORD_ID)
             End If
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnTextSelectedValueChanged: ", ex.Message)
@@ -4145,7 +4141,7 @@ Public Class frmConstructor_Main
             Dim detailRow As DataRowView = detailView.GetRow(detailView.FocusedRowHandle)
             Dim configid = detailRow.Item("CONFIG_ID")
 
-            Dim docId As Integer = ClassWindreamDocGrid.SELECTED_DOC_ID
+            Dim docId As Integer = ClassDocGrid.SELECTED_DOC_ID
             If docId = 0 Then
                 MsgBox("Sorry no document was selected! Please try again!", MsgBoxStyle.Exclamation)
                 Exit Sub
@@ -4155,8 +4151,8 @@ Public Class frmConstructor_Main
             Dim Sql As String = String.Format("EXEC PRPMO_DOC_VALUE_UPD_INS {0}, {1}, {2},'{3}','{4}'", docId, RECORD_ID, configid, value, user)
             If MYDB_ECM.ExecuteNonQuery(Sql) = False Then
                 ClassHelper.MSGBOX_Handler("ERROR", "UnexpectedError:", "Error updating doc-metadata (checkbox): " & vbNewLine & "Check the log for further information!")
-            Else
-                ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, RECORD_ID)
+                'Else
+                '    ClassProxy.PRPROXY_DOC_VALUES_UPD(docId, RECORD_ID)
             End If
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in OnCheckboxValueChanged: ", ex.Message)
@@ -4496,11 +4492,11 @@ Public Class frmConstructor_Main
                 Exit Sub
             End If
             If USER_PERSONIFIED_TEST = True Then
-                ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using ADDI in personified mode! Adding files is not allowed!")
+                ClassHelper.MSGBOX_Handler("INFO", "Attention", "You are using orgFLOW in personified mode! Adding files is not allowed!")
                 Exit Sub
             End If
-            If clsWindream.Create_Session = False Then
-                ClassHelper.MSGBOX_Handler("INFO", "Attention", "Check Your windream-connection and restart ADDI afterwards.", "Could not create a windream session!")
+            If WMMOD.SessionLoggedin = False Then
+                ClassHelper.MSGBOX_Handler("INFO", "Attention", "Check Your windream-connection and restart orgFLOW afterwards.", "Could not create a windream session!")
                 Exit Sub
             End If
             If act_FormViewID <> 0 And (RIGHT_READ_ONLY_DOC = False And GridControlDocSearch.ContextMenuStrip.Name = "ContextMenuStripResultFiles") Or RIGHT_ADD_DOC = True Then
@@ -4624,7 +4620,9 @@ Public Class frmConstructor_Main
                                 MsgBox("File contains invalid operator '!" & vbNewLine & "Please rename file and try again!", MsgBoxStyle.Exclamation)
                                 Continue For
                             End If
-                            ClassFolderWatcher.Insert_USER_File(CURRENT_WORKFILE, DropType)
+                            If ClassHelper.Insert_USER_File(CURRENT_WORKFILE, DropType) = False Then
+                                Exit Sub
+                            End If
                         End If
                     End If
                 Next
@@ -4839,7 +4837,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
     Private Sub tsButtonShowTaskOverview_Click(sender As Object, e As EventArgs) Handles tsButtonShowTaskOverview.Click
         ClassJumpRecord.JumpToRecord(2, RECORD_ID)
-        JUMP_RECORD_ID = 0
+        JUMP_ID = 0
     End Sub
 
 
@@ -4918,14 +4916,6 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         Load_Tree_View()
     End Sub
 
-    Private Sub DateiimportEntitätToolStripMenuItem_Click(sender As Object, e As EventArgs)
-        If PARENT_ENTITYID = 0 Then
-            Exit Sub
-        End If
-        CURRENT_ENTITYSTRING = _ENTITYSTRING
-        CURRENT_ENTITY_ID = ENTITY_ID
-        frmWM_EntityImport.ShowDialog()
-    End Sub
     Private Sub FormDesignerToolStripMenuItem1_Click(sender As Object, e As EventArgs) Handles FormDesignerToolStripMenuItem.Click
         Try
             Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode)
@@ -4988,8 +4978,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         Try
             Dim sw As New SW("Jump_Record")
 
-            If JUMP_RECORD_ID > 0 Then
-                Dim sql = String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", JUMP_RECORD_ID)
+            If JUMP_ID > 0 Then
+                Dim sql = String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", JUMP_ID)
                 Dim FormID = MYDB_ECM.GetScalarValue(sql)
                 If FormID > 0 Then
                     Dim n As TreeNode
@@ -5001,8 +4991,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
             ' wurde nicht zurückgesetzt, also 
             ' wurde der record nicht gefunden
-            If JUMP_RECORD_ID <> 0 Then
-                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Jump Record: ", "Record-ID " & JUMP_RECORD_ID & " konnte nicht gefunden werden")
+            If JUMP_ID <> 0 Then
+                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Jump Record: ", "Record-ID " & JUMP_ID & " konnte nicht gefunden werden")
             End If
             sw.Done()
         Catch ex As Exception
@@ -5020,10 +5010,10 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
             'Für Grid filtern wir die Aktuelle Ansicht nach der Record-ID,
             'für Carousel und Tiles markieren wir den Record
-            LocateRecordinGridById(JUMP_RECORD_ID)
+            LocateRecordinGridById(JUMP_ID)
 
             ' Jump Record-ID wieder zurücksetzen
-            JUMP_RECORD_ID = 0
+            JUMP_ID = 0
             Exit Sub
         End If
 
@@ -5036,10 +5026,10 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
                 'Für Grid filtern wir die Aktuelle Ansicht nach der Record-ID,
                 'für Carousel und Tiles markieren wir den Record
-                LocateRecordinGridById(JUMP_RECORD_ID)
+                LocateRecordinGridById(JUMP_ID)
 
                 ' Jump Record-ID wieder zurücksetzen
-                JUMP_RECORD_ID = 0
+                JUMP_ID = 0
                 Exit For
                 Exit Sub
             End If
@@ -5143,9 +5133,9 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                     If recordId > 0 Then
                         'Die neue Record-ID setzen
                         POS_RECORD_ID = recordId
-                        ClassProxy.PRPROXY_RECORD_UPD_INS(POS_ENTITY, POS_RECORD_ID)
+                        'ClassProxy.PRPROXY_RECORD_UPD_INS(POS_ENTITY, POS_RECORD_ID)
                         If ClassRecordCommands.ConnectRecord(PARENT_RECORDID, POS_RECORD_ID, "POS_LINK for Entity " & POS_ENTITY.ToString) = True Then
-                            ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, POS_RECORD_ID)
+                            'ClassProxy.PRPROXY_RECORD_CONNECT(PARENT_RECORDID, POS_RECORD_ID)
                         End If
                     Else
                         MsgBox("Unexpected Error in Creating POS", MsgBoxStyle.Exclamation)
@@ -5408,12 +5398,12 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
     End Sub
 
     Private Sub KopierenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_Copy.Click
-        If ClassWindreamDocGrid.SELECTED_DOC_PATH <> "" Then
+        If ClassDocGrid.SELECTED_DOC_PATH <> "" Then
             Try
                 Dim selectedfile(0) As String
 
-                selectedfile(0) = ClassWindreamDocGrid.SELECTED_DOC_PATH
-                selectedfile(0) = ClassHelper.FORMAT_WM_PATH(ClassWindreamDocGrid.SELECTED_DOC_PATH)
+                selectedfile(0) = ClassDocGrid.SELECTED_DOC_PATH
+                selectedfile(0) = ClassHelper.FORMAT_WM_PATH(ClassDocGrid.SELECTED_DOC_PATH)
 
                 Dim dataobj As New DataObject
 
@@ -5430,18 +5420,18 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
     Private Sub GridViewDoc_Search_FocusedColumnChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedColumnChangedEventArgs) Handles GridViewDoc_Search.FocusedColumnChanged
 
-        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+        ClassDocGrid.GetDocItems(GridViewDoc_Search)
         Refresh_DocID()
     End Sub
 
     Private Sub GridViewDoc_Search_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDoc_Search.FocusedRowChanged
 
-        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
+        ClassDocGrid.GetDocItems(GridViewDoc_Search)
         Refresh_DocID()
     End Sub
     Sub Refresh_DocID()
-        If ClassWindreamDocGrid.SELECTED_DOC_ID <> 0 Then
-            Dim msg = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString
+        If ClassDocGrid.SELECTED_DOC_ID <> 0 Then
+            Dim msg = "Doc-ID: " & ClassDocGrid.SELECTED_DOC_ID.ToString
             bsitmDocID.Caption = msg
             tslblDocIDTab1.Text = msg
         Else
@@ -5461,10 +5451,10 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             ClassHelper.MSGBOX_Handler("INFO", "Attention", "Missing Selection:", "Please select a record!")
             Exit Sub
         End If
-        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+        If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
             Exit Sub
         End If
-        If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count > 0 Then
+        If ClassDocGrid.DT_RESULTFILES.Rows.Count > 0 Then
             Dim msg = "Wollen Sie die Verknüpfung der gewählten Datei/en wirklich entfernen?" & vbNewLine & "Datei/en bleibt/bleiben im DMS/Archiv/Explorer erhalten!"
             If USER_LANGUAGE <> "de-DE" Then
                 msg = "Would You like to delete only the references?" & vbNewLine & "File(s) will stay in ECM/Archive/Explorer!"
@@ -5473,7 +5463,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
             If result = MsgBoxResult.Yes Then
                 Try
-                    For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+                    For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows
                         If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID"), RECORD_ID, 0) = True Then
                             ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH")
                             Cursor = Cursors.WaitCursor
@@ -5494,11 +5484,11 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         Show_File_Properties()
     End Sub
     Sub Show_File_Properties()
-        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+        If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
             MsgBox("Could not read File Parameters(4)!", MsgBoxStyle.Exclamation)
             Exit Sub
         End If
-        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+        For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows
             If row.Item("DOC_PATH") <> "" Then
                 Dim oFileFullPath = ClassHelper.FORMAT_WM_PATH(row.Item("DOC_PATH"))
                 Cursor = Cursors.WaitCursor
@@ -5783,7 +5773,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                 LOGGER.Warn("Attention: Could not set DocVariable RENAME_DOC_PATH: " & ex.Message)
                 RENAME_DOC_PATH = Nothing
             End Try
-            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
                 MsgBox("Could not read File Parameters!", MsgBoxStyle.Exclamation)
                 Exit Sub
             End If
@@ -5802,8 +5792,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
     Private Sub DateiMitDatensatzVerknüpfenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_linkRecord.Click
         Try
-            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            ClassDocGrid.GetDocItems(GridViewDoc_Search)
+            If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
                 MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
                 Exit Sub
             End If
@@ -5817,7 +5807,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
     Private Sub DetailAnsichtDatensatzToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DetailAnsichtDatensatzToolStripMenuItem.Click
         ClassJumpRecord.JumpToRecord(0, RECORD_ID)
-        JUMP_RECORD_ID = 0
+        JUMP_ID = 0
     End Sub
     Private Sub GridViewDoc_Search_RowStyle(sender As Object, e As Views.Grid.RowStyleEventArgs) Handles GridViewDoc_Search.RowStyle
         If e.RowHandle = DevExpress.XtraGrid.GridControl.AutoFilterRowHandle Then
@@ -5918,24 +5908,24 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
     End Sub
     Private Sub ContextMenuStripResultFiles_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStripResultFiles.Opening
         Try
-            If clsWindream.SESSION_CREATED = False Then
-                ClassHelper.MSGBOX_Handler("INFO", "Attention", "Check Your windream-connection and restart ADDI afterwards.", "Could not create a windream session!")
+            If WMMOD.SessionLoggedin Then
+                ClassHelper.MSGBOX_Handler("INFO", "Attention", "Check Your windream-connection and restart orgFLOW afterwards.", "Could not create a windream session!")
                 e.Cancel = True
             End If
             Me.Cursor = Cursors.WaitCursor
 
-            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            ClassDocGrid.GetDocItems(GridViewDoc_Search)
+            If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
                 e.Cancel = True
             End If
             Refresh_DocID()
-            If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
-                If ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_ID") = 0 Then
+            If ClassDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
+                If ClassDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_ID") = 0 Then
                     e.Cancel = True
                 End If
             End If
             File_in_Work()
-            Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID)
+            Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassDocGrid.SELECTED_DOC_ID)
             If Not IsNothing(Result) Then
                 ROW_READ_ONLY = False
                 Select Case Result.ToString
@@ -5968,8 +5958,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                     End If
                 End If
             End If
-            If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
-                If ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME") <> "" Then
+            If ClassDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
+                If ClassDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME") <> "" Then
                     DisplaynameUmbenennenToolStripMenuItem.Visible = True
                     Set_Displayname()
                 Else
@@ -5995,13 +5985,13 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         docCM_InWork.Enabled = True
         Try
             Dim expression As String
-            expression = "DocID = " & ClassWindreamDocGrid.SELECTED_DOC_ID
+            expression = "DocID = " & ClassDocGrid.SELECTED_DOC_ID
             Dim foundRowsLevel0() As DataRow
             ' Use the Select method to find all rows matching the filter.
             foundRowsLevel0 = CURRENT_DOC_RESULTS.Select(expression)
 
             Try
-                Dim oSQLDRList = $"Select COALESCE(IN_WORK_USER,'') IN_WORK_USER, COALESCE(IN_WORK_COMMENT,'') IN_WORK_COMMENT,IN_WORK FROM TBPMO_DOCRESULT_LIST where DocID = {ClassWindreamDocGrid.SELECTED_DOC_ID}"
+                Dim oSQLDRList = $"Select COALESCE(IN_WORK_USER,'') IN_WORK_USER, COALESCE(IN_WORK_COMMENT,'') IN_WORK_COMMENT,IN_WORK FROM TBPMO_DOCRESULT_LIST where DocID = {ClassDocGrid.SELECTED_DOC_ID}"
                 Dim oDT As DataTable = MYDB_ECM.GetDatatable(oSQLDRList)
                 If Not IsNothing(oDT) Then
                     If oDT.Rows.Count = 1 Then
@@ -6043,11 +6033,11 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         End Try
     End Sub
     Private Sub TSMI_inWork_Click(sender As Object, e As EventArgs) Handles docCM_InWork.Click
-        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+        If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
             MsgBox("Could not read File Parameters (3)!", MsgBoxStyle.Exclamation)
             Exit Sub
         End If
-        ClassFileResult.DocID = ClassWindreamDocGrid.SELECTED_DOC_ID
+        ClassFileResult.DocID = ClassDocGrid.SELECTED_DOC_ID
         If INWORK_FILE = True Then ' Datei ist in Bearbeitung
             Dim msglbl As String
             Dim msg1 As String
@@ -6065,16 +6055,16 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             End If
         Else
             frmFileInWork.ShowDialog()
-            ClassWindreamDocGrid.SELECTED_INWORK = ClassFileResult.InWork
+            ClassDocGrid.SELECTED_INWORK = ClassFileResult.InWork
             RUN_WDSEARCH_GRID(True)
         End If
     End Sub
 
     Sub Set_Displayname()
         Try
-            If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
-                If ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME") <> "" Then
-                    CMDoc_TextBoxRenameDisplay.Text = ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME")
+            If ClassDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
+                If ClassDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME") <> "" Then
+                    CMDoc_TextBoxRenameDisplay.Text = ClassDocGrid.DT_RESULTFILES.Rows(0).Item("DISPLAYNAME")
                     CMDoc_TextBoxRenameDisplay.Enabled = True
                 End If
             Else
@@ -6087,14 +6077,18 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
     Private Sub TestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_CheckRights.Click
         Dim msg = "Die Rechte wurden erfolgreich überprüft und aktualisiert!"
         CURRENT_RECORD_ID = RECORD_ID
-        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+        If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Could not read file Parameters: ", "Could not read file Parameters (6)")
             Exit Sub
         End If
         Dim err As Boolean = False
         Cursor = Cursors.WaitCursor
-        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
-            If ClassDOC_SEARCH.SET_WD_RIGHTS(row.Item("DOC_ID"), row.Item("DOC_PATH"), True) = True Then
+        For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows
+            Dim oWMObject As WINDREAMLib.WMObject
+            Dim oReldocpath = ClassHelper.GetRelPath(row.Item("DOC_PATH"))
+            LOGGER.Info("oReldocpath: " & oReldocpath)
+            oWMObject = WMMOD.GetFileByPath(oReldocpath)
+            If ClassDOC_SEARCH.SET_WD_RIGHTS(oWMObject, row.Item("DOC_ID"), row.Item("DOC_PATH"), True) = True Then
 
             Else
                 err = True
@@ -6106,7 +6100,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             End If
             'Create Session um Fehler bei windows Session icht zu erzeugen
             FAU_AD_USER = ""
-            clsWindream.Create_Session()
+            Dim OConnect = WMMOD.SessionReconnect()
         Next
         Cursor = Cursors.Default
         If err = False Then
@@ -6153,11 +6147,11 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             MsgBox("Please select a record!", MsgBoxStyle.Exclamation)
             Exit Sub
         End If
-        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+        If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
             MsgBox("Could not read File Parameters (DELETE FILES)!", MsgBoxStyle.Exclamation)
             Exit Sub
         End If
-        If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 0 Then
+        If ClassDocGrid.DT_RESULTFILES.Rows.Count = 0 Then
             MsgBox("Please choose a file!", MsgBoxStyle.Exclamation)
             Exit Sub
         End If
@@ -6168,7 +6162,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         Dim result1 As MsgBoxResult
         result1 = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result1 = MsgBoxResult.Yes Then
-            For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+            For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows
                 If row.Item("DOC_PATH") <> "" Then
                     Try
                         If Not IsNothing(row.Item("DOC_ID")) Then
@@ -6198,7 +6192,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                                     RECORD_ID = 0
                                 End If
                                 If ClassFileResult.Delete_ResultFile(row.Item("DOC_ID"), RECORD_ID, 1) = True Then
-                                    If clsWD_SET.Delete_WDFile(row.Item("DOC_PATH")) = True Then
+                                    If WMMOD.RemoveFile(row.Item("DOC_PATH")) = True Then
                                         ClassHelper.InsertEssential_Log(row.Item("DOC_ID"), "DOC-ID", "FILE DELETED BY USER")
                                     End If
 
@@ -6213,10 +6207,10 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                             End If
 
                         End If
-                        If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                            Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", row.Item("DOC_ID"))
-                            MYDB_ECM.ExecuteNonQuery(proc)
-                        End If
+                        'If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
+                        '    Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DELETE {0}", row.Item("DOC_ID"))
+                        '    MYDB_ECM.ExecuteNonQuery(proc)
+                        'End If
                     Catch ex As Exception
                         ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in delete file: ", ex.Message)
                     End Try
@@ -6295,12 +6289,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
                             Dim upd = String.Format("UPDATE TBPMO_RECORD SET FORM_ID = {0} where GUID = {1}", node_tag, _RECORD)
                             If MYDB_ECM.ExecuteNonQuery(upd) = True Then
-                                If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then
-                                    MYDB_ECM.ExecuteNonQuery(upd)
-                                    Dim del = String.Format("DELETE FROM TBPMO_ENTITY_TABLE{1} WHERE [Record-ID] = {0}", _RECORD, ENTITY_ID)
-                                    MYDB_ECM.ExecuteNonQuery(del)
 
-                                End If
                                 msg = String.Format("ENTITY WAS CHANGED TO {0}-{1} by User: {2}", ENTITY_STRING, node_tag, USER_USERNAME)
                                 ClassHelper.InsertEssential_Log(_RECORD, "RECORD-ID", msg)
                                 sql = "SELECT T.* FROM VWPMO_DOC_SEARCH T, TBPMO_DOC_RECORD_LINK T1  WHERE T.DocID = T1.DOC_ID AND T1.RECORD_ID = " & _RECORD
@@ -6313,15 +6302,10 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                                 For Each row As DataRow In DT_CHANGE_CTR.Rows
                                     upd = String.Format("UPDATE TBPMO_CONTROL_VALUE SET CONTROL_ID = {0}, CHANGED_WHO = '{3}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", row.Item("LINKED_CTRL_ID"), row.Item("ORIGIN_CTRL_ID"), _RECORD, USER_USERNAME)
                                     MYDB_ECM.ExecuteNonQuery(upd)
-                                    If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then
-                                        MYDB_ECM.ExecuteNonQuery(upd)
-                                    End If
                                 Next
                                 Dim execsql = String.Format("EXEC PRPMO_DELETE_RECORD_PMO_TABLE {0},{1}", ENTITY_ID, _RECORD)
                                 If MYDB_ECM.ExecuteNonQuery(execsql) = True Then
-                                    If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then
-                                        MYDB_ECM.ExecuteNonQuery(execsql)
-                                    End If
+
                                 End If
                                 execsql = String.Format("EXEC PRPMO_ENTITY_TABLE_RENEW_RECORD {0},{1}", node_tag, _RECORD)
                                 If MYDB_ECM.ExecuteNonQuery(execsql) = True Then
@@ -6335,13 +6319,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                             msg = String.Format("The record/s was/were successfully relinked with entity {0} (if criteria matched)", ENTITY_STRING.ToString)
                         End If
                         MsgBox(msg, MsgBoxStyle.Information)
-                        If DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED = True Then
-                            msg = "Sie benutzen einen Proxyserver. Die Daten des neu verlinkten Datensatzes werden Sie evtl. erst nach vollständiger Proxysynchronisation einsehen können!"
-                            If USER_LANGUAGE <> "de-DE" Then
-                                msg = String.Format("You are using a proxy-Server. The new linked record in entity '{0}' might only be displayed after a full synchronisation!", ENTITY_STRING)
-                            End If
-                            MsgBox(msg, MessageBoxIcon.Information)
-                        End If
+
                         Load_Datafor_Entity(True)
                     End If
                 End If
@@ -6381,7 +6359,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         End Try
     End Sub
     Private Sub DateirechteFürUserToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles docCM_GetRights.Click
-        Dim result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID)
+        Dim result = ClassDOC_SEARCH.Get_File_Rights(ClassDocGrid.SELECTED_DOC_ID)
         If Not IsNothing(result) Then
             Dim msg = "Das aktuelle Recht für Sie (" & USER_USERNAME & ") ist: "
             If USER_LANGUAGE <> "de-DE" Then
@@ -6411,11 +6389,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
     Private Sub Load_Variants()
         Try
-            If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                Me.TBPMO_RECORD_VARIANTTableAdapter.Connection.ConnectionString = ClassProxy.MyPROXYConnectionString
-            Else
-                Me.TBPMO_RECORD_VARIANTTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString
-            End If
+            Me.TBPMO_RECORD_VARIANTTableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString
             Me.TBPMO_RECORD_VARIANTTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_RECORD_VARIANT, ENTITY_ID, RECORD_ID)
         Catch ex As System.Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error while loading variants: ", ex.Message)
@@ -6440,7 +6414,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Show_Detail_Record: ", ex.Message)
         End Try
-        JUMP_RECORD_ID = 0
+        JUMP_ID = 0
     End Sub
 
 
@@ -6552,7 +6526,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
         table.Columns.Add("FILEPATH", GetType(System.String))
         table.Columns.Add("DOC_ID", GetType(System.Int32))
         table.Columns.Add("OBJECTTYPE", GetType(System.String))
-        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+        For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows
             If row.Item("DOC_PATH") <> String.Empty Then
                 'Set the ID column as the primary key column.
                 Dim newRow As DataRow = table.NewRow()
@@ -6580,11 +6554,11 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             Try
                 If CMDoc_TextBoxRenameFile.Text <> "" Then
                     Dim OldName, NewName, OnlyFilename As String
-                    OldName = ClassWindreamDocGrid.SELECTED_DOC_PATH
+                    OldName = ClassDocGrid.SELECTED_DOC_PATH
                     ' Define file names.
                     NewName = CMDoc_TextBoxRenameFile.Text
                     OnlyFilename = NewName
-                    Dim oFullFilename = ClassHelper.FORMAT_WM_PATH(ClassWindreamDocGrid.SELECTED_DOC_PATH)
+                    Dim oFullFilename = ClassHelper.FORMAT_WM_PATH(ClassDocGrid.SELECTED_DOC_PATH)
                     Dim name1 = Path.Combine(Path.GetDirectoryName(oFullFilename), NewName)
                     NewName = NewName & Path.GetExtension(oFullFilename)
                     OnlyFilename &= Path.GetExtension(oFullFilename)
@@ -6594,12 +6568,9 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                     My.Computer.FileSystem.RenameFile(OldName, NewName)
                     LOGGER.Info($"Renaming FileSystem done!")
                     Cursor = Cursors.WaitCursor
-                    Dim oEXEC As String = $"EXEC PRPMO_DOC_CREATE_NEW_DOC {ClassWindreamDocGrid.SELECTED_DOC_ID}, {CURRENT_RECORD_ID},'{USER_USERNAME}'"
+                    Dim oEXEC As String = $"EXEC PROF_DOC_CREATE_UPDATE {ClassDocGrid.SELECTED_DOC_ID}, {CURRENT_RECORD_ID},'{USER_USERNAME}',''"
                     If MYDB_ECM.ExecuteNonQuery(oEXEC) Then
-                        LOGGER.Info($"Exec PRPMO_DOC_CREATE_NEW_DOC done!")
-                        If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                            MYDB_ECM.ExecuteNonQuery(oEXEC, True)
-                        End If
+                        LOGGER.Info($"Exec PROF_DOC_CREATE_UPDATE done - rename abgeschlossen")
                     End If
 
                     Dim oRowHandle As Integer = GridViewDoc_Search.FocusedRowHandle
@@ -6628,7 +6599,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
     Private Sub SToolStripMenuItem_KeyUp(sender As Object, e As KeyEventArgs) Handles CMDoc_TextBoxRenameDisplay.KeyUp
         If e.KeyCode = Keys.Return Then
             Try
-                ClassFileResult.DocID = ClassWindreamDocGrid.SELECTED_DOC_ID
+                ClassFileResult.DocID = ClassDocGrid.SELECTED_DOC_ID
                 If CMDoc_TextBoxRenameDisplay.Text <> "" Then
                     If ClassFileResult.Set_Displayname(CMDoc_TextBoxRenameDisplay.Text) Then
                         Cursor = Cursors.WaitCursor
@@ -6702,7 +6673,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             'Dim NEWRECORD As Integer = ClassControlCommandsUI.GetLastRecord(ENTITY_ID)
             Dim NEWNODE = New TreeNode(tsmINewText.Text)
             If Not IsNothing(NEWRECORD) Then
-                ClassProxy.PRPROXY_RECORD_UPD_INS(ENTITY_ID, NEWRECORD)
+                'ClassProxy.PRPROXY_RECORD_UPD_INS(ENTITY_ID, NEWRECORD)
 
                 If Not IsNothing(CURRENT_NODE_CONFIGURABLE_ID) And CURRENT_NODE_CONFIGURABLE_ID > 0 Then
                     Dim index As Integer = 0
@@ -6785,8 +6756,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
     Sub Open_File()
         Me.Cursor = Cursors.WaitCursor
         Dim allow_Open As Boolean = False
-        ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-        Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID)
+        ClassDocGrid.GetDocItems(GridViewDoc_Search)
+        Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassDocGrid.SELECTED_DOC_ID)
         If Not IsNothing(Result) Then
             Select Case Result.ToString
                 Case "R"
@@ -6798,20 +6769,20 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             End Select
         End If
         If allow_Open = True Then
-            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
                 MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation)
                 Exit Sub
             End If
-            For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
-                If ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID")) = True Then
+            For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows
+                If ClassHelper.File_open(row.Item("DOC_PATH"), row.Item("DOC_ID"), 0) = True Then
                     TimerFileHandle.Enabled = True
                 End If
 
 
             Next
         Else
-            If clsWD_GET.WDFile_exists(ClassWindreamDocGrid.SELECTED_DOC_PATH, DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED, ClassProxy.MyLinkedServer, True) = True Then
-                ClassHelper.MSGBOX_Handler("ERROR", "Right-Management", "File is existing, but you do not have the rights to open this file! " & vbNewLine & "Please contact your admin!" & vbNewLine & "DOC-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString)
+            If WMMOD.TestFileExists(ClassDocGrid.SELECTED_DOC_PATH) = True Then
+                ClassHelper.MSGBOX_Handler("ERROR", "Right-Management", "File is existing, but you do not have the rights to open this file! " & vbNewLine & "Please contact your admin!" & vbNewLine & "DOC-ID: " & ClassDocGrid.SELECTED_DOC_ID.ToString)
             Else
                 ClassHelper.MSGBOX_Handler("ERROR", "", "File does not exist! Please contact your admin!")
             End If
@@ -6903,12 +6874,12 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
     Private Sub cmsResultFilesBasic_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles cmsResultFilesBasic.Opening
         Try
-            If clsWindream.SESSION_CREATED = False Then
-                ClassHelper.MSGBOX_Handler("INFO", "Attention", "Check Your windream-connection and restart ADDI afterwards.", "Could not create a windream session!")
+            If WMMOD.SessionLoggedin = False Then
+                ClassHelper.MSGBOX_Handler("INFO", "Attention", "Check Your windream-connection and restart orgFLOW afterwards.", "Could not create a windream session!")
                 e.Cancel = True
             End If
             Me.Cursor = Cursors.WaitCursor
-            Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassWindreamDocGrid.SELECTED_DOC_ID)
+            Dim Result = ClassDOC_SEARCH.Get_File_Rights(ClassDocGrid.SELECTED_DOC_ID)
             If Not IsNothing(Result) Then
                 Select Case Result.ToString
                     Case "R"
@@ -6928,11 +6899,11 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
     End Sub
 
     Private Sub OrdnerÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OrdnerÖffnenToolStripMenuItem.Click
-        If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+        If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
             MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation)
             Exit Sub
         End If
-        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
+        For Each row As DataRow In ClassDocGrid.DT_RESULTFILES.Rows
             ClassHelper.Open_Folder(row.Item("DOC_PATH"), row.Item("DOC_ID"))
         Next
     End Sub
@@ -7256,7 +7227,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
                     If result = MsgBoxResult.Yes Then
                         ClassJumpRecord.JumpToRecord(2, RECORD_ID)
                         ClassWorkflow.Refresh_Workflows_Entity()
-                        JUMP_RECORD_ID = 0
+                        JUMP_ID = 0
                     End If
                 Else
                     If USER_LANGUAGE = "de-DE" Then
@@ -7274,7 +7245,7 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
 
     Private Sub bbtniclearCache_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniclearCache.ItemClick
         Dim result As MsgBoxResult
-        Dim msg = "Möchten Sie den Anwendungscache wirklich leeren?" & vbNewLine & "Die Entität wird dann automatisch neugeladen!"
+        Dim msg = "Möchten Sie den Anwendungscache wirklich leeren?" & vbNewLine & "Die Sicht wird dann automatisch neugeladen!"
         If USER_LANGUAGE <> "de-DE" Then
             msg = "Would You like to clear the applications-cache?" & vbNewLine & "All data will be loaded new!"
         End If
@@ -7304,8 +7275,8 @@ WHERE T2.SHORT_NAME = 'ADDI' AND T.EMAIL IS NOT NULL order by USERNAME")
             frmNewVariant.ShowDialog()
             If recid <> CURRENT_RECORD_ID Then
                 Me.Cursor = Cursors.WaitCursor
-                ClassProxy.PRPROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD_VARIANT")
-                ClassProxy.PRPROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD")
+                'ClassProxy.PRPROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD_VARIANT")
+                'ClassProxy.PRPROXY_SYNC_DETAIL_OBJECT("TBPMO_RECORD")
                 Me.Cursor = Cursors.Default
                 Load_Datafor_Entity(True)
                 LocateRecordinGridById(CURRENT_RECORD_ID)

app/DD-Record-Organizer/frmCustomAppointment.resx.bak

@@ -121,8 +121,8 @@
   <data name="chkReminder.Properties.AutoHeight" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <assembly alias="DevExpress.XtraEditors.v15.2" name="DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="edtStartTime.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v15.2">
+  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="edtStartTime.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
     <value>DateTime</value>
   </data>
   <data name="&gt;&gt;cbReminder.ZOrder" xml:space="preserve">
@@ -138,7 +138,7 @@
     <value>23</value>
   </data>
   <data name="&gt;&gt;edtLabel.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.AppointmentLabelEdit, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.AppointmentLabelEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="edtStartDate.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
@@ -160,7 +160,7 @@
     <value>True</value>
   </data>
   <data name="&gt;&gt;lblLocation.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;edtResource.ZOrder" xml:space="preserve">
     <value>0</value>
@@ -180,8 +180,8 @@
   <data name="edtStartDate.Properties.Mask.IgnoreMaskBlank" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <assembly alias="DevExpress.Data.v15.2" name="DevExpress.Data.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="edtResources.ResourcesCheckedListBoxControl.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v15.2">
+  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="edtResources.ResourcesCheckedListBoxControl.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
     <value>Default</value>
   </data>
   <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.ShowPlaceHolders" type="System.Boolean, mscorlib">
@@ -297,7 +297,7 @@
     <value>False</value>
   </data>
   <data name="&gt;&gt;edtResources.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.AppointmentResourcesEdit, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.AppointmentResourcesEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;edtEndDate.Name" xml:space="preserve">
     <value>edtEndDate</value>
@@ -329,7 +329,7 @@
   <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.EditMask" xml:space="preserve">
     <value>T</value>
   </data>
-  <data name="tbLocation.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v15.2">
+  <data name="tbLocation.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
     <value>Default</value>
   </data>
   <data name="edtResources.ResourcesCheckedListBoxControl.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
@@ -348,12 +348,12 @@
     <value>True</value>
   </data>
   <data name="&gt;&gt;edtShowTimeAs.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.AppointmentStatusEdit, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.AppointmentStatusEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;cbReminder.Parent" xml:space="preserve">
     <value>panel1</value>
   </data>
-  <data name="tbSubject.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v15.2">
+  <data name="tbSubject.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
     <value>None</value>
   </data>
   <data name="&gt;&gt;edtStartTime.Name" xml:space="preserve">
@@ -392,7 +392,7 @@
   <data name="tbLocation.Properties.Mask.PlaceHolder" type="System.Char, mscorlib" xml:space="preserve">
     <value>_</value>
   </data>
-  <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v15.2">
+  <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
     <value>DateTime</value>
   </data>
   <data name="txtControlID.Size" type="System.Drawing.Size, System.Drawing">
@@ -422,7 +422,7 @@
   <data name="&gt;&gt;tbDescription.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="edtStartDate.Properties.CalendarTimeProperties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v15.2">
+  <data name="edtStartDate.Properties.CalendarTimeProperties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
     <value>Default</value>
   </data>
   <data name="edtStartTime.Properties.Mask.IgnoreMaskBlank" type="System.Boolean, mscorlib">
@@ -432,13 +432,13 @@
     <value>Horizontal</value>
   </data>
   <data name="&gt;&gt;chkReminder.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;lblPercentCompleteValue.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;tbDescription.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.MemoEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.MemoEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="btnJumpToRecord.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
@@ -450,7 +450,7 @@
     <value>4</value>
   </data>
   <data name="&gt;&gt;tbProgress.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.TrackBarControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.TrackBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="edtStartDate.Properties.Mask.PlaceHolder" type="System.Char, mscorlib" xml:space="preserve">
     <value>_</value>
@@ -459,7 +459,7 @@
     <value>Fill</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.AppointmentForm, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.AppointmentForm, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;cbReminder.Name" xml:space="preserve">
     <value>cbReminder</value>
@@ -488,7 +488,7 @@
   <data name="edtResources.ResourcesCheckedListBoxControl.ToolTipTitle" xml:space="preserve">
     <value />
   </data>
-  <data name="edtEndDate.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v15.2">
+  <data name="edtEndDate.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
     <value>DateTime</value>
   </data>
   <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
@@ -521,10 +521,10 @@
   <data name="&gt;&gt;txtControlID.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="edtShowTimeAs.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v15.2">
+  <data name="edtShowTimeAs.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v19.2">
     <value>Near</value>
   </data>
-  <data name="edtResources.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v15.2">
+  <data name="edtResources.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
     <value>None</value>
   </data>
   <data name="edtResources.Properties.Mask.SaveLiteral" type="System.Boolean, mscorlib">
@@ -543,9 +543,9 @@
     <value>panel1</value>
   </data>
   <data name="&gt;&gt;lblResource.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="edtEndDate.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v15.2">
+  <data name="edtEndDate.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
     <value>Default</value>
   </data>
   <data name="edtEndDate.Properties.CalendarTimeProperties.NullValuePromptShowForEmptyValue" type="System.Boolean, mscorlib">
@@ -554,7 +554,7 @@
   <data name="edtStartDate.Properties.CalendarTimeProperties.Mask.EditMask" xml:space="preserve">
     <value>T</value>
   </data>
-  <data name="edtStartDate.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v15.2">
+  <data name="edtStartDate.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
     <value>DateTime</value>
   </data>
   <data name="edtShowTimeAs.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
@@ -576,10 +576,10 @@
     <value>True</value>
   </data>
   <data name="&gt;&gt;lblStartTime.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;edtEndTime.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.SchedulerTimeEdit, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.SchedulerTimeEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="edtResources.ResourcesCheckedListBoxControl.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
     <value />
@@ -597,10 +597,10 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;lblPercentComplete.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;btnCancel.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="chkAllDay.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
     <value />
@@ -650,7 +650,7 @@
   <data name="edtResource.Properties.NullValuePromptShowForEmptyValue" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="tbLocation.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v15.2">
+  <data name="tbLocation.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
     <value>None</value>
   </data>
   <data name="btnJumpToRecord.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -660,7 +660,7 @@
     <value>0</value>
   </data>
   <data name="&gt;&gt;edtStartTime.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.SchedulerTimeEdit, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.SchedulerTimeEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;lblLocation.Name" xml:space="preserve">
     <value>lblLocation</value>
@@ -686,26 +686,26 @@
   <data name="&gt;&gt;edtEndTime.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="edtEndTime.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v15.2">
+  <data name="edtEndTime.Properties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
     <value>DateTime</value>
   </data>
   <data name="&gt;&gt;chkAllDay.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="edtResources.Properties.Mask.BeepOnError" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="edtResources.ResourcesCheckedListBoxControl.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.2">
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="edtResources.ResourcesCheckedListBoxControl.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
     <value>None</value>
   </data>
   <data name="edtStartTime.Properties.AutoHeight" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="&gt;&gt;btnDelete.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="edtStartDate.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v15.2">
+  <data name="edtStartDate.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
     <value>Default</value>
   </data>
   <data name="chkReminder.Properties.DisplayValueChecked" xml:space="preserve">
@@ -718,7 +718,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;lblLabel.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="txtRecordID.TabIndex" type="System.Int32, mscorlib">
     <value>30</value>
@@ -871,7 +871,7 @@
     <value />
   </data>
   <data name="&gt;&gt;btnRecurrence.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;tbLocation.ZOrder" xml:space="preserve">
     <value>15</value>
@@ -912,7 +912,7 @@
   <data name="&gt;&gt;txtControlID.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="edtEndTime.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v15.2">
+  <data name="edtEndTime.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
     <value>Default</value>
   </data>
   <data name="cbReminder.Properties.NullValuePrompt" xml:space="preserve">
@@ -940,7 +940,7 @@
     <value>True</value>
   </data>
   <data name="&gt;&gt;cbReminder.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.DurationEdit, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.DurationEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;lblLabel.Parent" xml:space="preserve">
     <value>panel1</value>
@@ -961,13 +961,13 @@
     <value>edtStartDate</value>
   </data>
   <data name="&gt;&gt;lblShowTimeAs.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;progressPanel.Name" xml:space="preserve">
     <value>progressPanel</value>
   </data>
   <data name="&gt;&gt;edtEndDate.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="lblPercentComplete.Appearance.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
     <value>Regular</value>
@@ -984,7 +984,7 @@
   <data name="edtEndDate.Properties.Mask.ShowPlaceHolders" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="edtResources.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v15.2">
+  <data name="edtResources.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
     <value>Default</value>
   </data>
   <data name="tbLocation.Properties.NullValuePrompt" xml:space="preserve">
@@ -1018,9 +1018,9 @@
     <value>lblEndTime</value>
   </data>
   <data name="&gt;&gt;tbLocation.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="edtResource.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v15.2">
+  <data name="edtResource.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v19.2">
     <value>Near</value>
   </data>
   <data name="&gt;&gt;tbDescription.Name" xml:space="preserve">
@@ -1039,7 +1039,7 @@
     <value>False</value>
   </data>
   <data name="&gt;&gt;lblSubject.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1057,7 +1057,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;panel1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.PanelControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="tbSubject.Properties.Mask.SaveLiteral" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1096,7 +1096,7 @@
     <value />
   </data>
   <data name="&gt;&gt;lblEndTime.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="tbSubject.Properties.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
     <value />
@@ -1123,7 +1123,7 @@
     <value>9</value>
   </data>
   <data name="&gt;&gt;btnOk.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="edtResources.ResourcesCheckedListBoxControl.MaximumSize" type="System.Drawing.Size, System.Drawing">
     <value>0, 0</value>
@@ -1155,7 +1155,7 @@
   <data name="&gt;&gt;tbDescription.ZOrder" xml:space="preserve">
     <value>5</value>
   </data>
-  <data name="edtStartTime.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v15.2">
+  <data name="edtStartTime.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
     <value>Default</value>
   </data>
   <data name="&gt;&gt;edtEndDate.ZOrder" xml:space="preserve">
@@ -1165,7 +1165,7 @@
     <value>412, 316</value>
   </data>
   <data name="&gt;&gt;edtResource.Type" xml:space="preserve">
-    <value>DevExpress.XtraScheduler.UI.AppointmentResourceEdit, DevExpress.XtraScheduler.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraScheduler.UI.AppointmentResourceEdit, DevExpress.XtraScheduler.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;txtControlID.Parent" xml:space="preserve">
     <value>$this</value>
@@ -1188,13 +1188,13 @@
   <data name="&gt;&gt;lblLocation.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="edtLabel.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v15.2">
+  <data name="edtLabel.Properties.GlyphAlignment" type="DevExpress.Utils.HorzAlignment, DevExpress.Data.v19.2">
     <value>Near</value>
   </data>
   <data name="tbLocation.Properties.Mask.ShowPlaceHolders" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="edtStartDate.Properties.CalendarTimeProperties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v15.2">
+  <data name="edtStartDate.Properties.CalendarTimeProperties.Mask.MaskType" type="DevExpress.XtraEditors.Mask.MaskType, DevExpress.XtraEditors.v19.2">
     <value>DateTime</value>
   </data>
   <data name="edtResources.Properties.AutoHeight" type="System.Boolean, mscorlib">
@@ -1215,14 +1215,14 @@
   <data name="edtEndTime.Properties.NullValuePromptShowForEmptyValue" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v15.2">
+  <data name="edtEndDate.Properties.CalendarTimeProperties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
     <value>Default</value>
   </data>
   <data name="&gt;&gt;tbSubject.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;edtStartDate.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;chkReminder.ZOrder" xml:space="preserve">
     <value>7</value>
@@ -1230,7 +1230,7 @@
   <data name="cbReminder.Properties.AutoHeight" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="tbSubject.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v15.2">
+  <data name="tbSubject.Properties.Mask.AutoComplete" type="DevExpress.XtraEditors.Mask.AutoCompleteType, DevExpress.XtraEditors.v19.2">
     <value>Default</value>
   </data>
   <data name="lblPercentCompleteValue.Appearance.FontSizeDelta" type="System.Int32, mscorlib">

app/DD-Record-Organizer/frmCustomAppointment.vb

@@ -94,9 +94,9 @@ Partial Public Class frmCustomAppointment
     Private Sub btnJumpToRecord_Click(sender As Object, e As EventArgs) Handles btnJumpToRecord.Click
         If txtRecordID.Text.Length > 0 Then
             Dim RecordId = Integer.Parse(txtRecordID.Text)
-            JUMP_RECORD_ID = RecordId
+            JUMP_ID = RecordId
 
-            Dim constructDT As DataTable = MYDB_ECM.GetDatatable("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)
+            Dim constructDT As DataTable = MYDB_ECM.GetDatatable("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_ID)
 
             ' TODO: FormId und ConstructId herausfinden
 

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

@@ -32,13 +32,13 @@ Partial Class frmDocRecordLink
         Me.btnloadData2Entity = New System.Windows.Forms.Button()
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
+        Me.bbtnitmLinkRecords = New DevExpress.XtraBars.BarButtonItem()
+        Me.bbtnitmsaveLayout = New DevExpress.XtraBars.BarButtonItem()
+        Me.bbtnitmresetlayout = New DevExpress.XtraBars.BarButtonItem()
+        Me.bsitmSource = New DevExpress.XtraBars.BarStaticItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.Label2 = New System.Windows.Forms.Label()
@@ -111,9 +111,9 @@ Partial Class frmDocRecordLink
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.bbtnitmLinkRecords, Me.bbtnitmsaveLayout, Me.bbtnitmresetlayout, Me.bsitmSource})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 5
+        Me.RibbonControl1.MaxItemId = 6
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -128,55 +128,63 @@ Partial Class frmDocRecordLink
         Me.bsiInfo.Id = 1
         Me.bsiInfo.Name = "bsiInfo"
         '
-        'BarButtonItem1
+        'bbtnitmLinkRecords
         '
-        Me.BarButtonItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Left
-        resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
-        Me.BarButtonItem1.Id = 2
-        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem1.Name = "BarButtonItem1"
+        Me.bbtnitmLinkRecords.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Left
+        resources.ApplyResources(Me.bbtnitmLinkRecords, "bbtnitmLinkRecords")
+        Me.bbtnitmLinkRecords.Id = 2
+        Me.bbtnitmLinkRecords.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmLinkRecords.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitmLinkRecords.ItemAppearance.Normal.Font = CType(resources.GetObject("bbtnitmLinkRecords.ItemAppearance.Normal.Font"), System.Drawing.Font)
+        Me.bbtnitmLinkRecords.ItemAppearance.Normal.Options.UseFont = True
+        Me.bbtnitmLinkRecords.Name = "bbtnitmLinkRecords"
         '
-        'BarButtonItem2
+        'bbtnitmsaveLayout
         '
-        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
-        Me.BarButtonItem2.Id = 3
-        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem2.Name = "BarButtonItem2"
+        resources.ApplyResources(Me.bbtnitmsaveLayout, "bbtnitmsaveLayout")
+        Me.bbtnitmsaveLayout.Id = 3
+        Me.bbtnitmsaveLayout.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmsaveLayout.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitmsaveLayout.ItemAppearance.Normal.Font = CType(resources.GetObject("bbtnitmsaveLayout.ItemAppearance.Normal.Font"), System.Drawing.Font)
+        Me.bbtnitmsaveLayout.ItemAppearance.Normal.Options.UseFont = True
+        Me.bbtnitmsaveLayout.Name = "bbtnitmsaveLayout"
         '
-        'BarButtonItem3
+        'bbtnitmresetlayout
         '
-        resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
-        Me.BarButtonItem3.Id = 4
-        Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem3.Name = "BarButtonItem3"
+        resources.ApplyResources(Me.bbtnitmresetlayout, "bbtnitmresetlayout")
+        Me.bbtnitmresetlayout.Id = 4
+        Me.bbtnitmresetlayout.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmresetlayout.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitmresetlayout.ItemAppearance.Normal.Font = CType(resources.GetObject("bbtnitmresetlayout.ItemAppearance.Normal.Font"), System.Drawing.Font)
+        Me.bbtnitmresetlayout.ItemAppearance.Normal.Options.UseFont = True
+        Me.bbtnitmresetlayout.Name = "bbtnitmresetlayout"
+        '
+        'bsitmSource
+        '
+        Me.bsitmSource.Id = 5
+        Me.bsitmSource.Name = "bsitmSource"
         '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup1})
         Me.RibbonPage1.Name = "RibbonPage1"
         resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
         '
+        'RibbonPageGroup3
+        '
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtnitmLinkRecords)
+        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
+        resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
+        '
         'RibbonPageGroup1
         '
         Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2)
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmsaveLayout)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmresetlayout)
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
         '
-        'RibbonPageGroup2
-        '
-        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
-        '
-        'RibbonPageGroup3
-        '
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
-        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo)
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsitmSource)
         resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
@@ -235,11 +243,11 @@ Partial Class frmDocRecordLink
     Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
     Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem
-    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents bbtnitmLinkRecords As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents bbtnitmsaveLayout As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
-    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents bbtnitmresetlayout As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents Label2 As Label
     Friend WithEvents txtcurrSichtData As TextBox
+    Friend WithEvents bsitmSource As DevExpress.XtraBars.BarStaticItem
 End Class

app/DD-Record-Organizer/frmDocRecordLink.resx

@@ -288,11 +288,11 @@
   <data name="bsiInfo.Caption" xml:space="preserve">
     <value>Waiting for Record-Selection...</value>
   </data>
-  <data name="BarButtonItem1.Caption" xml:space="preserve">
+  <data name="bbtnitmLinkRecords.Caption" xml:space="preserve">
     <value>Datei(en) verknüpfen</value>
   </data>
   <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtnitmLinkRecords.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -313,10 +313,13 @@
         Lz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem2.Caption" xml:space="preserve">
+  <data name="bbtnitmLinkRecords.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold</value>
+  </data>
+  <data name="bbtnitmsaveLayout.Caption" xml:space="preserve">
     <value>...speichern</value>
   </data>
-  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtnitmsaveLayout.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -336,10 +339,13 @@
         bGxvdyIgLz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="BarButtonItem3.Caption" xml:space="preserve">
+  <data name="bbtnitmsaveLayout.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold</value>
+  </data>
+  <data name="bbtnitmresetlayout.Caption" xml:space="preserve">
     <value>...zurücksetzen</value>
   </data>
-  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtnitmresetlayout.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -362,6 +368,9 @@
         LjR6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
 </value>
   </data>
+  <data name="bbtnitmresetlayout.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold</value>
+  </data>
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -369,13 +378,13 @@
     <value>Start</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1155, 158</value>
+    <value>1155, 147</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 639</value>
+    <value>0, 638</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1155, 22</value>
+    <value>1155, 23</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -401,12 +410,12 @@
   <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
     <value>9</value>
   </data>
-  <data name="RibbonPageGroup1.Text" xml:space="preserve">
-    <value>Layout</value>
-  </data>
   <data name="RibbonPageGroup3.Text" xml:space="preserve">
     <value>Funktionen</value>
   </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>Layout</value>
+  </data>
   <data name="RibbonPage2.Text" xml:space="preserve">
     <value>RibbonPage2</value>
   </data>
@@ -1708,7 +1717,7 @@
 </value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Datei mit Datensatz aus Entität verknüpfen</value>
+    <value>Datei mit Datensatz aus Sicht verknüpfen</value>
   </data>
   <data name="&gt;&gt;grvwGrid.Name" xml:space="preserve">
     <value>grvwGrid</value>
@@ -1722,48 +1731,48 @@
   <data name="&gt;&gt;bsiInfo.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
-    <value>BarButtonItem1</value>
+  <data name="&gt;&gt;bbtnitmLinkRecords.Name" xml:space="preserve">
+    <value>bbtnitmLinkRecords</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
+  <data name="&gt;&gt;bbtnitmLinkRecords.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
-    <value>BarButtonItem2</value>
+  <data name="&gt;&gt;bbtnitmsaveLayout.Name" xml:space="preserve">
+    <value>bbtnitmsaveLayout</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
+  <data name="&gt;&gt;bbtnitmsaveLayout.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem3.Name" xml:space="preserve">
-    <value>BarButtonItem3</value>
+  <data name="&gt;&gt;bbtnitmresetlayout.Name" xml:space="preserve">
+    <value>bbtnitmresetlayout</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
+  <data name="&gt;&gt;bbtnitmresetlayout.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;bsitmSource.Name" xml:space="preserve">
+    <value>bsitmSource</value>
+  </data>
+  <data name="&gt;&gt;bsitmSource.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
   <data name="&gt;&gt;RibbonPage1.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RibbonPageGroup1.Name" xml:space="preserve">
-    <value>RibbonPageGroup1</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
-    <value>RibbonPageGroup2</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;RibbonPageGroup3.Name" xml:space="preserve">
     <value>RibbonPageGroup3</value>
   </data>
   <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;RibbonPageGroup1.Name" xml:space="preserve">
+    <value>RibbonPageGroup1</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
     <value>RibbonPage2</value>
   </data>

app/DD-Record-Organizer/frmDocRecordLink.vb

@@ -1,13 +1,12 @@
 Imports System.IO
-Imports System.Text
-Imports DD_LIB_Standards
+Imports DevExpress.XtraGrid.Columns
 Public Class frmDocRecordLink
 
-    Public Property Documents As New List(Of ClassWindreamDocGrid.WindreamDoc)
+    Public Property myDocuments As New List(Of ClassDocGrid.clsWMDoc)
 
     Private CURRENT_LINK_ENTITY_ID As Integer = 0
     Private ENTITY_LOAD_ACTIVE As Boolean = False
-
+    Private DT_ENTITYDATA As DataTable
     Private Class ClassEntity
         Public title As String
         Public id As Integer
@@ -17,6 +16,9 @@ Public Class frmDocRecordLink
         End Function
     End Class
     Private Function GET_CURRENT_ENTITY_DATA()
+        If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then
+            Return Nothing
+        End If
         Dim oDatatable As DataTable = CURRENT_DT_ENTITY_RECORDS.Copy
         Return oDatatable
     End Function
@@ -24,57 +26,64 @@ Public Class frmDocRecordLink
         Dim DT_RECORDS As DataTable
         If current = True Then
             DT_RECORDS = GET_CURRENT_ENTITY_DATA()
+
         Else
             DT_RECORDS = ENTITY_DATATABLE
         End If
+        If CURRENT_LINK_ENTITY_ID = 0 Then
+            CURRENT_LINK_ENTITY_ID = CURRENT_ENTITY_ID
+        End If
+        'Try
+        '    DT_RECORDS.Columns.Add("already linked", Type.GetType("System.Boolean")).SetOrdinal(0)
+        '    DT_RECORDS.Columns("already linked").DefaultValue = False
+        'Catch ex As Exception
 
+        'End Try
 
+        'Try
+        '    For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows
+        '        Dim DOC_ID = row.Item("DOC_ID")
+
+        '        Dim sel = String.Format("select T.RECORD_ID FROM TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0} AND T.DOC_ID = {1}", CURRENT_LINK_ENTITY_ID, DOC_ID)
+        '        Dim DTRECS_LINKED As DataTable = MYDB_ECM.GetDatatable(sel)
+        '        For Each recrow As DataRow In DTRECS_LINKED.Rows
+        '            For Each rowrecsdisplay As DataRow In DT_RECORDS.Rows
+        '                If rowrecsdisplay.Item("Record-ID") = recrow.Item("RECORD_ID") Then
+        '                    rowrecsdisplay.Item("already linked") = True
+        '                Else
+        '                    rowrecsdisplay.Item("already linked") = False
+        '                End If
+        '            Next
+        '        Next
+        '    Next
+        'Catch ex As Exception
+        '    ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in displaying already linked", ex.Message, ex.StackTrace)
+        'End Try
         Try
-            DT_RECORDS.Columns.Add("already linked", Type.GetType("System.Boolean")).SetOrdinal(0)
-            DT_RECORDS.Columns("already linked").DefaultValue = False
-        Catch ex As Exception
+            grvwGrid.Columns.Clear()
+            dgEntityRecords.DataSource = DT_RECORDS
+            '  grvwGrid.Columns.Item("already linked").Fixed = True
+            'grvwGrid.PopulateColumns()
+            'dgEntityRecords.RefreshDataSource()
+            'grvwGrid.OptionsView.ColumnAutoWidth = False
+            'grvwGrid.Columns(0).Fixed = FixedStyle.Left
+            'grvwGrid.BestFitColumns()
 
+        Catch ex As Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in format grid", ex.Message, ex.StackTrace)
         End Try
 
-        Try
-            For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows
-                Dim DOC_ID = row.Item("DOC_ID")
-                Dim sel = String.Format("select T.RECORD_ID FROM TBPMO_DOC_RECORD_LINK T, TBPMO_RECORD T1 WHERE T.RECORD_ID = T1.GUID AND T1.FORM_ID = {0} AND T.DOC_ID = {1}", CURRENT_LINK_ENTITY_ID, DOC_ID)
-                Dim DTRECS_LINKED As DataTable = MYDB_ECM.GetDatatable(sel)
-                For Each recrow As DataRow In DTRECS_LINKED.Rows
-                    For Each rowrecsdisplay As DataRow In DT_RECORDS.Rows
-                        If rowrecsdisplay.Item("Record-ID") = recrow.Item("RECORD_ID") Then
-                            rowrecsdisplay.Item("already linked") = True
-                        Else
-                            rowrecsdisplay.Item("already linked") = False
-                        End If
-                    Next
-                Next
-            Next
-        Catch ex As Exception
-            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in displaying already linked", ex.Message, ex.StackTrace)
-        End Try
-        grvwGrid.Columns.Clear()
-        dgEntityRecords.DataSource = DT_RECORDS
-        grvwGrid.Columns.Item("already linked").Fixed = True
-        grvwGrid.PopulateColumns()
-        dgEntityRecords.RefreshDataSource()
-        grvwGrid.OptionsView.ColumnAutoWidth = False
-        grvwGrid.BestFitColumns()
     End Sub
     Private Sub frmDocRecordLink_Load(sender As Object, e As EventArgs) Handles Me.Load
         ' OLD WAY
-        If Documents.Count = 0 Then
+        If myDocuments.Count = 0 Then
             ENTITY_LOAD_ACTIVE = True
-            If ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
-                txtFileInfo.Text = ClassWindreamDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_PATH")
+            If ClassDocGrid.DT_RESULTFILES.Rows.Count = 1 Then
+                txtFileInfo.Text = ClassDocGrid.DT_RESULTFILES.Rows(0).Item("DOC_PATH")
             Else
-                txtFileInfo.Text = String.Format("{0} files selected for linking to record", ClassWindreamDocGrid.DT_RESULTFILES.Rows.Count)
+                txtFileInfo.Text = String.Format("{0} files selected for linking to record", ClassDocGrid.DT_RESULTFILES.Rows.Count)
             End If
             Try
-                If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then
-                    Me.Close()
-                End If
                 If CURRENT_LINK_ENTITY_ID = 0 Then
                     Refresh_Grid_Data(True, Nothing)
                     CURRENT_LINK_ENTITY_ID = CURRENT_ENTITY_ID
@@ -128,12 +137,12 @@ Public Class frmDocRecordLink
 
         End If
 
-        If Documents.Count > 0 Then
+        If myDocuments.Count > 0 Then
             ENTITY_LOAD_ACTIVE = True
-            If Documents.Count = 1 Then
-                txtFileInfo.Text = Documents.First.DocPath
+            If myDocuments.Count = 1 Then
+                txtFileInfo.Text = myDocuments.First.DocPath
             Else
-                txtFileInfo.Text = String.Format("{0} files selected for linking to record", Documents.Count)
+                txtFileInfo.Text = String.Format("{0} files selected for linking to record", myDocuments.Count)
             End If
             Try
                 If IsNothing(CURRENT_DT_ENTITY_RECORDS) Then
@@ -221,7 +230,7 @@ Public Class frmDocRecordLink
         Try
             Dim XMLPath = Get_DocGrid_Layout_Filename()
             grvwGrid.SaveLayoutToXml(XMLPath)
-            bsiInfo.Caption = "Grid-Layout saved - " + Now.ToShortTimeString
+            bsiInfo.Caption = "Grid-Layout saved - " + Now.ToLongTimeString
 
         Catch ex As Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Save_DocGrid_Layout", ex.Message, ex.StackTrace)
@@ -233,7 +242,7 @@ Public Class frmDocRecordLink
             If File.Exists(XMLPath) Then
                 grvwGrid.RestoreLayoutFromXml(XMLPath)
                 grvwGrid.GuessAutoFilterRowValuesFromFilter()
-                bsiInfo.Caption = "Grid-Layout loaded - " + Now.ToShortTimeString
+                bsiInfo.Caption = "Grid-Layout loaded - " + Now.ToLongTimeString
 
             End If
         Catch ex As Exception
@@ -249,66 +258,65 @@ Public Class frmDocRecordLink
     End Sub
 
     Private Sub btnloadData2Entity_Click(sender As Object, e As EventArgs) Handles btnloadData2Entity.Click
-        Dim entity As ClassEntity = DirectCast(cmbConstructorForms.SelectedItem, ClassEntity)
         Me.Cursor = Cursors.WaitCursor
         If cmbConstructorForms.SelectedIndex <> -1 Then
+            Dim entity As ClassEntity = DirectCast(cmbConstructorForms.SelectedItem, ClassEntity)
             ENTITY_LOAD_ACTIVE = True
-            Save_DocGrid_Layout()
+            dgEntityRecords.DataSource = Nothing
+            grvwGrid.Columns.Clear()
+
             Dim DT_RESULT = ReturnDataforEntity(entity.id)
             If Not IsNothing(DT_RESULT) Then
                 CURRENT_LINK_ENTITY_ID = entity.id
                 txtcurrSichtData.Text = entity.title
+                DT_ENTITYDATA = DT_RESULT
                 Refresh_Grid_Data(False, DT_RESULT)
             End If
+            Load_DocGrid_Layout()
+        Else
+            bsiInfo.Caption = "Bitte wöhlen Sie eine Sicht aus! " + Now.ToShortTimeString
         End If
-        Load_DocGrid_Layout()
+
         Me.Cursor = Cursors.Default
     End Sub
     Private Function ReturnDataforEntity(oEntityID As Integer) As DataTable
         Dim ResultSQL, ResultViewName As String
         LOGGER.Debug("GridType = Grid")
         ResultViewName = $"VWPMO_ENTITY_TABLE{oEntityID}"
-
+        bsitmSource.Caption = $"Source: " + ResultViewName
         ResultSQL = $"SELECT T.* FROM {ResultViewName} T"
         LOGGER.Debug("ResultSQL: " & ResultSQL)
+
         Return MYDB_ECM.GetDatatable(ResultSQL)
     End Function
 
-    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
-        If clsWindream.Create_Session = False Then
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmLinkRecords.ItemClick
+        If WMMOD.SessionLoggedin = False Then
             MsgBox("No session to windream created! Check Your connection!", MsgBoxStyle.Critical)
             Exit Sub
         End If
 
         Dim selectedRows As Integer() = grvwGrid.GetSelectedRows()
         Dim oLinkCount As Integer = 0
+        LOGGER.Info("Start der Verknüpfung - Es wurden [{0}] Datensätze ausgewählt!", selectedRows.Count)
         For Each rowhandle As Integer In selectedRows
-            Dim SELECTED_RECORDID = grvwGrid.GetRowCellValue(rowhandle, "Record-ID")
-            If IsNothing(SELECTED_RECORDID) Then
+            Dim oSelectedRecordID = grvwGrid.GetRowCellValue(rowhandle, "Record-ID")
+            If IsNothing(oSelectedRecordID) Then
                 Continue For
             End If
-            LOGGER.Debug(">>> Doc will be linked with Record: " & SELECTED_RECORDID.ToString)
             Try
-                For Each row As DataRow In CURRENT_DT_SELECTED_FILES.Rows
-                    CURRENT_DOC_ID = row.Item("DOC_ID")
-                    Dim DOC_PATH = row.Item("FILEPATH")
-                    Dim _objecttype = row.Item("OBJECTTYPE")
-                    clsWindream.MY_WDOBJECTTYPE = _objecttype
-                    Dim sql_Exec = String.Format("EXEC PRPMO_CHECK_DOC_RECORD_LINK {0},{1},'{2}','{3}'", SELECTED_RECORDID, CURRENT_DOC_ID, "MANUAL RECORD-LINK", USER_USERNAME)
-                    'Dim ins = String.Format("INSERT INTO TBPMO_DOC_RECORD_LINK (RECORD_ID,DOC_ID,COMMENT,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", SELECTED_RECORDID, CURRENT_DOC_ID, "MANUAL RECORD-LINK", USER_USERNAME)
+                For Each oRow As DataRow In CURRENT_DT_SELECTED_FILES.Rows
+
+                    CURRENT_DOC_ID = oRow.Item("DOC_ID")
+                    LOGGER.Info("DocID {0} will be linked with Record {1} ", CURRENT_DOC_ID.ToString, oSelectedRecordID.ToString)
+                    Dim DOC_PATH = oRow.Item("FILEPATH")
+                    Dim _objecttype = oRow.Item("OBJECTTYPE")
+                    WMOBJECTTYPE = _objecttype
+                    Dim sql_Exec = String.Format("EXEC PRPMO_CHECK_DOC_RECORD_LINK {0},{1},'{2}','{3}'", oSelectedRecordID, CURRENT_DOC_ID, "MANUAL RECORD-LINK", USER_USERNAME)
                     If MYDB_ECM.ExecuteNonQuery(sql_Exec) = False Then
                         MsgBox("Unexpected Error in Inserting Record-Doc Link. Please check logfile!", MsgBoxStyle.Critical)
                     Else
-                        If LICENSE_PROXY = True And DD_LIB_Standards.clsDatabase.DB_PROXY_INITIALIZED Then
-                            Dim proc = String.Format("EXEC PRPROXY_DOC_CHECK_DOC_REC_LINK {0},{1}", CURRENT_DOC_ID, SELECTED_RECORDID)
-                            MYDB_ECM.ExecuteNonQuery(proc)
-                        End If
-                        Dim msg = String.Format("Der Datensatz wurde erfolgreich verknüpft!")
-                        If USER_LANGUAGE <> "de-DE" Then
-                            msg = "The record was successfully linked"
-                        End If
-                        bsiInfo.Caption = msg
-                        ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "FILE LINK CREATED FOR RECORD: " & SELECTED_RECORDID.ToString)
+                        ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "FILE LINK CREATED FOR RECORD: " & oSelectedRecordID.ToString)
                         oLinkCount += 1
                     End If
                     Dim sql = String.Format("SELECT * FROM TBPMO_WD_OBJECTTYPE WHERE OBJECT_TYPE = '{0}'", _objecttype)
@@ -316,29 +324,35 @@ Public Class frmDocRecordLink
                     If DT_OBJTYPE.Rows.Count = 1 Then
                         Dim Entity_Index = DT_OBJTYPE.Rows(0).Item("IDXNAME_ENTITYID")
                         Dim Record_Index = DT_OBJTYPE.Rows(0).Item("IDXNAME_RECORDID")
-                        Dim ENT_ID = MYDB_ECM.GetScalarValue(String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", SELECTED_RECORDID))
+                        Dim ENT_ID = MYDB_ECM.GetScalarValue(String.Format("SELECT FORM_ID FROM TBPMO_RECORD WHERE GUID = {0}", oSelectedRecordID))
                         If ENT_ID > 1 And Entity_Index <> String.Empty Then
-                            clsWD_SET.IndexFile(DOC_PATH, Entity_Index, ENT_ID, _objecttype)
+                            WMMOD.SetFileIndex(DOC_PATH, Entity_Index, ENT_ID, _objecttype)
                         End If
                         If Record_Index <> String.Empty Then
-                            clsWD_SET.IndexFile(DOC_PATH, Record_Index, SELECTED_RECORDID, _objecttype)
+                            WMMOD.SetFileIndex(DOC_PATH, Record_Index, oSelectedRecordID, _objecttype)
                         End If
                     End If
                 Next
-                bsiInfo.Caption = $"[{oLinkCount}] records successfully linked - {Now.ToShortTimeString}"
-
             Catch ex As Exception
                 ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Linking Record to file", ex.Message, ex.StackTrace)
             End Try
         Next
+        Dim omsg = $"[{oLinkCount}] Datensätze erfolgreich verknüpft! - {Now.ToShortTimeString}"
+        If USER_LANGUAGE <> "de-DE" Then
+            omsg = $"[{oLinkCount}] records successfully linked - {Now.ToShortTimeString}"
+        End If
+        MsgBox(omsg, MsgBoxStyle.Information, "orgFLOW")
+
+        Refresh_Grid_Data(False, DT_ENTITYDATA)
+        Load_DocGrid_Layout()
         grvwGrid.ClearSelection()
     End Sub
 
-    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmsaveLayout.ItemClick
         Save_DocGrid_Layout()
     End Sub
 
-    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
+    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmresetlayout.ItemClick
         Reset_View_layout()
     End Sub
     Sub Reset_View_layout()
@@ -359,7 +373,7 @@ Public Class frmDocRecordLink
     End Sub
 
     Private Sub grvwGrid_StyleChanged(sender As Object, e As EventArgs) Handles grvwGrid.ColumnPositionChanged, grvwGrid.ColumnWidthChanged
-        If ENTITY_LOAD_ACTIVE = False Then
+        If ENTITY_LOAD_ACTIVE = True Then
             Save_DocGrid_Layout()
         End If
     End Sub

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

@@ -41,14 +41,28 @@ Partial Class frmDocSearchResult
         Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
         Me.bsiDocID = New DevExpress.XtraBars.BarStaticItem()
         Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem()
+        Me.bbtnitmPreview = New DevExpress.XtraBars.BarButtonItem()
+        Me.bchlitmPreview = New DevExpress.XtraBars.BarCheckItem()
+        Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
+        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
+        Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
+        Me.DateienVerknüpfenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ContextMenuStripResultFiles.SuspendLayout()
         CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainerControl1.Panel1.SuspendLayout()
+        CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainerControl1.Panel2.SuspendLayout()
+        Me.SplitContainerControl1.SuspendLayout()
         Me.SuspendLayout()
         '
         'GridControlDocSearch
@@ -57,10 +71,10 @@ Partial Class frmDocSearchResult
         Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill
         GridLevelNode1.RelationName = "Level1"
         Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1})
-        Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 158)
+        Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0)
         Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search
         Me.GridControlDocSearch.Name = "GridControlDocSearch"
-        Me.GridControlDocSearch.Size = New System.Drawing.Size(1083, 463)
+        Me.GridControlDocSearch.Size = New System.Drawing.Size(1073, 465)
         Me.GridControlDocSearch.TabIndex = 8
         Me.GridControlDocSearch.TabStop = False
         Me.GridControlDocSearch.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDoc_Search})
@@ -68,9 +82,9 @@ Partial Class frmDocSearchResult
         'ContextMenuStripResultFiles
         '
         Me.ContextMenuStripResultFiles.ImageScalingSize = New System.Drawing.Size(20, 20)
-        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.OrdnerÖffnenToolStripMenuItem, Me.docCM_Copy, Me.ToolStripSeparator20, Me.docCM_Showlinks, Me.ToolStripSeparator22, Me.docCM_PropertiesFile, Me.ToolStripSeparator25})
+        Me.ContextMenuStripResultFiles.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.docCM_Open, Me.OrdnerÖffnenToolStripMenuItem, Me.docCM_Copy, Me.ToolStripSeparator20, Me.docCM_Showlinks, Me.DateienVerknüpfenToolStripMenuItem, Me.ToolStripSeparator22, Me.docCM_PropertiesFile, Me.ToolStripSeparator25})
         Me.ContextMenuStripResultFiles.Name = "ContextMenuStripResultFiles"
-        Me.ContextMenuStripResultFiles.Size = New System.Drawing.Size(256, 152)
+        Me.ContextMenuStripResultFiles.Size = New System.Drawing.Size(256, 200)
         '
         'docCM_Open
         '
@@ -130,6 +144,10 @@ Partial Class frmDocSearchResult
         Me.GridViewDoc_Search.GridControl = Me.GridControlDocSearch
         Me.GridViewDoc_Search.LevelIndent = 10
         Me.GridViewDoc_Search.Name = "GridViewDoc_Search"
+        Me.GridViewDoc_Search.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewDoc_Search.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewDoc_Search.OptionsBehavior.Editable = False
+        Me.GridViewDoc_Search.OptionsBehavior.ReadOnly = True
         Me.GridViewDoc_Search.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
         Me.GridViewDoc_Search.OptionsDetail.ShowDetailTabs = False
         Me.GridViewDoc_Search.OptionsSelection.EnableAppearanceFocusedCell = False
@@ -145,9 +163,9 @@ Partial Class frmDocSearchResult
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.bsiDocID, Me.bsiInfo})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.bsiDocID, Me.bsiInfo, Me.bbtnitmPreview, Me.bchlitmPreview, Me.BarCheckItem1})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 5
+        Me.RibbonControl1.MaxItemId = 8
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -181,11 +199,31 @@ Partial Class frmDocSearchResult
         Me.bsiInfo.ItemAppearance.Normal.Options.UseFont = True
         Me.bsiInfo.Name = "bsiInfo"
         '
+        'bbtnitmPreview
+        '
+        Me.bbtnitmPreview.Caption = "BarButtonItem3"
+        Me.bbtnitmPreview.Id = 5
+        Me.bbtnitmPreview.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmPreview.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitmPreview.Name = "bbtnitmPreview"
+        '
+        'bchlitmPreview
+        '
+        Me.bchlitmPreview.Caption = "Vorschau anzeigen"
+        Me.bchlitmPreview.Id = 6
+        Me.bchlitmPreview.ImageOptions.SvgImage = CType(resources.GetObject("bchlitmPreview.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bchlitmPreview.Name = "bchlitmPreview"
+        '
+        'BarCheckItem1
+        '
+        Me.BarCheckItem1.Caption = "BarCheckItem1"
+        Me.BarCheckItem1.Id = 7
+        Me.BarCheckItem1.Name = "BarCheckItem1"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
         Me.RibbonPage1.Name = "RibbonPage1"
-        Me.RibbonPage1.Text = "DocResults"
+        Me.RibbonPage1.Text = "Start"
         '
         'RibbonPageGroup1
         '
@@ -195,27 +233,75 @@ Partial Class frmDocSearchResult
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         Me.RibbonPageGroup1.Text = "Funktionen"
         '
+        'RibbonPageGroup2
+        '
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.bchlitmPreview)
+        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
+        Me.RibbonPageGroup2.Text = "Datei"
+        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiDocID)
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo)
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 621)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 623)
         Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
         Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1083, 24)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1083, 22)
         '
         'RibbonPage2
         '
         Me.RibbonPage2.Name = "RibbonPage2"
         Me.RibbonPage2.Text = "RibbonPage2"
         '
+        'SplitContainerControl1
+        '
+        Me.SplitContainerControl1.Collapsed = True
+        Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
+        Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 158)
+        Me.SplitContainerControl1.Name = "SplitContainerControl1"
+        '
+        'SplitContainerControl1.Panel1
+        '
+        Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControlDocSearch)
+        Me.SplitContainerControl1.Panel1.Text = "Panel1"
+        '
+        'SplitContainerControl1.Panel2
+        '
+        Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1)
+        Me.SplitContainerControl1.Panel2.Text = "Panel2"
+        Me.SplitContainerControl1.Size = New System.Drawing.Size(1083, 465)
+        Me.SplitContainerControl1.SplitterPosition = 698
+        Me.SplitContainerControl1.TabIndex = 11
+        '
+        'DocumentViewer1
+        '
+        Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.DocumentViewer1.FileLoaded = False
+        Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
+        Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Size = New System.Drawing.Size(0, 0)
+        Me.DocumentViewer1.TabIndex = 0
+        '
+        'XtraSaveFileDialog1
+        '
+        Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1"
+        Me.XtraSaveFileDialog1.Filter = """xlsx-Dateien|*.xlsx"""
+        '
+        'DateienVerknüpfenToolStripMenuItem
+        '
+        Me.DateienVerknüpfenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link
+        Me.DateienVerknüpfenToolStripMenuItem.Name = "DateienVerknüpfenToolStripMenuItem"
+        Me.DateienVerknüpfenToolStripMenuItem.Size = New System.Drawing.Size(255, 26)
+        Me.DateienVerknüpfenToolStripMenuItem.Text = "Datei mit Datensatz verknüpfen"
+        '
         'frmDocSearchResult
         '
         Me.Appearance.Options.UseFont = True
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1083, 645)
-        Me.Controls.Add(Me.GridControlDocSearch)
+        Me.Controls.Add(Me.SplitContainerControl1)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
         Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -228,6 +314,12 @@ Partial Class frmDocSearchResult
         Me.ContextMenuStripResultFiles.ResumeLayout(False)
         CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerControl1.Panel1.ResumeLayout(False)
+        CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerControl1.Panel2.ResumeLayout(False)
+        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerControl1.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -252,4 +344,12 @@ Partial Class frmDocSearchResult
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents bsiDocID As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents bbtnitmPreview As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents bchlitmPreview As DevExpress.XtraBars.BarCheckItem
+    Friend WithEvents BarCheckItem1 As DevExpress.XtraBars.BarCheckItem
+    Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
+    Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer
+    Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog
+    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents DateienVerknüpfenToolStripMenuItem As ToolStripMenuItem
 End Class

app/DD-Record-Organizer/frmDocSearchResult.resx

@@ -118,13 +118,13 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="ContextMenuStripResultFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>241, 17</value>
+    <value>34, 20</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="docCM_Showlinks.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAINJREFUOE9jQAbfvn37TwyGKscEIEknJye8mH4GfHj/EQWTbAAuPIRcgAsPRwO+
+        vAAADrwBlbxySQAAAINJREFUOE9jQAbfvn37TwyGKscEIEknJye8mH4GfHj/EQWTbAAuPIRcgAsPRwO+
         f/+eABLEhX19ffEbABR4n5KSAlcA0rB582YwDRIHacAbjQ8ePABLgDSdPHny/5w5c8Ds5cuXg8VBYjDN
         WA2AuQDZZphimAvwGkAoDLBhqFYgYGAAAFMd0furxZnJAAAAAElFTkSuQmCC
 </value>
@@ -132,7 +132,7 @@
   <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -152,7 +152,7 @@
   </data>
   <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALICAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -169,6 +169,53 @@
         MTYgIiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
 </value>
   </data>
+  <data name="bbtnitmPreview.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlByZXZpZXciPg0KICAgIDxwYXRoIGQ9Ik0yMS40
+        LDI4SDE4bDAsMGwwLDBIOFY0aDEydjVjMCwwLjYsMC40LDEsMSwxaDV2MTMuNGwyLDJWOWwtNy03SDdD
+        Ni40LDIsNiwyLjQsNiwzdjI2YzAsMC42LDAuNCwxLDEsMWgxNi40ICAgTDIxLjQsMjh6IiBjbGFzcz0i
+        QmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE4LDE0YzMuMywwLDYsMi43LDYsNmMwLDEuMi0wLjQsMi4z
+        LTEsMy4zbDQuNiw0LjZjMC41LDAuNSwwLjUsMS4zLDAsMS43Yy0wLjUsMC41LTEuMywwLjUtMS43LDBM
+        MjEuMywyNSAgIGMtMC45LDAuNi0yLjEsMS0zLjMsMWMtMy4zLDAtNi0yLjctNi02QzEyLDE2LjcsMTQu
+        NywxNCwxOCwxNHogTTE4LDI0YzIuMiwwLDQtMS44LDQtNHMtMS44LTQtNC00cy00LDEuOC00LDRTMTUu
+        OCwyNCwxOCwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="bchlitmPreview.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlByZXZpZXciPg0KICAgIDxwYXRoIGQ9Ik0yMS40
+        LDI4SDE4bDAsMGwwLDBIOFY0aDEydjVjMCwwLjYsMC40LDEsMSwxaDV2MTMuNGwyLDJWOWwtNy03SDdD
+        Ni40LDIsNiwyLjQsNiwzdjI2YzAsMC42LDAuNCwxLDEsMWgxNi40ICAgTDIxLjQsMjh6IiBjbGFzcz0i
+        QmxhY2siIC8+DQogICAgPHBhdGggZD0iTTE4LDE0YzMuMywwLDYsMi43LDYsNmMwLDEuMi0wLjQsMi4z
+        LTEsMy4zbDQuNiw0LjZjMC41LDAuNSwwLjUsMS4zLDAsMS43Yy0wLjUsMC41LTEuMywwLjUtMS43LDBM
+        MjEuMywyNSAgIGMtMC45LDAuNi0yLjEsMS0zLjMsMWMtMy4zLDAtNi0yLjctNi02QzEyLDE2LjcsMTQu
+        NywxNCwxOCwxNHogTTE4LDI0YzIuMiwwLDQtMS44LDQtNHMtMS44LTQtNC00cy00LDEuOC00LDRTMTUu
+        OCwyNCwxOCwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <metadata name="XtraSaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>240, 20</value>
+  </metadata>
   <data name="frmDocSearchResult.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAoAMDAQAAEABABoBgAApgAAACAgEAABAAQA6AIAAA4HAAAQEBAAAQAEACgBAAD2CQAAMDAAAAEA

app/DD-Record-Organizer/frmDocSearchResult.vb

@@ -1,38 +1,61 @@
 Imports System.IO
+Imports System.Runtime.InteropServices
+Imports DevExpress.XtraEditors
+
 'Imports System.Runtime.InteropServices
 'Imports System.Text
 Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraPrinting
+Imports DigitalData.Modules.Database
 
 Public Class frmDocSearchResult
-    '   <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
-    ' Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
-    ' End Function
-
-    'Public Structure SHELLEXECUTEINFO
-    '    Public cbSize As Integer
-    '    Public fMask As Integer
-    '    Public hwnd As IntPtr
-    '    <MarshalAs(UnmanagedType.LPTStr)> Public lpVerb As String
-    '    <MarshalAs(UnmanagedType.LPTStr)> Public lpFile As String
-    '    <MarshalAs(UnmanagedType.LPTStr)> Public lpParameters As String
-    '    <MarshalAs(UnmanagedType.LPTStr)> Public lpDirectory As String
-    '    Dim nShow As Integer
-    '    Dim hInstApp As IntPtr
-    '    Dim lpIDList As IntPtr
-    '    <MarshalAs(UnmanagedType.LPTStr)> Public lpClass As String
-    '    Public hkeyClass As IntPtr
-    '    Public dwHotKey As Integer
-    '    Public hIcon As IntPtr
-    '    Public hProcess As IntPtr
-    'End Structure
-    ' Private Const SEE_MASK_INVOKEIDLIST = &HC
-    ' Private Const SEE_MASK_NOCLOSEPROCESS = &H40
-    ' Private Const SEE_MASK_FLAG_NO_UI = &H400
-    ' Public Const SW_SHOW As Short = 5
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
+    <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
+    Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
+    End Function
+    Public Structure SHELLEXECUTEINFO
+        Public cbSize As Integer
+        Public fMask As Integer
+        Public hwnd As IntPtr
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpVerb As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpFile As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpParameters As String
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpDirectory As String
+        Dim nShow As Integer
+        Dim hInstApp As IntPtr
+        Dim lpIDList As IntPtr
+        <MarshalAs(UnmanagedType.LPTStr)> Public lpClass As String
+        Public hkeyClass As IntPtr
+        Public dwHotKey As Integer
+        Public hIcon As IntPtr
+        Public hProcess As IntPtr
+    End Structure
+    Private Const SEE_MASK_INVOKEIDLIST = &HC
+    Private Const SEE_MASK_NOCLOSEPROCESS = &H40
+    Private Const SEE_MASK_FLAG_NO_UI = &H400
+    Public Const SW_SHOW As Short = 5
+    Private _Helper As ClassHelper
     Private DT_RESULT As DataTable
     Private SelectedDocID As Int64
     Private SelectedFULL_FILEPATH As String
+
+    Private Sub frmDocSearchResult_Load(sender As Object, e As EventArgs) Handles Me.Load
+        LoadDocSearch(False)
+        _Helper = New ClassHelper
+        Text = CURRENT_DOCSEARCH_CAPTION
+
+        DocumentViewer1.Init(LOGCONFIG, MYGDPICTURE_LICENSE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
+            .ShowPrintButton = True,
+            .ShowRotateButton = True,
+            .ShowFlipButton = True,
+            .ShowSettingButton = True
+        })
+    End Sub
+
+    Private Sub frmDocSearchResult_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
+        Save_DocGrid_Layout()
+    End Sub
+
     Public Sub LoadDocSearch(reload As Boolean)
         Try
             Cursor = Cursors.WaitCursor
@@ -64,13 +87,19 @@ Public Class frmDocSearchResult
             GetDocID()
             Refresh_DocID()
         End If
-
     End Sub
 
     Private Sub GridViewDoc_Search_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDoc_Search.FocusedRowChanged
         If GridViewDoc_Search.RowCount > 0 Then
-            GetDocID()
-            Refresh_DocID()
+            LoadFile2Viewer()
+        End If
+    End Sub
+    Sub LoadFile2Viewer()
+        GetDocID()
+        Refresh_DocID()
+        If SplitContainerControl1.Collapsed = False Then
+            Dim OFilePath = ClassHelper.FORMAT_WM_PATH(SelectedFULL_FILEPATH)
+            DocumentViewer1.LoadFile_FromPath(OFilePath)
         End If
     End Sub
     Sub Refresh_DocID()
@@ -118,7 +147,7 @@ Public Class frmDocSearchResult
                 MsgBox("Could not read File Parameters(5)!", MsgBoxStyle.Exclamation)
                 Exit Sub
             End If
-            ClassHelper.File_open(SelectedFULL_FILEPATH, SelectedDocID)
+            ClassHelper.File_open(SelectedFULL_FILEPATH, SelectedDocID, 0)
             If CURRENT_OFFICE_FILE_CHANGED = True Then LoadDocSearch(True)
 
         Else
@@ -142,10 +171,10 @@ Public Class frmDocSearchResult
     End Sub
 
     Private Sub docCM_Copy_Click(sender As Object, e As EventArgs) Handles docCM_Copy.Click
-        If ClassWindreamDocGrid.SELECTED_DOC_PATH <> "" Then
+        If ClassDocGrid.SELECTED_DOC_PATH <> "" Then
             Try
                 Dim selectedfile(0) As String
-                selectedfile(0) = ClassWindreamDocGrid.SELECTED_DOC_PATH
+                selectedfile(0) = ClassDocGrid.SELECTED_DOC_PATH
                 Dim dataobj As New DataObject
                 dataobj.SetData(DataFormats.FileDrop, True, selectedfile)
 
@@ -160,49 +189,62 @@ Public Class frmDocSearchResult
 
     Private Sub docCM_Showlinks_Click(sender As Object, e As EventArgs) Handles docCM_Showlinks.Click
         Try
-            ClassWindreamDocGrid.GetDocItems(GridViewDoc_Search)
-            If IsNothing(ClassWindreamDocGrid.DT_RESULTFILES) Then
+            ClassDocGrid.GetDocItems(GridViewDoc_Search)
+            If IsNothing(ClassDocGrid.DT_RESULTFILES) Then
                 MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
                 Exit Sub
             End If
 
-            Dim frm As New frmDoc_Links
-            frm.Show()
-            frm.BringToFront()
+            Try
+                For Each row In GridViewDoc_Search.GetSelectedRows
+                    Dim SELECTED_DOC_ID = GridViewDoc_Search.GetRowCellValue(row, "DocID")
+                    If IsNothing(SELECTED_DOC_ID) Then
+                        MsgBox("Could not Get a selected DocID!", MsgBoxStyle.Exclamation)
+                        Exit Sub
+                    End If
+                    CURRENT_DOC_ID = SELECTED_DOC_ID
+                    Dim frm As New frmDoc_Links
+                    frm.Show()
+                    frm.BringToFront()
+                Next
+            Catch ex As Exception
+                MsgBox("Unexpected Error in Showing DocLinks: " & ex.Message, MsgBoxStyle.Critical)
+            End Try
         Catch ex As Exception
             MsgBox("Unexpected Error in Showing DocLinks: " & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
 
     Private Sub docCM_PropertiesFile_Click(sender As Object, e As EventArgs) Handles docCM_PropertiesFile.Click
-        'Show_File_Properties()
+        Show_File_Properties()
     End Sub
-    'Sub Show_File_Properties()
-    '    If IsNothing(SelectedFULL_FILEPATH) Then
-    '        MsgBox("Could not read File Parameters(4)!", MsgBoxStyle.Exclamation)
-    '        Exit Sub
-    '    End If
-    '    If SelectedFULL_FILEPATH <> "" Then
-    '        Cursor = Cursors.WaitCursor
-    '        Dim sei As New SHELLEXECUTEINFO
-    '        sei.cbSize = Marshal.SizeOf(sei)
-    '        sei.lpVerb = "properties"
-    '        sei.lpFile = SelectedFULL_FILEPATH
-    '        sei.nShow = SW_SHOW
-    '        sei.fMask = SEE_MASK_INVOKEIDLIST
-    '        If Not ShellExecuteEx(sei) Then
-    '            Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
-    '            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Open file properties:", ex.Message)
-    '        End If
-    '    End If
-    '    Cursor = Cursors.Default
+    Sub Show_File_Properties()
+        Try
+            For Each row In GridViewDoc_Search.GetSelectedRows
+                Dim SELECTED_DOC_PATH = _Helper.FORMAT_WM_PATH(GridViewDoc_Search.GetRowCellValue(row, "FULL_FILENAME"))
+                Dim SELECTED_DOC_ID = GridViewDoc_Search.GetRowCellValue(row, "DocID")
 
-    'End Sub
+                Cursor = Cursors.WaitCursor
+                Dim sei As New SHELLEXECUTEINFO
+                sei.cbSize = Marshal.SizeOf(sei)
+                sei.lpVerb = "properties"
+                sei.lpFile = SELECTED_DOC_PATH
+                sei.nShow = SW_SHOW
+                sei.fMask = SEE_MASK_INVOKEIDLIST
+                If Not ShellExecuteEx(sei) Then
+                    Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
+                    ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Open file propertys:", ex.Message)
+                End If
+            Next
+
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
+        End Try
 
-    Private Sub frmDocSearchResult_Load(sender As Object, e As EventArgs) Handles Me.Load
-        LoadDocSearch(False)
-        Me.Text = CURRENT_DOCSEARCH_CAPTION
     End Sub
+
+
     Sub Save_DocGrid_Layout()
         Try
             Dim XMLPath = Get_DocGrid_Layout_Filename()
@@ -231,9 +273,7 @@ Public Class frmDocSearchResult
         Return LAYOUT_DOC_GRIDVIEW
     End Function
 
-    Private Sub frmDocSearchResult_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
-        Save_DocGrid_Layout()
-    End Sub
+
 
     Private Sub GridControlDocSearch_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch.DoubleClick
         GetDocID()
@@ -248,11 +288,6 @@ Public Class frmDocSearchResult
     Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs)
         LoadDocSearch(False)
     End Sub
-
-
-
-
-
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
         Dim XMLPath = Get_DocGrid_Layout_Filename()
         If File.Exists(XMLPath) Then
@@ -263,34 +298,53 @@ Public Class frmDocSearchResult
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
         Try
-            Dim saveFileDialogDocSearchResult As New SaveFileDialog
-            saveFileDialogDocSearchResult.Filter = "Excel File|*.xlsx"
-            saveFileDialogDocSearchResult.Title = "Export to Excel:"
-            saveFileDialogDocSearchResult.ShowDialog()
-            If saveFileDialogDocSearchResult.FileName <> "" Then
-                Cursor = Cursors.WaitCursor
-                'Dim oOptions As XlsxExportOptionsEx = New XlsxExportOptionsEx
-                'oOptions.ShowGridLines = True
-                'oOptions.AllowSortingAndFiltering = DevExpress.Utils.DefaultBoolean.True
-                'oOptions.ExportType = DevExpress.Export.ExportType.DataAware
-                'oOptions.ExportMode = XlsxExportMode.SingleFile
-                'oOptions.AllowFixedColumnHeaderPanel = DevExpress.Utils.DefaultBoolean.True
-                GridControlDocSearch.MainView.ExportToXlsx(saveFileDialogDocSearchResult.FileName)
-                Dim result As MsgBoxResult
-                Dim msg = String.Format("Datei wurde erstellt! Wollen Sie diese nun öffnen?")
+            XtraSaveFileDialog1.FileName = GridViewDoc_Search.Name & ".xlsx"
+            XtraSaveFileDialog1.DefaultExt = ".xlsx"
 
-                If USER_LANGUAGE <> "de-DE" Then
-                    msg = String.Format("File was created. Do You want to open excel?")
-                End If
-                result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                If result = MsgBoxResult.Yes Then
-                    Process.Start(saveFileDialogDocSearchResult.FileName)
+            If XtraSaveFileDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then
+                Dim oOptions As New XlsxExportOptions() With {
+                    .ExportMode = XlsxExportMode.SingleFile
+}
+                GridViewDoc_Search.ExportToXlsx(XtraSaveFileDialog1.FileName, oOptions)
+                If File.Exists(XtraSaveFileDialog1.FileName) Then
+                    MsgBox($"File successfully created: {XtraSaveFileDialog1.FileName}", MsgBoxStyle.Information)
                 End If
+
+
             End If
 
         Catch ex As Exception
             MsgBox("Unexpected Error in ExportExcel: " & ex.Message, MsgBoxStyle.Critical)
         End Try
-        Cursor = Cursors.Default
+    End Sub
+
+    Private Sub GridViewDoc_Search_DoubleClick(sender As Object, e As EventArgs) Handles GridViewDoc_Search.DoubleClick
+        Open_File()
+    End Sub
+
+    Private Sub bchlitmPreview_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bchlitmPreview.CheckedChanged
+        SplitContainerControl1.Collapsed = Not bchlitmPreview.Checked
+        If SplitContainerControl1.Collapsed = False Then
+            LoadFile2Viewer()
+        End If
+    End Sub
+
+    Private Sub DateienVerknüpfenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateienVerknüpfenToolStripMenuItem.Click
+        Try
+            ClassDocGrid.GetDocItems(GridViewDoc_Search)
+
+            Dim oDocuments = ClassDocGrid.SELECTED_DOCUMENTS
+
+            If oDocuments.Count = 0 Or ClassDocGrid.HasNoSelectedDocuments(GridViewDoc_Search) Then
+                MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
+                Exit Sub
+            End If
+
+            Dim oForm As New frmDocRecordLink With {.myDocuments = oDocuments}
+            oForm.Show()
+
+        Catch ex As Exception
+            MsgBox("Unexpected Error in Showing DocRecordLink-Form: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
     End Sub
 End Class

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

@@ -32,11 +32,14 @@ Partial Class frmDoc_Links
         Me.bbtnitmdeletelink = New DevExpress.XtraBars.BarButtonItem()
         Me.BarStaticItemStatus = New DevExpress.XtraBars.BarStaticItem()
         Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.bsiSource = New DevExpress.XtraBars.BarStaticItem()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.bsiSource = New DevExpress.XtraBars.BarStaticItem()
         CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ContextMenuStrip1.SuspendLayout()
         CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -92,9 +95,9 @@ Partial Class frmDoc_Links
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnitmdeletelink, Me.BarStaticItemStatus, Me.BarButtonItem2, Me.bsiSource})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnitmdeletelink, Me.BarStaticItemStatus, Me.BarButtonItem2, Me.bsiSource, Me.BarButtonItem1, Me.BarButtonItem3})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 5
+        Me.RibbonControl1.MaxItemId = 7
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -121,9 +124,30 @@ Partial Class frmDoc_Links
         Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem2.Name = "BarButtonItem2"
         '
+        'bsiSource
+        '
+        Me.bsiSource.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
+        resources.ApplyResources(Me.bsiSource, "bsiSource")
+        Me.bsiSource.Id = 4
+        Me.bsiSource.Name = "bsiSource"
+        '
+        'BarButtonItem1
+        '
+        resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
+        Me.BarButtonItem1.Id = 5
+        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
+        'BarButtonItem3
+        '
+        resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3")
+        Me.BarButtonItem3.Id = 6
+        Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem3.Name = "BarButtonItem3"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2})
         Me.RibbonPage1.Name = "RibbonPage1"
         resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
         '
@@ -134,6 +158,14 @@ Partial Class frmDoc_Links
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
         '
+        'RibbonPageGroup2
+        '
+        Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3)
+        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
+        resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2")
+        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemStatus)
@@ -147,13 +179,6 @@ Partial Class frmDoc_Links
         Me.RibbonPage2.Name = "RibbonPage2"
         resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
         '
-        'bsiSource
-        '
-        Me.bsiSource.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
-        resources.ApplyResources(Me.bsiSource, "bsiSource")
-        Me.bsiSource.Id = 4
-        Me.bsiSource.Name = "bsiSource"
-        '
         'frmDoc_Links
         '
         resources.ApplyResources(Me, "$this")
@@ -186,4 +211,7 @@ Partial Class frmDoc_Links
     Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
     Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents bsiSource As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
 End Class

app/DD-Record-Organizer/frmDoc_Links.resx

@@ -121,12 +121,6 @@
     <value>241, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="OrdnerÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 22</value>
-  </data>
-  <data name="OrdnerÖffnenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Ordner öffnen</value>
-  </data>
   <data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
     <value>150, 26</value>
   </data>
@@ -141,10 +135,10 @@
     <value>Fill</value>
   </data>
   <data name="GridControlRecords.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 158</value>
+    <value>0, 147</value>
   </data>
   <data name="GridControlRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>800, 270</value>
+    <value>908, 334</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="GridControlRecords.TabIndex" type="System.Int32, mscorlib">
@@ -162,8 +156,14 @@
   <data name="&gt;&gt;GridControlRecords.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="OrdnerÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>149, 22</value>
+  </data>
+  <data name="OrdnerÖffnenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Ordner öffnen</value>
+  </data>
   <data name="bbtnitmdeletelink.Caption" xml:space="preserve">
-    <value>Ausgewählte Links löschen</value>
+    <value>Ausgewählte Verknüpfungen löschen</value>
   </data>
   <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="bbtnitmdeletelink.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -197,42 +197,139 @@
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHYNAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
         IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
         MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
         Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
-        Pg0KICA8ZyBpZD0iRXhwb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxMnY2
-        djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho
-        MTR2LTJIMjJ6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln
-        b24gcG9pbnRzPSIxNiwxMCAyNCwxMCAyNCwxNCAzMiw4IDI0LDIgMjQsNiAxNiw2ICAiIGNsYXNzPSJH
-        cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5H
+        cmVlbntmaWxsOiMwMzlDMjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgkuc3Qwe29wYWNpdHk6MC4z
+        O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTgsNGgxOHY2aDJWM2MwLTAuNS0wLjUtMS0xLTFIN0M2LjUs
+        Miw2LDIuNSw2LDN2N2gyVjR6IiBjbGFzcz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0yNiwyNkg4di04
+        SDZ2OWMwLDAuNSwwLjUsMSwxLDFoMjBjMC41LDAsMS0wLjUsMS0xdi05aC0yVjI2eiIgY2xhc3M9IkJs
+        YWNrIiAvPg0KICA8cGF0aCBkPSJNMzEsOEgzQzIuNCw4LDIsOC40LDIsOXYxMGMwLDAuNiwwLjQsMSwx
+        LDFoMjhjMC42LDAsMS0wLjQsMS0xVjlDMzIsOC40LDMxLjYsOCwzMSw4eiBNOS4xLDE4bC0xLjMtMi41
+        ICBjLTAuMS0wLjEtMC4xLTAuMy0wLjItMC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDYuMSwxOEg0
+        bDIuNS0zLjlsLTIuMi0zLjloMi4xbDEuMSwyLjNjMC4xLDAuMiwwLjIsMC40LDAuMiwwLjdoMCAgYzAt
+        MC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXogTTE2Ljcs
+        MThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45Yy0wLjIsMC4zLTAuNCwwLjUtMC43
+        LDAuNyAgcy0wLjYsMC4zLTEsMC40Yy0wLjQsMC4xLTAuOCwwLjEtMS4yLDAuMWMtMC40LDAtMC44LDAt
+        MS4yLTAuMWMtMC40LTAuMS0wLjctMC4yLTEtMC4zVjE2YzAuMywwLjMsMC42LDAuNSwxLDAuNnMwLjcs
+        MC4yLDEuMSwwLjIgIGMwLjIsMCwwLjQsMCwwLjYtMC4xczAuMy0wLjEsMC40LTAuMmMwLjEtMC4xLDAu
+        Mi0wLjIsMC4yLTAuMmMwLjEtMC4xLDAuMS0wLjIsMC4xLTAuM2MwLTAuMiwwLTAuMy0wLjEtMC40ICBj
+        LTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0wLjctMC4zYy0w
+        LjYtMC4zLTEuMS0wLjYtMS4zLTAuOWMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjMgIGMwLTAuNCwwLjEt
+        MC43LDAuMi0xYzAuMi0wLjMsMC40LTAuNSwwLjctMC43YzAuMy0wLjIsMC42LTAuMywxLTAuNHMwLjgt
+        MC4xLDEuMi0wLjFjMC40LDAsMC44LDAsMS4xLDAuMWMwLjMsMCwwLjYsMC4xLDAuOSwwLjIgIHYxLjZj
+        LTAuMS0wLjEtMC4zLTAuMi0wLjQtMC4ycy0wLjMtMC4xLTAuNS0wLjJjLTAuMiwwLTAuMy0wLjEtMC41
+        LTAuMXMtMC4zLDAtMC41LDBjLTAuMiwwLTAuNCwwLTAuNSwwLjFjLTAuMiwwLTAuMywwLjEtMC40LDAu
+        MiAgYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAuMSwwLjNjMCwwLjEs
+        MCwwLjIsMC4xLDAuM2MwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4xLDAuMywwLjIsMC41LDAu
+        MyAgczAuNCwwLjIsMC42LDAuM2MwLjMsMC4xLDAuNiwwLjMsMC44LDAuNGMwLjIsMC4xLDAuNSwwLjMs
+        MC42LDAuNWMwLjIsMC4yLDAuMywwLjQsMC40LDAuNnMwLjEsMC41LDAuMSwwLjggIEMyMi42LDE2LjMs
+        MjIuNSwxNi42LDIyLjQsMTYuOXogTTI4LjEsMThsLTEuMy0yLjVjLTAuMS0wLjEtMC4xLTAuMy0wLjIt
+        MC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDI1LjEsMThIMjNsMi41LTMuOWwtMi4yLTMuOSAgaDIu
+        MWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4xLTAuNCwwLjItMC43bDEu
+        Mi0yLjNoMS45bC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xh
+        c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTMxLDhIM0MyLjQsOCwyLDguNCwyLDl2MTBjMCwwLjYsMC40
+        LDEsMSwxaDI4YzAuNiwwLDEtMC40LDEtMVY5QzMyLDguNCwzMS42LDgsMzEsOHogTTkuMSwxOGwtMS4z
+        LTIuNSAgIGMtMC4xLTAuMS0wLjEtMC4zLTAuMi0wLjVoMGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMNi4x
+        LDE4SDRsMi41LTMuOWwtMi4yLTMuOWgyLjFsMS4xLDIuM2MwLjEsMC4yLDAuMiwwLjQsMC4yLDAuN2gw
+        ICAgYzAtMC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXog
+        TTE2LjcsMThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45ICAgYy0wLjIsMC4zLTAu
+        NCwwLjUtMC43LDAuN3MtMC42LDAuMy0xLDAuNGMtMC40LDAuMS0wLjgsMC4xLTEuMiwwLjFjLTAuNCww
+        LTAuOCwwLTEuMi0wLjFjLTAuNC0wLjEtMC43LTAuMi0xLTAuM1YxNiAgIGMwLjMsMC4zLDAuNiwwLjUs
+        MSwwLjZzMC43LDAuMiwxLjEsMC4yYzAuMiwwLDAuNCwwLDAuNi0wLjFzMC4zLTAuMSwwLjQtMC4yYzAu
+        MS0wLjEsMC4yLTAuMiwwLjItMC4yYzAuMS0wLjEsMC4xLTAuMiwwLjEtMC4zICAgYzAtMC4yLDAtMC4z
+        LTAuMS0wLjRjLTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0w
+        LjctMC4zYy0wLjYtMC4zLTEuMS0wLjYtMS4zLTAuOSAgIGMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjNj
+        MC0wLjQsMC4xLTAuNywwLjItMWMwLjItMC4zLDAuNC0wLjUsMC43LTAuN2MwLjMtMC4yLDAuNi0wLjMs
+        MS0wLjRzMC44LTAuMSwxLjItMC4xICAgYzAuNCwwLDAuOCwwLDEuMSwwLjFjMC4zLDAsMC42LDAuMSww
+        LjksMC4ydjEuNmMtMC4xLTAuMS0wLjMtMC4yLTAuNC0wLjJzLTAuMy0wLjEtMC41LTAuMmMtMC4yLDAt
+        MC4zLTAuMS0wLjUtMC4xcy0wLjMsMC0wLjUsMCAgIGMtMC4yLDAtMC40LDAtMC41LDAuMWMtMC4yLDAt
+        MC4zLDAuMS0wLjQsMC4yYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAu
+        MSwwLjNjMCwwLjEsMCwwLjIsMC4xLDAuMyAgIGMwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4x
+        LDAuMywwLjIsMC41LDAuM3MwLjQsMC4yLDAuNiwwLjNjMC4zLDAuMSwwLjYsMC4zLDAuOCwwLjRjMC4y
+        LDAuMSwwLjUsMC4zLDAuNiwwLjUgICBjMC4yLDAuMiwwLjMsMC40LDAuNCwwLjZzMC4xLDAuNSwwLjEs
+        MC44QzIyLjYsMTYuMywyMi41LDE2LjYsMjIuNCwxNi45eiBNMjguMSwxOGwtMS4zLTIuNWMtMC4xLTAu
+        MS0wLjEtMC4zLTAuMi0wLjVoMCAgIGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMMjUuMSwxOEgyM2wyLjUt
+        My45bC0yLjItMy45aDIuMWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4x
+        LTAuNCwwLjItMC43bDEuMi0yLjNoMS45ICAgbC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJC
+        bHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
   </data>
   <data name="bsiSource.Caption" xml:space="preserve">
     <value>Source: VWPMO_CUST_DOC_OBJECT_LINKS</value>
   </data>
+  <data name="BarButtonItem1.Caption" xml:space="preserve">
+    <value>...speichern</value>
+  </data>
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOMCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTmV3VGFibGVTdHlsZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5l
+        dyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3
+        O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJLnN0MHtvcGFj
+        aXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGNsYXNzPSJzdDAiPg0KICAgIDxwYXRoIGQ9Ik0wLDIwaDh2
+        NkgwVjIweiBNMTAsMjZoOHYtNmgtOFYyNnogTTIwLDEydjZoOHYtNkgyMHogTTIwLDI2aDh2LTZoLThW
+        MjZ6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCiAgPHBhdGggZD0iTTAsNGg4djZIMFY0eiBNMCwx
+        OGg4di02SDBWMTh6IE0xMCwxMGg4VjRoLThWMTB6IE0xMCwxOGg4di02aC04VjE4eiIgY2xhc3M9IkJs
+        dWUiIC8+DQogIDxwb2x5Z29uIHBvaW50cz0iMjUsMiAyNywwIDI3LDMgMzAsMyAyOCw1IDMwLDcgMjcs
+        NyAyNywxMCAyNSw4IDIzLDEwIDIzLDcgMjAsNyAyMiw1IDIwLDMgMjMsMyAyMywwICIgY2xhc3M9Illl
+        bGxvdyIgLz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="BarButtonItem3.Caption" xml:space="preserve">
+    <value>...zurücksetzen</value>
+  </data>
+  <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKIDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJUYWJsZVN0eWxlIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6
+        bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmx1ZXtmaWxsOiMxMTc3
+        RDc7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNp
+        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgY2xhc3M9InN0MCI+DQogICAgPHBhdGggZD0iTTI4LDEwaC04
+        VjRoOFYxMHogTTI0LjYsMTQuOWMwLjYtMC42LDEuNC0wLjksMi4yLTAuOWMwLjQsMCwwLjgsMC4xLDEu
+        MiwwLjJWMTJoLTh2NmgxLjVMMjQuNiwxNC45eiBNMCwyNiAgIGg4di02SDBWMjZ6IE0xNC45LDI0LjZs
+        My4xLTMuMVYyMGgtOHY2aDQuMUMxNC4zLDI1LjUsMTQuNSwyNSwxNC45LDI0LjZ6IiBjbGFzcz0iQmxh
+        Y2siIC8+DQogIDwvZz4NCiAgPHBhdGggZD0iTTAsNGg4djZIMFY0eiBNMCwxOGg4di02SDBWMTh6IE0x
+        MCwxMGg4VjRoLThWMTB6IE0xMCwxOGg4di02aC04VjE4eiBNMTksMjMuM0wxNi4zLDI2ICBjLTAuNCww
+        LjQtMC40LDEuMiwwLDEuNmw0LDRjMC40LDAuNCwxLjIsMC40LDEuNiwwbDIuNy0yLjdMMTksMjMuM3oi
+        IGNsYXNzPSJCbHVlIiAvPg0KICA8cGF0aCBkPSJNMzEuNywyMC40bC00LTRjLTAuNC0wLjQtMS4yLTAu
+        NC0xLjYsMGwtNi4xLDYuMWw1LjYsNS42bDYuMS02LjFDMzIuMSwyMS41LDMyLjEsMjAuOCwzMS43LDIw
+        LjR6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
+</value>
+  </data>
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
   <data name="RibbonPageGroup1.Text" xml:space="preserve">
     <value>Aktionen</value>
   </data>
+  <data name="RibbonPageGroup2.Text" xml:space="preserve">
+    <value>Layout</value>
+  </data>
   <data name="RibbonPage1.Text" xml:space="preserve">
-    <value>Doc-Links</value>
+    <value>Verknüpfungen</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>800, 158</value>
+    <value>908, 147</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 428</value>
+    <value>0, 481</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>800, 22</value>
+    <value>908, 23</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -268,7 +365,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>800, 450</value>
+    <value>908, 504</value>
   </data>
   <data name="frmDoc_Links.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -443,8 +540,11 @@
         AA/+AAAP/gAAD/4AAA/+AAAP/gAAD/4AAA/+AAAP/gAAD/4AAA/+AAAP/gAAD/4AAA/+AAAP
 </value>
   </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterScreen</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Doc-Links</value>
+    <value>Verknüpfungen</value>
   </data>
   <data name="&gt;&gt;OrdnerÖffnenToolStripMenuItem.Name" xml:space="preserve">
     <value>OrdnerÖffnenToolStripMenuItem</value>
@@ -476,6 +576,24 @@
   <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;bsiSource.Name" xml:space="preserve">
+    <value>bsiSource</value>
+  </data>
+  <data name="&gt;&gt;bsiSource.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
+    <value>BarButtonItem1</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem3.Name" xml:space="preserve">
+    <value>BarButtonItem3</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
@@ -488,18 +606,18 @@
   <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;RibbonPageGroup2.Name" xml:space="preserve">
+    <value>RibbonPageGroup2</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
     <value>RibbonPage2</value>
   </data>
   <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;bsiSource.Name" xml:space="preserve">
-    <value>bsiSource</value>
-  </data>
-  <data name="&gt;&gt;bsiSource.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmDoc_Links</value>
   </data>

app/DD-Record-Organizer/frmDoc_Links.vb

@@ -1,13 +1,20 @@
 Imports System.IO
-Imports DD_LIB_Standards
+'Imports DD_LIB_Standards'
+Imports System.Text
+Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraPrinting
+Imports Microsoft.Office.Interop.Outlook
 
 Public Class frmDoc_Links
-    Public Property Documents As New List(Of ClassWindreamDocGrid.WindreamDoc)
+
+    Private ENTITY_ID As Integer = 0
+    Private form_shown As Boolean = False
+    Public Property Documents As New List(Of ClassDocGrid.clsWMDoc)
 
     Private Sub frmDoc_DocLinks_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
             Refresh_Grid_Data(Documents)
+            Load_DocGrid_Layout()
 
             If USER_IS_ADMIN Then
                 bsiSource.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
@@ -17,7 +24,7 @@ Public Class frmDoc_Links
 
             ' TODO: this does not work for the old form
             If Documents.Count = 0 Then
-                Text = $"Document-Links for: NODOC-ID"
+                Text = $"Document-Link for: NODOC-ID"
             ElseIf Documents.Count = 1 Then
                 Text = $"Document-Links for: {Documents.First.DocPath}"
             Else
@@ -38,12 +45,13 @@ Public Class frmDoc_Links
                 Case "RWA"
                     bbtnitmdeletelink.Enabled = True
             End Select
-        Catch ex As Exception
+        Catch ex As System.Exception
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in frmDoc_DocLinks_Load", ex.Message, ex.StackTrace)
         End Try
+        form_shown = True
     End Sub
 
-    Private Function Get_Grid_Data(pDocuments As List(Of ClassWindreamDocGrid.WindreamDoc)) As DataTable
+    Private Function Get_Grid_Data(pDocuments As List(Of ClassDocGrid.clsWMDoc)) As DataTable
         Dim oTable As DataTable
         Dim oSql As String = ""
 
@@ -63,7 +71,7 @@ Public Class frmDoc_Links
         Return oTable
     End Function
 
-    Sub Refresh_Grid_Data(pDocuments As List(Of ClassWindreamDocGrid.WindreamDoc))
+    Sub Refresh_Grid_Data(pDocuments As List(Of ClassDocGrid.clsWMDoc))
         Try
             Dim oTable = Get_Grid_Data(pDocuments)
 
@@ -80,12 +88,13 @@ Public Class frmDoc_Links
                         If grvwGrid.Columns.Item("VALUE") IsNot Nothing Then
                             grvwGrid.Columns.Item("VALUE").Visible = False
                         End If
-                    Catch ex1 As Exception
+                    Catch ex1 As System.Exception
                         LOGGER.Warn("Column VALUE not part of VWPMO_CUST_DOC_OBJECT_LINKS" & ex1.Message)
                     End Try
                     grvwGrid.OptionsView.ColumnAutoWidth = False
                     grvwGrid.BestFitColumns()
-                Catch ex As Exception
+                    grvwGrid.Columns(0).Fixed = FixedStyle.Left
+                Catch ex As System.Exception
                     LOGGER.Error(ex)
                 End Try
 
@@ -99,7 +108,7 @@ Public Class frmDoc_Links
                 MsgBox($"Please check Your link-object-relation", MsgBoxStyle.Exclamation)
             End If
 
-        Catch ex As Exception
+        Catch ex As System.Exception
             LOGGER.Error(ex)
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Sub Refresh_Grid_Data", ex.Message, ex.StackTrace)
         End Try
@@ -108,29 +117,62 @@ Public Class frmDoc_Links
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmdeletelink.ItemClick
         Dim oSelectedRows As Integer() = grvwGrid.GetSelectedRows()
-        For Each rowhandle As Integer In oSelectedRows
-            Try
-                Dim oSelectedDocID = grvwGrid.GetRowCellValue(rowhandle, "DocID")
-                Dim oSelectedRecordID = grvwGrid.GetRowCellValue(rowhandle, "RecordID")
-                If IsNothing(oSelectedDocID) Then
-                    Continue For
-                End If
-                LOGGER.Debug($"RecordLink will be removed Record: {oSelectedRecordID} - DocID: {oSelectedDocID} ")
-                Try
-                    If ClassFileResult.Delete_ResultFile(oSelectedDocID, oSelectedRecordID, 0) = True Then
-                        ClassHelper.InsertEssential_Log(oSelectedDocID, "DOC-ID", $"RECORD LINK {oSelectedRecordID} REMOVED FROM DOC-SEARCH")
-                    End If
-                Catch ex As Exception
-                    ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Removing DocRecord-Link", ex.Message, ex.StackTrace)
-                End Try
-            Catch ex As Exception
-                ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Collecting DocRecord-Link", ex.Message, ex.StackTrace)
-            End Try
-        Next
+        If oSelectedRows.Count > 0 Then
+            Dim result As MsgBoxResult
+            Dim msg = String.Format("Wollen Sie die ausgewählten Links wirklich löschen?")
+            Dim oCount As Integer = 0
+            If USER_LANGUAGE <> "de-DE" Then
+                msg = String.Format("Do you really want to delete the selected links?")
+            End If
+            result = MessageBox.Show(msg, "Bestätigung/Commitment:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+            If result = MsgBoxResult.Yes Then
+                For Each rowhandle As Integer In oSelectedRows
+                    Try
+                        Dim oSelectedDocID = grvwGrid.GetRowCellValue(rowhandle, "DocID")
+                        Dim oSelectedRecordID = grvwGrid.GetRowCellValue(rowhandle, "RecordID")
+                        If IsNothing(oSelectedDocID) Then
+                            Continue For
+                        End If
+                        LOGGER.Debug($"RecordLink will be removed - Record: {oSelectedRecordID} - DocID: {oSelectedDocID} ")
+                        Try
+                            Dim oDEL = $"DELETE FROM TBPMO_DOC_RECORD_LINK WHERE Doc_ID = {oSelectedDocID} AND RECORD_ID = {oSelectedRecordID}"
+                            If MYDB_ECM.ExecuteNonQuery(oDEL) = True Then
+                                oCount += 1
+                                ClassHelper.InsertEssential_Log(oSelectedDocID, "DOC-ID", $"RECORD LINK {oSelectedRecordID} REMOVED FROM DOC-SEARCH")
+                            End If
+                        Catch ex As System.Exception
+                            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Removing DocRecord-Link", ex.Message, ex.StackTrace)
+                        End Try
+                    Catch ex As System.Exception
+                        ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Collecting DocRecord-Link", ex.Message, ex.StackTrace)
+                    End Try
+                Next
+                MsgBox($"Es wurden {oCount} Links erfolreich gelöscht!", MsgBoxStyle.Information)
+            End If
+
+            Refresh_Grid_Data(Documents)
+        Else
+            MsgBox("No links selected!", MsgBoxStyle.Information)
+        End If
 
-        Refresh_Grid_Data(Documents)
     End Sub
+    Sub Save_DocGrid_Layout()
+        If form_shown = False Then
+            Exit Sub
+        End If
+        Try
+            Dim XMLPath = Get_DocGrid_Layout_Filename()
+            grvwGrid.SaveLayoutToXml(XMLPath)
+            BarStaticItemStatus.Caption = "Grid-Layout saved - " + Now.ToShortTimeString
 
+        Catch ex As System.Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Save_DocGrid_Layout", ex.Message, ex.StackTrace)
+        End Try
+    End Sub
+    Private Function Get_DocGrid_Layout_Filename()
+        Dim Filename As String = String.Format("GridViewDocLinks-{0}-UserLayout.xml", CURRENT_ENTITY_ID)
+        Return System.IO.Path.Combine(System.Windows.Forms.Application.UserAppDataPath(), Filename)
+    End Function
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
         Try
             Dim saveFileDialogDocSearchResult As New SaveFileDialog With {
@@ -162,7 +204,7 @@ Public Class frmDoc_Links
                 End If
             End If
 
-        Catch ex As Exception
+        Catch ex As System.Exception
             LOGGER.Error(ex)
             MsgBox("Unexpected Error in ExportExcel: " & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -173,7 +215,7 @@ Public Class frmDoc_Links
         Try
             grvwGrid.OptionsView.ColumnAutoWidth = False
             grvwGrid.BestFitColumns()
-        Catch ex As Exception
+        Catch ex As System.Exception
             LOGGER.Error(ex)
         End Try
     End Sub
@@ -181,8 +223,64 @@ Public Class frmDoc_Links
     Private Sub OrdnerÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OrdnerÖffnenToolStripMenuItem.Click
         Dim oPAth = grvwGrid.GetFocusedRowCellValue(grvwGrid.Columns("FULL_FILENAME"))
         Dim oDocID = grvwGrid.GetFocusedRowCellValue(grvwGrid.Columns("DocID"))
-        For Each row As DataRow In ClassWindreamDocGrid.DT_RESULTFILES.Rows
-            ClassHelper.Open_Folder(oPAth, oDocID)
-        Next
+        If Not IsNothing(oPAth) Then
+            If Not IsNothing(oDocID) Then
+                ClassHelper.Open_Folder(oPAth, oDocID)
+            End If
+
+        End If
+
+    End Sub
+
+    Private Sub BarButtonItem1_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+        Save_DocGrid_Layout()
+    End Sub
+
+    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
+        Reset_View_layout()
+    End Sub
+    Sub Reset_View_layout()
+        Me.Cursor = Cursors.WaitCursor
+        Try
+            Dim XMLPath = Get_DocGrid_Layout_Filename()
+            If File.Exists(XMLPath) Then
+                File.Delete(XMLPath)
+                Refresh_Grid_Data(Documents)
+            Else
+                MsgBox("Resetting the layout was not successful - File not existing!", MsgBoxStyle.Information)
+            End If
+        Catch ex As System.Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", "Error in Reset_View_layout: ", ex.Message)
+        End Try
+        Me.Cursor = Cursors.Default
+    End Sub
+
+    Private Sub grvwGrid_ColumnPositionChanged(sender As Object, e As EventArgs) Handles grvwGrid.ColumnPositionChanged
+        Save_DocGrid_Layout()
+    End Sub
+
+    Private Sub grvwGrid_ColumnWidthChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.ColumnEventArgs) Handles grvwGrid.ColumnWidthChanged
+        Save_DocGrid_Layout()
+    End Sub
+
+    Private Sub grvwGrid_ColumnFilterChanged(sender As Object, e As EventArgs) Handles grvwGrid.ColumnFilterChanged
+        Save_DocGrid_Layout()
+    End Sub
+
+    Private Sub grvwGrid_EndSorting(sender As Object, e As EventArgs) Handles grvwGrid.EndSorting
+        Save_DocGrid_Layout()
+    End Sub
+    Sub Load_DocGrid_Layout()
+        Try
+            Dim XMLPath = Get_DocGrid_Layout_Filename()
+            If File.Exists(XMLPath) Then
+                grvwGrid.RestoreLayoutFromXml(XMLPath)
+                grvwGrid.GuessAutoFilterRowValuesFromFilter()
+                BarStaticItemStatus.Caption = "Grid-Layout loaded - " + Now.ToShortTimeString
+
+            End If
+        Catch ex As System.Exception
+            ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error in Load_DocGrid_Layout", ex.Message, ex.StackTrace)
+        End Try
     End Sub
 End Class

app/DD-Record-Organizer/frmDoctype_NameConvention.resx.bak

@@ -144,8 +144,8 @@
   <data name="Label7.Size" type="System.Drawing.Size, System.Drawing">
     <value>80, 17</value>
   </data>
-  <assembly alias="DevExpress.Utils.v15.2" name="DevExpress.Utils.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.2">
+  <assembly alias="DevExpress.Utils.v19.2" name="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v19.2">
     <value>None</value>
   </data>
   <data name="btnOK.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
@@ -155,7 +155,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="cmbDate.Items7" xml:space="preserve">
     <value>YYYYMMDD</value>
@@ -173,7 +173,7 @@
     <value>2</value>
   </data>
   <data name="&gt;&gt;colFORMAT_RULE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="Label20.Location" type="System.Drawing.Point, System.Drawing">
     <value>6, 63</value>
@@ -269,7 +269,7 @@
     <value>GroupBox3</value>
   </data>
   <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="BindingNavigatorCountItem.ToolTipText" xml:space="preserve">
     <value>Die Gesamtanzahl der Elemente.</value>
@@ -335,7 +335,7 @@
     <value>90</value>
   </data>
   <data name="&gt;&gt;colPATTERN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;Label4.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -714,7 +714,7 @@
     <value>12, 93</value>
   </data>
   <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;cmbEntity.Parent" xml:space="preserve">
     <value>GroupBox3</value>
@@ -922,8 +922,8 @@ genutzt werden.</value>
   <data name="GroupBox2.Text" xml:space="preserve">
     <value>Variablen einfügen:</value>
   </data>
-  <assembly alias="DevExpress.Data.v15.2" name="DevExpress.Data.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v15.2">
+  <assembly alias="DevExpress.Data.v19.2" name="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v19.2">
     <value>Default</value>
   </data>
   <data name="&gt;&gt;btnAddDivers.Name" xml:space="preserve">
@@ -1011,7 +1011,7 @@ genutzt werden.</value>
     <value>37</value>
   </data>
   <data name="&gt;&gt;colADDED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;btnAddIndexA.Name" xml:space="preserve">
     <value>btnAddIndexA</value>
@@ -1193,7 +1193,7 @@ Indizes und Textbausteinen zusammenzustellen.</value>
     <value>203, 23</value>
   </data>
   <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="GroupBox3.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt, style=Bold</value>
@@ -1262,7 +1262,7 @@ Indizes und Textbausteinen zusammenzustellen.</value>
     <value>$this</value>
   </data>
   <data name="&gt;&gt;colCHANGED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
     <value>141, 26</value>
@@ -1324,8 +1324,8 @@ Indizes und Textbausteinen zusammenzustellen.</value>
   <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
     <value>448, 13</value>
   </data>
-  <assembly alias="DevExpress.XtraGrid.v15.2" name="DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="colGUID.Fixed" type="DevExpress.XtraGrid.Columns.FixedStyle, DevExpress.XtraGrid.v15.2">
+  <assembly alias="DevExpress.XtraGrid.v19.2" name="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="colGUID.Fixed" type="DevExpress.XtraGrid.Columns.FixedStyle, DevExpress.XtraGrid.v19.2">
     <value>Left</value>
   </data>
   <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
@@ -1388,8 +1388,8 @@ Indizes und Textbausteinen zusammenzustellen.</value>
   <data name="&gt;&gt;txtnamenKonv.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <assembly alias="DevExpress.XtraEditors.v15.2" name="DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v15.2">
+  <assembly alias="DevExpress.XtraEditors.v19.2" name="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="GridControl1.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v19.2">
     <value>Center</value>
   </data>
   <data name="colCHANGED_WHEN.Visible" type="System.Boolean, mscorlib">

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

@@ -37,7 +37,6 @@ Partial Class frmEntities
         Me.TBPMO_FORMBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.DD_DMSDataSet = New DD_Record_Organizer.DD_DMSDataSet()
         Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
-        Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
         Me.DESCRIPTIONTextBox = New System.Windows.Forms.TextBox()
         Me.TBPMO_FORM_VIEWBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.FORM_TITLETextBox = New System.Windows.Forms.TextBox()
@@ -53,7 +52,7 @@ Partial Class frmEntities
         Me.SINGLE_RECORDCheckBox = New System.Windows.Forms.CheckBox()
         Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown()
         Me.ENTITY_IDTextBox = New System.Windows.Forms.TextBox()
-        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
+        Me.cmbEntityType = New System.Windows.Forms.ComboBox()
         Me.TBPMO_FORM_TYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.SHOW_FORM_CONSTRUCTCheckBox = New System.Windows.Forms.CheckBox()
         Me.TreeViewEntity = New System.Windows.Forms.TreeView()
@@ -65,7 +64,7 @@ Partial Class frmEntities
         Me.btncopy = New System.Windows.Forms.Button()
         Me.lblStatus = New System.Windows.Forms.Label()
         Me.btnGenerate = New System.Windows.Forms.Button()
-        Me.Label3 = New System.Windows.Forms.Label()
+        Me.lblCreateConstrForm = New System.Windows.Forms.Label()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.btncancel = New System.Windows.Forms.Button()
         Me.ProgressPanel1 = New DevExpress.XtraWaitForm.ProgressPanel()
@@ -143,7 +142,7 @@ Partial Class frmEntities
         Me.TBPMO_FORMBindingNavigator.BindingSource = Me.TBPMO_FORMBindingSource
         Me.TBPMO_FORMBindingNavigator.CountItem = Nothing
         Me.TBPMO_FORMBindingNavigator.DeleteItem = Nothing
-        Me.TBPMO_FORMBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1, Me.ToolStripButton2})
+        Me.TBPMO_FORMBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButton1})
         resources.ApplyResources(Me.TBPMO_FORMBindingNavigator, "TBPMO_FORMBindingNavigator")
         Me.TBPMO_FORMBindingNavigator.MoveFirstItem = Nothing
         Me.TBPMO_FORMBindingNavigator.MoveLastItem = Nothing
@@ -168,12 +167,6 @@ Partial Class frmEntities
         resources.ApplyResources(Me.ToolStripButton1, "ToolStripButton1")
         Me.ToolStripButton1.Name = "ToolStripButton1"
         '
-        'ToolStripButton2
-        '
-        Me.ToolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2")
-        Me.ToolStripButton2.Name = "ToolStripButton2"
-        '
         'DESCRIPTIONTextBox
         '
         Me.DESCRIPTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_VIEWBindingSource, "DESCRIPTION", True))
@@ -279,7 +272,7 @@ Partial Class frmEntities
         Me.GroupBox2.Controls.Add(Me.ENTITY_IDTextBox)
         Me.GroupBox2.Controls.Add(GUIDLabel)
         Me.GroupBox2.Controls.Add(Label1)
-        Me.GroupBox2.Controls.Add(Me.ComboBox1)
+        Me.GroupBox2.Controls.Add(Me.cmbEntityType)
         Me.GroupBox2.Controls.Add(Me.SHOW_FORM_CONSTRUCTCheckBox)
         Me.GroupBox2.Controls.Add(PARENT_IDLabel)
         Me.GroupBox2.Controls.Add(Me.ADDED_WHOTextBox)
@@ -319,15 +312,15 @@ Partial Class frmEntities
         Me.ENTITY_IDTextBox.Name = "ENTITY_IDTextBox"
         Me.ENTITY_IDTextBox.ReadOnly = True
         '
-        'ComboBox1
+        'cmbEntityType
         '
-        Me.ComboBox1.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FORMBindingSource, "FORM_TYPE_ID", True))
-        Me.ComboBox1.DataSource = Me.TBPMO_FORM_TYPEBindingSource
-        Me.ComboBox1.DisplayMember = "FORM_TYPE"
-        resources.ApplyResources(Me.ComboBox1, "ComboBox1")
-        Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.ValueMember = "GUID"
+        Me.cmbEntityType.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPMO_FORMBindingSource, "FORM_TYPE_ID", True))
+        Me.cmbEntityType.DataSource = Me.TBPMO_FORM_TYPEBindingSource
+        Me.cmbEntityType.DisplayMember = "FORM_TYPE"
+        resources.ApplyResources(Me.cmbEntityType, "cmbEntityType")
+        Me.cmbEntityType.FormattingEnabled = True
+        Me.cmbEntityType.Name = "cmbEntityType"
+        Me.cmbEntityType.ValueMember = "GUID"
         '
         'TBPMO_FORM_TYPEBindingSource
         '
@@ -391,10 +384,10 @@ Partial Class frmEntities
         Me.btnGenerate.Name = "btnGenerate"
         Me.btnGenerate.UseVisualStyleBackColor = True
         '
-        'Label3
+        'lblCreateConstrForm
         '
-        resources.ApplyResources(Me.Label3, "Label3")
-        Me.Label3.Name = "Label3"
+        resources.ApplyResources(Me.lblCreateConstrForm, "lblCreateConstrForm")
+        Me.lblCreateConstrForm.Name = "lblCreateConstrForm"
         '
         'GroupBox1
         '
@@ -414,7 +407,6 @@ Partial Class frmEntities
         '
         'ProgressPanel1
         '
-        Me.ProgressPanel1.Appearance.BackColor = CType(resources.GetObject("ProgressPanel1.Appearance.BackColor"), System.Drawing.Color)
         Me.ProgressPanel1.Appearance.Options.UseBackColor = True
         Me.ProgressPanel1.AppearanceCaption.Options.UseTextOptions = True
         resources.ApplyResources(Me.ProgressPanel1, "ProgressPanel1")
@@ -442,7 +434,7 @@ Partial Class frmEntities
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.GroupBox1)
-        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.lblCreateConstrForm)
         Me.Controls.Add(Me.btnGenerate)
         Me.Controls.Add(Me.lblStatus)
         Me.Controls.Add(Me.btncopy)
@@ -478,14 +470,13 @@ Partial Class frmEntities
     Friend WithEvents PARENT_IDTextBox As System.Windows.Forms.TextBox
     Friend WithEvents NAMETextBox As System.Windows.Forms.TextBox
     Friend WithEvents ADDED_WHOTextBox As System.Windows.Forms.TextBox
-    Friend WithEvents ToolStripButton2 As System.Windows.Forms.ToolStripButton
     Friend WithEvents TBPMO_FORM_VIEWBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPMO_FORM_VIEWTableAdapter As DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_FORM_VIEWTableAdapter
     Friend WithEvents CHANGED_WHOTextBoxPMOForm As System.Windows.Forms.TextBox
     Friend WithEvents DESCRIPTIONTextBox As System.Windows.Forms.TextBox
     Friend WithEvents FORM_TITLETextBox As System.Windows.Forms.TextBox
     Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
-    Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox
+    Friend WithEvents cmbEntityType As System.Windows.Forms.ComboBox
     Friend WithEvents SHOW_FORM_CONSTRUCTCheckBox As System.Windows.Forms.CheckBox
     Friend WithEvents TBPMO_FORM_TYPEBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPMO_FORM_TYPETableAdapter As DD_Record_Organizer.DD_DMSDataSetTableAdapters.TBPMO_FORM_TYPETableAdapter
@@ -498,7 +489,7 @@ Partial Class frmEntities
     Friend WithEvents btncopy As System.Windows.Forms.Button
     Friend WithEvents lblStatus As System.Windows.Forms.Label
     Friend WithEvents btnGenerate As System.Windows.Forms.Button
-    Friend WithEvents Label3 As System.Windows.Forms.Label
+    Friend WithEvents lblCreateConstrForm As System.Windows.Forms.Label
     Friend WithEvents NumericUpDown1 As System.Windows.Forms.NumericUpDown
     Friend WithEvents Label4 As System.Windows.Forms.Label
     Friend WithEvents SINGLE_RECORDCheckBox As System.Windows.Forms.CheckBox

app/DD-Record-Organizer/frmEntities.resx

@@ -449,15 +449,6 @@
   <data name="ToolStripButton1.Text" xml:space="preserve">
     <value>Im Form Designer öffnen</value>
   </data>
-  <data name="ToolStripButton2.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="ToolStripButton2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>97, 22</value>
-  </data>
-  <data name="ToolStripButton2.Text" xml:space="preserve">
-    <value>Vorschau öffnen</value>
-  </data>
   <data name="TBPMO_FORMBindingNavigator.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -698,16 +689,16 @@
   <data name="&gt;&gt;ENTITY_IDTextBox.ZOrder" xml:space="preserve">
     <value>7</value>
   </data>
-  <data name="&gt;&gt;ComboBox1.Name" xml:space="preserve">
-    <value>ComboBox1</value>
+  <data name="&gt;&gt;cmbEntityType.Name" xml:space="preserve">
+    <value>cmbEntityType</value>
   </data>
-  <data name="&gt;&gt;ComboBox1.Type" xml:space="preserve">
+  <data name="&gt;&gt;cmbEntityType.Type" xml:space="preserve">
     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;ComboBox1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;cmbEntityType.Parent" xml:space="preserve">
     <value>GroupBox2</value>
   </data>
-  <data name="&gt;&gt;ComboBox1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;cmbEntityType.ZOrder" xml:space="preserve">
     <value>10</value>
   </data>
   <data name="&gt;&gt;SHOW_FORM_CONSTRUCTCheckBox.Name" xml:space="preserve">
@@ -858,28 +849,28 @@ diese Entität angelegt werden.</value>
   <metadata name="TBPMO_FORM_TYPEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>255, 56</value>
   </metadata>
-  <data name="ComboBox1.Font" type="System.Drawing.Font, System.Drawing">
+  <data name="cmbEntityType.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
-  <data name="ComboBox1.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="cmbEntityType.Location" type="System.Drawing.Point, System.Drawing">
     <value>147, 295</value>
   </data>
-  <data name="ComboBox1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="cmbEntityType.Size" type="System.Drawing.Size, System.Drawing">
     <value>220, 25</value>
   </data>
-  <data name="ComboBox1.TabIndex" type="System.Int32, mscorlib">
+  <data name="cmbEntityType.TabIndex" type="System.Int32, mscorlib">
     <value>17</value>
   </data>
-  <data name="&gt;&gt;ComboBox1.Name" xml:space="preserve">
-    <value>ComboBox1</value>
+  <data name="&gt;&gt;cmbEntityType.Name" xml:space="preserve">
+    <value>cmbEntityType</value>
   </data>
-  <data name="&gt;&gt;ComboBox1.Type" xml:space="preserve">
+  <data name="&gt;&gt;cmbEntityType.Type" xml:space="preserve">
     <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;ComboBox1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;cmbEntityType.Parent" xml:space="preserve">
     <value>GroupBox2</value>
   </data>
-  <data name="&gt;&gt;ComboBox1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;cmbEntityType.ZOrder" xml:space="preserve">
     <value>10</value>
   </data>
   <metadata name="TBPMO_FORM_TYPEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -1191,7 +1182,7 @@ diese Entität angelegt werden.</value>
   <data name="btnGenerate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf
+        vwAADr8BOAVTJAAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf
         /yM6KFk5Z0NsRBFgz3DbtUhciBhCKNbaorVuwB409KCXbUexOTnnLkaJ9x4hqQmhRYTQM/TgkFjNBq8m
         m9bXWt7ps4NnqfNxDAK23pnBKAQeeBHQCJJRCLxNQG0ccQ75f0CPmSM8/ojPfiPPQpyZwkozSCha7KM8
         M43dUUZxyG+X6Vwk3rjOSn0Bs2pSjcG3D98AAAAASUVORK5CYII=
@@ -1230,44 +1221,116 @@ diese Entität angelegt werden.</value>
   <data name="&gt;&gt;btnGenerate.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="Label3.AutoSize" type="System.Boolean, mscorlib">
+  <data name="lblCreateConstrForm.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="Label3.Font" type="System.Drawing.Font, System.Drawing">
+  <data name="lblCreateConstrForm.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 8.25pt, style=Italic</value>
   </data>
-  <data name="Label3.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="lblCreateConstrForm.Location" type="System.Drawing.Point, System.Drawing">
     <value>755, 280</value>
   </data>
-  <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="lblCreateConstrForm.Size" type="System.Drawing.Size, System.Drawing">
     <value>268, 26</value>
   </data>
-  <data name="Label3.TabIndex" type="System.Int32, mscorlib">
+  <data name="lblCreateConstrForm.TabIndex" type="System.Int32, mscorlib">
     <value>31</value>
   </data>
-  <data name="Label3.Text" xml:space="preserve">
+  <data name="lblCreateConstrForm.Text" xml:space="preserve">
     <value>Mit dieser Funktion wird die Sicht erzeugt, 
 welche die links dargestellte TreeView-Struktur umsetzt.</value>
   </data>
-  <data name="Label3.Visible" type="System.Boolean, mscorlib">
+  <data name="lblCreateConstrForm.Visible" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
-  <data name="&gt;&gt;Label3.Name" xml:space="preserve">
-    <value>Label3</value>
+  <data name="&gt;&gt;lblCreateConstrForm.Name" xml:space="preserve">
+    <value>lblCreateConstrForm</value>
   </data>
-  <data name="&gt;&gt;Label3.Type" xml:space="preserve">
+  <data name="&gt;&gt;lblCreateConstrForm.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;Label3.Parent" xml:space="preserve">
+  <data name="&gt;&gt;lblCreateConstrForm.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;lblCreateConstrForm.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="&gt;&gt;btncancel.Name" xml:space="preserve">
+    <value>btncancel</value>
+  </data>
+  <data name="&gt;&gt;btncancel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btncancel.Parent" xml:space="preserve">
+    <value>GroupBox1</value>
+  </data>
+  <data name="&gt;&gt;btncancel.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;ProgressPanel1.Name" xml:space="preserve">
+    <value>ProgressPanel1</value>
+  </data>
+  <data name="&gt;&gt;ProgressPanel1.Type" xml:space="preserve">
+    <value>DevExpress.XtraWaitForm.ProgressPanel, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;ProgressPanel1.Parent" xml:space="preserve">
+    <value>GroupBox1</value>
+  </data>
+  <data name="&gt;&gt;ProgressPanel1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;btnRefreshEntityTable.Name" xml:space="preserve">
+    <value>btnRefreshEntityTable</value>
+  </data>
+  <data name="&gt;&gt;btnRefreshEntityTable.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnRefreshEntityTable.Parent" xml:space="preserve">
+    <value>GroupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnRefreshEntityTable.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;btnCreateEntityTable.Name" xml:space="preserve">
+    <value>btnCreateEntityTable</value>
+  </data>
+  <data name="&gt;&gt;btnCreateEntityTable.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnCreateEntityTable.Parent" xml:space="preserve">
+    <value>GroupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnCreateEntityTable.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="GroupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>328, 427</value>
+  </data>
+  <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>424, 125</value>
+  </data>
+  <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>32</value>
+  </data>
+  <data name="GroupBox1.Text" xml:space="preserve">
+    <value>Erzeugung Tabellenstruktur:</value>
+  </data>
+  <data name="&gt;&gt;GroupBox1.Name" xml:space="preserve">
+    <value>GroupBox1</value>
+  </data>
+  <data name="&gt;&gt;GroupBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GroupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;GroupBox1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="btncancel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAQdJREFUOE+lkTEOgkAURD0CR/AIHMHQk9jSWXAAaiorWsMJOAIFPSUtCaEkSEUI
+        vwAADr8BOAVTJAAAAQdJREFUOE+lkTEOgkAURD0CR/AIHMHQk9jSWXAAaiorWsMJOAIFPSUtCaEkSEUI
         FHS03z8bVllcEsFJJq7z/7xFORHRX9aGe/w5sKZpMtlPNrEjES7E2WU51wFi3/fJsixK0xRL1zk/t20b
         h2FIQRC84TpAJAG2bVNVVbjtnmXZ6DiOUoZ0AKPrutx1XQHBJ27FeV2GvgDQGrJVhrYA5mEAL3lFUYzL
         n4AyzkmSAOKJxVkKADeUZSn+PFnGkyCXEMz5u3gzkAJomkYp930/8rKJRUDwBJgvcwVQ1/WIMpYA46Ub
@@ -1307,9 +1370,6 @@ welche die links dargestellte TreeView-Struktur umsetzt.</value>
   <data name="&gt;&gt;btncancel.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="ProgressPanel1.Appearance.BackColor" type="System.Drawing.Color, System.Drawing">
-    <value>Transparent</value>
-  </data>
   <data name="ProgressPanel1.Description" xml:space="preserve">
     <value>Procedure is executing ......</value>
   </data>
@@ -1343,7 +1403,7 @@ welche die links dargestellte TreeView-Struktur umsetzt.</value>
   <data name="btnRefreshEntityTable.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAGxJREFUOE/NjNEJgDAMBTNbVnA3v1zDQZxE/cmv8oqBECm+VgQDR9PAnWDM7Oih
+        vgAADr4B6kKxwAAAAGxJREFUOE/NjNEJgDAMBTNbVnA3v1zDQZxE/cmv8oqBECm+VgQDR9PAnWDM7Oih
         yBh8VLWJnwa2daegAzJMhXz/PjDOS3ljwG/gMQAJggd8pwNRjhE6kCNRBlQAQMwyoAM1qoEWboEeLv3N
         iJxnTngNYdMDJwAAAABJRU5ErkJggg==
 </value>
@@ -1384,7 +1444,7 @@ welche die links dargestellte TreeView-Struktur umsetzt.</value>
   <data name="btnCreateEntityTable.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAE1JREFUOE9j+P//P8O3b9/+k4vhBjg5OZGMB6EBH95/hGNi+NQ3gFRMfRegKyDE
+        vwAADr8BOAVTJAAAAE1JREFUOE9j+P//P8O3b9/+k4vhBjg5OZGMB6EBH95/hGNi+NQ3gFRMfRegKyDE
         xzCAVEx9F6ArIMTHMIBUjGIAuRhsACUYqyDx+D8DAGWb3TPY4bxVAAAAAElFTkSuQmCC
 </value>
   </data>
@@ -1418,30 +1478,6 @@ welche die links dargestellte TreeView-Struktur umsetzt.</value>
   <data name="&gt;&gt;btnCreateEntityTable.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="GroupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>328, 427</value>
-  </data>
-  <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>424, 125</value>
-  </data>
-  <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>32</value>
-  </data>
-  <data name="GroupBox1.Text" xml:space="preserve">
-    <value>Erzeugung Tabellenstruktur:</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.Name" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <metadata name="BW_Entity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>733, 56</value>
   </metadata>
@@ -1930,12 +1966,6 @@ welche die links dargestellte TreeView-Struktur umsetzt.</value>
   <data name="&gt;&gt;ToolStripButton1.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;ToolStripButton2.Name" xml:space="preserve">
-    <value>ToolStripButton2</value>
-  </data>
-  <data name="&gt;&gt;ToolStripButton2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;TBPMO_FORM_VIEWBindingSource.Name" xml:space="preserve">
     <value>TBPMO_FORM_VIEWBindingSource</value>
   </data>

app/DD-Record-Organizer/frmEntities.vb

@@ -48,8 +48,8 @@ Public Class frmEntities
     End Sub
     Sub Load_TreeView()
         Try
-            Dim DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & _
-                                       "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 1 AND T.PARENT_ID = 0 AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2}))", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
+            Dim DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " &
+                                       "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID IN (1,6) AND T.PARENT_ID = 0 AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2}))", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
             LOGGER.Debug(Now.ToString & "Level 0 >>" & DT_SQL, False)
 
             Dim DT As DataTable = MYDB_ECM.GetDatatable(DT_SQL)
@@ -71,7 +71,7 @@ Public Class frmEntities
                             Dim Node1 As TreeNode
                             Node1 = Node.Nodes.Add(row1.Item("CAPTION").ToString)
                             Node1.Tag = row1.Item("GUID")
-                            DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " & _
+                            DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' FROM " &
                                                    "TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (3,5) AND T.PARENT_ID = {2} AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {3})) ORDER BY LEVEL", USER_LANGUAGE, CURRENT_SCREEN_ID, row1.Item("GUID"), USER_GUID)
                             LOGGER.Debug(Now.ToString & "Level 2 >>" & DT_SQL, False)
                             ' Dim sql1 As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID in (3,5) AND T.PARENT_ID = " & row1.Item("GUID") & " ORDER BY LEVEL"
@@ -89,7 +89,7 @@ Public Class frmEntities
 
                     End If
                 Next
-                DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' " & _
+                DT_SQL = String.Format("SELECT T.GUID, T1.FORM_TITLE,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T1.GUID), {1}) AS 'CAPTION' " &
                                        "FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 4 AND T.PARENT_ID = 0 AND T.GUID IN (select DISTINCT ENTITY_ID FROM TBPMO_CLIENT_ENTITY WHERE CLIENT_ID IN (select client_Id from TBDD_CLIENT_USER where USER_ID = {2})) ORDER BY CAPTION", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
                 'Dim sql2 As String = "SELECT T.GUID, T1.FORM_TITLE FROM TBPMO_FORM T, TBPMO_FORM_VIEW T1 WHERE T.GUID = T1.FORM_ID AND T.FORM_TYPE_ID = 4 AND T.PARENT_ID = 0 ORDER BY T1.FORM_TITLE"
                 Dim DT3 As DataTable = MYDB_ECM.GetDatatable(DT_SQL)
@@ -126,10 +126,12 @@ Public Class frmEntities
 
             Me.btnGenerate.Visible = True
 
-            If PARENT_IDTextBox.Text = 0 And (ComboBox1.SelectedValue = 1 Or ComboBox1.SelectedValue = 4) Then
+            If PARENT_IDTextBox.Text = 0 And (cmbEntityType.SelectedValue = 1 Or cmbEntityType.Text = "Personal file") Then
                 Me.btnGenerate.Visible = True
+                lblCreateConstrForm.Visible = True
             Else
                 Me.btnGenerate.Visible = False
+                lblCreateConstrForm.Visible = False
             End If
         Catch ex As Exception
             MsgBox("Error in Load_Forms:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -248,7 +250,7 @@ Public Class frmEntities
             ' Save FORM_VIEW Properties
             If insert = True Then
                 Dim sql = "SELECT (MAX(GUID)) FROM TBPMO_FORM"
-                Dim FORM_ID = MYDB_ECM.GetScalarValue(SQL)
+                Dim FORM_ID = MYDB_ECM.GetScalarValue(sql)
 
                 Dim ADDED_WHO As String = USER_USERNAME
 
@@ -257,7 +259,7 @@ Public Class frmEntities
                 'ggg()
                 If FORM_ID Is Nothing = False Then
                     sql = String.Format("INSERT INTO TBPMO_FORM_VIEW (FORM_ID, SCREEN_ID, FORM_TITLE, DESCRIPTION, ADDED_WHO,LANGUAGE) VALUES ({0}, {1},'{2}','{3}','{4}','{5}')", FORM_ID, CURRENT_SCREEN_ID, FORM_TITLE, DESCRIPTION, ADDED_WHO, USER_LANGUAGE)
-                    MYDB_ECM.ExecuteNonQuery(Sql)
+                    MYDB_ECM.ExecuteNonQuery(sql)
                 End If
                 Load_TreeView()
             Else
@@ -294,7 +296,7 @@ Public Class frmEntities
             Try
                 Dim CurrentID = GetCurrentGUID()
                 Dim sql = "EXEC PRPMO_DELETE_ENTITY " & CurrentID
-                If MYDB_ECM.ExecuteNonQuery(Sql) = True Then
+                If MYDB_ECM.ExecuteNonQuery(sql) = True Then
                     MsgBox("Entity was deleted!", MsgBoxStyle.Information)
                     Load_TreeView()
                     Load_Forms(999999999)
@@ -312,7 +314,7 @@ Public Class frmEntities
         Dim anz_ent = MYDB_ECM.GetScalarValue("SELECT Count(GUID) FROM TBPMO_FORM where PARENT_ID = 0 and FORM_TYPE_ID = 1")
         anz_ent += 1
         If anz_ent > LICENSE_DOSSIER_COUNT Then
-            Dim msg = String.Format("Die Anzahl an lizensierten Sichten/Akten {0} ist erreicht! Bitte kontaktieren Sie Digital Data!", LICENSE_DOSSIER_COUNT.ToString)
+            Dim msg = String.Format("Die Anzahl an lizensierten Sichten {0} ist erreicht! Bitte kontaktieren Sie Digital Data!", LICENSE_DOSSIER_COUNT.ToString)
             If USER_LANGUAGE <> "de-DE" Then
                 msg = String.Format("The number of licensed views {0} was reached! Please contact Digital Data", LICENSE_DOSSIER_COUNT.ToString)
             End If
@@ -350,7 +352,7 @@ Public Class frmEntities
             Try
                 Dim CurrentID = GetCurrentGUID()
                 Dim sql As String = "EXEC PRPMO_COPY_ENTITY " & CurrentID.ToString & ", '" & USER_USERNAME & "'"
-                If MYDB_ECM.ExecuteNonQuery(Sql) = True Then
+                If MYDB_ECM.ExecuteNonQuery(sql) = True Then
                     'MsgBox("Die Entität wurde erfolgreich kopiert!", MsgBoxStyle.Information)
                     Load_TreeView()
                     Load_Forms(999999999)
@@ -383,6 +385,7 @@ Public Class frmEntities
                 Dim result As MsgBoxResult = MsgBox(msg, MsgBoxStyle.YesNo, "Question:")
                 If result = MsgBoxResult.Yes Then
                     INTEGER1 = CurrentID
+                    STRING1 = FORM_TITLETextBox.Text
                     frmNewKombiForm.ShowDialog()
                 End If
             End If
@@ -391,13 +394,13 @@ Public Class frmEntities
         End Try
     End Sub
 
-    Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
-        If ComboBox1.SelectedIndex <> -1 Then
-            If ComboBox1.SelectedValue = 5 Then
-                ToolStripButton2.Enabled = False
+    Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbEntityType.SelectedIndexChanged
+        If cmbEntityType.SelectedIndex <> -1 Then
+            If cmbEntityType.SelectedValue = 5 Then
+
                 ToolStripButton1.Enabled = False
             Else
-                ToolStripButton2.Enabled = True
+
                 ToolStripButton1.Enabled = True
             End If
         End If
@@ -446,8 +449,8 @@ Public Class frmEntities
 
     Private Sub btnRefreshEntityTable_Click(sender As Object, e As EventArgs) Handles btnRefreshEntityTable.Click
         Dim CurrentID = GetCurrentGUID()
-        EXECUTE_STATEMENT = String.Format("DECLARE @return_value int " & vbNewLine & _
-                  "EXEC	@return_value = dbo.PRPMO_ENTITY_TABLE_IMPORT_RECORDS {0}" & vbNewLine & _
+        EXECUTE_STATEMENT = String.Format("DECLARE @return_value int " & vbNewLine &
+                  "EXEC	@return_value = dbo.PRPMO_ENTITY_TABLE_IMPORT_RECORDS {0}" & vbNewLine &
                   "SELECT	'Return Value' = @return_value", CurrentID)
         ProgressPanel1.Description = "Inserting Records...."
         ProgressPanel1.Visible = True
@@ -455,4 +458,12 @@ Public Class frmEntities
         '.. und starten
         BW_Entity.RunWorkerAsync()
     End Sub
+
+    Private Sub NAMETextBox_LostFocus(sender As Object, e As EventArgs) Handles NAMETextBox.LostFocus
+        If FORM_TITLETextBox.Text = String.Empty Then
+            FORM_TITLETextBox.Text = NAMETextBox.Text
+        End If
+
+    End Sub
+
 End Class

app/DD-Record-Organizer/frmFileInWork.vb

@@ -1,23 +1,27 @@
 Public Class frmFileInWork
-
+    Public Property myDocuments As New List(Of ClassDocGrid.clsWMDoc)
     Private Sub btnInWork_Click(sender As Object, e As EventArgs) Handles btnInWork.Click
         Try
-            If ClassFileResult.Set_InWork(1, txtComment.Text) = True Then
-                Dim expression As String
-                expression = "DocID = " & ClassFileResult.DocID
-                Dim foundRowsLevel0() As DataRow
-                ' Use the Select method to find all rows matching the filter.
-                foundRowsLevel0 = CURRENT_DOC_RESULTS.Select(expression)
-                Try
-                    foundRowsLevel0(0)(13) = True
-                Catch ex As Exception
-                   
-                End Try
+            For Each oDoc As ClassDocGrid.clsWMDoc In myDocuments
+                ClassFileResult.DocID = oDoc.DocId
+                If ClassFileResult.Set_InWork(1, txtComment.Text) = True Then
+                    Dim expression As String
+                    expression = "DocID = " & ClassFileResult.DocID
+                    Dim foundRowsLevel0() As DataRow
+                    ' Use the Select method to find all rows matching the filter.
+                    foundRowsLevel0 = CURRENT_DOC_RESULTS.Select(expression)
+                    Try
+                        foundRowsLevel0(0)(13) = True
+                    Catch ex As Exception
 
-                Me.Close()
-            Else
-                MsgBox("Unexpected Error 1 in Setting to work - Check logfile", MsgBoxStyle.Exclamation)
-            End If
+                    End Try
+
+
+                Else
+                    MsgBox("Unexpected Error 1 in Setting to work - Check logfile", MsgBoxStyle.Exclamation)
+                End If
+            Next
+            Me.Close()
         Catch ex As Exception
             MsgBox("Unexpected Error 2 in Setting to work - Check logfile", MsgBoxStyle.Exclamation)
         End Try

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

@@ -101,6 +101,7 @@ Partial Class frmFileRename
         Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "frmFileRename"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Datei umbenennen"
         Me.TopMost = True
         Me.ResumeLayout(False)

app/DD-Record-Organizer/frmFileRename.vb

@@ -1,8 +1,12 @@
 Imports System.IO
 
 Public Class frmFileRename
-    Dim oRenameType As String
-    Public Sub New(DocID As Int32, oldName As String, pRenameType As String)
+    Private ReadOnly oRenameType As String
+    Private DisplayName As String
+    Private FullFilename As String
+    Private DocID As Int64
+
+    Public Sub New(pDocID As Integer, oldName As String, pRenameType As String, pFullFilename As String)
 
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
@@ -12,19 +16,32 @@ Public Class frmFileRename
         lblOldFilename.Text = oldName
         txtNewName.Text = oldName
         oRenameType = pRenameType
+        FullFilename = pFullFilename
+        DocID = pDocID
     End Sub
 
     Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click
         Dim result As MsgBoxResult
-        Dim oMSG = "Wollen Sie die Datei wirklich umbenennen?"
+        Dim oFilePattern As String
+        If oRenameType = "Displayname" Then
+            oFilePattern = "den Displaynamen"
+            If USER_LANGUAGE <> "de-DE" Then
+                oFilePattern = "the displayname"
+            End If
+        Else
+            oFilePattern = "die Datei"
+            If USER_LANGUAGE <> "de-DE" Then
+                oFilePattern = "the file"
+            End If
+        End If
+        Dim oMSG = "Wollen Sie " + oFilePattern + " wirklich umbenennen?"
         If USER_LANGUAGE <> "de-DE" Then
-            oMSG = "Do You really want to rename the file?"
+            oMSG = $"Do You really want to rename {oFilePattern} ?"
         End If
         result = MessageBox.Show(oMSG, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result = MsgBoxResult.Yes Then
             If oRenameType = "Displayname" Then
                 Try
-                    ClassFileResult.DocID = ClassWindreamDocGrid.SELECTED_DOC_ID
                     If txtNewName.Text <> "" Then
                         If ClassFileResult.Set_Displayname(txtNewName.Text) Then
                             Me.Close()
@@ -37,31 +54,28 @@ Public Class frmFileRename
                 End Try
             Else
                 Dim OldName, NewName, OnlyFilename As String
-                OldName = ClassWindreamDocGrid.SELECTED_DOC_PATH
+                OldName = FullFilename
+
                 ' Define file names.
                 NewName = txtNewName.Text
                 OnlyFilename = NewName
-                Dim oFullFilename = ClassHelper.FORMAT_WM_PATH(ClassWindreamDocGrid.SELECTED_DOC_PATH)
+                Dim oFullFilename = ClassHelper.FORMAT_WM_PATH(FullFilename)
                 Dim name1 = Path.Combine(Path.GetDirectoryName(oFullFilename), NewName)
-                NewName = NewName & Path.GetExtension(oFullFilename)
+                NewName &= Path.GetExtension(oFullFilename)
                 OnlyFilename &= Path.GetExtension(oFullFilename)
                 ' Rename file.
-                LOGGER.Info($"Renaming Old: [{OldName}]")
+                LOGGER.Info($"Renaming Old: [{oFullFilename}]")
                 LOGGER.Info($"Renaming New: [{NewName}]")
-                My.Computer.FileSystem.RenameFile(OldName, NewName)
+                My.Computer.FileSystem.RenameFile(oFullFilename, NewName)
                 LOGGER.Info($"Renaming FileSystem done!")
-                Cursor = Cursors.WaitCursor
-                Dim oEXEC As String = $"EXEC PRPMO_DOC_CREATE_NEW_DOC {ClassWindreamDocGrid.SELECTED_DOC_ID}, {CURRENT_RECORD_ID},'{USER_USERNAME}'"
+                Dim oEXEC As String = $"EXEC PROF_DOC_CREATE_UPDATE {DocID}, {CURRENT_RECORD_ID},'{USER_USERNAME}',''"
                 If MYDB_ECM.ExecuteNonQuery(oEXEC) Then
                     Me.Close()
                 Else
                     MsgBox("Not succesfull - Check log", MsgBoxStyle.Critical)
                 End If
+
             End If
         End If
-
-
-
-
     End Sub
 End Class

app/DD-Record-Organizer/frmFollowUp.resx.bak

@@ -1051,7 +1051,7 @@
     <value>GridControl1</value>
   </data>
   <data name="&gt;&gt;GridControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridControl1.Parent" xml:space="preserve">
     <value>GroupBox3</value>
@@ -1114,7 +1114,7 @@
     <value>GridControlUsers2Group</value>
   </data>
   <data name="&gt;&gt;GridControlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridControlUsers2Group.Parent" xml:space="preserve">
     <value>GroupBox3</value>
@@ -2304,7 +2304,7 @@
     <value>XtraTabPage1</value>
   </data>
   <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
     <value>XtraTabControl1</value>
@@ -2463,7 +2463,7 @@
     <value>XtraTabPage2</value>
   </data>
   <data name="&gt;&gt;XtraTabPage2.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;XtraTabPage2.Parent" xml:space="preserve">
     <value>XtraTabControl1</value>
@@ -2490,7 +2490,7 @@
     <value>GridResult</value>
   </data>
   <data name="&gt;&gt;GridResult.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridResult.Parent" xml:space="preserve">
     <value>XtraTabPage3</value>
@@ -2508,7 +2508,7 @@
     <value>XtraTabPage3</value>
   </data>
   <data name="&gt;&gt;XtraTabPage3.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;XtraTabPage3.Parent" xml:space="preserve">
     <value>XtraTabControl1</value>
@@ -2520,7 +2520,7 @@
     <value>XtraTabControl1</value>
   </data>
   <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
     <value>$this</value>
@@ -3035,31 +3035,31 @@
     <value>GridView1</value>
   </data>
   <data name="&gt;&gt;GridView1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridColumn3.Name" xml:space="preserve">
     <value>GridColumn3</value>
   </data>
   <data name="&gt;&gt;GridColumn3.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridColumn4.Name" xml:space="preserve">
     <value>GridColumn4</value>
   </data>
   <data name="&gt;&gt;GridColumn4.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridColumn5.Name" xml:space="preserve">
     <value>GridColumn5</value>
   </data>
   <data name="&gt;&gt;GridColumn5.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridColumn6.Name" xml:space="preserve">
     <value>GridColumn6</value>
   </data>
   <data name="&gt;&gt;GridColumn6.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TBAD_UsersBindingSource.Name" xml:space="preserve">
     <value>TBAD_UsersBindingSource</value>
@@ -3071,31 +3071,31 @@
     <value>GridViewlUsers2Group</value>
   </data>
   <data name="&gt;&gt;GridViewlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colSelect.Name" xml:space="preserve">
     <value>colSelect</value>
   </data>
   <data name="&gt;&gt;colSelect.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridColumn1.Name" xml:space="preserve">
     <value>GridColumn1</value>
   </data>
   <data name="&gt;&gt;GridColumn1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridColumn2.Name" xml:space="preserve">
     <value>GridColumn2</value>
   </data>
   <data name="&gt;&gt;GridColumn2.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colID.Name" xml:space="preserve">
     <value>colID</value>
   </data>
   <data name="&gt;&gt;colID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;BindingNavigatorAddNewItem.Name" xml:space="preserve">
     <value>BindingNavigatorAddNewItem</value>
@@ -3173,7 +3173,7 @@
     <value>grvwResult</value>
   </data>
   <data name="&gt;&gt;grvwResult.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TBPMO_FOLLOW_UP_EMAILTableAdapter.Name" xml:space="preserve">
     <value>TBPMO_FOLLOW_UP_EMAILTableAdapter</value>

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

@@ -26,40 +26,44 @@ Partial Class frmGlobalSearch
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGlobalSearch))
         Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
         Me.GridControlRecords = New DevExpress.XtraGrid.GridControl()
-        Me.cmsRecords = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.ExportExcelToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ShowRecordToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GridViewRecords = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.ToolStripRecords = New System.Windows.Forms.ToolStrip()
         Me.tslblRecordsResult = New System.Windows.Forms.ToolStripLabel()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.GridControlFiles = New DevExpress.XtraGrid.GridControl()
-        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.VerknüpfungenAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.GridViewFiles = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.ToolStripDokumente = New System.Windows.Forms.ToolStrip()
         Me.tslblDocView = New System.Windows.Forms.ToolStripLabel()
         Me.Label1 = New System.Windows.Forms.Label()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.rbSearchRecord = New System.Windows.Forms.RadioButton()
-        Me.rbSearchFulltext = New System.Windows.Forms.RadioButton()
-        Me.rbSearchCombined = New System.Windows.Forms.RadioButton()
         Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl()
+        Me.lblFT_Irregular = New System.Windows.Forms.Label()
         Me.txtSearch = New System.Windows.Forms.TextBox()
         Me.Label2 = New System.Windows.Forms.Label()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
         Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem()
         Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem10 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarToggleSearchCombined = New DevExpress.XtraBars.BarToggleSwitchItem()
+        Me.BarToggleSearchRecord = New DevExpress.XtraBars.BarToggleSwitchItem()
+        Me.BarToggleFulltext = New DevExpress.XtraBars.BarToggleSwitchItem()
+        Me.bbtnitmJump2Filestore = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupRecords = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupFiles = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupExcel = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.DD_ECMAdmin1 = New DD_Record_Organizer.DD_ECMAdmin()
+        Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerMain.Panel1.SuspendLayout()
@@ -67,16 +71,14 @@ Partial Class frmGlobalSearch
         Me.SplitContainerMain.Panel2.SuspendLayout()
         Me.SplitContainerMain.SuspendLayout()
         CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.cmsRecords.SuspendLayout()
         CType(Me.GridViewRecords, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ToolStripRecords.SuspendLayout()
         CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.ContextMenuStrip1.SuspendLayout()
         CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ToolStripDokumente.SuspendLayout()
         Me.Panel1.SuspendLayout()
-        Me.GroupBox1.SuspendLayout()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DD_ECMAdmin1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'SplitContainerMain
@@ -96,34 +98,15 @@ Partial Class frmGlobalSearch
         Me.SplitContainerMain.Panel2.Controls.Add(Me.GridControlFiles)
         Me.SplitContainerMain.Panel2.Controls.Add(Me.ToolStripDokumente)
         resources.ApplyResources(Me.SplitContainerMain.Panel2, "SplitContainerMain.Panel2")
-        Me.SplitContainerMain.SplitterPosition = 751
+        Me.SplitContainerMain.SplitterPosition = 616
         '
         'GridControlRecords
         '
-        Me.GridControlRecords.ContextMenuStrip = Me.cmsRecords
         resources.ApplyResources(Me.GridControlRecords, "GridControlRecords")
         Me.GridControlRecords.MainView = Me.GridViewRecords
         Me.GridControlRecords.Name = "GridControlRecords"
         Me.GridControlRecords.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewRecords})
         '
-        'cmsRecords
-        '
-        Me.cmsRecords.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ExportExcelToolStripMenuItem, Me.ShowRecordToolStripMenuItem})
-        Me.cmsRecords.Name = "cmsRecords"
-        resources.ApplyResources(Me.cmsRecords, "cmsRecords")
-        '
-        'ExportExcelToolStripMenuItem
-        '
-        Me.ExportExcelToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Excel_25ixel
-        Me.ExportExcelToolStripMenuItem.Name = "ExportExcelToolStripMenuItem"
-        resources.ApplyResources(Me.ExportExcelToolStripMenuItem, "ExportExcelToolStripMenuItem")
-        '
-        'ShowRecordToolStripMenuItem
-        '
-        Me.ShowRecordToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.application_view_detail
-        Me.ShowRecordToolStripMenuItem.Name = "ShowRecordToolStripMenuItem"
-        resources.ApplyResources(Me.ShowRecordToolStripMenuItem, "ShowRecordToolStripMenuItem")
-        '
         'GridViewRecords
         '
         Me.GridViewRecords.Appearance.EvenRow.BackColor = System.Drawing.Color.Aqua
@@ -162,41 +145,11 @@ Partial Class frmGlobalSearch
         '
         'GridControlFiles
         '
-        Me.GridControlFiles.ContextMenuStrip = Me.ContextMenuStrip1
         resources.ApplyResources(Me.GridControlFiles, "GridControlFiles")
         Me.GridControlFiles.MainView = Me.GridViewFiles
         Me.GridControlFiles.Name = "GridControlFiles"
         Me.GridControlFiles.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFiles})
         '
-        'ContextMenuStrip1
-        '
-        Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.OrdnerÖffnenToolStripMenuItem, Me.EigenschaftenToolStripMenuItem, Me.VerknüpfungenAnzeigenToolStripMenuItem})
-        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
-        resources.ApplyResources(Me.ContextMenuStrip1, "ContextMenuStrip1")
-        '
-        'DateiÖffnenToolStripMenuItem
-        '
-        Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem"
-        resources.ApplyResources(Me.DateiÖffnenToolStripMenuItem, "DateiÖffnenToolStripMenuItem")
-        '
-        'OrdnerÖffnenToolStripMenuItem
-        '
-        Me.OrdnerÖffnenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.folder_Open_16xLG
-        Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem"
-        resources.ApplyResources(Me.OrdnerÖffnenToolStripMenuItem, "OrdnerÖffnenToolStripMenuItem")
-        '
-        'EigenschaftenToolStripMenuItem
-        '
-        Me.EigenschaftenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Property_501
-        Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem"
-        resources.ApplyResources(Me.EigenschaftenToolStripMenuItem, "EigenschaftenToolStripMenuItem")
-        '
-        'VerknüpfungenAnzeigenToolStripMenuItem
-        '
-        Me.VerknüpfungenAnzeigenToolStripMenuItem.Image = Global.DD_Record_Organizer.My.Resources.Resources.Link
-        Me.VerknüpfungenAnzeigenToolStripMenuItem.Name = "VerknüpfungenAnzeigenToolStripMenuItem"
-        resources.ApplyResources(Me.VerknüpfungenAnzeigenToolStripMenuItem, "VerknüpfungenAnzeigenToolStripMenuItem")
-        '
         'GridViewFiles
         '
         Me.GridViewFiles.Appearance.EvenRow.BackColor = System.Drawing.Color.Orange
@@ -234,41 +187,29 @@ Partial Class frmGlobalSearch
         resources.ApplyResources(Me.Label1, "Label1")
         Me.Label1.Name = "Label1"
         '
-        'Label3
-        '
-        resources.ApplyResources(Me.Label3, "Label3")
-        Me.Label3.Name = "Label3"
-        '
-        'rbSearchRecord
-        '
-        resources.ApplyResources(Me.rbSearchRecord, "rbSearchRecord")
-        Me.rbSearchRecord.Name = "rbSearchRecord"
-        Me.rbSearchRecord.UseVisualStyleBackColor = True
-        '
-        'rbSearchFulltext
-        '
-        resources.ApplyResources(Me.rbSearchFulltext, "rbSearchFulltext")
-        Me.rbSearchFulltext.Name = "rbSearchFulltext"
-        Me.rbSearchFulltext.UseVisualStyleBackColor = True
-        '
-        'rbSearchCombined
-        '
-        resources.ApplyResources(Me.rbSearchCombined, "rbSearchCombined")
-        Me.rbSearchCombined.Checked = True
-        Me.rbSearchCombined.Name = "rbSearchCombined"
-        Me.rbSearchCombined.TabStop = True
-        Me.rbSearchCombined.UseVisualStyleBackColor = True
-        '
         'Panel1
         '
+        Me.Panel1.Controls.Add(Me.LabelControl1)
+        Me.Panel1.Controls.Add(Me.lblFT_Irregular)
         Me.Panel1.Controls.Add(Me.txtSearch)
         Me.Panel1.Controls.Add(Me.Label2)
-        Me.Panel1.Controls.Add(Me.GroupBox1)
         Me.Panel1.Controls.Add(Me.Label1)
-        Me.Panel1.Controls.Add(Me.Label3)
         resources.ApplyResources(Me.Panel1, "Panel1")
         Me.Panel1.Name = "Panel1"
         '
+        'LabelControl1
+        '
+        Me.LabelControl1.Appearance.Font = CType(resources.GetObject("LabelControl1.Appearance.Font"), System.Drawing.Font)
+        Me.LabelControl1.Appearance.Options.UseFont = True
+        resources.ApplyResources(Me.LabelControl1, "LabelControl1")
+        Me.LabelControl1.Name = "LabelControl1"
+        '
+        'lblFT_Irregular
+        '
+        resources.ApplyResources(Me.lblFT_Irregular, "lblFT_Irregular")
+        Me.lblFT_Irregular.ForeColor = System.Drawing.Color.Red
+        Me.lblFT_Irregular.Name = "lblFT_Irregular"
+        '
         'txtSearch
         '
         resources.ApplyResources(Me.txtSearch, "txtSearch")
@@ -279,40 +220,17 @@ Partial Class frmGlobalSearch
         resources.ApplyResources(Me.Label2, "Label2")
         Me.Label2.Name = "Label2"
         '
-        'GroupBox1
-        '
-        Me.GroupBox1.Controls.Add(Me.rbSearchRecord)
-        Me.GroupBox1.Controls.Add(Me.rbSearchFulltext)
-        Me.GroupBox1.Controls.Add(Me.rbSearchCombined)
-        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.TabStop = False
-        '
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.bsiInfo, Me.BarButtonItem3})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarToggleSearchCombined, Me.BarToggleSearchRecord, Me.BarToggleFulltext, Me.bbtnitmJump2Filestore, Me.BarButtonItem2})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 5
+        Me.RibbonControl1.MaxItemId = 17
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
         Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
         '
-        'BarButtonItem1
-        '
-        resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1")
-        Me.BarButtonItem1.Id = 1
-        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem1.Name = "BarButtonItem1"
-        '
-        'BarButtonItem2
-        '
-        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
-        Me.BarButtonItem2.Id = 2
-        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem2.Name = "BarButtonItem2"
-        '
         'bsiInfo
         '
         Me.bsiInfo.Id = 3
@@ -327,20 +245,133 @@ Partial Class frmGlobalSearch
         Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem3.Name = "BarButtonItem3"
         '
+        'BarButtonItem4
+        '
+        resources.ApplyResources(Me.BarButtonItem4, "BarButtonItem4")
+        Me.BarButtonItem4.Id = 5
+        Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem4.Name = "BarButtonItem4"
+        '
+        'BarButtonItem6
+        '
+        resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6")
+        Me.BarButtonItem6.Id = 7
+        Me.BarButtonItem6.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem6.Name = "BarButtonItem6"
+        '
+        'BarButtonItem7
+        '
+        resources.ApplyResources(Me.BarButtonItem7, "BarButtonItem7")
+        Me.BarButtonItem7.Id = 8
+        Me.BarButtonItem7.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem7.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem7.Name = "BarButtonItem7"
+        '
+        'BarButtonItem8
+        '
+        resources.ApplyResources(Me.BarButtonItem8, "BarButtonItem8")
+        Me.BarButtonItem8.Id = 9
+        Me.BarButtonItem8.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem8.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem8.Name = "BarButtonItem8"
+        '
+        'BarButtonItem9
+        '
+        resources.ApplyResources(Me.BarButtonItem9, "BarButtonItem9")
+        Me.BarButtonItem9.Id = 10
+        Me.BarButtonItem9.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem9.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem9.Name = "BarButtonItem9"
+        '
+        'BarButtonItem10
+        '
+        resources.ApplyResources(Me.BarButtonItem10, "BarButtonItem10")
+        Me.BarButtonItem10.Id = 11
+        Me.BarButtonItem10.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem10.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem10.Name = "BarButtonItem10"
+        '
+        'BarToggleSearchCombined
+        '
+        Me.BarToggleSearchCombined.BindableChecked = True
+        resources.ApplyResources(Me.BarToggleSearchCombined, "BarToggleSearchCombined")
+        Me.BarToggleSearchCombined.Checked = True
+        Me.BarToggleSearchCombined.Id = 12
+        Me.BarToggleSearchCombined.Name = "BarToggleSearchCombined"
+        '
+        'BarToggleSearchRecord
+        '
+        resources.ApplyResources(Me.BarToggleSearchRecord, "BarToggleSearchRecord")
+        Me.BarToggleSearchRecord.Id = 13
+        Me.BarToggleSearchRecord.Name = "BarToggleSearchRecord"
+        '
+        'BarToggleFulltext
+        '
+        resources.ApplyResources(Me.BarToggleFulltext, "BarToggleFulltext")
+        Me.BarToggleFulltext.Id = 14
+        Me.BarToggleFulltext.Name = "BarToggleFulltext"
+        '
+        'bbtnitmJump2Filestore
+        '
+        resources.ApplyResources(Me.bbtnitmJump2Filestore, "bbtnitmJump2Filestore")
+        Me.bbtnitmJump2Filestore.Id = 15
+        Me.bbtnitmJump2Filestore.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitmJump2Filestore.Name = "bbtnitmJump2Filestore"
+        '
+        'BarButtonItem2
+        '
+        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
+        Me.BarButtonItem2.Id = 16
+        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem2.Name = "BarButtonItem2"
+        '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupRecords, Me.RibbonPageGroupFiles, Me.RibbonPageGroupExcel, Me.RibbonPageGroup3})
         Me.RibbonPage1.Name = "RibbonPage1"
         resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
         '
         'RibbonPageGroup1
         '
+        Me.RibbonPageGroup1.AllowTextClipping = False
         Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3)
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2)
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
         '
+        'RibbonPageGroupRecords
+        '
+        Me.RibbonPageGroupRecords.AllowTextClipping = False
+        Me.RibbonPageGroupRecords.Enabled = False
+        Me.RibbonPageGroupRecords.ItemLinks.Add(Me.BarButtonItem9)
+        Me.RibbonPageGroupRecords.Name = "RibbonPageGroupRecords"
+        resources.ApplyResources(Me.RibbonPageGroupRecords, "RibbonPageGroupRecords")
+        '
+        'RibbonPageGroupFiles
+        '
+        Me.RibbonPageGroupFiles.AllowTextClipping = False
+        Me.RibbonPageGroupFiles.Enabled = False
+        Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem6)
+        Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem7)
+        Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem8)
+        Me.RibbonPageGroupFiles.ItemLinks.Add(Me.BarButtonItem10)
+        Me.RibbonPageGroupFiles.ItemLinks.Add(Me.bbtnitmJump2Filestore)
+        Me.RibbonPageGroupFiles.Name = "RibbonPageGroupFiles"
+        resources.ApplyResources(Me.RibbonPageGroupFiles, "RibbonPageGroupFiles")
+        '
+        'RibbonPageGroupExcel
+        '
+        Me.RibbonPageGroupExcel.AllowTextClipping = False
+        Me.RibbonPageGroupExcel.Enabled = False
+        Me.RibbonPageGroupExcel.ItemLinks.Add(Me.BarButtonItem4)
+        Me.RibbonPageGroupExcel.Name = "RibbonPageGroupExcel"
+        resources.ApplyResources(Me.RibbonPageGroupExcel, "RibbonPageGroupExcel")
+        '
+        'RibbonPageGroup3
+        '
+        Me.RibbonPageGroup3.AllowTextClipping = False
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarToggleSearchCombined)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarToggleSearchRecord)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarToggleFulltext)
+        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
+        resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
+        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo)
@@ -353,6 +384,16 @@ Partial Class frmGlobalSearch
         Me.RibbonPage2.Name = "RibbonPage2"
         resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
         '
+        'DD_ECMAdmin1
+        '
+        Me.DD_ECMAdmin1.DataSetName = "DD_ECMAdmin"
+        Me.DD_ECMAdmin1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
+        'XtraSaveFileDialog1
+        '
+        Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1"
+        resources.ApplyResources(Me.XtraSaveFileDialog1, "XtraSaveFileDialog1")
+        '
         'frmGlobalSearch
         '
         resources.ApplyResources(Me, "$this")
@@ -375,30 +416,22 @@ Partial Class frmGlobalSearch
         CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainerMain.ResumeLayout(False)
         CType(Me.GridControlRecords, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.cmsRecords.ResumeLayout(False)
         CType(Me.GridViewRecords, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ToolStripRecords.ResumeLayout(False)
         Me.ToolStripRecords.PerformLayout()
         CType(Me.GridControlFiles, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ContextMenuStrip1.ResumeLayout(False)
         CType(Me.GridViewFiles, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ToolStripDokumente.ResumeLayout(False)
         Me.ToolStripDokumente.PerformLayout()
         Me.Panel1.ResumeLayout(False)
         Me.Panel1.PerformLayout()
-        Me.GroupBox1.ResumeLayout(False)
-        Me.GroupBox1.PerformLayout()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DD_ECMAdmin1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
     End Sub
     Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents Label3 As System.Windows.Forms.Label
-    Friend WithEvents rbSearchRecord As System.Windows.Forms.RadioButton
-    Friend WithEvents rbSearchFulltext As System.Windows.Forms.RadioButton
-    Friend WithEvents rbSearchCombined As System.Windows.Forms.RadioButton
-    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
     Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl
     Friend WithEvents txtSearch As System.Windows.Forms.TextBox
     Friend WithEvents Label2 As System.Windows.Forms.Label
@@ -411,22 +444,31 @@ Partial Class frmGlobalSearch
     Friend WithEvents GridControlFiles As DevExpress.XtraGrid.GridControl
     Friend WithEvents GridViewFiles As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents ToolStripSeparator1 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents cmsRecords As System.Windows.Forms.ContextMenuStrip
-    Friend WithEvents ExportExcelToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents ShowRecordToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
     Friend WithEvents Panel1 As System.Windows.Forms.Panel
-    Friend WithEvents ContextMenuStrip1 As ContextMenuStrip
-    Friend WithEvents DateiÖffnenToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents OrdnerÖffnenToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents EigenschaftenToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents VerknüpfungenAnzeigenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
     Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
     Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
-    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents DD_ECMAdmin1 As DD_ECMAdmin
+    Friend WithEvents lblFT_Irregular As Label
+    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroupRecords As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonPageGroupFiles As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem10 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroupExcel As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog
+    Friend WithEvents BarToggleSearchCombined As DevExpress.XtraBars.BarToggleSwitchItem
+    Friend WithEvents BarToggleSearchRecord As DevExpress.XtraBars.BarToggleSwitchItem
+    Friend WithEvents BarToggleFulltext As DevExpress.XtraBars.BarToggleSwitchItem
+    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl
+    Friend WithEvents bbtnitmJump2Filestore As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
 End Class

app/DD-Record-Organizer/frmGlobalSearch.resx

@@ -123,31 +123,7 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="SplitContainerMain.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 252</value>
-  </data>
-  <metadata name="cmsRecords.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>454, 17</value>
-  </metadata>
-  <data name="ExportExcelToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 22</value>
-  </data>
-  <data name="ExportExcelToolStripMenuItem.Text" xml:space="preserve">
-    <value>Export Excel</value>
-  </data>
-  <data name="ShowRecordToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 22</value>
-  </data>
-  <data name="ShowRecordToolStripMenuItem.Text" xml:space="preserve">
-    <value>Show Record</value>
-  </data>
-  <data name="cmsRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 48</value>
-  </data>
-  <data name="&gt;&gt;cmsRecords.Name" xml:space="preserve">
-    <value>cmsRecords</value>
-  </data>
-  <data name="&gt;&gt;cmsRecords.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>0, 248</value>
   </data>
   <data name="GridControlRecords.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -156,10 +132,10 @@
     <value>0, 25</value>
   </data>
   <data name="GridViewRecords.ViewCaption" xml:space="preserve">
-    <value>ADDI-Datensätze</value>
+    <value>orgFLOW-Datensätze</value>
   </data>
   <data name="GridControlRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>751, 155</value>
+    <value>616, 402</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="GridControlRecords.TabIndex" type="System.Int32, mscorlib">
@@ -178,19 +154,13 @@
     <value>0</value>
   </data>
   <metadata name="ToolStripRecords.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>145, 17</value>
+    <value>17, 17</value>
   </metadata>
-  <data name="tslblRecordsResult.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 22</value>
-  </data>
-  <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>6, 25</value>
-  </data>
   <data name="ToolStripRecords.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
   <data name="ToolStripRecords.Size" type="System.Drawing.Size, System.Drawing">
-    <value>751, 25</value>
+    <value>616, 25</value>
   </data>
   <data name="ToolStripRecords.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -225,42 +195,6 @@
   <data name="&gt;&gt;SplitContainerMain.Panel1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>571, 17</value>
-  </metadata>
-  <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>205, 22</value>
-  </data>
-  <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Datei öffnen</value>
-  </data>
-  <data name="OrdnerÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>205, 22</value>
-  </data>
-  <data name="OrdnerÖffnenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Ordner öffnen</value>
-  </data>
-  <data name="EigenschaftenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>205, 22</value>
-  </data>
-  <data name="EigenschaftenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Eigenschaften</value>
-  </data>
-  <data name="VerknüpfungenAnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>205, 22</value>
-  </data>
-  <data name="VerknüpfungenAnzeigenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Verknüpfungen anzeigen</value>
-  </data>
-  <data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>206, 92</value>
-  </data>
-  <data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve">
-    <value>ContextMenuStrip1</value>
-  </data>
-  <data name="&gt;&gt;ContextMenuStrip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="GridControlFiles.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
@@ -268,10 +202,10 @@
     <value>0, 25</value>
   </data>
   <data name="GridViewFiles.ViewCaption" xml:space="preserve">
-    <value>windream-Dokumente</value>
+    <value>Dateien</value>
   </data>
   <data name="GridControlFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>406, 155</value>
+    <value>841, 402</value>
   </data>
   <data name="GridControlFiles.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -289,22 +223,16 @@
     <value>0</value>
   </data>
   <metadata name="ToolStripDokumente.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>289, 17</value>
+    <value>159, 17</value>
   </metadata>
   <data name="ToolStripDokumente.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 9pt</value>
   </data>
-  <data name="tslblDocView.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 8.25pt, style=Bold, Italic</value>
-  </data>
-  <data name="tslblDocView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>0, 22</value>
-  </data>
   <data name="ToolStripDokumente.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
   <data name="ToolStripDokumente.Size" type="System.Drawing.Size, System.Drawing">
-    <value>406, 25</value>
+    <value>841, 25</value>
   </data>
   <data name="ToolStripDokumente.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -340,7 +268,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 180</value>
+    <value>1467, 427</value>
   </data>
   <data name="SplitContainerMain.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -358,19 +286,31 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;SplitContainerMain.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>0</value>
+  </data>
+  <data name="tslblRecordsResult.Size" type="System.Drawing.Size, System.Drawing">
+    <value>0, 22</value>
+  </data>
+  <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>6, 25</value>
+  </data>
+  <data name="tslblDocView.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 8.25pt, style=Bold, Italic</value>
+  </data>
+  <data name="tslblDocView.Size" type="System.Drawing.Size, System.Drawing">
+    <value>0, 22</value>
   </data>
   <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="Label1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt, style=Italic</value>
+    <value>Tahoma, 9.75pt, style=Bold</value>
   </data>
   <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 11</value>
   </data>
   <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>504, 13</value>
+    <value>683, 16</value>
   </data>
   <data name="Label1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -388,116 +328,68 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="Label3.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>703, 112</value>
-  </data>
-  <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>38, 13</value>
-  </data>
-  <data name="Label3.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="Label3.Text" xml:space="preserve">
-    <value>Label3</value>
-  </data>
-  <data name="&gt;&gt;Label3.Name" xml:space="preserve">
-    <value>Label3</value>
-  </data>
-  <data name="&gt;&gt;Label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label3.Parent" xml:space="preserve">
-    <value>Panel1</value>
-  </data>
-  <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
-  <data name="rbSearchRecord.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="LabelControl1.Appearance.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Italic</value>
   </data>
-  <data name="rbSearchRecord.Location" type="System.Drawing.Point, System.Drawing">
-    <value>423, 20</value>
+  <data name="LabelControl1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>382, 74</value>
   </data>
-  <data name="rbSearchRecord.Size" type="System.Drawing.Size, System.Drawing">
-    <value>183, 17</value>
+  <data name="LabelControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>134, 13</value>
   </data>
-  <data name="rbSearchRecord.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+  <data name="LabelControl1.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
   </data>
-  <data name="rbSearchRecord.Text" xml:space="preserve">
-    <value>Nur in ADDI-Datensätzen suchen</value>
+  <data name="LabelControl1.Text" xml:space="preserve">
+    <value>Leerzeichen mit % ersetzen</value>
   </data>
-  <data name="&gt;&gt;rbSearchRecord.Name" xml:space="preserve">
-    <value>rbSearchRecord</value>
+  <data name="&gt;&gt;LabelControl1.Name" xml:space="preserve">
+    <value>LabelControl1</value>
   </data>
-  <data name="&gt;&gt;rbSearchRecord.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;LabelControl1.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;rbSearchRecord.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
+  <data name="&gt;&gt;LabelControl1.Parent" xml:space="preserve">
+    <value>Panel1</value>
   </data>
-  <data name="&gt;&gt;rbSearchRecord.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;LabelControl1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="rbSearchFulltext.AutoSize" type="System.Boolean, mscorlib">
+  <data name="lblFT_Irregular.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="rbSearchFulltext.Location" type="System.Drawing.Point, System.Drawing">
-    <value>423, 43</value>
+  <data name="lblFT_Irregular.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Italic</value>
   </data>
-  <data name="rbSearchFulltext.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 17</value>
+  <data name="lblFT_Irregular.Location" type="System.Drawing.Point, System.Drawing">
+    <value>15, 74</value>
   </data>
-  <data name="rbSearchFulltext.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+  <data name="lblFT_Irregular.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 13</value>
   </data>
-  <data name="rbSearchFulltext.Text" xml:space="preserve">
-    <value>Nur in Volltext der Dateien suchen</value>
+  <data name="lblFT_Irregular.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
   </data>
-  <data name="&gt;&gt;rbSearchFulltext.Name" xml:space="preserve">
-    <value>rbSearchFulltext</value>
+  <data name="lblFT_Irregular.Text" xml:space="preserve">
+    <value>Volltext enthält ungültige Zeichen. (".")</value>
   </data>
-  <data name="&gt;&gt;rbSearchFulltext.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="lblFT_Irregular.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
   </data>
-  <data name="&gt;&gt;rbSearchFulltext.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
+  <data name="&gt;&gt;lblFT_Irregular.Name" xml:space="preserve">
+    <value>lblFT_Irregular</value>
   </data>
-  <data name="&gt;&gt;rbSearchFulltext.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;lblFT_Irregular.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lblFT_Irregular.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;lblFT_Irregular.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="rbSearchCombined.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="rbSearchCombined.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 20</value>
-  </data>
-  <data name="rbSearchCombined.Size" type="System.Drawing.Size, System.Drawing">
-    <value>405, 17</value>
-  </data>
-  <data name="rbSearchCombined.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="rbSearchCombined.Text" xml:space="preserve">
-    <value>Kombinierte Suche (ADDI-Datensätzen und Dateien - wenn Volltext vorhanden)</value>
-  </data>
-  <data name="&gt;&gt;rbSearchCombined.Name" xml:space="preserve">
-    <value>rbSearchCombined</value>
-  </data>
-  <data name="&gt;&gt;rbSearchCombined.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;rbSearchCombined.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;rbSearchCombined.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
   <data name="txtSearch.Location" type="System.Drawing.Point, System.Drawing">
     <value>15, 50</value>
   </data>
@@ -517,7 +409,7 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;txtSearch.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>2</value>
   </data>
   <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -526,13 +418,13 @@
     <value>15, 31</value>
   </data>
   <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 13</value>
+    <value>69, 13</value>
   </data>
   <data name="Label2.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
   </data>
   <data name="Label2.Text" xml:space="preserve">
-    <value>Suchbegriff:</value>
+    <value>Suchbegriff: </value>
   </data>
   <data name="&gt;&gt;Label2.Name" xml:space="preserve">
     <value>Label2</value>
@@ -544,40 +436,16 @@
     <value>Panel1</value>
   </data>
   <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="GroupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>538, 31</value>
-  </data>
-  <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>619, 74</value>
-  </data>
-  <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="GroupBox1.Text" xml:space="preserve">
-    <value>Bitte definieren Sie eine Suchvariante:</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.Name" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.Parent" xml:space="preserve">
-    <value>Panel1</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <data name="Panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Top</value>
   </data>
   <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 147</value>
+    <value>0, 158</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 105</value>
+    <value>1467, 90</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -592,64 +460,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="BarButtonItem1.Caption" xml:space="preserve">
-    <value>Export Excel</value>
-  </data>
-  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
-        Pg0KICA8ZyBpZD0iRXhwb3J0Ij4NCiAgICA8cGF0aCBkPSJNMTAsMTJINlY2aDRWMTJ6IE0yMiwxMnY2
-        djljMCwwLjYtMC40LDEtMSwxSDFjLTAuNiwwLTEtMC40LTEtMVY3YzAtMC42LDAuNC0xLDEtMWgzdjho
-        MTR2LTJIMjJ6IE0xOCwxOEg0ICAgdjZoMTRWMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHBvbHln
-        b24gcG9pbnRzPSIxNiwxMCAyNCwxMCAyNCwxNCAzMiw4IDI0LDIgMjQsNiAxNiw2ICAiIGNsYXNzPSJH
-        cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-</value>
-  </data>
-  <data name="BarButtonItem2.Caption" xml:space="preserve">
-    <value>Detailansicht</value>
-  </data>
-  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQFAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
-        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
-        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
-        MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
-        bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGV0YWlsZWQiPg0KICAgIDxwYXRo
-        IGQ9Ik04LDhINlY2aDJWOHogTTgsMTBINnYyaDJWMTB6IE04LDE0SDZ2MmgyVjE0eiBNOCwxOEg2djJo
-        MlYxOHogTTgsMjJINnYyaDJWMjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgICA8cGF0aCBkPSJNMiwyOFYy
-        aDIydjEyLjNjMC43LDAuMiwxLjQsMC41LDIsMC44VjFjMC0wLjUtMC41LTEtMS0xSDFDMC41LDAsMCww
-        LjUsMCwxdjI4YzAsMC41LDAuNSwxLDEsMWgyMSAgIGMtMiwwLTMuOS0wLjgtNS4zLTJIMnoiIGNsYXNz
-        PSJCbGFjayIgLz4NCiAgICA8cGF0aCBkPSJNMzEuNiwyOS45TDI3LDI1LjNjMC42LTAuOSwxLTIuMSwx
-        LTMuM2MwLTMuMy0yLjctNi02LTZzLTYsMi43LTYsNnMyLjcsNiw2LDZjMS4yLDAsMi4zLTAuNCwzLjMt
-        MWw0LjYsNC42ICAgYzAuNSwwLjUsMS4zLDAuNSwxLjcsMEMzMi4xLDMxLjIsMzIuMSwzMC40LDMxLjYs
-        MjkuOXogTTIyLDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNC4yLDI2LDIy
-        LDI2eiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPGcgY2xhc3M9InN0MCI+DQogICAgICA8cGF0aCBkPSJN
-        MTYuNywxNkgxMHYtMmgxMHYwLjNDMTguOCwxNC42LDE3LjYsMTUuMiwxNi43LDE2eiBNMjAsNkgxMHYy
-        aDEwVjZ6IE0yMCwxMEgxMHYyaDEwVjEweiBNMTQsMjJoLTR2Mmg0LjMgICAgQzE0LjEsMjMuNCwxNCwy
-        Mi43LDE0LDIyeiBNMTUuMSwxOEgxMHYyaDQuM0MxNC40LDE5LjMsMTQuNywxOC42LDE1LjEsMTh6IiBj
-        bGFzcz0iQmxhY2siIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L
-</value>
+    <value>1</value>
   </data>
   <data name="bsiInfo.ItemAppearance.Normal.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8.25pt, style=Bold, Italic</value>
@@ -657,6 +468,7 @@
   <data name="BarButtonItem3.Caption" xml:space="preserve">
     <value>Starte Suche</value>
   </data>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
@@ -675,25 +487,268 @@
         IDxwYXRoIGQ9Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMy
         My43LDIsMTYsMnogTTEyLDIyVjEwbDEwLDZMMTIsMjJ6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N
         Cjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="BarButtonItem4.Caption" xml:space="preserve">
+    <value>Export</value>
+  </data>
+  <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHYNAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5H
+        cmVlbntmaWxsOiMwMzlDMjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgkuc3Qwe29wYWNpdHk6MC4z
+        O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTgsNGgxOHY2aDJWM2MwLTAuNS0wLjUtMS0xLTFIN0M2LjUs
+        Miw2LDIuNSw2LDN2N2gyVjR6IiBjbGFzcz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0yNiwyNkg4di04
+        SDZ2OWMwLDAuNSwwLjUsMSwxLDFoMjBjMC41LDAsMS0wLjUsMS0xdi05aC0yVjI2eiIgY2xhc3M9IkJs
+        YWNrIiAvPg0KICA8cGF0aCBkPSJNMzEsOEgzQzIuNCw4LDIsOC40LDIsOXYxMGMwLDAuNiwwLjQsMSwx
+        LDFoMjhjMC42LDAsMS0wLjQsMS0xVjlDMzIsOC40LDMxLjYsOCwzMSw4eiBNOS4xLDE4bC0xLjMtMi41
+        ICBjLTAuMS0wLjEtMC4xLTAuMy0wLjItMC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDYuMSwxOEg0
+        bDIuNS0zLjlsLTIuMi0zLjloMi4xbDEuMSwyLjNjMC4xLDAuMiwwLjIsMC40LDAuMiwwLjdoMCAgYzAt
+        MC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXogTTE2Ljcs
+        MThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45Yy0wLjIsMC4zLTAuNCwwLjUtMC43
+        LDAuNyAgcy0wLjYsMC4zLTEsMC40Yy0wLjQsMC4xLTAuOCwwLjEtMS4yLDAuMWMtMC40LDAtMC44LDAt
+        MS4yLTAuMWMtMC40LTAuMS0wLjctMC4yLTEtMC4zVjE2YzAuMywwLjMsMC42LDAuNSwxLDAuNnMwLjcs
+        MC4yLDEuMSwwLjIgIGMwLjIsMCwwLjQsMCwwLjYtMC4xczAuMy0wLjEsMC40LTAuMmMwLjEtMC4xLDAu
+        Mi0wLjIsMC4yLTAuMmMwLjEtMC4xLDAuMS0wLjIsMC4xLTAuM2MwLTAuMiwwLTAuMy0wLjEtMC40ICBj
+        LTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0wLjctMC4zYy0w
+        LjYtMC4zLTEuMS0wLjYtMS4zLTAuOWMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjMgIGMwLTAuNCwwLjEt
+        MC43LDAuMi0xYzAuMi0wLjMsMC40LTAuNSwwLjctMC43YzAuMy0wLjIsMC42LTAuMywxLTAuNHMwLjgt
+        MC4xLDEuMi0wLjFjMC40LDAsMC44LDAsMS4xLDAuMWMwLjMsMCwwLjYsMC4xLDAuOSwwLjIgIHYxLjZj
+        LTAuMS0wLjEtMC4zLTAuMi0wLjQtMC4ycy0wLjMtMC4xLTAuNS0wLjJjLTAuMiwwLTAuMy0wLjEtMC41
+        LTAuMXMtMC4zLDAtMC41LDBjLTAuMiwwLTAuNCwwLTAuNSwwLjFjLTAuMiwwLTAuMywwLjEtMC40LDAu
+        MiAgYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAuMSwwLjNjMCwwLjEs
+        MCwwLjIsMC4xLDAuM2MwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4xLDAuMywwLjIsMC41LDAu
+        MyAgczAuNCwwLjIsMC42LDAuM2MwLjMsMC4xLDAuNiwwLjMsMC44LDAuNGMwLjIsMC4xLDAuNSwwLjMs
+        MC42LDAuNWMwLjIsMC4yLDAuMywwLjQsMC40LDAuNnMwLjEsMC41LDAuMSwwLjggIEMyMi42LDE2LjMs
+        MjIuNSwxNi42LDIyLjQsMTYuOXogTTI4LjEsMThsLTEuMy0yLjVjLTAuMS0wLjEtMC4xLTAuMy0wLjIt
+        MC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDI1LjEsMThIMjNsMi41LTMuOWwtMi4yLTMuOSAgaDIu
+        MWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4xLTAuNCwwLjItMC43bDEu
+        Mi0yLjNoMS45bC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xh
+        c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTMxLDhIM0MyLjQsOCwyLDguNCwyLDl2MTBjMCwwLjYsMC40
+        LDEsMSwxaDI4YzAuNiwwLDEtMC40LDEtMVY5QzMyLDguNCwzMS42LDgsMzEsOHogTTkuMSwxOGwtMS4z
+        LTIuNSAgIGMtMC4xLTAuMS0wLjEtMC4zLTAuMi0wLjVoMGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMNi4x
+        LDE4SDRsMi41LTMuOWwtMi4yLTMuOWgyLjFsMS4xLDIuM2MwLjEsMC4yLDAuMiwwLjQsMC4yLDAuN2gw
+        ICAgYzAtMC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXog
+        TTE2LjcsMThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45ICAgYy0wLjIsMC4zLTAu
+        NCwwLjUtMC43LDAuN3MtMC42LDAuMy0xLDAuNGMtMC40LDAuMS0wLjgsMC4xLTEuMiwwLjFjLTAuNCww
+        LTAuOCwwLTEuMi0wLjFjLTAuNC0wLjEtMC43LTAuMi0xLTAuM1YxNiAgIGMwLjMsMC4zLDAuNiwwLjUs
+        MSwwLjZzMC43LDAuMiwxLjEsMC4yYzAuMiwwLDAuNCwwLDAuNi0wLjFzMC4zLTAuMSwwLjQtMC4yYzAu
+        MS0wLjEsMC4yLTAuMiwwLjItMC4yYzAuMS0wLjEsMC4xLTAuMiwwLjEtMC4zICAgYzAtMC4yLDAtMC4z
+        LTAuMS0wLjRjLTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0w
+        LjctMC4zYy0wLjYtMC4zLTEuMS0wLjYtMS4zLTAuOSAgIGMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjNj
+        MC0wLjQsMC4xLTAuNywwLjItMWMwLjItMC4zLDAuNC0wLjUsMC43LTAuN2MwLjMtMC4yLDAuNi0wLjMs
+        MS0wLjRzMC44LTAuMSwxLjItMC4xICAgYzAuNCwwLDAuOCwwLDEuMSwwLjFjMC4zLDAsMC42LDAuMSww
+        LjksMC4ydjEuNmMtMC4xLTAuMS0wLjMtMC4yLTAuNC0wLjJzLTAuMy0wLjEtMC41LTAuMmMtMC4yLDAt
+        MC4zLTAuMS0wLjUtMC4xcy0wLjMsMC0wLjUsMCAgIGMtMC4yLDAtMC40LDAtMC41LDAuMWMtMC4yLDAt
+        MC4zLDAuMS0wLjQsMC4yYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAu
+        MSwwLjNjMCwwLjEsMCwwLjIsMC4xLDAuMyAgIGMwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4x
+        LDAuMywwLjIsMC41LDAuM3MwLjQsMC4yLDAuNiwwLjNjMC4zLDAuMSwwLjYsMC4zLDAuOCwwLjRjMC4y
+        LDAuMSwwLjUsMC4zLDAuNiwwLjUgICBjMC4yLDAuMiwwLjMsMC40LDAuNCwwLjZzMC4xLDAuNSwwLjEs
+        MC44QzIyLjYsMTYuMywyMi41LDE2LjYsMjIuNCwxNi45eiBNMjguMSwxOGwtMS4zLTIuNWMtMC4xLTAu
+        MS0wLjEtMC4zLTAuMi0wLjVoMCAgIGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMMjUuMSwxOEgyM2wyLjUt
+        My45bC0yLjItMy45aDIuMWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4x
+        LTAuNCwwLjItMC43bDEuMi0yLjNoMS45ICAgbC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJC
+        bHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="BarButtonItem6.Caption" xml:space="preserve">
+    <value>Ordner öffnen</value>
+  </data>
+  <data name="BarButtonItem6.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAMDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iT3BlbjIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMy
+        IDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5HcmVlbntmaWxsOiMwMzlDMjM7fQoJLlll
+        bGxvd3tmaWxsOiNGRkIxMTU7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBjbGFz
+        cz0ic3QwIj4NCiAgICA8cGF0aCBkPSJNMTkuMiwxMEgxMlY3YzAtMC42LTAuNC0xLTEtMUgzQzIuNCw2
+        LDIsNi41LDIsN3YxOGMwLDAuMiwwLDAuMywwLjEsMC40YzAsMCwwLjEtMC4xLDAuMS0wLjJsNS41LTEw
+        ICAgQzgsMTQuNSw4LjcsMTQsOS41LDE0aDEzLjdMMTkuMiwxMHoiIGNsYXNzPSJZZWxsb3ciIC8+DQog
+        IDwvZz4NCiAgPHBhdGggZD0iTTI5LjMsMTZIOS42TDQsMjZoMTkuOGMwLjUsMCwxLjEtMC4yLDEuMy0w
+        LjZsNC45LTguOUMzMC4xLDE2LjIsMjkuOCwxNiwyOS4zLDE2eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAg
+        PHBhdGggZD0iTTI4LDhjMC0zLjMtMi43LTYtNi02cy02LDIuNy02LDZjMC0yLjIsMS44LTQsNC00czQs
+        MS44LDQsNGgtNGw2LDZsNi02SDI4eiIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="BarButtonItem7.Caption" xml:space="preserve">
+    <value>Eigenschaften</value>
+  </data>
+  <data name="BarButtonItem7.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOYDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iRG9jdW1lbnRfUHJvcGVydGllcyIgc3R5bGU9ImVuYWJsZS1iYWNrZ3Jv
+        dW5kOm5ldyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6
+        IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMzAsMjV2
+        LTJsLTIuMi0wLjRjLTAuMi0wLjYtMC40LTEuMy0wLjctMS44bDEuMy0xLjhsLTEuNC0xLjRsLTEuOCwx
+        LjNjLTAuNS0wLjMtMS4yLTAuNi0xLjgtMC43TDIzLDE2aC0yICBsLTAuNCwyLjJjLTAuNiwwLjItMS4z
+        LDAuNC0xLjgsMC43bC0xLjgtMS4zbC0xLjQsMS40bDEuMywxLjhjLTAuMywwLjUtMC42LDEuMi0wLjcs
+        MS44TDE0LDIzdjJsMi4yLDAuNGMwLjIsMC42LDAuNCwxLjMsMC43LDEuOCAgbC0xLjMsMS44bDEuNCwx
+        LjRsMS44LTEuM2MwLjUsMC4zLDEuMiwwLjYsMS44LDAuN0wyMSwzMmgybDAuNC0yLjJjMC42LTAuMiwx
+        LjMtMC40LDEuOC0wLjdsMS44LDEuM2wxLjQtMS40bC0xLjMtMS44ICBjMC4zLTAuNSwwLjYtMS4yLDAu
+        Ny0xLjhMMzAsMjV6IE0yMiwyNmMtMS4xLDAtMi0wLjktMi0yczAuOS0yLDItMnMyLDAuOSwyLDJTMjMu
+        MSwyNiwyMiwyNnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8cGF0aCBkPSJNMTQuMywyNkg2VjRoNmg2djVj
+        MCwwLjYsMC40LDEsMSwxaDV2NS45bDAsMC40YzAuNywwLjIsMS40LDAuNSwyLDAuOFY5bC03LTdINUM0
+        LjQsMiw0LDIuNCw0LDN2MjQgIGMwLDAuNiwwLjQsMSwxLDFoMTAuMUMxNC43LDI3LjQsMTQuNCwyNi43
+        LDE0LjMsMjZ6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="BarButtonItem8.Caption" xml:space="preserve">
+    <value>Verknüpfungen anzeigen</value>
+  </data>
+  <data name="BarButtonItem8.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPYDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iSHlwZXJsaW5rXzFfIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3
+        IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDojNzI3Mjcy
+        O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTE2LjgsMThjMS4zLDEuOSwxLjEsNC42LTAuNiw2LjNsLTQu
+        Miw0LjJjLTIsMi01LjEsMi03LjEsMGwtMS40LTEuNGMtMi0yLTItNS4xLDAtNy4xICBsNC4yLTQuMmMx
+        LjctMS43LDQuMy0xLjksNi4zLTAuNmwtMS41LDEuNWMtMS4xLTAuNS0yLjUtMC4zLTMuNCwwLjZsLTQu
+        Miw0LjJjLTEuMiwxLjItMS4yLDMuMSwwLDQuMmwxLjQsMS40ICBjMS4yLDEuMiwzLjEsMS4yLDQuMiww
+        bDQuMi00LjJjMC45LTAuOSwxLjEtMi4zLDAuNi0zLjRMMTYuOCwxOHogTTI4LjUsNC45bC0xLjQtMS40
+        Yy0yLTItNS4xLTItNy4xLDBsLTQuMiw0LjIgIGMtMS43LDEuNy0xLjksNC4zLTAuNiw2LjNsMS41LTEu
+        NWMtMC41LTEuMS0wLjMtMi41LDAuNi0zLjRsNC4yLTQuMmMxLjItMS4yLDMuMS0xLjIsNC4yLDBsMS40
+        LDEuNGMxLjIsMS4yLDEuMiwzLjEsMCw0LjJsLTQuMiw0LjIgIGMtMC45LDAuOS0yLjMsMS4xLTMuNCww
+        LjZMMTgsMTYuOGMxLjksMS4zLDQuNiwxLjEsNi4zLTAuNmw0LjItNC4yQzMwLjUsMTAsMzAuNSw2Ljgs
+        MjguNSw0Ljl6IE0yMS43LDExLjdjMC40LTAuNCwwLjQtMSwwLTEuNGwwLDAgIGMtMC40LTAuNC0xLTAu
+        NC0xLjQsMGwtMTAsMTBjLTAuNCwwLjQtMC40LDEsMCwxLjRsMCwwYzAuNCwwLjQsMSwwLjQsMS40LDBM
+        MjEuNywxMS43eiIgaWQ9Ikh5cGVybGluayIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="BarButtonItem9.Caption" xml:space="preserve">
+    <value>Zeige Datensatz</value>
+  </data>
+  <data name="BarButtonItem9.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iU2VsZWN0VGFibGVSb3ciIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpu
+        ZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbHVle2ZpbGw6IzExNzdE
+        Nzt9CgkuQmxhY2t7ZmlsbDojNzI3MjcyO30KCS5zdDB7b3BhY2l0eTowLjU7fQo8L3N0eWxlPg0KICA8
+        cGF0aCBkPSJNMTAsMThIMnYtNmg4VjE4eiBNMjAsMTJoLTh2Nmg4VjEyeiBNMzAsMTJoLTh2Nmg4VjEy
+        eiIgY2xhc3M9IkJsdWUiIC8+DQogIDxnIGNsYXNzPSJzdDAiPg0KICAgIDxwYXRoIGQ9Ik0xMCwxMEgy
+        VjRoOFYxMHogTTIwLDRoLTh2Nmg4VjR6IE0zMCw0aC04djZoOFY0eiBNMTAsMjBIMnY2aDhWMjB6IE0y
+        MCwyMGgtOHY2aDhWMjB6IE0zMCwyMGgtOHY2aDhWMjB6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
+        Cjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="BarButtonItem10.Caption" xml:space="preserve">
+    <value>Datei öffnen</value>
+  </data>
+  <data name="BarButtonItem10.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOMCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlNpbmdsZVBhZ2VWaWV3Ij4NCiAgICA8cGF0aCBk
+        PSJNMjcsMEgzQzIuNCwwLDIsMC40LDIsMXYyOGMwLDAuNiwwLjQsMSwxLDFoMjRjMC42LDAsMS0wLjQs
+        MS0xVjFDMjgsMC40LDI3LjYsMCwyNywweiBNMjYsMjhINFYyaDIyVjI4eiIgY2xhc3M9IkJsYWNrIiAv
+        Pg0KICAgIDxwYXRoIGQ9Ik0yMiw4SDhWNmgxNFY4eiBNMjIsMTBIOHYyaDE0VjEweiBNMjIsMTRIOHYy
+        aDE0VjE0eiBNMjIsMThIOHYyaDE0VjE4eiBNMjIsMjJIOHYyaDE0VjIyeiIgY2xhc3M9IkJsdWUiIC8+
+        DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="BarToggleSearchCombined.Caption" xml:space="preserve">
+    <value>Kombinierte Suche (Datensätze und Volltext)</value>
+  </data>
+  <data name="BarToggleSearchRecord.Caption" xml:space="preserve">
+    <value>Nur in orgFLOW-Datensätzen</value>
+  </data>
+  <data name="BarToggleFulltext.Caption" xml:space="preserve">
+    <value>Nur in Volltext</value>
+  </data>
+  <data name="bbtnitmJump2Filestore.Caption" xml:space="preserve">
+    <value>Springe zu Filestore</value>
+  </data>
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEADAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuR3JlZW57ZmlsbDojMDM5
+        QzIzO30KCS5CbHVle2ZpbGw6IzExNzdENzt9Cjwvc3R5bGU+DQogIDxnIGlkPSJTdG9yZSI+DQogICAg
+        PHJlY3QgeD0iMjQiIHk9IjE2IiB3aWR0aD0iMiIgaGVpZ2h0PSIxMiIgcng9IjAiIHJ5PSIwIiBjbGFz
+        cz0iUmVkIiAvPg0KICAgIDxwb2x5Z29uIHBvaW50cz0iMTYsMjIgOCwyMiA4LDE2IDYsMTYgNiwyMiA2
+        LDI4IDgsMjggMTYsMjggMTgsMjggMTgsMjIgMTgsMTYgMTYsMTYgICIgY2xhc3M9IlJlZCIgLz4NCiAg
+        ICA8cGF0aCBkPSJNMjYsNEg2TDIsOHYydjAuNUMyLDEyLjQsMy42LDE0LDUuNSwxNFM5LDEyLjQsOSwx
+        MC41YzAsMS45LDEuNiwzLjUsMy41LDMuNWMxLjksMCwzLjUtMS42LDMuNS0zLjUgICBjMCwxLjksMS42
+        LDMuNSwzLjUsMy41czMuNS0xLjYsMy41LTMuNWMwLDEuOSwxLjYsMy41LDMuNSwzLjVzMy41LTEuNiwz
+        LjUtMy41VjEwVjhMMjYsNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="BarButtonItem2.Caption" xml:space="preserve">
+    <value>Mit Datensatz verknüpfen</value>
+  </data>
+  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABkDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAxNiAxNiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGluayIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMTYg
+        MTYiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5
+        bGU+DQogIDxwYXRoIGQ9Ik0xMi41LDVoLTJDOS4zLDUsOC4zLDUuOSw4LjEsN0g2LjlDNi43LDUuOSw1
+        LjcsNSw0LjUsNWgtMkMxLjEsNSwwLDYuMSwwLDcuNVMxLjEsMTAsMi41LDEwaDIgIGMxLjIsMCwyLjIt
+        MC45LDIuNC0yaDEuMWMwLjIsMS4xLDEuMiwyLDIuNCwyaDJjMS40LDAsMi41LTEuMSwyLjUtMi41UzEz
+        LjksNSwxMi41LDV6IE00LjUsOWgtMkMxLjcsOSwxLDguMywxLDcuNSAgQzEsNi43LDEuNyw2LDIuNSw2
+        aDJjMC42LDAsMS4yLDAuNCwxLjQsMUgzLjVDMy4yLDcsMyw3LjIsMyw3LjVTMy4yLDgsMy41LDhoMi40
+        QzUuNyw4LjYsNS4xLDksNC41LDl6IE0xMi41LDloLTIgIEM5LjksOSw5LjMsOC42LDkuMSw4aDIuNEMx
+        MS44LDgsMTIsNy44LDEyLDcuNVMxMS44LDcsMTEuNSw3SDkuMWMwLjItMC42LDAuOC0xLDEuNC0xaDJD
+        MTMuMyw2LDE0LDYuNywxNCw3LjVDMTQsOC4zLDEzLjMsOSwxMi41LDkgIHoiIGNsYXNzPSJCbGFjayIg
+        Lz4NCjwvc3ZnPgs=
 </value>
   </data>
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="RibbonPageGroup1.Text" xml:space="preserve">
-    <value>Aktionen</value>
-  </data>
   <data name="RibbonPage1.Text" xml:space="preserve">
-    <value>Global Search</value>
+    <value>Globale Suche</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 147</value>
+    <value>1467, 158</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 432</value>
+    <value>0, 675</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 23</value>
+    <value>1467, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -705,7 +760,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;RibbonControl1.Name" xml:space="preserve">
     <value>RibbonControl1</value>
@@ -717,11 +772,35 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>3</value>
+  </data>
+  <data name="RibbonPageGroup1.Text" xml:space="preserve">
+    <value>Aktionen</value>
+  </data>
+  <data name="RibbonPageGroupRecords.Text" xml:space="preserve">
+    <value>Datensatz</value>
+  </data>
+  <data name="RibbonPageGroupFiles.Text" xml:space="preserve">
+    <value>Datei(en)</value>
+  </data>
+  <data name="RibbonPageGroupExcel.Text" xml:space="preserve">
+    <value>Funktionen Tabelle</value>
+  </data>
+  <data name="RibbonPageGroup3.Text" xml:space="preserve">
+    <value>Suchvariante</value>
   </data>
   <data name="RibbonPage2.Text" xml:space="preserve">
     <value>RibbonPage2</value>
   </data>
+  <metadata name="DD_ECMAdmin1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>321, 17</value>
+  </metadata>
+  <metadata name="XtraSaveFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>463, 17</value>
+  </metadata>
+  <data name="XtraSaveFileDialog1.Filter" xml:space="preserve">
+    <value>"xlsx-Dateien|*.xlsx"</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -729,7 +808,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1169, 455</value>
+    <value>1467, 697</value>
   </data>
   <data name="frmGlobalSearch.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -786,18 +865,6 @@
   <data name="$this.Text" xml:space="preserve">
     <value>Search all over</value>
   </data>
-  <data name="&gt;&gt;ExportExcelToolStripMenuItem.Name" xml:space="preserve">
-    <value>ExportExcelToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;ExportExcelToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ShowRecordToolStripMenuItem.Name" xml:space="preserve">
-    <value>ShowRecordToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;ShowRecordToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;GridViewRecords.Name" xml:space="preserve">
     <value>GridViewRecords</value>
   </data>
@@ -816,30 +883,6 @@
   <data name="&gt;&gt;ToolStripSeparator1.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;DateiÖffnenToolStripMenuItem.Name" xml:space="preserve">
-    <value>DateiÖffnenToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;DateiÖffnenToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;OrdnerÖffnenToolStripMenuItem.Name" xml:space="preserve">
-    <value>OrdnerÖffnenToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;OrdnerÖffnenToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;EigenschaftenToolStripMenuItem.Name" xml:space="preserve">
-    <value>EigenschaftenToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;EigenschaftenToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;VerknüpfungenAnzeigenToolStripMenuItem.Name" xml:space="preserve">
-    <value>VerknüpfungenAnzeigenToolStripMenuItem</value>
-  </data>
-  <data name="&gt;&gt;VerknüpfungenAnzeigenToolStripMenuItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;GridViewFiles.Name" xml:space="preserve">
     <value>GridViewFiles</value>
   </data>
@@ -852,18 +895,6 @@
   <data name="&gt;&gt;tslblDocView.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem1.Name" xml:space="preserve">
-    <value>BarButtonItem1</value>
-  </data>
-  <data name="&gt;&gt;BarButtonItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
-    <value>BarButtonItem2</value>
-  </data>
-  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;bsiInfo.Name" xml:space="preserve">
     <value>bsiInfo</value>
   </data>
@@ -876,6 +907,72 @@
   <data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;BarButtonItem4.Name" xml:space="preserve">
+    <value>BarButtonItem4</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem4.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem6.Name" xml:space="preserve">
+    <value>BarButtonItem6</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem6.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem7.Name" xml:space="preserve">
+    <value>BarButtonItem7</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem7.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem8.Name" xml:space="preserve">
+    <value>BarButtonItem8</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem8.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem9.Name" xml:space="preserve">
+    <value>BarButtonItem9</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem9.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem10.Name" xml:space="preserve">
+    <value>BarButtonItem10</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem10.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarToggleSearchCombined.Name" xml:space="preserve">
+    <value>BarToggleSearchCombined</value>
+  </data>
+  <data name="&gt;&gt;BarToggleSearchCombined.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarToggleSearchRecord.Name" xml:space="preserve">
+    <value>BarToggleSearchRecord</value>
+  </data>
+  <data name="&gt;&gt;BarToggleSearchRecord.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarToggleFulltext.Name" xml:space="preserve">
+    <value>BarToggleFulltext</value>
+  </data>
+  <data name="&gt;&gt;BarToggleFulltext.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;bbtnitmJump2Filestore.Name" xml:space="preserve">
+    <value>bbtnitmJump2Filestore</value>
+  </data>
+  <data name="&gt;&gt;bbtnitmJump2Filestore.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
+    <value>BarButtonItem2</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
   </data>
@@ -888,12 +985,48 @@
   <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;RibbonPageGroupRecords.Name" xml:space="preserve">
+    <value>RibbonPageGroupRecords</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroupRecords.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroupFiles.Name" xml:space="preserve">
+    <value>RibbonPageGroupFiles</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroupFiles.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroupExcel.Name" xml:space="preserve">
+    <value>RibbonPageGroupExcel</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroupExcel.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup3.Name" xml:space="preserve">
+    <value>RibbonPageGroup3</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPage2.Name" xml:space="preserve">
     <value>RibbonPage2</value>
   </data>
   <data name="&gt;&gt;RibbonPage2.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;DD_ECMAdmin1.Name" xml:space="preserve">
+    <value>DD_ECMAdmin1</value>
+  </data>
+  <data name="&gt;&gt;DD_ECMAdmin1.Type" xml:space="preserve">
+    <value>DD_Record_Organizer.DD_ECMAdmin, DD_ECMAdmin.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;XtraSaveFileDialog1.Name" xml:space="preserve">
+    <value>XtraSaveFileDialog1</value>
+  </data>
+  <data name="&gt;&gt;XtraSaveFileDialog1.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmGlobalSearch</value>
   </data>

app/DD-Record-Organizer/frmGlobalSearch.vb

@@ -7,8 +7,10 @@ Imports DevExpress.XtraPrinting
 Imports DevExpress.Data.Filtering.Helpers.SubExprHelper.CriteriaTokens
 Imports DevExpress.XtraSplashScreen
 Imports System.Threading
+Imports DevExpress.XtraGrid
 
 Public Class frmGlobalSearch
+
     Inherits DevExpress.XtraBars.Ribbon.RibbonForm
     <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
     Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
@@ -35,31 +37,44 @@ Public Class frmGlobalSearch
     Private Const SEE_MASK_FLAG_NO_UI = &H400
     Public Const SW_SHOW As Short = 5
     Private _Helper As ClassHelper
-    Dim sel_Records, sel_FT As String
-    Private SelectedGrid As DevExpress.XtraGrid.GridControl
+    Dim sel_Records, FuULLTEXT_select As String
+    Private _ActiveGrid As GridControl = Nothing
+    Private Function GetActiveGridControl() As GridControl
+        If _ActiveGrid Is Nothing Then
+            Return Nothing
+        End If
 
+        Return _ActiveGrid
+    End Function
+    Private Sub GridControlWK1_Enter(sender As Object, e As EventArgs) Handles GridControlFiles.Enter, GridControlRecords.Enter
+        _ActiveGrid = sender
+    End Sub
     Sub Refresh_Search()
+
         If txtSearch.Text = "" Then
             Exit Sub
         End If
+        Me.Cursor = Cursors.WaitCursor
         Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
         Try
+            lblFT_Irregular.Visible = False
             sel_Records = ""
-            sel_FT = ""
+            FuULLTEXT_select = ""
 
-            If rbSearchCombined.Checked = True Then
+            If BarToggleSearchCombined.Checked = True Then
                 PREPARE_RECORD_SQL()
                 PREPARE_FT_SQL()
+
             End If
-            If rbSearchRecord.Checked = True Then
+            If BarToggleSearchRecord.Checked = True Then
                 PREPARE_RECORD_SQL()
             End If
-            If rbSearchFulltext.Checked Then
+            If BarToggleFulltext.Checked Then
                 PREPARE_FT_SQL()
             End If
             Dim DT_Files As DataTable
             Dim DT_RECORD_RESULT As DataTable
-            If rbSearchCombined.Checked Or rbSearchRecord.Checked Then
+            If BarToggleSearchCombined.Checked Or BarToggleSearchRecord.Checked Then
                 DT_RECORD_RESULT = Refresh_Records()
             Else
                 SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1
@@ -67,9 +82,9 @@ Public Class frmGlobalSearch
                 tslblRecordsResult.Text = String.Format("No records found")
                 GridControlRecords.DataSource = Nothing
             End If
-            If rbSearchCombined.Checked Or rbSearchFulltext.Checked Then
+            If BarToggleSearchCombined.Checked Or BarToggleFulltext.Checked Then
                 DT_Files = Refresh_Files()
-                If rbSearchFulltext.Checked Then
+                If BarToggleFulltext.Checked Then
                     SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1
                     SplitContainerMain.Collapsed = True
                 End If
@@ -85,6 +100,7 @@ Public Class frmGlobalSearch
 
         Finally
             SplashScreenManager.CloseOverlayForm(oHandle)
+            Me.Cursor = Cursors.Default
         End Try
 
 
@@ -92,21 +108,20 @@ Public Class frmGlobalSearch
 
     End Sub
     Sub PREPARE_FT_SQL()
-        Dim oFTSearchtext = txtSearch.Text
-        If oFTSearchtext.Contains(" ") Then
-            oFTSearchtext = oFTSearchtext.Replace(" ", "%")
-        End If
-        Dim sqlft = SQL_FULLTEXT
-        sqlft = sqlft.Replace("@FULLTEXT", oFTSearchtext)
-        'Dim selDoc = String.Format("SELECT T.[DocID],T.[FULL_FILENAME],T.[Filename],T.[DISPLAY_NAME],T.[Doctype],T.[Creation_DateTime] As CreatedWhen,T.[Change_DateTime] as ChangedWhen,T.[IN_WORK] as [InWork?] " &
-        '            "FROM VWPMO_DOC_SEARCH T INNER JOIN ( " & vbNewLine &
-        '            "{0}) Y ON  T.DocID = Y.dwDocID " & vbNewLine &
-        '            "INNER JOIN VWPMO_WD_OBJECT_RIGHTS TRIGHT ON T.DocID = TRIGHT.dwObjectID WHERE TRIGHT.dwUserOrGroupID = {1}", sqlft, USERID_FK_INT_ECM)
-        sel_FT = sqlft
+        Dim oSearchTermFT = txtSearch.Text
+        oSearchTermFT = oSearchTermFT.Replace(" ", "%")
+        oSearchTermFT = oSearchTermFT.Replace(".", "")
+        Dim oSQLft = SQL_FULLTEXT
+        oSQLft = oSQLft.Replace("@FULLTEXT_RP", oSearchTermFT)
+        oSQLft = oSQLft.Replace("@FULLTEXT", txtSearch.Text)
+
+        LOGGER.Debug("oSQLft is: " + oSQLft)
+        FuULLTEXT_select = oSQLft
 
     End Sub
     Sub PREPARE_RECORD_SQL()
-        sel_Records = String.Format("select T.RECORD_ID,TR.FORM_ID AS ENTITY_ID ,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), TFV.GUID), 1) as Entity," &
+
+        sel_Records = String.Format("Select T.RECORD_ID,TR.FORM_ID As ENTITY_ID ,[dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), TFV.GUID), 1) as Entity," &
                                        "T.VALUE,TR.ADDED_WHO as AddedWho,TR.ADDED_WHEN as AddedWhen,TR.CHANGED_WHO As ChangedWho,TR.CHANGED_WHEN as ChangedWhen from TBPMO_CONTROL_VALUE T,TBPMO_RECORD TR,TBPMO_FORM_VIEW TFV " &
                                        "where T.RECORD_ID = TR.GUID AND TR.FORM_ID = TFV.FORM_ID AND T.value like '%{1}%' ORDER BY T.RECORD_ID", USER_LANGUAGE, txtSearch.Text)
     End Sub
@@ -139,7 +154,14 @@ Public Class frmGlobalSearch
         End If
     End Function
     Private Function Refresh_Files()
-        Dim DT_Files = MYDB_ECM.GetDatatable(sel_FT)
+        Dim DT_Files As DataTable
+        If FuULLTEXT_select <> "FT_Incompatible" Then
+            DT_Files = MYDB_ECM.GetDatatable(FuULLTEXT_select)
+        Else
+            tslblDocView.Text = String.Format("No full text result because the search term contained characters that are incompatible with a full text search.")
+            GridControlFiles.DataSource = Nothing
+        End If
+
         If Not IsNothing(DT_Files) Then
             SplitContainerMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.None
             SplitContainerMain.Collapsed = False
@@ -147,17 +169,13 @@ Public Class frmGlobalSearch
                 GridControlFiles.DataSource = DT_Files
                 tslblDocView.Text = String.Format("{0} files found", DT_Files.Rows.Count)
                 Try
-                    GridViewFiles.Columns("AddedWhen").DisplayFormat.FormatType = FormatType.DateTime
-                    GridViewFiles.Columns("AddedWhen").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
-                    GridViewFiles.Columns("ChangedWhen").DisplayFormat.FormatType = FormatType.DateTime
-                    GridViewFiles.Columns("ChangedWhen").DisplayFormat.FormatString = CURRENT_DATE_FORMAT & " HH:MM:ss"
+                    GridViewFiles.Columns.Item("FULL_FILENAME").Visible = False
+                    GridViewFiles.OptionsView.ColumnAutoWidth = False
+                    GridViewFiles.BestFitColumns()
                 Catch ex As Exception
 
                 End Try
-                ' FormID und RecordID immer ausblenden
-                ' GridViewFiles.Columns.Item("FULL_FILENAME").Visible = False
-                GridViewFiles.OptionsView.ColumnAutoWidth = False
-                GridViewFiles.BestFitColumns()
+
             Else
                 tslblDocView.Text = String.Format(" No files found")
                 GridControlFiles.DataSource = Nothing
@@ -171,45 +189,26 @@ Public Class frmGlobalSearch
 
 
 
-
-    Private Sub ExportExcelToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ExportExcelToolStripMenuItem.Click
-        Export_Excel()
-    End Sub
     Sub Export_Excel()
-        If IsNothing(SelectedGrid) Then
-            MsgBox("Please choose a grid!", MsgBoxStyle.Exclamation)
-            Exit Sub
-        End If
-        Dim saveFileDialog1 As New SaveFileDialog
-        saveFileDialog1.Filter = "Excel File|*.xlsx"
-        saveFileDialog1.Title = "Export to Excel:"
-        saveFileDialog1.ShowDialog()
-        If saveFileDialog1.FileName <> "" Then
-            Cursor = Cursors.WaitCursor
-            Dim oOptions As XlsxExportOptionsEx = New XlsxExportOptionsEx
-            oOptions.ShowGridLines = True
-            oOptions.AllowSortingAndFiltering = DevExpress.Utils.DefaultBoolean.True
-            oOptions.ExportType = DevExpress.Export.ExportType.DataAware
-            oOptions.ExportMode = XlsxExportMode.SingleFile
-            oOptions.AllowFixedColumnHeaderPanel = DevExpress.Utils.DefaultBoolean.True
-            SelectedGrid.MainView.ExportToXlsx(saveFileDialog1.FileName, oOptions)
-            Dim result As MsgBoxResult
-            Dim msg = String.Format("Datei wurde erstellt! Wollen Sie diese nun öffnen?")
+        Dim oActiveGrid = GetActiveGridControl()
 
-            If USER_LANGUAGE <> "de-DE" Then
-                msg = String.Format("File was created. Do You want to open excel?")
-            End If
-            result = MessageBox.Show(msg, "Exporting result:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-            If result = MsgBoxResult.Yes Then
-                Process.Start(saveFileDialog1.FileName)
+        If oActiveGrid IsNot Nothing Then
+            Cursor = Cursors.WaitCursor
+            XtraSaveFileDialog1.FileName = oActiveGrid.Name & ".xlsx"
+            XtraSaveFileDialog1.DefaultExt = ".xlsx"
+
+            If XtraSaveFileDialog1.ShowDialog() = Windows.Forms.DialogResult.OK Then
+                Dim oOptions As New XlsxExportOptions() With {
+                    .ExportMode = XlsxExportMode.SingleFile
+                }
+                oActiveGrid.ExportToXlsx(XtraSaveFileDialog1.FileName, oOptions)
             End If
+        Else
+            MessageBox.Show("Please select a grid/table that you would like to export.", Text, MessageBoxButtons.OK)
         End If
         Cursor = Cursors.Default
     End Sub
 
-    Private Sub ShowRecordToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ShowRecordToolStripMenuItem.Click
-        Show_Detail_Record()
-    End Sub
     Sub Show_Detail_Record()
         Try
             Dim RECORD_ID = GridViewRecords.GetFocusedRowCellValue(GridViewRecords.Columns("RECORD_ID"))
@@ -219,7 +218,7 @@ Public Class frmGlobalSearch
         Catch ex As Exception
             MsgBox("Unexpected Error in Show_Detail_Record:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
-        JUMP_RECORD_ID = 0
+        JUMP_ID = 0
     End Sub
 
     Private Sub frmSearchAllOVer_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
@@ -290,6 +289,11 @@ Public Class frmGlobalSearch
     End Function
 
     Private Sub frmSearchAllOVer_Load(sender As Object, e As EventArgs) Handles Me.Load
+        If OF_FILESTORE_ENTITY = 0 Then
+            bbtnitmJump2Filestore.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+        Else
+            bbtnitmJump2Filestore.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+        End If
         _Helper = New ClassHelper
         Load_DocGrid_Layout()
         Load_RecordGrid_Layout()
@@ -337,23 +341,48 @@ Public Class frmGlobalSearch
 
     End Sub
 
-    Private Sub GridControlRecords_DoubleClick(sender As Object, e As EventArgs) Handles GridControlRecords.DoubleClick
 
+
+    Private Sub GridControlRecords_Click(sender As Object, e As EventArgs) Handles GridControlRecords.Click
+        RibbonPageGroupFiles.Enabled = False
+        RibbonPageGroupRecords.Enabled = True
     End Sub
 
-    Private Sub DateiÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateiÖffnenToolStripMenuItem.Click
-        File_open()
+    Private Sub GridControlFiles_Click(sender As Object, e As EventArgs) Handles GridControlFiles.Click
+        RibbonPageGroupFiles.Enabled = True
+        RibbonPageGroupRecords.Enabled = False
     End Sub
 
-    Private Sub OrdnerÖffnenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OrdnerÖffnenToolStripMenuItem.Click
+
+    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
+        Show_Detail_Record()
+    End Sub
+
+    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
+        Refresh_Search()
+    End Sub
+
+    Private Sub txtSearch_TextChanged(sender As Object, e As EventArgs) Handles txtSearch.TextChanged
+        Dim oTerm As String = txtSearch.Text
+        If txtSearch.Text.Contains(".") Then
+            lblFT_Irregular.Visible = True
+        Else
+            lblFT_Irregular.Visible = False
+        End If
+    End Sub
+
+    Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
+        Export_Excel()
+    End Sub
+
+    Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem6.ItemClick
         Open_folder()
     End Sub
 
-    Private Sub EigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles EigenschaftenToolStripMenuItem.Click
+    Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick
         Show_File_Properties()
     End Sub
-
-    Private Sub VerknüpfungenAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerknüpfungenAnzeigenToolStripMenuItem.Click
+    Private Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem8.ItemClick
         Try
             For Each row In GridViewFiles.GetSelectedRows
                 Dim SELECTED_DOC_ID = GridViewFiles.GetRowCellValue(row, "DocID")
@@ -371,26 +400,76 @@ Public Class frmGlobalSearch
         End Try
     End Sub
 
-    Private Sub GridControlRecords_Click(sender As Object, e As EventArgs) Handles GridControlRecords.Click
-        SelectedGrid = sender
-    End Sub
-
-    Private Sub GridControlFiles_Click(sender As Object, e As EventArgs) Handles GridControlFiles.Click
-        SelectedGrid = sender
-    End Sub
-
-    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
-        Export_Excel()
-    End Sub
-
-    Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+    Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick
         Show_Detail_Record()
     End Sub
 
-    Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
-        Refresh_Search()
+    Private Sub BarButtonItem10_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem10.ItemClick
+        File_open()
     End Sub
 
+    Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.Click
+
+    End Sub
+
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmJump2Filestore.ItemClick
+        For Each row In GridViewFiles.GetSelectedRows
+            Dim SELECTED_DOC_ID = GridViewFiles.GetRowCellValue(row, "DocID")
+            Dim oJumpToDocSQL = String.Format("DECLARE @PID BIGINT
+                SELECT @PID = dwParentID FROM TBPMO_DOCRESULT_LIST WHERE DocID = {0}
+                SELECT GUID FROM VWPMO_STRUCTURE_NODES WHERE ENTITY_ID = {1} AND ISNUMERIC(ID1) = 1  AND ID1 = @PID", SELECTED_DOC_ID, OF_FILESTORE_ENTITY)
+            Dim ojumpID As Integer = MYDB_ECM.GetScalarValue(oJumpToDocSQL)
+            If Not IsNothing(ojumpID) AndAlso ojumpID <> 0 Then
+                OpenFormConstructor(OF_FILESTORE_CONSTRUCTOR, 1, OF_FILESTORE_ENTITY, ojumpID)
+
+            Else
+                MessageBox.Show("A parent node could not be found!", "No Node found", MessageBoxButtons.OK, MessageBoxIcon.Warning)
+            End If
+            Exit For
+        Next
+    End Sub
+
+    Private Sub BarButtonItem2_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+        Dim Current_DocList As ClassDocGrid
+        Current_DocList = New ClassDocGrid(GridViewFiles)
+        Dim oDocuments = Current_DocList.SelectedDocuments
+
+        If oDocuments.Count = 0 Or ClassDocGrid.HasNoSelectedDocuments(GridViewFiles) Then
+            MsgBox("Could not read File Parameters (LinkRecord)!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        Refresh_Selected_Table()
+
+        Dim oForm As New frmDocRecordLink With {.myDocuments = oDocuments}
+        oForm.Show()
+    End Sub
+    Sub Refresh_Selected_Table()
+        Dim table As New DataTable With {
+            .TableName = "SelectedFiles"
+        }
+
+        ' Create two columns, ID and Name.
+        Dim idColumn As DataColumn = table.Columns.Add("ID", GetType(System.Int32))
+        idColumn.AutoIncrement = True
+        idColumn.AutoIncrementSeed = 0
+        idColumn.AutoIncrementStep = 1
+        table.PrimaryKey = New DataColumn() {idColumn}
+        table.Columns.Add("FILEPATH", GetType(System.String))
+        table.Columns.Add("DOC_ID", GetType(System.Int32))
+        table.Columns.Add("OBJECTTYPE", GetType(System.String))
+        For Each oDoc As ClassDocGrid.clsWMDoc In ClassDocGrid.GetSelectedDocuments(GridViewFiles)
+            If oDoc.DocPath <> String.Empty Then
+                'Set the ID column as the primary key column.
+                Dim newRow As DataRow = table.NewRow()
+                newRow("FILEPATH") = oDoc.DocPath
+                newRow("DOC_ID") = oDoc.DocId
+                newRow("OBJECTTYPE") = oDoc.DocType
+                table.Rows.Add(newRow)
+            End If
+        Next
+        table.AcceptChanges()
+        CURRENT_DT_SELECTED_FILES = table
+    End Sub
     Sub File_open()
         Me.Cursor = Cursors.WaitCursor
 
@@ -402,7 +481,7 @@ Public Class frmGlobalSearch
                 Exit Sub
             End If
 
-            ClassHelper.File_open(SELECTED_DOC_PATH, SELECTED_DOC_ID)
+            ClassHelper.File_open(SELECTED_DOC_PATH, SELECTED_DOC_ID, 0)
 
         Next
         Me.Cursor = Cursors.Default

app/DD-Record-Organizer/frmLanguage_Translator.resx.bak

@@ -587,7 +587,7 @@
     <value>GridControlObjects</value>
   </data>
   <data name="&gt;&gt;GridControlObjects.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;GridControlObjects.Parent" xml:space="preserve">
     <value>Panel1</value>
@@ -1216,67 +1216,67 @@
     <value>grvwGridObjects</value>
   </data>
   <data name="&gt;&gt;grvwGridObjects.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colGUID.Name" xml:space="preserve">
     <value>colGUID</value>
   </data>
   <data name="&gt;&gt;colGUID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colLANGUAGE_TYPE.Name" xml:space="preserve">
     <value>colLANGUAGE_TYPE</value>
   </data>
   <data name="&gt;&gt;colLANGUAGE_TYPE.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colSCREEN_ID.Name" xml:space="preserve">
     <value>colSCREEN_ID</value>
   </data>
   <data name="&gt;&gt;colSCREEN_ID.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colPMO_OBJECT_NAME.Name" xml:space="preserve">
     <value>colPMO_OBJECT_NAME</value>
   </data>
   <data name="&gt;&gt;colPMO_OBJECT_NAME.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colCAPTION.Name" xml:space="preserve">
     <value>colCAPTION</value>
   </data>
   <data name="&gt;&gt;colCAPTION.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colHINT.Name" xml:space="preserve">
     <value>colHINT</value>
   </data>
   <data name="&gt;&gt;colHINT.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colADDED_WHO.Name" xml:space="preserve">
     <value>colADDED_WHO</value>
   </data>
   <data name="&gt;&gt;colADDED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colADDED_WHEN.Name" xml:space="preserve">
     <value>colADDED_WHEN</value>
   </data>
   <data name="&gt;&gt;colADDED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colCHANGED_WHO.Name" xml:space="preserve">
     <value>colCHANGED_WHO</value>
   </data>
   <data name="&gt;&gt;colCHANGED_WHO.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colCHANGED_WHEN.Name" xml:space="preserve">
     <value>colCHANGED_WHEN</value>
   </data>
   <data name="&gt;&gt;colCHANGED_WHEN.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;TBPMO_LANGUAGE_OBJECTBindingSource.Name" xml:space="preserve">
     <value>TBPMO_LANGUAGE_OBJECTBindingSource</value>

app/DD-Record-Organizer/frmLicense.en-US.resx

@@ -155,6 +155,6 @@
     <value>User licences:</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>ADDI Licensemanager</value>
+    <value>orgFLOW Licensemanager</value>
   </data>
 </root>

app/DD-Record-Organizer/frmLicense.vb

@@ -58,6 +58,8 @@ Public Class frmLicense
                 Dim sql As String = String.Format("UPDATE TBDD_CLIENT SET LICENSE_PMO = '" & result & "' WHERE GUID = {0}", CLIENT_ID)
                 If MYDB_ECM.ExecuteNonQuery(Sql) = True Then
                     Refresh_Licence(True)
+                Else
+                    MsgBox("Fehler bei Update der License. Überprüfe das Log!", MsgBoxStyle.Exclamation)
                 End If
 
                 'MsgBox("Die Lizenzen wurden erfolgreich aktualisiert!", MsgBoxStyle.Exclamation, "Erfolgsmeldung:")

app/DD-Record-Organizer/frmLicense_Login.resx

@@ -130,10 +130,13 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="OK_Button.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
+    <value>4, 4</value>
+  </data>
+  <data name="OK_Button.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="OK_Button.Size" type="System.Drawing.Size, System.Drawing">
-    <value>67, 23</value>
+    <value>89, 28</value>
   </data>
   <data name="OK_Button.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -157,10 +160,13 @@
     <value>None</value>
   </data>
   <data name="Cancel_Button.Location" type="System.Drawing.Point, System.Drawing">
-    <value>76, 3</value>
+    <value>101, 4</value>
+  </data>
+  <data name="Cancel_Button.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="Cancel_Button.Size" type="System.Drawing.Size, System.Drawing">
-    <value>67, 23</value>
+    <value>89, 28</value>
   </data>
   <data name="Cancel_Button.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -181,13 +187,16 @@
     <value>1</value>
   </data>
   <data name="TableLayoutPanel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>277, 274</value>
+    <value>369, 337</value>
+  </data>
+  <data name="TableLayoutPanel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="TableLayoutPanel1.RowCount" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
   <data name="TableLayoutPanel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>146, 29</value>
+    <value>195, 36</value>
   </data>
   <data name="TableLayoutPanel1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -211,10 +220,13 @@
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>8, 16</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>435, 315</value>
+    <value>580, 388</value>
+  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterParent</value>

app/DD-Record-Organizer/frmLicense_User.en-US.resx

@@ -137,7 +137,7 @@
     <value>104, 17</value>
   </data>
   <data name="Label2.Text" xml:space="preserve">
-    <value>ADDI - Licenses:</value>
+    <value>orgFLOW - Licenses:</value>
   </data>
   <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
     <value>93, 17</value>

app/DD-Record-Organizer/frmLicense_User.resx

@@ -123,13 +123,17 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="Label1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
+    <value>Tahoma, 9.75pt</value>
   </data>
   <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 26</value>
+    <value>14, 32</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Label1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>139, 16</value>
+    <value>122, 16</value>
   </data>
   <data name="Label1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -150,10 +154,13 @@
     <value>10</value>
   </data>
   <data name="cmbClients.Location" type="System.Drawing.Point, System.Drawing">
-    <value>175, 25</value>
+    <value>204, 31</value>
+  </data>
+  <data name="cmbClients.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="cmbClients.Size" type="System.Drawing.Size, System.Drawing">
-    <value>189, 21</value>
+    <value>220, 24</value>
   </data>
   <data name="cmbClients.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -174,19 +181,22 @@
     <value>True</value>
   </data>
   <data name="Label2.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
+    <value>Tahoma, 9.75pt</value>
   </data>
   <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 68</value>
+    <value>14, 84</value>
+  </data>
+  <data name="Label2.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>116, 16</value>
+    <value>129, 16</value>
   </data>
   <data name="Label2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
   <data name="Label2.Text" xml:space="preserve">
-    <value>ADDI - Lizenzen:</value>
+    <value>OrgFLOW - Lizenzen:</value>
   </data>
   <data name="&gt;&gt;Label2.Name" xml:space="preserve">
     <value>Label2</value>
@@ -204,13 +214,16 @@
     <value>True</value>
   </data>
   <data name="Label3.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
+    <value>Tahoma, 9.75pt</value>
   </data>
   <data name="Label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 94</value>
+    <value>14, 116</value>
+  </data>
+  <data name="Label3.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>99, 16</value>
+    <value>84, 16</value>
   </data>
   <data name="Label3.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -234,13 +247,16 @@
     <value>True</value>
   </data>
   <data name="Label5.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
+    <value>Tahoma, 9.75pt</value>
   </data>
   <data name="Label5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 122</value>
+    <value>14, 150</value>
+  </data>
+  <data name="Label5.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 16</value>
+    <value>64, 16</value>
   </data>
   <data name="Label5.TabIndex" type="System.Int32, mscorlib">
     <value>8</value>
@@ -264,10 +280,13 @@
     <value>Tahoma, 9.75pt</value>
   </data>
   <data name="lbLicenceCount.Location" type="System.Drawing.Point, System.Drawing">
-    <value>264, 65</value>
+    <value>308, 80</value>
+  </data>
+  <data name="lbLicenceCount.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="lbLicenceCount.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+    <value>117, 28</value>
   </data>
   <data name="lbLicenceCount.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -294,10 +313,13 @@
     <value>Tahoma, 9.75pt</value>
   </data>
   <data name="lbDossierCount.Location" type="System.Drawing.Point, System.Drawing">
-    <value>264, 91</value>
+    <value>308, 112</value>
+  </data>
+  <data name="lbDossierCount.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="lbDossierCount.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+    <value>117, 28</value>
   </data>
   <data name="lbDossierCount.TabIndex" type="System.Int32, mscorlib">
     <value>11</value>
@@ -324,10 +346,13 @@
     <value>Tahoma, 9.75pt</value>
   </data>
   <data name="lbValidUntil.Location" type="System.Drawing.Point, System.Drawing">
-    <value>264, 119</value>
+    <value>308, 146</value>
+  </data>
+  <data name="lbValidUntil.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="lbValidUntil.Size" type="System.Drawing.Size, System.Drawing">
-    <value>100, 23</value>
+    <value>117, 28</value>
   </data>
   <data name="lbValidUntil.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
@@ -351,10 +376,16 @@
     <value>3</value>
   </data>
   <data name="GroupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 52</value>
+    <value>18, 64</value>
+  </data>
+  <data name="GroupBox1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
+  <data name="GroupBox1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 1</value>
+    <value>407, 1</value>
   </data>
   <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
     <value>14</value>
@@ -372,10 +403,13 @@
     <value>2</value>
   </data>
   <data name="DataGridViewAddOns.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 167</value>
+    <value>18, 206</value>
+  </data>
+  <data name="DataGridViewAddOns.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
   <data name="DataGridViewAddOns.Size" type="System.Drawing.Size, System.Drawing">
-    <value>349, 136</value>
+    <value>407, 167</value>
   </data>
   <data name="DataGridViewAddOns.TabIndex" type="System.Int32, mscorlib">
     <value>22</value>
@@ -396,17 +430,19 @@
     <value>True</value>
   </data>
   <data name="Label4.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 9.75pt, style=Bold</value>
+    <value>Tahoma, 9.75pt</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="Label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="Label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 148</value>
+    <value>14, 182</value>
+  </data>
+  <data name="Label4.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 0, 4, 0</value>
   </data>
   <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>63, 16</value>
+    <value>56, 16</value>
   </data>
   <data name="Label4.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
@@ -430,13 +466,13 @@
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
+    <value>7, 16</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>376, 315</value>
+    <value>439, 388</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
+    <value>Tahoma, 9.75pt</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -604,6 +640,9 @@
         AAA=
 </value>
   </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
+  </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
   </data>

app/DD-Record-Organizer/frmLogRecord.resx.bak

@@ -799,7 +799,7 @@ D.h. der alte und der Neue Wert werden gespeichert und können nachverfolgt werd
     <value>XtraTabPage1</value>
   </data>
   <data name="&gt;&gt;XtraTabPage1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;XtraTabPage1.Parent" xml:space="preserve">
     <value>XtraTabControl1</value>
@@ -817,7 +817,7 @@ D.h. der alte und der Neue Wert werden gespeichert und können nachverfolgt werd
     <value>XtraTabControl1</value>
   </data>
   <data name="&gt;&gt;XtraTabControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;XtraTabControl1.Parent" xml:space="preserve">
     <value>$this</value>

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

@@ -65,7 +65,6 @@ Partial Class frmMain
         Me.BarSubItem1 = New DevExpress.XtraBars.BarSubItem()
         Me.BarButtonItem14 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem21 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem22 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
         Me.btnGlobalSearch = New DevExpress.XtraBars.BarButtonItem()
@@ -197,7 +196,7 @@ Partial Class frmMain
         Me.ribbonMain.ApplicationButtonDropDownControl = Me.MainMenu
         Me.ribbonMain.BackColor = System.Drawing.Color.DarkGray
         Me.ribbonMain.ExpandCollapseItem.Id = 0
-        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.ribbonMain.SearchEditItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem22, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox, Me.BarButtonItem13, Me.BarButtonItemSwitchCon, Me.LabelConString, Me.StatusVersionDB})
+        Me.ribbonMain.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.ribbonMain.ExpandCollapseItem, Me.ribbonMain.SearchEditItem, Me.LabelMachine, Me.LabelLoggedIn, Me.LabelVersion, Me.itemInfo, Me.itemExit, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.itemSettings, Me.BarButtonItem2, Me.BarButtonItem10, Me.BarButtonItem12, Me.BarButtonItemConnections, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.LabelLanguage, Me.BarButtonItem20, Me.BarButtonItemSAPConnect, Me.BarButtonItemStructureNOdes, Me.BarSubItem1, Me.BarButtonItem14, Me.BarButtonItem21, Me.BarButtonItem8, Me.BarButtonItem9, Me.itemAbout, Me.BarButtonItem19, Me.btnGlobalSearch, Me.LabelUser, Me.bbtnItemViewsUser, Me.LabelProxyServer, Me.BarSubItem2, Me.BarButtonItem25, Me.StatusPersonifiedLogin, Me.itemScanInbox, Me.BarButtonItem13, Me.BarButtonItemSwitchCon, Me.LabelConString, Me.StatusVersionDB})
         resources.ApplyResources(Me.ribbonMain, "ribbonMain")
         Me.ribbonMain.MaxItemId = 1
         Me.ribbonMain.Name = "ribbonMain"
@@ -418,7 +417,7 @@ Partial Class frmMain
         resources.ApplyResources(Me.BarButtonItemSAPConnect, "BarButtonItemSAPConnect")
         Me.BarButtonItemSAPConnect.Enabled = False
         Me.BarButtonItemSAPConnect.Id = 36
-        Me.BarButtonItemSAPConnect.ImageOptions.Image = Global.DD_Record_Organizer.My.Resources.Resources.Connection_Manager
+        Me.BarButtonItemSAPConnect.ImageOptions.Image = CType(resources.GetObject("BarButtonItemSAPConnect.ImageOptions.Image"), System.Drawing.Image)
         Me.BarButtonItemSAPConnect.Name = "BarButtonItemSAPConnect"
         Me.BarButtonItemSAPConnect.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
@@ -434,7 +433,7 @@ Partial Class frmMain
         '
         resources.ApplyResources(Me.BarSubItem1, "BarSubItem1")
         Me.BarSubItem1.Id = 38
-        Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem14), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem21), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem22), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9)})
+        Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem14), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem21), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9)})
         Me.BarSubItem1.Name = "BarSubItem1"
         Me.BarSubItem1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
         '
@@ -452,13 +451,6 @@ Partial Class frmMain
         Me.BarButtonItem21.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem21.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem21.Name = "BarButtonItem21"
         '
-        'BarButtonItem22
-        '
-        resources.ApplyResources(Me.BarButtonItem22, "BarButtonItem22")
-        Me.BarButtonItem22.Id = 41
-        Me.BarButtonItem22.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem22.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem22.Name = "BarButtonItem22"
-        '
         'BarButtonItem8
         '
         resources.ApplyResources(Me.BarButtonItem8, "BarButtonItem8")
@@ -801,7 +793,6 @@ Partial Class frmMain
     Friend WithEvents BarSubItem1 As DevExpress.XtraBars.BarSubItem
     Friend WithEvents BarButtonItem14 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem21 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem22 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents itemAbout As DevExpress.XtraBars.BarButtonItem

app/DD-Record-Organizer/frmMain.de-DE.resx

@@ -1011,7 +1011,7 @@
 </value>
   </data>
   <data name="NotifyIcon.Text" xml:space="preserve">
-    <value>ADDI - Informationen</value>
+    <value>orgFLOW - Informationen</value>
   </data>
   <data name="itemSettings.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

app/DD-Record-Organizer/frmMain.vb

@@ -1,12 +1,13 @@
 Imports System.Globalization
 Imports System.Net
 Imports System.Threading
-Imports DD_LIB_Standards
+'Imports DD_LIB_Standards'
 Imports DevExpress.LookAndFeel
 Imports DevExpress.XtraBars
 Imports DevExpress.XtraBars.Ribbon
 Imports DevExpress.XtraBars.Ribbon.ViewInfo
 Imports DevExpress.XtraNavBar
+Imports Microsoft.Office.Core
 
 Public Class frmMain
     Dim strIPAddress As String
@@ -72,7 +73,7 @@ Public Class frmMain
                 ClassWindowLocation.LoadFormLocationSize(Me, 1, CURRENT_SCREEN_ID, "frmMain")
                 Dim i = My.Application.UICulture.ToString()
 
-                UserLookAndFeel.Default.SetSkinStyle(MyFormsDesign)
+                UserLookAndFeel.Default.SetSkinStyle(CONFIG.Config.FormsDesign)
 
 
                 ' GetIPv4Address()
@@ -118,8 +119,8 @@ Public Class frmMain
                 MsgBox("Error in Load Form:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             End Try
             LOGGER.Debug("FormLoad finished!")
-            Proxy_Server_Controls()
-            CONN_Manager
+            'Proxy_Server_Controls()
+            CONN_Manager()
 
         End If
     End Sub
@@ -148,21 +149,21 @@ Public Class frmMain
             LOGGER.Warn("Unexpected Error in CONN_Manager:" & ex.Message)
         End Try
     End Sub
-    Sub Proxy_Server_Controls()
-        Try
-            If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then
-                'itemRefreshProxy.Visibility = BarItemVisibility.Always
-                LabelProxyServer.Visibility = BarItemVisibility.Always
-                LOGGER.Info("PROXY-SERVER is being used")
-            Else
-                'itemRefreshProxy.Visibility = BarItemVisibility.Never
-                LabelProxyServer.Visibility = BarItemVisibility.Never
-            End If
-        Catch ex As Exception
-            LOGGER.Warn("Unexpected Error in Sub Proxy_Server_Controls():" & ex.Message)
-        End Try
+    'Sub Proxy_Server_Controls()
+    '    Try
+    '        If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then
+    '            'itemRefreshProxy.Visibility = BarItemVisibility.Always
+    '            LabelProxyServer.Visibility = BarItemVisibility.Always
+    '            LOGGER.Info("PROXY-SERVER is being used")
+    '        Else
+    '            'itemRefreshProxy.Visibility = BarItemVisibility.Never
+    '            LabelProxyServer.Visibility = BarItemVisibility.Never
+    '        End If
+    '    Catch ex As Exception
+    '        LOGGER.Warn("Unexpected Error in Sub Proxy_Server_Controls():" & ex.Message)
+    '    End Try
 
-    End Sub
+    'End Sub
     Public Sub RUN_TIMER()
         Try
             If TIMER_SCAN.Enabled = False And CURRENT_SCAN_FOLDERWATCH <> "" And FWSCAN_started = True Then
@@ -207,23 +208,28 @@ Public Class frmMain
         ElseIf ERROR_INIT = "INVALID USER" Then
 
         End If
-        Load_TasksforUser()
+        'Load_TasksforUser()
     End Sub
     Sub LoggedIn()
         Try
-            Dim oSQL = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED)
+            Dim oSQL As String = ""
+            If SQL_LIC_NAMED_USER <> "" Then
+                oSQL = SQL_LIC_NAMED_USER
+            Else
+                oSQL = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Record-Organizer') AND CLIENT_ID = {0}", CLIENT_SELECTED)
+            End If
             Dim anzahl = MYDB_ECM.GetScalarValue(oSQL)
-            USERS_LOGGED_IN = CInt(anzahl)
+            LICENSES_USED = CInt(anzahl)
 
         Catch ex As Exception
 
         End Try
-        Dim msg = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString()
+        Dim msg = "Anzahl verbrauchte Lizenzen: " & LICENSES_USED.ToString()
         If USER_LANGUAGE <> "de-DE" Then
-            msg = "#User logged in: " & USERS_LOGGED_IN.ToString()
+            msg = "#Used licenses: " & LICENSES_USED.ToString()
         End If
         LabelLoggedIn.Caption = msg
-        LOGGER.Info(msg + "(+1)")
+        LOGGER.Debug(msg)
     End Sub
     Sub Display_ConString()
         Try
@@ -241,6 +247,7 @@ Public Class frmMain
     End Sub
     Sub Load_TasksforUser()
         Try
+
             VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MYDB_ECM.CurrentConnectionString
             Me.VWPMO_WF_ACTIVETableAdapter.Fill(Me.DD_DMSDataSet.VWPMO_WF_ACTIVE, USER_LANGUAGE, USER_USERNAME)
             CURRENT_TASKS_GENERAL = Me.DD_DMSDataSet.VWPMO_WF_ACTIVE
@@ -412,7 +419,7 @@ Public Class frmMain
             End If
 
             Dim sql = "SELECT COUNT(GUID) FROM TBPMO_USER_GLOBAL_SEARCH WHERE USER_ID = " & USER_GUID
-            Dim Count = MYDB_ECM.GetScalarValue(SQL)
+            Dim Count = MYDB_ECM.GetScalarValue(sql)
             If Count = 0 Then
                 btnGlobalSearch.Enabled = False
                 groupSearchAllOver.Visible = False
@@ -508,9 +515,9 @@ Public Class frmMain
             If DD_DMSDataSet.VWPMO_WF_ACTIVE.Rows.Count > 0 Then
                 NotifyIcon.Visible = True
                 If USER_LANGUAGE = "de-DE" Then
-                    NotifyIcon.ShowBalloonTip(50000, "ADDI-Unerledigte Tasks", "Sie haben unerledigte Tasks in Ihrem Verantwortungsbereich." & vbNewLine & "Bitte überprüfen Sie Ihre Workflow-Tasks", ToolTipIcon.Info)
+                    NotifyIcon.ShowBalloonTip(50000, "OrgFLOW-Unerledigte Tasks", "Sie haben unerledigte Tasks in Ihrem Verantwortungsbereich." & vbNewLine & "Bitte überprüfen Sie Ihre Workflow-Tasks", ToolTipIcon.Info)
                 Else
-                    NotifyIcon.ShowBalloonTip(50000, "ADDI-Pending Tasks", "You have pending tasks in Your authority." & vbNewLine & "Please check Your Tasks", ToolTipIcon.Info)
+                    NotifyIcon.ShowBalloonTip(50000, "OrgFLOW-Pending Tasks", "You have pending tasks in Your authority." & vbNewLine & "Please check Your Tasks", ToolTipIcon.Info)
                 End If
 
             End If
@@ -544,7 +551,7 @@ Public Class frmMain
     End Sub
 
     Private Sub Timer1_Tick(sender As Object, e As EventArgs) Handles TimerTasks.Tick
-        Refresh_TaskReminder()
+        ' Refresh_TaskReminder()
 
     End Sub
 
@@ -562,7 +569,7 @@ Public Class frmMain
 
                 If Task_Popup_minutes <> 0 Then
                     TimerTasks.Start()
-                    Refresh_TaskReminder()
+                    'Refresh_TaskReminder()
                 End If
 
                 RUN_TIMER()
@@ -575,7 +582,8 @@ Public Class frmMain
                 End If
 
                 'Lizenz abgellaufen, überprüfen ob User Admin ist
-                If LICENSE_COUNT <= (USERS_LOGGED_IN + 1) Then
+                If LICENSE_COUNT <= (LICENSES_USED) Then
+                    LOGGER.Info($"{LICENSE_COUNT} <= {LICENSES_USED}")
                     If USER_IS_ADMIN = True Then
                         LOGGER.Info("User is Admin - Timer will be started")
                         'If USER_LANGUAGE = "de-DE" Then
@@ -594,53 +602,6 @@ Public Class frmMain
                         Me.BarButtonItemSAPConnect.Enabled = True
                     End If
                 End If
-                Try
-                    If ClassUpdate.Init = True And Not IsNothing(ClassUpdate.DT_UPDATE_ITEMS) Then
-                        'MsgBox("532")
-                        If Not IsNothing(ClassUpdate.DT_UPDATE) Then
-
-                            If ClassUpdate.DT_UPDATE_ITEMS.Rows.Count > 0 Then
-                                If ClassUpdate.InitUser = False Then
-                                    Me.Cursor = Cursors.Default
-                                    Exit Sub
-                                Else
-                                    If ClassUpdate.DT_USER_DATA.Rows.Count = 1 Or ClassUpdate.ALL_USERS = True Then
-                                        If ClassUpdate.InitInstallPath() = False Then
-                                            Exit Sub
-                                        End If
-                                    End If
-
-                                    ClassUpdate.RUN_UPDATE()
-                                    If ClassUpdate.UPDATE_ERROR = True Then
-                                        Dim msg = String.Format("Während des Updatevorgangs für Version '{0}' haben sich unerwartet Fehler ereignet!" & vbNewLine & "Wollen Sie die Logdatei anzeigen?", ClassUpdate.VERSION_SERVER)
-                                        If USER_LANGUAGE <> "de-DE" Then
-                                            msg = String.Format("During update of version '{0}' unexpected errors occured!" & vbNewLine & "Would You like to show the logfile?", ClassUpdate.VERSION_SERVER)
-                                        End If
-                                        ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("Unexpected errors occured during client-update update of version {0}!", ClassUpdate.VERSION_SERVER))
-                                        Dim result As MsgBoxResult
-                                        result = MessageBox.Show(msg, CAPTION_CONFIRMATION, MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                                        If result = MsgBoxResult.Yes Then
-                                            Process.Start(LOGCONFIG.LogFile)
-                                        End If
-                                    Else
-                                        If ClassUpdate.UPDATE_NECESSARY Then
-                                            Dim msg = "Das Addon-Update war erfolgreich!"
-                                            If USER_LANGUAGE <> "de-DE" Then
-                                                msg = "The Addon-Update was successful!"
-                                            End If
-                                            MsgBox(msg, MsgBoxStyle.Information)
-                                        End If
-
-
-                                    End If
-                                End If
-                            End If
-                        End If
-                    End If
-                Catch ex As Exception
-                    MsgBox("Unexpected Error in Update VersionChecker: " & ex.Message, MsgBoxStyle.Critical)
-                End Try
-
             Else
                 MsgBox("Application will close now!", MsgBoxStyle.Critical)
                 Me.Close()
@@ -659,7 +620,7 @@ Public Class frmMain
                     Application.AddMessageFilter(New ClassInactivityFilter(Me))
                 End If
             Catch ex As Exception
-                ClassHelper.InsertEssential_Log(USER_GUID, "USER_ID", "Unexpected Error in AUOTP_LOGOUT_USER: " & ex.Message)
+                ClassHelper.InsertEssential_Log(USER_GUID, "USER_ID", "Unexpected Error in AUTO_LOGOUT_USER: " & ex.Message)
             End Try
 
         Catch ex As Exception
@@ -745,19 +706,19 @@ Public Class frmMain
         Me.Cursor = Cursors.WaitCursor
         Dim upd = "UPDATE TBPROXY_CONFIG SET SYNC_RUNNING = 1 WHERE GUID = 1"
         MYDB_ECM.ExecuteNonQuery(upd, True)
-        If ClassProxy.Refresh_Object_Data() = True Then
-            If ClassProxy.PRPROXY_SYNC_DOC_OBJECTS() = True Then
-                Dim msg = "Die Proxydaten wurden erfolgreich synchronisiert!"
-                If USER_LANGUAGE <> "de-DE" Then
-                    msg = "All proxydata was refreshed successfully!"
-                End If
-                MessageBox.Show(msg, "", MessageBoxButtons.OK, MessageBoxIcon.Information)
-            Else
-                MessageBox.Show("Error while refreshing proxy-data (Doc)!", "", MessageBoxButtons.OK, MessageBoxIcon.Error)
-            End If
-        Else
-            MessageBox.Show("Error while refreshing proxy-data (objects)!", "", MessageBoxButtons.OK, MessageBoxIcon.Error)
-        End If
+        'If ClassProxy.Refresh_Object_Data() = True Then
+        '    If ClassProxy.PRPROXY_SYNC_DOC_OBJECTS() = True Then
+        '        Dim msg = "Die Proxydaten wurden erfolgreich synchronisiert!"
+        '        If USER_LANGUAGE <> "de-DE" Then
+        '            msg = "All proxydata was refreshed successfully!"
+        '        End If
+        '        MessageBox.Show(msg, "", MessageBoxButtons.OK, MessageBoxIcon.Information)
+        '    Else
+        '        MessageBox.Show("Error while refreshing proxy-data (Doc)!", "", MessageBoxButtons.OK, MessageBoxIcon.Error)
+        '    End If
+        'Else
+        '    MessageBox.Show("Error while refreshing proxy-data (objects)!", "", MessageBoxButtons.OK, MessageBoxIcon.Error)
+        'End If
         upd = "UPDATE TBPROXY_CONFIG SET SYNC_RUNNING = 0, LAST_SYNC = GETDATE() WHERE GUID = 1"
         MYDB_ECM.ExecuteNonQuery(upd, True)
         Me.Cursor = Cursors.Default
@@ -785,7 +746,7 @@ Public Class frmMain
             TimerTasks.Enabled = False
             TimerTasks.Stop()
         End If
-        Proxy_Server_Controls()
+        'Proxy_Server_Controls()
         RUN_TIMER()
 
     End Sub
@@ -839,7 +800,7 @@ Public Class frmMain
     End Sub
 
     Private Sub TimerClose3Minutes_Tick(sender As Object, e As EventArgs) Handles TimerClose3Minutes.Tick
-        If LICENSE_EXPIRED = True Or LICENSE_COUNT <= (USERS_LOGGED_IN + 1) Then
+        If LICENSE_EXPIRED = True Or LICENSE_COUNT <= (LICENSES_USED + 1) Then
             'If USER_LANGUAGE = "de-DE" Then
             '    MsgBox("Global Indexer wird nun geschlossen, weil keine neue Lizenzdaten eingegeben wurden!", MsgBoxStyle.Information)
             'Else
@@ -936,11 +897,6 @@ Public Class frmMain
         OpenObjecttypeConfig()
     End Sub
 
-    Private Sub BarButtonItem22_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem22.ItemClick
-        Close_Maximized_Forms()
-        OpenWindream_Files()
-    End Sub
-
     Private Sub BarButtonItem8_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem8.ItemClick
         Close_Maximized_Forms()
         OpenRightsmanager()
@@ -974,6 +930,7 @@ Public Class frmMain
     Private Sub frmMain_MdiChildActivate(sender As Object, e As EventArgs) Handles Me.MdiChildActivate
         Dim mainForm As Form = sender
         Dim constructorFound = False
+        Dim child As Form = Me.ActiveMdiChild
 
         For Each childForm As Form In mainForm.MdiChildren
             If (childForm.Name = "frmConstructor_Main") Then
@@ -994,6 +951,7 @@ Public Class frmMain
         Else
             ribbonMain.Minimized = False
         End If
+
     End Sub
 
     Private Sub ribbonMain_MouseMove(sender As Object, e As MouseEventArgs) Handles ribbonMain.MouseMove
@@ -1097,7 +1055,7 @@ Public Class frmMain
 
                     If oSqlcon_Proxy <> String.Empty Then
                         SaveMySettingsValue("MyProxyConnectionString", oSqlcon_Proxy, "ConfigMain")
-                        ClassProxy.MyPROXYConnectionString = oSqlcon_Proxy
+                        'ClassProxy.MyPROXYConnectionString = oSqlcon_Proxy
                     End If
                     Dim sql = String.Format("UPDATE TBPMO_CLIENT_CONN_SWITCH_USER SET ACTIVE = 1 WHERE GUID = {0}", oINACTIVE_GUID)
                     MYDB_ECM.GetScalarValue(SQL)
@@ -1140,4 +1098,8 @@ Public Class frmMain
     Private Sub Timer5mins_Tick(sender As Object, e As EventArgs) Handles Timer5mins.Tick
         LoggedIn()
     End Sub
+
+    Private Sub ADDIBeendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ADDIBeendenToolStripMenuItem.Click
+        Me.Close()
+    End Sub
 End Class

app/DD-Record-Organizer/frmMass_Change.vb

@@ -98,7 +98,7 @@ Public Class frmMass_Change
                     For Each Record As String In MASS_RECORD_IDs2CHANGE
                     Dim del = String.Format("DELETE FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", _CONTROLID, CInt(Record))
                     MYDB_ECM.ExecuteNonQuery(del)
-                    ClassProxy.PRPROXY_CONTROL_DEL(CInt(Record), CURRENT_ENTITY_ID, _CONTROLID)
+                    'ClassProxy.PRPROXY_CONTROL_DEL(CInt(Record), CURRENT_ENTITY_ID, _CONTROLID)
                 Next
                 End If
                 Try
@@ -118,16 +118,16 @@ Public Class frmMass_Change
                                 _Error = True
                                 LOGGER.Warn("Error in updating the value for Record: " & Record)
 
-                            Else
-                                ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, _CONTROLID, CInt(Record), val)
+                                'Else
+                                'ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, _CONTROLID, CInt(Record), val)
                             End If
                             Else
                             SQL = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID, RECORD_ID, VALUE, ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", _CONTROLID, CInt(Record), val, USER_USERNAME)
                             If MYDB_ECM.ExecuteNonQuery(SQL) = False Then
                                 _Error = True
                                 LOGGER.Warn("Error in inserting the value for Record: " & Record)
-                            Else
-                                ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, _CONTROLID, CInt(Record), val)
+                                'Else
+                                'ClassProxy.PRPROXY_CONTROL_VALUE_UPD_INS(CURRENT_ENTITY_ID, _CONTROLID, CInt(Record), val)
                             End If
                             End If
                         End If