Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager_Client

app/DD_PM_WINDREAM/ClassControlCreator.vb

@@ -11,6 +11,7 @@ Imports DevExpress.XtraGrid.Columns
 Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.Controls.LookupGrid
+Imports DigitalData.GUIs.Common
 
 Public Class ClassControlCreator
 
@@ -38,7 +39,10 @@ Public Class ClassControlCreator
     Public Const PREFIX_LINE = "LINE"
     Public Const PREFIX_BUTTON = "BTN"
 
-    Public Shared GridTables As New Dictionary(Of String, Dictionary(Of String, DataTable))
+    ''' <summary>
+    ''' Saves the column data for each grid and each column in that grid
+    ''' </summary>
+    Public Shared Property GridTables As New Dictionary(Of Integer, Dictionary(Of String, RepositoryItem))
 
     ''' <summary>
     ''' Standard Eigenschaften für alle Controls
@@ -407,8 +411,9 @@ Public Class ClassControlCreator
         Return control
     End Function
 
-    Public Shared Function CreateExistingGridControl(row As DataRow, DT_MY_COLUMNS As DataTable, designMode As Boolean) As GridControl
+    Public Shared Function CreateExistingGridControl(row As DataRow, DT_MY_COLUMNS As DataTable, designMode As Boolean, pPanel As Panel) As GridControl
         Dim oControl As GridControl = CreateBaseControl(New GridControl(), row, designMode)
+        Dim oControlId = DirectCast(oControl.Tag, ControlMetadata).Guid
         Dim oDatatable As New DataTable
         Dim oView As GridView
 
@@ -418,9 +423,14 @@ Public Class ClassControlCreator
         oView.OptionsView.ShowGroupPanel = False
         oControl.ContextMenu = Nothing
 
+        Dim oGridBuilder As New GridBuilder(oView)
+        oGridBuilder.WithClipboardHandler()
+
         If Not designMode Then
             oView.OptionsBehavior.Editable = Not row.Item("READ_ONLY")
             oView.OptionsBehavior.ReadOnly = row.Item("READ_ONLY")
+            'oView.OptionsBehavior.EditorShowMode = EditorShowMode.Click
+
             oControl.UseEmbeddedNavigator = Not row.Item("READ_ONLY")
 
             ' Copy single cell value in CTRL+C instead of whole row
@@ -456,10 +466,10 @@ Public Class ClassControlCreator
 
         End With
 
-        If GridTables.ContainsKey(oControl.Name) Then
+        If GridTables.ContainsKey(oControlId) Then
-            GridTables.Item(oControl.Name).Clear()
+            GridTables.Item(oControlId).Clear()
         Else
-            GridTables.Add(oControl.Name, New Dictionary(Of String, DataTable)())
+            GridTables.Add(oControlId, New Dictionary(Of String, RepositoryItem)())
         End If
 
         For Each oRow As DataRow In DT_MY_COLUMNS.Rows
@@ -478,25 +488,27 @@ Public Class ClassControlCreator
             Dim oConnectionId As Integer = NotNull(oRow.Item("CONNECTION_ID"), 0)
             Dim oSqlCommand As String = NotNull(oRow.Item("SQL_COMMAND"), "")
 
-            If Not clsPatterns.HasComplexPatterns(oSqlCommand) Then
+            If oConnectionId > 0 And oSqlCommand <> "" Then
-                If oConnectionId > 0 And oSqlCommand <> "" Then
+                Try
-                    Try
+                    Dim oComboboxDataTable As DataTable = Nothing
-                        Dim oComboboxDataTable As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId)
+                    Dim oColumnName As String = oRow.Item("SPALTENNAME")
 
-                        If oComboboxDataTable Is Nothing Then
+                    If Not clsPatterns.HasComplexPatterns(oSqlCommand) Then
-                            LOGGER.Warn("DataTable for SQL [{0}] is nothing. Possible error on SQL Query.")
+                        oComboboxDataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId)
-                        End If
+                    End If
 
-                        GridTables.Item(oControl.Name).Add(oRow.Item("SPALTENNAME"), oComboboxDataTable)
+                    Dim oRepositoryItem = GridTables_GetRepositoryItemForColumn(oColumnName, oComboboxDataTable, oRow.Item("ADVANCED_LOOKUP"))
-                        'GridTables.Add(oRow.Item("SPALTENNAME"), oComboboxDataTable)
+
-                    Catch ex As Exception
+                    If GridTables.Item(oControlId).ContainsKey(oColumnName) Then
-                        LOGGER.Warn("Could not load data for column {0} in control {1}", oRow.Item("SPALTENNAME"), oControl.Name)
+                        GridTables.Item(oControlId).Item(oColumnName) = oRepositoryItem
-                        LOGGER.Error(ex)
+                    Else
-                    End Try
+                        GridTables.Item(oControlId).Add(oColumnName, oRepositoryItem)
-                End If
+                    End If
+                Catch ex As Exception
+                    LOGGER.Warn("Could not load data for column {0} in control {1}", oRow.Item("SPALTENNAME"), oControl.Name)
+                    LOGGER.Error(ex)
+                End Try
             End If
-
-
         Next
 
         oView.PopulateColumns(oDatatable)
@@ -515,54 +527,12 @@ Public Class ClassControlCreator
         AddHandler oView.CustomRowCellEdit, Sub(sender As Object, e As CustomRowCellEditEventArgs)
                                                 Try
                                                     For Each oRow As DataRow In DT_MY_COLUMNS.Rows
-                                                        If oRow.Item("SPALTENNAME") = e.Column.FieldName Then
+                                                        Dim oColumnName = oRow.Item("SPALTENNAME")
-                                                            If GridTables.Item(oControl.Name).ContainsKey(e.Column.FieldName) Then
+                                                        Dim oEditorExists = GridTables_TestEditorExistsByControlAndColumn(oControlId, oColumnName)
-                                                                Dim oComboboxDataTable As DataTable = GridTables.Item(oControl.Name).Item(e.Column.FieldName)
 
-                                                                If oComboboxDataTable Is Nothing Then
+                                                        If oColumnName = e.Column.FieldName And oEditorExists Then
-                                                                    Throw New ApplicationException($"ComboboxTable for Column {e.Column.FieldName} is empty.")
+                                                            Dim oEditor = GridTables.Item(oControlId).Item(oColumnName)
-                                                                End If
+                                                            e.RepositoryItem = oEditor
-
-                                                                If oRow.Item("ADVANCED_LOOKUP") And oComboboxDataTable IsNot Nothing Then
-                                                                    Dim oEditor = New RepositoryItemLookupControl3 With {
-                                                                        .DataSource = oComboboxDataTable,
-                                                                        .DisplayMember = oComboboxDataTable.Columns.Item(0).ColumnName,
-                                                                        .ValueMember = oComboboxDataTable.Columns.Item(0).ColumnName
-                                                                    }
-
-
-                                                                    'AddHandler oEditor.SelectedValuesChanged, Sub(_sender As Object, _e As List(Of String))
-                                                                    '                                              oView.PostEditor()
-                                                                    '                                          End Sub
-
-                                                                    e.RepositoryItem = oEditor
-                                                                Else
-                                                                    Dim oEditor = New RepositoryItemComboBox()
-                                                                    Dim oItems As New List(Of String)
-
-                                                                    AddHandler oEditor.Validating, Sub(_sender As ComboBoxEdit, _e As CancelEventArgs)
-                                                                                                       If oItems.Contains(_sender.EditValue) Then
-                                                                                                           _e.Cancel = False
-                                                                                                       Else
-                                                                                                           _e.Cancel = True
-                                                                                                       End If
-
-                                                                                                   End Sub
-                                                                    For Each oRow2 As DataRow In oComboboxDataTable.Rows
-                                                                        Dim oValue = oRow2.Item(0)
-
-                                                                        Try
-                                                                            oValue &= $" | {oRow2.Item(1)}"
-                                                                        Catch ex As Exception
-                                                                        End Try
-
-                                                                        oEditor.Items.Add(oValue)
-                                                                        oItems.Add(oValue)
-                                                                    Next
-
-                                                                    e.RepositoryItem = oEditor
-                                                                End If
-                                                            End If
                                                         End If
                                                     Next
                                                 Catch ex As Exception
@@ -571,57 +541,18 @@ Public Class ClassControlCreator
                                                 End Try
                                             End Sub
 
-        'AddHandler oView.CellValueChanged, Sub(sender As Object, e As CellValueChangedEventArgs)
+        AddHandler oView.ValidatingEditor, Sub(sender As Object, e As BaseContainerValidateEditorEventArgs)
-        '                                       Console.WriteLine("")
+                                               Dim oRow As DataRowView = oView.GetRow(oView.FocusedRowHandle)
-        '                                   End Sub
+                                               Dim oColumnName = oView.FocusedColumn.FieldName
 
-        AddHandler oView.ValidateRow, Sub(sender As Object, e As ValidateRowEventArgs)
+                                               GridTables_ValidateColumn(oView, DT_MY_COLUMNS, oColumnName, e.Value, e.Valid, e.ErrorText)
-                                          Dim oRow As DataRowView = oView.GetRow(oView.FocusedRowHandle)
+                                           End Sub
-
-                                          For Each oCol As DataColumn In oRow.DataView.Table.Columns
-                                              Dim oColumn As DataRow = (From r As DataRow In DT_MY_COLUMNS.Rows
-                                                                        Where r.Item("SPALTENNAME") = oCol.ColumnName
-                                                                        Select r).FirstOrDefault()
-
-                                              Dim oGridColumn As GridColumn = (From c As GridColumn In oView.Columns
-                                                                               Where c.FieldName = oCol.ColumnName
-                                                                               Select c).FirstOrDefault()
-
-                                              Dim oIsRequired = oColumn.Item("VALIDATION")
-                                              Dim oValue = NotNull(oView.GetRowCellValue(e.RowHandle, oCol.ColumnName), "")
-
-                                              Try
-                                                  Dim oRegex = NotNull(oColumn.Item("REGEX_MATCH"), String.Empty)
-                                                  Dim oRegexMessage = NotNull(oColumn.Item("REGEX_MESSAGE_DE"), String.Empty)
-                                                  If oRegex <> String.Empty Then
-                                                      Dim oMatch = New Regex(oRegex).IsMatch(oValue)
-                                                      Dim oDefaultMessage = "Wert entspricht nicht dem gefordertem Format!"
-                                                      Dim oMessage = IIf(oRegexMessage <> String.Empty, oRegexMessage, oDefaultMessage)
-
-                                                      If oMatch = False Then
-                                                          oView.SetColumnError(oGridColumn, oMessage)
-                                                          e.Valid = False
-                                                          Exit For
-
-                                                      End If
-                                                  End If
-                                              Catch ex As Exception
-                                                  LOGGER.Error(ex)
-                                              End Try
-
-                                              If oIsRequired And oValue = "" Then
-                                                  oView.SetColumnError(oGridColumn, "Spalte muss ausgefüllt werden!")
-                                                  e.Valid = False
-                                                  Exit For
-
-                                              End If
-                                          Next
-                                      End Sub
 
         AddHandler oView.InvalidRowException, Sub(sender As Object, e As InvalidRowExceptionEventArgs)
                                                   e.ExceptionMode = ExceptionMode.NoAction
                                               End Sub
 
+
         AddHandler oView.ValidatingEditor, Sub(sender As Object, e As BaseContainerValidateEditorEventArgs)
                                                Dim oValue As String = NotNull(e.Value, "")
 
@@ -764,4 +695,162 @@ Public Class ClassControlCreator
         End Try
 
     End Function
+
+    Public Shared Sub GridTables_CacheDatatableForColumn(pControlId As Object, pColumnName As Object, pSqlStatement As Object, pConnectionId As Integer, pAdvancedLookup As Boolean)
+        Try
+            Dim oTable As DataTable = ClassDatabase.Return_Datatable_ConId(pSqlStatement, pConnectionId)
+
+            ' If no columns for this control have been added, create an empty dict now
+            If Not GridTables.ContainsKey(pControlId) Then
+                GridTables.Add(pControlId, New Dictionary(Of String, RepositoryItem))
+            End If
+
+            Dim oRepositoryItem = GridTables_GetRepositoryItemForColumn(pColumnName, oTable, pAdvancedLookup)
+            Dim oColumnDictionary = GridTables.Item(pControlId)
+
+            If oColumnDictionary.ContainsKey(pColumnName) Then
+                oColumnDictionary.Item(pColumnName) = oRepositoryItem
+            Else
+                oColumnDictionary.Add(pColumnName, oRepositoryItem)
+            End If
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        End Try
+    End Sub
+
+    Public Shared Function GridTables_GetRepositoryItemForColumn(pColumnName As String, pDataTable As DataTable, pIsAdvancedLookup As Boolean) As RepositoryItem
+        If pIsAdvancedLookup Then
+
+            Dim oEditor = New RepositoryItemLookupControl3
+
+            If pDataTable IsNot Nothing Then
+                oEditor.DisplayMember = pDataTable.Columns.Item(0).ColumnName
+                oEditor.ValueMember = pDataTable.Columns.Item(0).ColumnName
+                oEditor.DataSource = pDataTable
+            End If
+
+            Return oEditor
+        Else
+            Dim oEditor = New RepositoryItemComboBox()
+            Dim oItems As New List(Of String)
+
+            AddHandler oEditor.Validating, Sub(_sender As ComboBoxEdit, _e As CancelEventArgs)
+                                               If oItems.Contains(_sender.EditValue) Then
+                                                   _e.Cancel = False
+                                               Else
+                                                   _e.Cancel = True
+                                               End If
+
+                                           End Sub
+
+            If pDataTable IsNot Nothing Then
+                For Each oRow2 As DataRow In pDataTable.Rows
+                    Dim oValue = oRow2.Item(0)
+
+                    Try
+                        oValue &= $" | {oRow2.Item(1)}"
+                    Catch ex As Exception
+                    End Try
+
+                    oEditor.Items.Add(oValue)
+                    oItems.Add(oValue)
+                Next
+            End If
+
+            Return oEditor
+        End If
+    End Function
+
+    Public Shared Sub GridTables_HandleControlValueChange(pControlPanel As Panel, pColumnsWithSqlAndControlPlaceholders As DataTable)
+        If Not IsNothing(pColumnsWithSqlAndControlPlaceholders) AndAlso pColumnsWithSqlAndControlPlaceholders.Rows.Count > 0 Then
+            For Each oRow As DataRow In pColumnsWithSqlAndControlPlaceholders.Rows
+                Try
+                    Dim oControlId = oRow.Item("CONTROL_ID")
+                    Dim oSqlStatement = oRow.Item("SQL_COMMAND")
+                    Dim oConnectionId = oRow.Item("CONNECTION_ID")
+                    Dim oColumnName = oRow.Item("SPALTENNAME")
+                    Dim oAdvancedLookup = oRow.Item("ADVANCED_LOOKUP")
+
+                    If Not IsDBNull(oSqlStatement) And Not IsDBNull(oSqlStatement) Then
+                        oSqlStatement = clsPatterns.ReplaceAllValues(oSqlStatement, pControlPanel, True)
+
+                        ClassControlCreator.GridTables_CacheDatatableForColumn(oControlId, oColumnName, oSqlStatement, oConnectionId, oAdvancedLookup)
+
+
+                        ' === Block to force setting the editor for GridColumns
+                        For Each oControl As Control In pControlPanel.Controls
+                            Try
+                                Dim oMeta = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata)
+                                If oMeta.Guid = oControlId AndAlso TypeOf oControl Is GridControl Then
+                                    Dim oGrid As GridControl = DirectCast(oControl, GridControl)
+                                    DirectCast(oGrid.FocusedView, GridView).FocusInvalidRow()
+                                    Exit For
+                                End If
+                            Catch ex As Exception
+                                LOGGER.Error(ex)
+                            End Try
+                        Next
+                        ' === End
+
+                    End If
+                Catch ex As Exception
+                    LOGGER.Error(ex)
+                    LOGGER.Info("Unexpected Error in Display SQL result for grid column: " & oRow.Item("CONTROL_ID") & " - ERROR: " & ex.Message)
+                End Try
+            Next
+        End If
+    End Sub
+
+    Private Shared Function GridTables_TestEditorExistsByControlAndColumn(oControlId As Integer, pColumn As String) As Boolean
+        If GridTables.ContainsKey(oControlId) Then
+            Dim oContainsKey = GridTables.Item(oControlId).ContainsKey(pColumn)
+            If oContainsKey AndAlso GridTables.Item(oControlId).Item(pColumn) IsNot Nothing Then
+                Return True
+            Else
+                Return False
+            End If
+        Else
+            Return False
+        End If
+    End Function
+
+    Private Shared Function GridTables_ValidateColumn(pView As GridView, pColumnDefinition As DataTable, ColumnName As String, pValue As Object, ByRef pIsValid As Boolean, ByRef pErrorText As String) As Boolean
+        Dim oColumn As DataRow = (From r As DataRow In pColumnDefinition.Rows
+                                  Where r.Item("SPALTENNAME") = ColumnName
+                                  Select r).FirstOrDefault()
+
+        Dim oGridColumn As GridColumn = (From c As GridColumn In pView.Columns
+                                         Where c.FieldName = ColumnName
+                                         Select c).FirstOrDefault()
+
+        Dim oIsRequired = oColumn.Item("VALIDATION")
+
+        Try
+            Dim oRegex = NotNull(oColumn.Item("REGEX_MATCH"), String.Empty)
+            Dim oRegexMessage = NotNull(oColumn.Item("REGEX_MESSAGE_DE"), String.Empty)
+            If oRegex <> String.Empty Then
+                Dim oMatch = New Regex(oRegex).IsMatch(pValue.ToString)
+                Dim oDefaultMessage = "Wert entspricht nicht dem gefordertem Format!"
+                Dim oMessage = IIf(oRegexMessage <> String.Empty, oRegexMessage, oDefaultMessage)
+
+                If oMatch = False Then
+                    pErrorText = oMessage
+                    pIsValid = False
+                    Return False
+                End If
+            End If
+        Catch ex As Exception
+            LOGGER.Error(ex)
+        End Try
+
+        If oIsRequired And pValue.ToString = "" Then
+            pErrorText = "Spalte muss ausgefüllt werden!"
+            pIsValid = False
+            Return False
+
+        End If
+
+        Return True
+    End Function
+
 End Class

app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj

@@ -159,6 +159,9 @@
     <Reference Include="DigitalData.Controls.SnapPanel">
       <HintPath>..\..\..\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.GUIs.Common">
+      <HintPath>..\..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Config">
       <HintPath>..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>

app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb

@@ -104,8 +104,8 @@ Module ModuleRuntimeVariables
     Public CURRENT_SQL_COMAMND As String
     Public CURRENT_DT_SQL_CONFIG_TABLE As DataTable
 
-    Public CURRENT_CLICKED_PROFILE_ID As Integer = 0
+    Public Property CURRENT_CLICKED_PROFILE_ID As Integer = 0
-    Public CURRENT_CLICKED_PROFILE_TITLE As String
+    Public Property CURRENT_CLICKED_PROFILE_TITLE As String
 
     Public DT_CLIENT_USER As DataTable
     Public CLIENT_SELECTED As Integer = 0
@@ -114,7 +114,7 @@ Module ModuleRuntimeVariables
     Public CURR_SELECT_CONTROL As String
     Public CURR_CHOICE_LIST As String
 
-    Public CURR_DT_DEPENDING_CONTROLS As DataTable 'enthält zur Laufzeit die abhängigen Controls
+    Public Property CURR_DT_DEPENDING_CONTROLS As DataTable 'enthält zur Laufzeit die abhängigen Controls
 
 
     Public CURRENT_DT_MASS_CHANGE_DOCS As DataTable

app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.2.25.0")>
+<Assembly: AssemblyVersion("2.2.26.0")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 

app/DD_PM_WINDREAM/clsPatterns.vb

@@ -73,6 +73,7 @@ Public Class clsPatterns
         Catch ex As Exception
             LOGGER.Error(ex)
             LOGGER.Info("Error in ReplaceAllValues:" & ex.Message)
+            Return input
         End Try
     End Function
 

app/DD_PM_WINDREAM/frmFormDesigner.vb

@@ -267,7 +267,7 @@ Public Class frmFormDesigner
                         Dim oDTColumnsPerDevExGrid As DataTable = Database_ECM.GetDatatable($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {guid} ORDER BY [SEQUENCE]") ', "FDesignLaodControls")
 
 
-                        Dim table = ClassControlCreator.CreateExistingGridControl(row, oDTColumnsPerDevExGrid, True)
+                        Dim table = ClassControlCreator.CreateExistingGridControl(row, oDTColumnsPerDevExGrid, True, pnldesigner)
 
                         AddHandler table.MouseClick, AddressOf gridControl_MouseClick
                         ' AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick

app/DD_PM_WINDREAM/frmMassValidator.vb

@@ -369,7 +369,7 @@ Public Class frmMassValidator
                         LOGGER.Debug("Versuch Tabelle zu laden")
                         Dim oDTMyColumns As DataTable = Database_ECM.GetDatatable($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlRow.Item("GUID")} ORDER BY SEQUENCE") ', "MV_LoadControls1")
 
-                        oControl = ClassControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False)
+                        oControl = ClassControlCreator.CreateExistingGridControl(oControlRow, oDTMyColumns, False, pnldesigner)
                 End Select
 
                 If oControl IsNot Nothing AndAlso TypeOf oControl IsNot Label Then

app/DD_PM_WINDREAM/frmValidator.Designer.vb

@@ -30,7 +30,7 @@ Partial Class frmValidator
         Me.TITLELabel1 = New System.Windows.Forms.Label()
         Me.btnSave = New System.Windows.Forms.Button()
         Me.DESCRIPTIONLabel = New System.Windows.Forms.Label()
-        Me.pnldesigner = New System.Windows.Forms.Panel()
+        Me.PanelValidatorControl = New System.Windows.Forms.Panel()
         Me.DocumentViewerValidator = New DigitalData.Controls.DocumentViewer.DocumentViewer()
         Me.ChatControl1 = New DigitalData.Controls.ChatControl.ChatControl()
         Me.BarAndDockingController3 = New DevExpress.XtraBars.BarAndDockingController(Me.components)
@@ -110,6 +110,7 @@ Partial Class frmValidator
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
+        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.SplitContainer2_DV_Chat, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainer2_DV_Chat.SuspendLayout()
         CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -161,7 +162,7 @@ Partial Class frmValidator
         Me.Panel1.Controls.Add(Me.TITLELabel1)
         Me.Panel1.Controls.Add(Me.btnSave)
         Me.Panel1.Controls.Add(Me.DESCRIPTIONLabel)
-        Me.Panel1.Controls.Add(Me.pnldesigner)
+        Me.Panel1.Controls.Add(Me.PanelValidatorControl)
         resources.ApplyResources(Me.Panel1, "Panel1")
         Me.Panel1.Name = "Panel1"
         '
@@ -185,9 +186,9 @@ Partial Class frmValidator
         '
         'pnldesigner
         '
-        resources.ApplyResources(Me.pnldesigner, "pnldesigner")
+        resources.ApplyResources(Me.PanelValidatorControl, "pnldesigner")
-        Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.PanelValidatorControl.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnldesigner.Name = "pnldesigner"
+        Me.PanelValidatorControl.Name = "pnldesigner"
         '
         'DocumentViewerValidator
         '
@@ -452,9 +453,9 @@ Partial Class frmValidator
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.btnitemConversationEnd, Me.bbtnitem_ConversationNew, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarEditItem3, Me.btnitemConversation_reload, Me.BarButtonItem5, Me.BarButtonItemAttmt, Me.barbtnitmExport})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiError, Me.bsiInformation, Me.bsiDocID, Me.BarButtonItemFileView, Me.BarButtonItem3, Me.BarButtonItem4, Me.bbtniRefresh, Me.bbtniRefreshSearches, Me.bbtniNext, Me.bbtniDelete, Me.bbtniAnnotation, Me.bsiInfo1, Me.bsiInfo2, Me.BbtnitmSave, Me.BarButtonItem2, Me.BarLinkContainerItem1, Me.btnitemConversationEnd, Me.bbtnitem_ConversationNew, Me.BarLinkContainerItem2, Me.BarEditItem1, Me.BarEditItem2, Me.BarEditItem3, Me.btnitemConversation_reload, Me.BarButtonItem5, Me.BarButtonItemAttmt, Me.barbtnitmExport, Me.BarButtonItem6})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 29
+        Me.RibbonControl1.MaxItemId = 30
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageConversations})
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
@@ -738,6 +739,7 @@ Partial Class frmValidator
         Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtniNext)
         Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtniDelete)
         Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtniAnnotation)
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem6)
         Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
         resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
         '
@@ -774,6 +776,12 @@ Partial Class frmValidator
         Me.RibbonPage2.Name = "RibbonPage2"
         resources.ApplyResources(Me.RibbonPage2, "RibbonPage2")
         '
+        'BarButtonItem6
+        '
+        resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6")
+        Me.BarButtonItem6.Id = 29
+        Me.BarButtonItem6.Name = "BarButtonItem6"
+        '
         'frmValidator
         '
         Me.Appearance.Options.UseFont = True
@@ -816,7 +824,7 @@ Partial Class frmValidator
     Friend WithEvents TITLELabel1 As System.Windows.Forms.Label
     Friend WithEvents btnSave As System.Windows.Forms.Button
     Friend WithEvents DESCRIPTIONLabel As System.Windows.Forms.Label
-    Friend WithEvents pnldesigner As System.Windows.Forms.Panel
+    Friend WithEvents PanelValidatorControl As System.Windows.Forms.Panel
     Friend WithEvents PdfBarController1 As DevExpress.XtraPdfViewer.Bars.PdfBarController
     Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager
     Friend WithEvents PdfFileOpenBarItem1 As DevExpress.XtraPdfViewer.Bars.PdfFileOpenBarItem
@@ -899,4 +907,5 @@ Partial Class frmValidator
     Friend WithEvents RibbonPageCust As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents barbtnitmExport As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
+    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
 End Class

app/DD_PM_WINDREAM/frmValidator.resx

@@ -1063,6 +1063,9 @@
         cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
 </value>
   </data>
+  <data name="BarButtonItem6.Caption" xml:space="preserve">
+    <value>Set Grid Focus (DEBUG)</value>
+  </data>
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -1787,6 +1790,12 @@
   <data name="&gt;&gt;FolderBrowserDialog1.Type" xml:space="preserve">
     <value>System.Windows.Forms.FolderBrowserDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</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.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmValidator</value>
   </data>

app/DD_PM_WINDREAM/frmValidatorSearch.vb

@@ -414,7 +414,7 @@ Public Class frmValidatorSearch
         If IsNothing(_DTSQLSearches) Then Exit Sub
         Dim oConID = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("CONN_ID")
         Dim oCommand = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("SQL_COMMAND")
-        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, True)
+        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
         Dim oTabIndex = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("TAB_INDEX")
         Dim oTabCaption = _DTSQLSearches.Rows(XtraTabControlSQL.SelectedTabPageIndex).Item("TAB_TITLE")
         RefreshTabSQL(oConID, oCommand, oTabIndex, oTabCaption)
@@ -423,7 +423,7 @@ Public Class frmValidatorSearch
         If IsNothing(_DTDocSearches) Then Exit Sub
         Dim oConID = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("CONN_ID")
         Dim oCommand = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("SQL_COMMAND")
-        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, True)
+        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
         Dim oTabIndex = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("TAB_INDEX")
         Dim oTabCaption = _DTDocSearches.Rows(XtraTabControlDocs.SelectedTabPageIndex).Item("TAB_TITLE")
         RefreshTabDoc(oConID, oCommand, oTabIndex, oTabCaption)
@@ -614,7 +614,7 @@ Public Class frmValidatorSearch
             _DTSQLSearches = BASEDATA_DT_PROFILE_SEARCHES_SQL
             Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("CONN_ID")
             Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("SQL_COMMAND")
-            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, True)
+            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
             XtraTabControlSQL.SelectedTabPageIndex = 0
             Refresh_Load_GridSQL(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(0).Item("TAB_TITLE"))
         End If
@@ -622,7 +622,7 @@ Public Class frmValidatorSearch
             _DTDocSearches = BASEDATA_DT_PROFILE_SEARCHES_DOC
             Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("CONN_ID")
             Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("SQL_COMMAND")
-            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, True)
+            oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
             XtraTabControlDocs.SelectedTabPageIndex = 0
             RefreshTabDoc(oConID, oCommand, 0, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(0).Item("TAB_TITLE"))
         End If
@@ -639,7 +639,7 @@ Public Class frmValidatorSearch
         Dim oTabIndex = XtraTabControlDocs.SelectedTabPageIndex
         Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("CONN_ID")
         Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("SQL_COMMAND")
-        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, True)
+        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
         RefreshTabDoc(oConID, oCommand, oTabIndex, BASEDATA_DT_PROFILE_SEARCHES_DOC.Rows(oTabIndex).Item("TAB_TITLE"))
     End Sub
 
@@ -671,7 +671,7 @@ Public Class frmValidatorSearch
         Dim oTabIndex = XtraTabControlSQL.SelectedTabPageIndex
         Dim oConID = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("CONN_ID")
         Dim oCommand = BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("SQL_COMMAND")
-        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.pnldesigner, True)
+        oCommand = clsPatterns.ReplaceAllValues(oCommand, _frmValidator.PanelValidatorControl, True)
         RefreshTabSQL(oConID, oCommand, oTabIndex, BASEDATA_DT_PROFILE_SEARCHES_SQL.Rows(oTabIndex).Item("TAB_TITLE"))
     End Sub
 

app/SetupVS19/Product.wxs

@@ -118,6 +118,7 @@
         <File Id="DDLibStandards" Name="DD_LIB_Standards.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll"/>
         <File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="DigitalData.Controls.LookupGrid.dll"/>
         <File Id="DDSnapPanel" Name="DigitalData.Controls.SnapPanel.dll" Source="DigitalData.Controls.SnapPanel.dll"/>
+        <File Id="DDCommonGUIs" Name="DigitalData.GUIs.Common.dll" Source="DigitalData.GUIs.Common.dll"/>
         <File Id="DDConfig" Name="DigitalData.Modules.Config.dll" Source="DigitalData.Modules.Config.dll"/>
         <File Id="DDLogging" Name="DigitalData.Modules.Logging.dll" Source="DigitalData.Modules.Logging.dll"/>
         <File Id="DDLanguage" Name="DigitalData.Modules.Language.dll" Source="DigitalData.Modules.Language.dll"/>