MS_

2016-04-28 14:56:48 +02:00
parent 0cae7cdc6a
commit 70e1d73fa4
9 changed files with 5594 additions and 4771 deletions
--- a/app/DD-Record-Organiser/ClassControlBuilder.vb
+++ b/app/DD-Record-Organiser/ClassControlBuilder.vb
@@ -141,60 +141,88 @@ Public Class ClassControlBuilder
        combo.BackColor = Color.White
    End Sub
    Dim CONTROL_ID
-    Public Sub Enable_Controls()
-
-    End Sub
-    Public Sub Depending_Controls()
-
-    End Sub
-    Public Sub OnComboBoxValueChanged(sender As Object, ByVal e As EventArgs)
-        If CURRENT_RECORD_ENABLED = False Then Exit Sub
-
+    Public Sub Enable_Controls(control As Control, TableResult As DataTable, value As Object)
        Try
-            Dim control As Control = DirectCast(sender, Control)
-            Dim controlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id
-            CONTROL_ID = controlId
-            If CONTROL_ID = 29 Then
-                Console.WriteLine("Obacht")
-            End If
-            'SQL für abhängige Auswahllisten
-            Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
-            Dim value
-            'SQL für enable control
-            Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
-
-            ' Diese Befehle führen dazu, dass auch der ValueMember als Wert ausgelesen wird
-            ' Das kann zu unerwarteten Ergebnissen führen, da der Benutzer nur den DisplayMember sieht.
-            'Select Case control.GetType()
-            '    Case GetType(CustomComboBox)
-            '        If IsNothing(DirectCast(control, CustomComboBox).ValueMember) Then
-            '            value = DirectCast(control, CustomComboBox).Text
-            '        Else
-            '            value = DirectCast(control, CustomComboBox).SelectedValue
-            '        End If
-            '    Case Else
-            '        Exit Sub
-            'End Select
-            ' Die bessere Lösung ist für jetzt, einfach den angezeigten Wert auszulesen:
-            value = DirectCast(control, CustomComboBox).Text
-
-            If String.IsNullOrEmpty(value) Then
+            If TableResult.Rows.Count = 0 Then
                Exit Sub
            End If

-            Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL)
-            Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable)
-            If datatable.Rows.Count = 0 Then
-                Exit Sub
-            End If
-            If CURRENT_RECORD_ID = 0 And CtrlCommandUI.IsInsert = True Then
-                Exit Sub
-            End If

            If CURRENT_RECORD_ID = 0 Then
                Exit Sub
            End If
-            For Each row As DataRow In datatable.Rows
+            For Each row As DataRow In TableResult.Rows
+                Dim sqlcommand As String = row.Item("SQL_COMMAND_2")
+
+                If IsNothing(sqlcommand) Then
+                    Continue For
+                End If
+
+                sqlcommand = sqlcommand.ToUpper.Replace("@RECORD_ID", CURRENT_RECORD_ID)
+                Dim regex As New System.Text.RegularExpressions.Regex("(@(\d+)@)")
+                Dim match As System.Text.RegularExpressions.Match = regex.Match(sqlcommand)
+                If match.Success Then
+                    ' DependingControlId bezeichnet das Control, das die Abhängigkeit enthält
+                    Dim dependingControlId As Integer = row.Item("GUID")
+                    Dim panel As Panel = DirectCast(control.Parent, Panel)
+                    ' Über die Id das Control finden
+                    Dim dependingControl As Control = panel.Controls.OfType(Of Control)().Where(Function(c As Control)
+                                                                                                    Return DirectCast(c.Tag, ClassControlMetadata).Id = dependingControlId
+                                                                                                End Function).SingleOrDefault()
+
+                    sqlcommand = sqlcommand.Replace(match.Groups(1).Value, value)
+                    If LogErrorsOnly = False Then ClassLogger.Add(" >> " & String.Format("Executing SQL_COMMAND: '{0}' for controlID '{1}'", sqlcommand, dependingControlId))
+
+                    Dim dt As DataTable = ClassDatabase.Return_Datatable(sqlcommand)
+                    Dim type = dependingControl.GetType().Name
+                    If dt.Rows.Count = 1 Then
+                        Select Case type
+                            Case "DateEdit"
+                                Try
+                                    Dim enabled As Boolean = CBool(dt.Rows(0).Item(0))
+                                    dependingControl.Enabled = enabled
+                                Catch ex As Exception
+                                    ClassLogger.Add("Unexpected Error in EnableControls - DateEdit: " & ex.Message, True)
+                                End Try
+                            Case "CustomComboBox"
+                                Try
+                                    Dim enabled As Boolean = CBool(dt.Rows(0).Item(0))
+                                    dependingControl.Enabled = enabled
+                                Catch ex As Exception
+                                    ClassLogger.Add("Unexpected Error in EnableControls - CustomComboBox: " & ex.Message, True)
+                                End Try
+                            Case "TextBox"
+                                Try
+                                    Dim enabled As Boolean = CBool(dt.Rows(0).Item(0))
+                                    dependingControl.Enabled = enabled
+                                Catch ex As Exception
+                                    ClassLogger.Add("Unexpected Error in EnableControls - TextBox: " & ex.Message, True)
+                                End Try
+
+                        End Select
+                    Else
+                        ClassLogger.Add(" >> Attention: RowCount for enabling control was '" & dt.Rows.Count.ToString & "' and not 1 as expected - Check SQL: '" & sqlcommand & "'")
+                    End If
+
+
+
+                End If
+            Next
+        Catch ex As Exception
+            MsgBox("Error in Enable Controls - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+    Public Sub Depending_Controls(control As Control, TableResult As DataTable, value As String)
+        Try
+            If TableResult.Rows.Count = 0 Then
+                Exit Sub
+            End If
+
+
+            If CURRENT_RECORD_ID = 0 Then
+                Exit Sub
+            End If
+            For Each row As DataRow In TableResult.Rows
                Dim sqlcommand As String = row.Item("SQL_COMMAND_1")

                If IsNothing(sqlcommand) Then
@@ -205,13 +233,13 @@ Public Class ClassControlBuilder
                Dim regex As New System.Text.RegularExpressions.Regex("(@(\d+)@)")
                Dim match As System.Text.RegularExpressions.Match = regex.Match(sqlcommand)
                If match.Success Then
-                    Dim sqlguid = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", controlId, CURRENT_RECORD_ID)
+                    Dim sqlguid = String.Format("SELECT GUID FROM TBPMO_CONTROL_VALUE WHERE CONTROL_ID = {0} AND RECORD_ID = {1}", CONTROL_ID, CURRENT_RECORD_ID)
                    Dim ctrlvalID = ClassDatabase.Execute_Scalar(sqlguid)
                    If Not IsNothing(ctrlvalID) Then
-                        Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", value.ToString, controlId, CURRENT_RECORD_ID)
+                        Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", value.ToString, CONTROL_ID, CURRENT_RECORD_ID)
                        ClassDatabase.Execute_non_Query(upd1)
                    Else
-                        Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", controlId, CURRENT_RECORD_ID, value, Environment.UserName)
+                        Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, CURRENT_RECORD_ID, value, Environment.UserName)
                        If ClassDatabase.Execute_non_Query(ins) = True Then
                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
                        End If
@@ -313,6 +341,119 @@ Public Class ClassControlBuilder

                End If
            Next
+        Catch ex As Exception
+            MsgBox("Error in DependingControls - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+    Public Sub OnComboBoxValueChanged(sender As Object, ByVal e As EventArgs)
+        If CURRENT_RECORD_ENABLED = False Then Exit Sub
+
+        Try
+            Dim control As Control = DirectCast(sender, Control)
+            Dim controlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id
+            CONTROL_ID = controlId
+            If CONTROL_ID = 29 Then
+                Console.WriteLine("Obacht")
+            End If
+            'SQL für abhängige Auswahllisten
+            Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
+            Dim value
+            'SQL für enable control
+            Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2 FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
+
+            ' Diese Befehle führen dazu, dass auch der ValueMember als Wert ausgelesen wird
+            ' Das kann zu unerwarteten Ergebnissen führen, da der Benutzer nur den DisplayMember sieht.
+            'Select Case control.GetType()
+            '    Case GetType(CustomComboBox)
+            '        If IsNothing(DirectCast(control, CustomComboBox).ValueMember) Then
+            '            value = DirectCast(control, CustomComboBox).Text
+            '        Else
+            '            value = DirectCast(control, CustomComboBox).SelectedValue
+            '        End If
+            '    Case Else
+            '        Exit Sub
+            'End Select
+            ' Die bessere Lösung ist für jetzt, einfach den angezeigten Wert auszulesen:
+            value = DirectCast(control, CustomComboBox).Text
+
+            If String.IsNullOrEmpty(value) Then
+                Exit Sub
+            End If
+            If CURRENT_RECORD_ID = 0 And CtrlCommandUI.IsInsert = True Then
+                Exit Sub
+            End If
+
+            Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL)
+            Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable)
+            Depending_Controls(control, datatable, value)
+            Enable_Controls(control, datatable1, value)
+            
+
+            'Dim sqlcommand As String = datatable.Rows(0).Item("SQL_COMMAND_1")
+
+            'If IsNothing(sqlcommand) Then
+            '    Exit Sub
+            'End If
+
+            'If String.IsNullOrEmpty(value) Then
+            '    Exit Sub
+            'End If
+
+
+
+            'Dim regex As New System.Text.RegularExpressions.Regex("(@(\d+)@)")
+            'Dim match As System.Text.RegularExpressions.Match = regex.Match(sqlcommand)
+
+            'If match.Success Then
+            '    ' DependingControlId bezeichnet das Control, das die Abhängigkeit enthält
+            '    Dim dependingControlId As Integer = datatable.Rows(0).Item("GUID")
+            '    Dim panel As Panel = DirectCast(control.Parent, Panel)
+            '    ' Über die Id das Control finden
+            '    Dim dependingControl As CustomComboBox = panel.Controls.OfType(Of CustomComboBox)().Where(Function(c As CustomComboBox)
+            '                                                                                      Return DirectCast(c.Tag, ClassControlMetadata).Id = dependingControlId
+            '                                                                                  End Function).SingleOrDefault()
+
+            '    sqlcommand = sqlcommand.Replace(match.Groups(1).Value, value)
+            '    Console.WriteLine("Executing SQL_COMMAND: {0}", sqlcommand)
+            '    Dim dt As DataTable = ClassDatabase.Return_Datatable(sqlcommand)
+            '    ControlLoader.Combobox.SetDataSource(dependingControl, dt)
+            'End If
+
+            Console.WriteLine("value changed")
+        Catch ex As Exception
+            If ex.Message.Contains("Objektverweis") Or ex.Message.Contains("reference not set") Then
+
+            Else
+                MsgBox("Error in OnComboBoxValueChanged - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical)
+            End If
+        End Try
+    End Sub
+    Public Sub CheckBoxChanged(sender As Object, ByVal e As EventArgs)
+        If CURRENT_RECORD_ENABLED = False Then Exit Sub
+
+        Try
+            Dim control As Control = DirectCast(sender, Control)
+            Dim controlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id
+            CONTROL_ID = controlId
+
+            Dim checkstate
+            'SQL für enable control
+            Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2 FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
+            Try
+                ' Den CheckState setzen
+                checkstate = DirectCast(control, CheckBox).Checked
+            Catch ex As Exception
+                Exit Sub
+            End Try
+         
+            If CURRENT_RECORD_ID = 0 And CtrlCommandUI.IsInsert = True Then
+                Exit Sub
+            End If
+
+
+            Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable)
+            Enable_Controls(control, datatable1, checkstate)
+

            'Dim sqlcommand As String = datatable.Rows(0).Item("SQL_COMMAND_1")

@@ -403,7 +544,7 @@ Public Class ClassControlBuilder
                Dim checkbox As CheckBox = CType(control, CheckBox)
                AddHandler checkbox.CheckedChanged, AddressOf RecordChanged
                AddHandler checkbox.EnabledChanged, AddressOf OnEnabledChanged
-
+                AddHandler checkbox.CheckedChanged, AddressOf CheckBoxChanged
            Case "PictureBox"
                Dim picturebox As PictureBox = CType(control, PictureBox)
                AddHandler picturebox.BackgroundImageChanged, AddressOf RecordChanged
--- a/app/DD-Record-Organiser/ClassControlValues.vb
+++ b/app/DD-Record-Organiser/ClassControlValues.vb
@@ -404,7 +404,61 @@ Public Class ClassControlValues
            MsgBox("Unexpected Error in LoadControlValuesListWithPlaceholders:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
+    Public Shared Sub Enable_Depending_Controls(FormId As Integer, RecordId As Integer, ParentRecordId As Integer, controls As Control.ControlCollection, entity_ID As Integer)
+        Try
+            If controls.Count = 0 Then
+                'MsgBox("LoadControlValuesListWithPlaceholders: Control.ControlCollection is unexpected empty!", MsgBoxStyle.Exclamation)
+                ClassLogger.Add("Enable_Depending_Controls: Control.ControlCollection is unexpected empty!")
+                Exit Sub
+            End If
+            Dim SQL As String = String.Format("select GUID,SQL_COMMAND_2 from TBPMO_CONTROL where FORM_ID = {0} AND SQL_COMMAND_2 IS NOT NULL " _
+                                              & "AND LEN(SQL_COMMAND_2) > 10 AND SQL_COMMAND_2 LIKE '%@%@%", FormId)
+            Dim SW As Stopwatch = Stopwatch.StartNew()
+            Dim commands As New List(Of String)
+            Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)

+            If dt.Rows.Count = 0 Then
+                Exit Sub
+            End If
+
+            For Each Ctrl As Control In controls
+                Dim controlTagId = DirectCast(Ctrl.Tag, ClassControlMetadata).Id
+                Dim row As DataRow = dt.Select(String.Format("CONTROL_ID={0}", controlTagId)).FirstOrDefault()
+
+                If IsNothing(row) Then
+                    Continue For
+                End If
+
+                Dim connID = row.Item("CONTROL_CONNID_1")
+                Dim sqlcommand As String = row.Item("SQL")
+
+
+                sqlcommand = ReplaceSqlCommandPlaceholders(sqlcommand, RecordId, ParentRecordId, entity_ID)
+
+                Select Case Ctrl.GetType()
+                    Case GetType(CustomComboBox)
+                        Dim combobox = DirectCast(Ctrl, CustomComboBox)
+                        ControlLoader.Combobox.LoadList(combobox, FormId, connID, sqlcommand)
+
+                    Case GetType(DevExpress.XtraEditors.ListBoxControl)
+                        Dim listbox = DirectCast(Ctrl, DevExpress.XtraEditors.ListBoxControl)
+                        ControlLoader.ListBox.LoadList(listbox, FormId, connID, sqlcommand)
+
+                    Case GetType(DevExpress.XtraEditors.CheckedListBoxControl)
+                        Dim chlistbox = DirectCast(Ctrl, DevExpress.XtraEditors.CheckedListBoxControl)
+                        ControlLoader.CheckedListBox.LoadList(chlistbox, FormId, connID, sqlcommand)
+
+                End Select
+            Next
+            Dim elapsed As Double
+            elapsed = SW.Elapsed.TotalSeconds
+            SW.Stop()
+            Console.WriteLine("Enable_Depending_Controls took {0} to load", Format(elapsed, "0.000000000") & " seconds")
+        Catch ex As Exception
+            ClassLogger.Add("Unexpected Error in Enable_Depending_Controls: " & ex.Message, True)
+            MsgBox("Unexpected Error in Enable_Depending_Controls:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
    Public Shared Function ReplaceSqlCommandPlaceholders(sqlCommand As String, recordId As Integer, parentRecordId As Integer, entity_Id As Integer)
        sqlCommand = sqlCommand.Replace("@RECORD_ID", recordId)
        sqlCommand = sqlCommand.Replace("@RECORDID", recordId)
--- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
@@ -22,7 +22,6 @@ Partial Class frmConstructorDesigner
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
        Dim GUIDLabel As System.Windows.Forms.Label
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructorDesigner))
        Dim FORM_TITLELabel As System.Windows.Forms.Label
@@ -52,14 +51,14 @@ Partial Class frmConstructorDesigner
        Dim CHANGED_WHENLabel2 As System.Windows.Forms.Label
        Dim Label19 As System.Windows.Forms.Label
        Dim SQL_RIGHT_READ_AND_VIEW_ONLYLabel As System.Windows.Forms.Label
-        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
        Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
-        Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource()
        Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter()
        Me.TableAdapterManager = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager()
        Me.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTOR_DETAILTableAdapter()
-        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
+        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator = New System.Windows.Forms.BindingNavigator()
        Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
        Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
@@ -72,11 +71,11 @@ Partial Class frmConstructorDesigner
        Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton()
        Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator()
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton()
-        Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource()
        Me.TreeViewDetails = New System.Windows.Forms.TreeView()
-        Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip()
        Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
+        Me.ImageList1 = New System.Windows.Forms.ImageList()
        Me.CONSTRUCTOR_IDTextBox = New System.Windows.Forms.TextBox()
        Me.FORM_TITLETextBox = New System.Windows.Forms.TextBox()
        Me.SEQUENCE_MENUNumericUpDown = New System.Windows.Forms.NumericUpDown()
@@ -145,7 +144,7 @@ Partial Class frmConstructorDesigner
        Me.TabControl1 = New System.Windows.Forms.TabControl()
        Me.TabPage1 = New System.Windows.Forms.TabPage()
        Me.GridControlUserSQL = New DevExpress.XtraGrid.GridControl()
-        Me.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource()
        Me.GridViewUserSQL = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -161,7 +160,7 @@ Partial Class frmConstructorDesigner
        Me.btnAddUserSQL = New System.Windows.Forms.Button()
        Me.lblsaveSQLUser = New System.Windows.Forms.Label()
        Me.CHANGED_WHENTextBox2 = New System.Windows.Forms.TextBox()
-        Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource = New System.Windows.Forms.BindingSource()
        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
        Me.CHANGED_WHOTextBox2 = New System.Windows.Forms.TextBox()
        Me.ADDED_WHENTextBox2 = New System.Windows.Forms.TextBox()
@@ -181,17 +180,17 @@ Partial Class frmConstructorDesigner
        Me.tslblSaveDetail = New System.Windows.Forms.ToolStripStatusLabel()
        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
        Me.tsbtnSave = New System.Windows.Forms.ToolStripButton()
-        Me.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource()
        Me.ListBox1 = New System.Windows.Forms.ListBox()
        Me.Label1 = New System.Windows.Forms.Label()
-        Me.TBPMO_FORM_CONSTRUCTORBindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
+        Me.TBPMO_FORM_CONSTRUCTORBindingSource1 = New System.Windows.Forms.BindingSource()
        Me.TBPMO_FORM_CONSTRUCTORTableAdapter1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter()
        Me.TableAdapterManager1 = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TableAdapterManager()
        Me.lblSave = New System.Windows.Forms.Label()
        Me.OFDWindreamsuche = New System.Windows.Forms.OpenFileDialog()
        Me.TBTEMP_QUICKDISPLAYTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBTEMP_QUICKDISPLAYTableAdapter()
        Me.TableAdapterManager2 = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
-        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
+        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection()
        Me.btndeleteUserConstructorRel = New System.Windows.Forms.Button()
        Me.btnAddUser2ConstructorREL = New System.Windows.Forms.Button()
        Me.ListBoxUsersFORConstructor = New System.Windows.Forms.ListBox()
@@ -204,7 +203,7 @@ Partial Class frmConstructorDesigner
        Me.TableAdapterManager3 = New DD_Record_Organiser.DD_DMSDataSetCalendarTableAdapters.TableAdapterManager()
        Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter()
        Me.GridControlUsers2Menue = New DevExpress.XtraGrid.GridControl()
-        Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource()
        Me.GridViewlUsers2Menue = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.colSelect = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -444,13 +443,13 @@ Partial Class frmConstructorDesigner
        '
        'TBPMO_FORM_CONSTRUCTORBindingNavigator
        '
-        resources.ApplyResources(Me.TBPMO_FORM_CONSTRUCTORBindingNavigator, "TBPMO_FORM_CONSTRUCTORBindingNavigator")
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.AddNewItem = Me.BindingNavigatorAddNewItem
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.BindingSource = Me.TBPMO_FORM_CONSTRUCTORBindingSource
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.CountItem = Me.BindingNavigatorCountItem
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.CountItemFormat = "from {0} records"
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.DeleteItem = Me.BindingNavigatorDeleteItem
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem})
+        resources.ApplyResources(Me.TBPMO_FORM_CONSTRUCTORBindingNavigator, "TBPMO_FORM_CONSTRUCTORBindingNavigator")
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.MoveFirstItem = Me.BindingNavigatorMoveFirstItem
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.MoveLastItem = Me.BindingNavigatorMoveLastItem
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigator.MoveNextItem = Me.BindingNavigatorMoveNextItem
@@ -460,37 +459,37 @@ Partial Class frmConstructorDesigner
        '
        'BindingNavigatorAddNewItem
        '
-        resources.ApplyResources(Me.BindingNavigatorAddNewItem, "BindingNavigatorAddNewItem")
        Me.BindingNavigatorAddNewItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorAddNewItem, "BindingNavigatorAddNewItem")
        Me.BindingNavigatorAddNewItem.Name = "BindingNavigatorAddNewItem"
        '
        'BindingNavigatorCountItem
        '
-        resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem")
        Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem"
+        resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem")
        '
        'BindingNavigatorDeleteItem
        '
-        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
        Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
        Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
        '
        'BindingNavigatorMoveFirstItem
        '
-        resources.ApplyResources(Me.BindingNavigatorMoveFirstItem, "BindingNavigatorMoveFirstItem")
        Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMoveFirstItem, "BindingNavigatorMoveFirstItem")
        Me.BindingNavigatorMoveFirstItem.Name = "BindingNavigatorMoveFirstItem"
        '
        'BindingNavigatorMovePreviousItem
        '
-        resources.ApplyResources(Me.BindingNavigatorMovePreviousItem, "BindingNavigatorMovePreviousItem")
        Me.BindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMovePreviousItem, "BindingNavigatorMovePreviousItem")
        Me.BindingNavigatorMovePreviousItem.Name = "BindingNavigatorMovePreviousItem"
        '
        'BindingNavigatorSeparator
        '
-        resources.ApplyResources(Me.BindingNavigatorSeparator, "BindingNavigatorSeparator")
        Me.BindingNavigatorSeparator.Name = "BindingNavigatorSeparator"
+        resources.ApplyResources(Me.BindingNavigatorSeparator, "BindingNavigatorSeparator")
        '
        'BindingNavigatorPositionItem
        '
@@ -499,30 +498,30 @@ Partial Class frmConstructorDesigner
        '
        'BindingNavigatorSeparator1
        '
-        resources.ApplyResources(Me.BindingNavigatorSeparator1, "BindingNavigatorSeparator1")
        Me.BindingNavigatorSeparator1.Name = "BindingNavigatorSeparator1"
+        resources.ApplyResources(Me.BindingNavigatorSeparator1, "BindingNavigatorSeparator1")
        '
        'BindingNavigatorMoveNextItem
        '
-        resources.ApplyResources(Me.BindingNavigatorMoveNextItem, "BindingNavigatorMoveNextItem")
        Me.BindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMoveNextItem, "BindingNavigatorMoveNextItem")
        Me.BindingNavigatorMoveNextItem.Name = "BindingNavigatorMoveNextItem"
        '
        'BindingNavigatorMoveLastItem
        '
-        resources.ApplyResources(Me.BindingNavigatorMoveLastItem, "BindingNavigatorMoveLastItem")
        Me.BindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorMoveLastItem, "BindingNavigatorMoveLastItem")
        Me.BindingNavigatorMoveLastItem.Name = "BindingNavigatorMoveLastItem"
        '
        'BindingNavigatorSeparator2
        '
-        resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
        Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2"
+        resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
        '
        'TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem
        '
-        resources.ApplyResources(Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem, "TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem")
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem, "TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem")
        Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem.Name = "TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem"
        '
        'TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource
@@ -532,22 +531,22 @@ Partial Class frmConstructorDesigner
        '
        'TreeViewDetails
        '
-        resources.ApplyResources(Me.TreeViewDetails, "TreeViewDetails")
        Me.TreeViewDetails.AllowDrop = True
        Me.TreeViewDetails.ContextMenuStrip = Me.cmstrpEntity
+        resources.ApplyResources(Me.TreeViewDetails, "TreeViewDetails")
        Me.TreeViewDetails.ImageList = Me.ImageList1
        Me.TreeViewDetails.Name = "TreeViewDetails"
        '
        'cmstrpEntity
        '
-        resources.ApplyResources(Me.cmstrpEntity, "cmstrpEntity")
        Me.cmstrpEntity.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.FormDesignerToolStripMenuItem})
        Me.cmstrpEntity.Name = "cmstrpEntity"
+        resources.ApplyResources(Me.cmstrpEntity, "cmstrpEntity")
        '
        'FormDesignerToolStripMenuItem
        '
-        resources.ApplyResources(Me.FormDesignerToolStripMenuItem, "FormDesignerToolStripMenuItem")
        Me.FormDesignerToolStripMenuItem.Name = "FormDesignerToolStripMenuItem"
+        resources.ApplyResources(Me.FormDesignerToolStripMenuItem, "FormDesignerToolStripMenuItem")
        '
        'ImageList1
        '
@@ -558,82 +557,82 @@ Partial Class frmConstructorDesigner
        '
        'CONSTRUCTOR_IDTextBox
        '
-        resources.ApplyResources(Me.CONSTRUCTOR_IDTextBox, "CONSTRUCTOR_IDTextBox")
        Me.CONSTRUCTOR_IDTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.CONSTRUCTOR_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTORBindingSource, "GUID", True))
+        resources.ApplyResources(Me.CONSTRUCTOR_IDTextBox, "CONSTRUCTOR_IDTextBox")
        Me.CONSTRUCTOR_IDTextBox.Name = "CONSTRUCTOR_IDTextBox"
        Me.CONSTRUCTOR_IDTextBox.ReadOnly = True
        '
        'FORM_TITLETextBox
        '
-        resources.ApplyResources(Me.FORM_TITLETextBox, "FORM_TITLETextBox")
        Me.FORM_TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTORBindingSource, "FORM_TITLE", True))
+        resources.ApplyResources(Me.FORM_TITLETextBox, "FORM_TITLETextBox")
        Me.FORM_TITLETextBox.Name = "FORM_TITLETextBox"
        '
        'SEQUENCE_MENUNumericUpDown
        '
-        resources.ApplyResources(Me.SEQUENCE_MENUNumericUpDown, "SEQUENCE_MENUNumericUpDown")
        Me.SEQUENCE_MENUNumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBPMO_FORM_CONSTRUCTORBindingSource, "SEQUENCE_MENU", True))
+        resources.ApplyResources(Me.SEQUENCE_MENUNumericUpDown, "SEQUENCE_MENUNumericUpDown")
        Me.SEQUENCE_MENUNumericUpDown.Name = "SEQUENCE_MENUNumericUpDown"
        '
        'SHORT_TITLETextBox
        '
-        resources.ApplyResources(Me.SHORT_TITLETextBox, "SHORT_TITLETextBox")
        Me.SHORT_TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTORBindingSource, "SHORT_TITLE", True))
+        resources.ApplyResources(Me.SHORT_TITLETextBox, "SHORT_TITLETextBox")
        Me.SHORT_TITLETextBox.Name = "SHORT_TITLETextBox"
        '
        'ADDED_WHOTextBox
        '
-        resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox")
        Me.ADDED_WHOTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.ADDED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTORBindingSource, "ADDED_WHO", True))
+        resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox")
        Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox"
        Me.ADDED_WHOTextBox.ReadOnly = True
        '
        'ADDED_WHENTextBox
        '
-        resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox")
        Me.ADDED_WHENTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.ADDED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTORBindingSource, "ADDED_WHEN", True))
+        resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox")
        Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox"
        Me.ADDED_WHENTextBox.ReadOnly = True
        '
        'CHANGED_WHOTextBox
        '
-        resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox")
        Me.CHANGED_WHOTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTORBindingSource, "CHANGED_WHO", True))
+        resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox")
        Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
        Me.CHANGED_WHOTextBox.ReadOnly = True
        '
        'CHANGED_WHENTextBox
        '
-        resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox")
        Me.CHANGED_WHENTextBox.BackColor = System.Drawing.Color.WhiteSmoke
        Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTORBindingSource, "CHANGED_WHEN", True))
+        resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox")
        Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
        Me.CHANGED_WHENTextBox.ReadOnly = True
        '
        'GUIDTextBox1
        '
-        resources.ApplyResources(Me.GUIDTextBox1, "GUIDTextBox1")
        Me.GUIDTextBox1.BackColor = System.Drawing.Color.WhiteSmoke
        Me.GUIDTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "GUID", True))
+        resources.ApplyResources(Me.GUIDTextBox1, "GUIDTextBox1")
        Me.GUIDTextBox1.Name = "GUIDTextBox1"
        Me.GUIDTextBox1.ReadOnly = True
        '
        'LEVEL1_SELECTCheckBox
        '
-        resources.ApplyResources(Me.LEVEL1_SELECTCheckBox, "LEVEL1_SELECTCheckBox")
        Me.LEVEL1_SELECTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "LEVEL1_SELECT", True))
+        resources.ApplyResources(Me.LEVEL1_SELECTCheckBox, "LEVEL1_SELECTCheckBox")
        Me.LEVEL1_SELECTCheckBox.Name = "LEVEL1_SELECTCheckBox"
        Me.LEVEL1_SELECTCheckBox.UseVisualStyleBackColor = True
        '
        'WINDREAM_SEARCHTextBox
        '
-        resources.ApplyResources(Me.WINDREAM_SEARCHTextBox, "WINDREAM_SEARCHTextBox")
        Me.WINDREAM_SEARCHTextBox.BackColor = System.Drawing.SystemColors.Info
        Me.WINDREAM_SEARCHTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "WINDREAM_SEARCH", True))
+        resources.ApplyResources(Me.WINDREAM_SEARCHTextBox, "WINDREAM_SEARCHTextBox")
        Me.WINDREAM_SEARCHTextBox.Name = "WINDREAM_SEARCHTextBox"
        '
        'XtraTabControl1
@@ -645,12 +644,12 @@ Partial Class frmConstructorDesigner
        '
        'XtraTabPage1
        '
-        resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
        Me.XtraTabPage1.Controls.Add(Me.XtraTabControl2)
        Me.XtraTabPage1.Controls.Add(Me.StatusStrip1)
        Me.XtraTabPage1.Controls.Add(Me.ToolStrip1)
        Me.XtraTabPage1.Controls.Add(Me.TreeViewDetails)
        Me.XtraTabPage1.Name = "XtraTabPage1"
+        resources.ApplyResources(Me.XtraTabPage1, "XtraTabPage1")
        '
        'XtraTabControl2
        '
@@ -688,20 +687,20 @@ Partial Class frmConstructorDesigner
        '
        'SQL_RIGHT_READ_AND_VIEW_ONLYTextBox
        '
-        resources.ApplyResources(Me.SQL_RIGHT_READ_AND_VIEW_ONLYTextBox, "SQL_RIGHT_READ_AND_VIEW_ONLYTextBox")
        Me.SQL_RIGHT_READ_AND_VIEW_ONLYTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SQL_RIGHT_READ_AND_VIEW_ONLY", True))
+        resources.ApplyResources(Me.SQL_RIGHT_READ_AND_VIEW_ONLYTextBox, "SQL_RIGHT_READ_AND_VIEW_ONLYTextBox")
        Me.SQL_RIGHT_READ_AND_VIEW_ONLYTextBox.Name = "SQL_RIGHT_READ_AND_VIEW_ONLYTextBox"
        '
        'CONTROL_DOCTYPE_MATCHTextBox
        '
-        resources.ApplyResources(Me.CONTROL_DOCTYPE_MATCHTextBox, "CONTROL_DOCTYPE_MATCHTextBox")
        Me.CONTROL_DOCTYPE_MATCHTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "CONTROL_DOCTYPE_MATCH", True))
+        resources.ApplyResources(Me.CONTROL_DOCTYPE_MATCHTextBox, "CONTROL_DOCTYPE_MATCHTextBox")
        Me.CONTROL_DOCTYPE_MATCHTextBox.Name = "CONTROL_DOCTYPE_MATCHTextBox"
        '
        'LOAD_DIRECTCheckBox
        '
-        resources.ApplyResources(Me.LOAD_DIRECTCheckBox, "LOAD_DIRECTCheckBox")
        Me.LOAD_DIRECTCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "LOAD_DIRECT", True))
+        resources.ApplyResources(Me.LOAD_DIRECTCheckBox, "LOAD_DIRECTCheckBox")
        Me.LOAD_DIRECTCheckBox.Name = "LOAD_DIRECTCheckBox"
        Me.LOAD_DIRECTCheckBox.UseVisualStyleBackColor = True
        '
@@ -712,9 +711,9 @@ Partial Class frmConstructorDesigner
        '
        'COLUMN_NAME1ComboBox
        '
-        resources.ApplyResources(Me.COLUMN_NAME1ComboBox, "COLUMN_NAME1ComboBox")
        Me.COLUMN_NAME1ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "COLUMN_NAME1", True))
        Me.COLUMN_NAME1ComboBox.FormattingEnabled = True
+        resources.ApplyResources(Me.COLUMN_NAME1ComboBox, "COLUMN_NAME1ComboBox")
        Me.COLUMN_NAME1ComboBox.Name = "COLUMN_NAME1ComboBox"
        '
        'Label2
@@ -724,39 +723,39 @@ Partial Class frmConstructorDesigner
        '
        'SQL_SELECT_EBENE1TextBox
        '
-        resources.ApplyResources(Me.SQL_SELECT_EBENE1TextBox, "SQL_SELECT_EBENE1TextBox")
        Me.SQL_SELECT_EBENE1TextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SQL_SELECT_EBENE1", True))
+        resources.ApplyResources(Me.SQL_SELECT_EBENE1TextBox, "SQL_SELECT_EBENE1TextBox")
        Me.SQL_SELECT_EBENE1TextBox.Name = "SQL_SELECT_EBENE1TextBox"
        '
        'CHANGED_WHENTextBox1
        '
-        resources.ApplyResources(Me.CHANGED_WHENTextBox1, "CHANGED_WHENTextBox1")
        Me.CHANGED_WHENTextBox1.BackColor = System.Drawing.Color.WhiteSmoke
        Me.CHANGED_WHENTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "CHANGED_WHEN", True))
+        resources.ApplyResources(Me.CHANGED_WHENTextBox1, "CHANGED_WHENTextBox1")
        Me.CHANGED_WHENTextBox1.Name = "CHANGED_WHENTextBox1"
        Me.CHANGED_WHENTextBox1.ReadOnly = True
        '
        'CHANGED_WHOTextBox1
        '
-        resources.ApplyResources(Me.CHANGED_WHOTextBox1, "CHANGED_WHOTextBox1")
        Me.CHANGED_WHOTextBox1.BackColor = System.Drawing.Color.WhiteSmoke
        Me.CHANGED_WHOTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "CHANGED_WHO", True))
+        resources.ApplyResources(Me.CHANGED_WHOTextBox1, "CHANGED_WHOTextBox1")
        Me.CHANGED_WHOTextBox1.Name = "CHANGED_WHOTextBox1"
        Me.CHANGED_WHOTextBox1.ReadOnly = True
        '
        'ADDED_WHENTextBox1
        '
-        resources.ApplyResources(Me.ADDED_WHENTextBox1, "ADDED_WHENTextBox1")
        Me.ADDED_WHENTextBox1.BackColor = System.Drawing.Color.WhiteSmoke
        Me.ADDED_WHENTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "ADDED_WHEN", True))
+        resources.ApplyResources(Me.ADDED_WHENTextBox1, "ADDED_WHENTextBox1")
        Me.ADDED_WHENTextBox1.Name = "ADDED_WHENTextBox1"
        Me.ADDED_WHENTextBox1.ReadOnly = True
        '
        'ADDED_WHOTextBox1
        '
-        resources.ApplyResources(Me.ADDED_WHOTextBox1, "ADDED_WHOTextBox1")
        Me.ADDED_WHOTextBox1.BackColor = System.Drawing.Color.WhiteSmoke
        Me.ADDED_WHOTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "ADDED_WHO", True))
+        resources.ApplyResources(Me.ADDED_WHOTextBox1, "ADDED_WHOTextBox1")
        Me.ADDED_WHOTextBox1.Name = "ADDED_WHOTextBox1"
        Me.ADDED_WHOTextBox1.ReadOnly = True
        '
@@ -834,8 +833,8 @@ Partial Class frmConstructorDesigner
        '
        'ListBoxConfiguredDisplay
        '
-        resources.ApplyResources(Me.ListBoxConfiguredDisplay, "ListBoxConfiguredDisplay")
        Me.ListBoxConfiguredDisplay.FormattingEnabled = True
+        resources.ApplyResources(Me.ListBoxConfiguredDisplay, "ListBoxConfiguredDisplay")
        Me.ListBoxConfiguredDisplay.Name = "ListBoxConfiguredDisplay"
        '
        'Label6
@@ -861,11 +860,11 @@ Partial Class frmConstructorDesigner
        '
        'XtraTabPage4
        '
-        resources.ApplyResources(Me.XtraTabPage4, "XtraTabPage4")
        Me.XtraTabPage4.Controls.Add(Me.chkWDSearch_Active)
        Me.XtraTabPage4.Controls.Add(Me.grpbxWD_RecordSearch)
        Me.XtraTabPage4.Controls.Add(Me.GroupBox1)
        Me.XtraTabPage4.Name = "XtraTabPage4"
+        resources.ApplyResources(Me.XtraTabPage4, "XtraTabPage4")
        '
        'chkWDSearch_Active
        '
@@ -906,8 +905,8 @@ Partial Class frmConstructorDesigner
        '
        'txtWindreamsuche
        '
-        resources.ApplyResources(Me.txtWindreamsuche, "txtWindreamsuche")
        Me.txtWindreamsuche.BackColor = System.Drawing.SystemColors.Info
+        resources.ApplyResources(Me.txtWindreamsuche, "txtWindreamsuche")
        Me.txtWindreamsuche.Name = "txtWindreamsuche"
        '
        'Label15
@@ -1001,47 +1000,47 @@ Partial Class frmConstructorDesigner
        '
        'SEARCH_PATTERN4ComboBox
        '
-        resources.ApplyResources(Me.SEARCH_PATTERN4ComboBox, "SEARCH_PATTERN4ComboBox")
        Me.SEARCH_PATTERN4ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SEARCH_PATTERN4", True))
        Me.SEARCH_PATTERN4ComboBox.FormattingEnabled = True
        Me.SEARCH_PATTERN4ComboBox.Items.AddRange(New Object() {resources.GetString("SEARCH_PATTERN4ComboBox.Items"), resources.GetString("SEARCH_PATTERN4ComboBox.Items1"), resources.GetString("SEARCH_PATTERN4ComboBox.Items2")})
+        resources.ApplyResources(Me.SEARCH_PATTERN4ComboBox, "SEARCH_PATTERN4ComboBox")
        Me.SEARCH_PATTERN4ComboBox.Name = "SEARCH_PATTERN4ComboBox"
        '
        'SEARCH_PATTERN1ComboBox
        '
-        resources.ApplyResources(Me.SEARCH_PATTERN1ComboBox, "SEARCH_PATTERN1ComboBox")
        Me.SEARCH_PATTERN1ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SEARCH_PATTERN1", True))
        Me.SEARCH_PATTERN1ComboBox.FormattingEnabled = True
        Me.SEARCH_PATTERN1ComboBox.Items.AddRange(New Object() {resources.GetString("SEARCH_PATTERN1ComboBox.Items"), resources.GetString("SEARCH_PATTERN1ComboBox.Items1"), resources.GetString("SEARCH_PATTERN1ComboBox.Items2")})
+        resources.ApplyResources(Me.SEARCH_PATTERN1ComboBox, "SEARCH_PATTERN1ComboBox")
        Me.SEARCH_PATTERN1ComboBox.Name = "SEARCH_PATTERN1ComboBox"
        '
        'SEARCH_PATTERN3ComboBox
        '
-        resources.ApplyResources(Me.SEARCH_PATTERN3ComboBox, "SEARCH_PATTERN3ComboBox")
        Me.SEARCH_PATTERN3ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SEARCH_PATTERN3", True))
        Me.SEARCH_PATTERN3ComboBox.FormattingEnabled = True
        Me.SEARCH_PATTERN3ComboBox.Items.AddRange(New Object() {resources.GetString("SEARCH_PATTERN3ComboBox.Items"), resources.GetString("SEARCH_PATTERN3ComboBox.Items1"), resources.GetString("SEARCH_PATTERN3ComboBox.Items2")})
+        resources.ApplyResources(Me.SEARCH_PATTERN3ComboBox, "SEARCH_PATTERN3ComboBox")
        Me.SEARCH_PATTERN3ComboBox.Name = "SEARCH_PATTERN3ComboBox"
        '
        'SEARCH_PATTERN2ComboBox
        '
-        resources.ApplyResources(Me.SEARCH_PATTERN2ComboBox, "SEARCH_PATTERN2ComboBox")
        Me.SEARCH_PATTERN2ComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource, "SEARCH_PATTERN2", True))
        Me.SEARCH_PATTERN2ComboBox.FormattingEnabled = True
        Me.SEARCH_PATTERN2ComboBox.Items.AddRange(New Object() {resources.GetString("SEARCH_PATTERN2ComboBox.Items"), resources.GetString("SEARCH_PATTERN2ComboBox.Items1"), resources.GetString("SEARCH_PATTERN2ComboBox.Items2")})
+        resources.ApplyResources(Me.SEARCH_PATTERN2ComboBox, "SEARCH_PATTERN2ComboBox")
        Me.SEARCH_PATTERN2ComboBox.Name = "SEARCH_PATTERN2ComboBox"
        '
        'XtraTabPage2
        '
-        resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
        Me.XtraTabPage2.Controls.Add(Me.TabControl1)
        Me.XtraTabPage2.Name = "XtraTabPage2"
+        resources.ApplyResources(Me.XtraTabPage2, "XtraTabPage2")
        '
        'TabControl1
        '
-        resources.ApplyResources(Me.TabControl1, "TabControl1")
        Me.TabControl1.Controls.Add(Me.TabPage1)
        Me.TabControl1.Controls.Add(Me.TabPage2)
+        resources.ApplyResources(Me.TabControl1, "TabControl1")
        Me.TabControl1.Name = "TabControl1"
        Me.TabControl1.SelectedIndex = 0
        '
@@ -1076,18 +1075,6 @@ Partial Class frmConstructorDesigner
        '
        resources.ApplyResources(Me.GridControlUserSQL, "GridControlUserSQL")
        Me.GridControlUserSQL.DataSource = Me.TBWH_Users1BindingSource
-        Me.GridControlUserSQL.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControlUserSQL.EmbeddedNavigator.AccessibleDescription")
-        Me.GridControlUserSQL.EmbeddedNavigator.AccessibleName = resources.GetString("GridControlUserSQL.EmbeddedNavigator.AccessibleName")
-        Me.GridControlUserSQL.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControlUserSQL.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
-        Me.GridControlUserSQL.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControlUserSQL.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridControlUserSQL.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControlUserSQL.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
-        Me.GridControlUserSQL.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControlUserSQL.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
-        Me.GridControlUserSQL.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControlUserSQL.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridControlUserSQL.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControlUserSQL.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
-        Me.GridControlUserSQL.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControlUserSQL.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridControlUserSQL.EmbeddedNavigator.ToolTip = resources.GetString("GridControlUserSQL.EmbeddedNavigator.ToolTip")
-        Me.GridControlUserSQL.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControlUserSQL.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridControlUserSQL.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControlUserSQL.EmbeddedNavigator.ToolTipTitle")
        Me.GridControlUserSQL.MainView = Me.GridViewUserSQL
        Me.GridControlUserSQL.Name = "GridControlUserSQL"
        Me.GridControlUserSQL.ShowOnlyPredefinedDetails = True
@@ -1101,18 +1088,9 @@ Partial Class frmConstructorDesigner
        'GridViewUserSQL
        '
        Me.GridViewUserSQL.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewUserSQL.Appearance.EvenRow.BackColor"), System.Drawing.Color)
-        Me.GridViewUserSQL.Appearance.EvenRow.FontSizeDelta = CType(resources.GetObject("GridViewUserSQL.Appearance.EvenRow.FontSizeDelta"), Integer)
-        Me.GridViewUserSQL.Appearance.EvenRow.FontStyleDelta = CType(resources.GetObject("GridViewUserSQL.Appearance.EvenRow.FontStyleDelta"), System.Drawing.FontStyle)
-        Me.GridViewUserSQL.Appearance.EvenRow.GradientMode = CType(resources.GetObject("GridViewUserSQL.Appearance.EvenRow.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
-        Me.GridViewUserSQL.Appearance.EvenRow.Image = CType(resources.GetObject("GridViewUserSQL.Appearance.EvenRow.Image"), System.Drawing.Image)
        Me.GridViewUserSQL.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridViewUserSQL.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewUserSQL.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
-        Me.GridViewUserSQL.Appearance.FocusedRow.FontSizeDelta = CType(resources.GetObject("GridViewUserSQL.Appearance.FocusedRow.FontSizeDelta"), Integer)
-        Me.GridViewUserSQL.Appearance.FocusedRow.FontStyleDelta = CType(resources.GetObject("GridViewUserSQL.Appearance.FocusedRow.FontStyleDelta"), System.Drawing.FontStyle)
-        Me.GridViewUserSQL.Appearance.FocusedRow.GradientMode = CType(resources.GetObject("GridViewUserSQL.Appearance.FocusedRow.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
-        Me.GridViewUserSQL.Appearance.FocusedRow.Image = CType(resources.GetObject("GridViewUserSQL.Appearance.FocusedRow.Image"), System.Drawing.Image)
        Me.GridViewUserSQL.Appearance.FocusedRow.Options.UseBackColor = True
-        resources.ApplyResources(Me.GridViewUserSQL, "GridViewUserSQL")
        Me.GridViewUserSQL.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn4, Me.GridColumn5, Me.GridColumn6, Me.colID1})
        Me.GridViewUserSQL.GridControl = Me.GridControlUserSQL
        Me.GridViewUserSQL.Name = "GridViewUserSQL"
@@ -1127,27 +1105,25 @@ Partial Class frmConstructorDesigner
        '
        'GridColumn4
        '
-        resources.ApplyResources(Me.GridColumn4, "GridColumn4")
        Me.GridColumn4.FieldName = "Username"
        Me.GridColumn4.Name = "GridColumn4"
        Me.GridColumn4.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn4, "GridColumn4")
        '
        'GridColumn5
        '
-        resources.ApplyResources(Me.GridColumn5, "GridColumn5")
        Me.GridColumn5.FieldName = "Email"
        Me.GridColumn5.Name = "GridColumn5"
        Me.GridColumn5.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn5, "GridColumn5")
        '
        'GridColumn6
        '
-        resources.ApplyResources(Me.GridColumn6, "GridColumn6")
        Me.GridColumn6.FieldName = "ID"
        Me.GridColumn6.Name = "GridColumn6"
        '
        'colID1
        '
-        resources.ApplyResources(Me.colID1, "colID1")
        Me.colID1.FieldName = "ID"
        Me.colID1.Name = "colID1"
        '
@@ -1163,22 +1139,22 @@ Partial Class frmConstructorDesigner
        '
        'dgvResult
        '
-        resources.ApplyResources(Me.dgvResult, "dgvResult")
        Me.dgvResult.AllowUserToAddRows = False
        Me.dgvResult.AllowUserToDeleteRows = False
-        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
-        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
+        DataGridViewCellStyle3.BackColor = System.Drawing.Color.Cyan
+        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        resources.ApplyResources(Me.dgvResult, "dgvResult")
        Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvResult.Name = "dgvResult"
        Me.dgvResult.ReadOnly = True
        '
        'dgvPlaceholders
        '
-        resources.ApplyResources(Me.dgvPlaceholders, "dgvPlaceholders")
        Me.dgvPlaceholders.AllowUserToAddRows = False
        Me.dgvPlaceholders.AllowUserToDeleteRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
-        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan
+        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+        resources.ApplyResources(Me.dgvPlaceholders, "dgvPlaceholders")
        Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace})
        Me.dgvPlaceholders.Name = "dgvPlaceholders"
@@ -1203,8 +1179,8 @@ Partial Class frmConstructorDesigner
        '
        'btnAddUserSQL
        '
-        resources.ApplyResources(Me.btnAddUserSQL, "btnAddUserSQL")
        Me.btnAddUserSQL.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xLG
+        resources.ApplyResources(Me.btnAddUserSQL, "btnAddUserSQL")
        Me.btnAddUserSQL.Name = "btnAddUserSQL"
        Me.btnAddUserSQL.UseVisualStyleBackColor = True
        '
@@ -1216,8 +1192,8 @@ Partial Class frmConstructorDesigner
        '
        'CHANGED_WHENTextBox2
        '
-        resources.ApplyResources(Me.CHANGED_WHENTextBox2, "CHANGED_WHENTextBox2")
        Me.CHANGED_WHENTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource, "CHANGED_WHEN", True))
+        resources.ApplyResources(Me.CHANGED_WHENTextBox2, "CHANGED_WHENTextBox2")
        Me.CHANGED_WHENTextBox2.Name = "CHANGED_WHENTextBox2"
        Me.CHANGED_WHENTextBox2.ReadOnly = True
        '
@@ -1233,35 +1209,35 @@ Partial Class frmConstructorDesigner
        '
        'CHANGED_WHOTextBox2
        '
-        resources.ApplyResources(Me.CHANGED_WHOTextBox2, "CHANGED_WHOTextBox2")
        Me.CHANGED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource, "CHANGED_WHO", True))
+        resources.ApplyResources(Me.CHANGED_WHOTextBox2, "CHANGED_WHOTextBox2")
        Me.CHANGED_WHOTextBox2.Name = "CHANGED_WHOTextBox2"
        Me.CHANGED_WHOTextBox2.ReadOnly = True
        '
        'ADDED_WHENTextBox2
        '
-        resources.ApplyResources(Me.ADDED_WHENTextBox2, "ADDED_WHENTextBox2")
        Me.ADDED_WHENTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource, "ADDED_WHEN", True))
+        resources.ApplyResources(Me.ADDED_WHENTextBox2, "ADDED_WHENTextBox2")
        Me.ADDED_WHENTextBox2.Name = "ADDED_WHENTextBox2"
        Me.ADDED_WHENTextBox2.ReadOnly = True
        '
        'ADDED_WHOTextBox2
        '
-        resources.ApplyResources(Me.ADDED_WHOTextBox2, "ADDED_WHOTextBox2")
        Me.ADDED_WHOTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource, "ADDED_WHO", True))
+        resources.ApplyResources(Me.ADDED_WHOTextBox2, "ADDED_WHOTextBox2")
        Me.ADDED_WHOTextBox2.Name = "ADDED_WHOTextBox2"
        Me.ADDED_WHOTextBox2.ReadOnly = True
        '
        'SQL_COMMANDTextBox
        '
-        resources.ApplyResources(Me.SQL_COMMANDTextBox, "SQL_COMMANDTextBox")
        Me.SQL_COMMANDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource, "SQL_COMMAND", True))
+        resources.ApplyResources(Me.SQL_COMMANDTextBox, "SQL_COMMANDTextBox")
        Me.SQL_COMMANDTextBox.Name = "SQL_COMMANDTextBox"
        '
        'GUIDTextBox
        '
-        resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox")
        Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_CONSTRUCTOR_USER_SQLBindingSource, "GUID", True))
+        resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox")
        Me.GUIDTextBox.Name = "GUIDTextBox"
        Me.GUIDTextBox.ReadOnly = True
        '
@@ -1278,7 +1254,6 @@ Partial Class frmConstructorDesigner
        '
        'XtraTabPage6
        '
-        resources.ApplyResources(Me.XtraTabPage6, "XtraTabPage6")
        Me.XtraTabPage6.Controls.Add(Me.btndeleteEntityfromClient)
        Me.XtraTabPage6.Controls.Add(Me.lblUser2Client)
        Me.XtraTabPage6.Controls.Add(Me.chklbxEntitiesforClient)
@@ -1286,11 +1261,12 @@ Partial Class frmConstructorDesigner
        Me.XtraTabPage6.Controls.Add(Me.Label18)
        Me.XtraTabPage6.Controls.Add(Me.chklbxClient)
        Me.XtraTabPage6.Name = "XtraTabPage6"
+        resources.ApplyResources(Me.XtraTabPage6, "XtraTabPage6")
        '
        'btndeleteEntityfromClient
        '
-        resources.ApplyResources(Me.btndeleteEntityfromClient, "btndeleteEntityfromClient")
        Me.btndeleteEntityfromClient.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
+        resources.ApplyResources(Me.btndeleteEntityfromClient, "btndeleteEntityfromClient")
        Me.btndeleteEntityfromClient.Name = "btndeleteEntityfromClient"
        Me.btndeleteEntityfromClient.UseVisualStyleBackColor = True
        '
@@ -1308,8 +1284,8 @@ Partial Class frmConstructorDesigner
        '
        'btnsaddUser2Client
        '
-        resources.ApplyResources(Me.btnsaddUser2Client, "btnsaddUser2Client")
        Me.btnsaddUser2Client.Image = Global.DD_Record_Organiser.My.Resources.Resources.add1
+        resources.ApplyResources(Me.btnsaddUser2Client, "btnsaddUser2Client")
        Me.btnsaddUser2Client.Name = "btnsaddUser2Client"
        Me.btnsaddUser2Client.UseVisualStyleBackColor = True
        '
@@ -1327,20 +1303,20 @@ Partial Class frmConstructorDesigner
        '
        'StatusStrip1
        '
-        resources.ApplyResources(Me.StatusStrip1, "StatusStrip1")
        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblSaveDetail})
+        resources.ApplyResources(Me.StatusStrip1, "StatusStrip1")
        Me.StatusStrip1.Name = "StatusStrip1"
        '
        'tslblSaveDetail
        '
-        resources.ApplyResources(Me.tslblSaveDetail, "tslblSaveDetail")
        Me.tslblSaveDetail.BackColor = System.Drawing.Color.Yellow
        Me.tslblSaveDetail.Name = "tslblSaveDetail"
+        resources.ApplyResources(Me.tslblSaveDetail, "tslblSaveDetail")
        '
        'ToolStrip1
        '
-        resources.ApplyResources(Me.ToolStrip1, "ToolStrip1")
        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnSave})
+        resources.ApplyResources(Me.ToolStrip1, "ToolStrip1")
        Me.ToolStrip1.Name = "ToolStrip1"
        '
        'tsbtnSave
@@ -1476,8 +1452,8 @@ Partial Class frmConstructorDesigner
        '
        'LANGUAGETextBox
        '
-        resources.ApplyResources(Me.LANGUAGETextBox, "LANGUAGETextBox")
        Me.LANGUAGETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_CONSTRUCTORBindingSource, "LANGUAGE", True))
+        resources.ApplyResources(Me.LANGUAGETextBox, "LANGUAGETextBox")
        Me.LANGUAGETextBox.Name = "LANGUAGETextBox"
        Me.LANGUAGETextBox.ReadOnly = True
        '
@@ -1489,8 +1465,8 @@ Partial Class frmConstructorDesigner
        '
        'btnChangeHOMESTANDARD
        '
-        resources.ApplyResources(Me.btnChangeHOMESTANDARD, "btnChangeHOMESTANDARD")
        Me.btnChangeHOMESTANDARD.Image = Global.DD_Record_Organiser.My.Resources.Resources.Link
+        resources.ApplyResources(Me.btnChangeHOMESTANDARD, "btnChangeHOMESTANDARD")
        Me.btnChangeHOMESTANDARD.Name = "btnChangeHOMESTANDARD"
        Me.btnChangeHOMESTANDARD.UseVisualStyleBackColor = True
        '
@@ -1510,18 +1486,6 @@ Partial Class frmConstructorDesigner
        '
        resources.ApplyResources(Me.GridControlUsers2Menue, "GridControlUsers2Menue")
        Me.GridControlUsers2Menue.DataSource = Me.TBAD_UsersBindingSource
-        Me.GridControlUsers2Menue.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControlUsers2Menue.EmbeddedNavigator.AccessibleDescription")
-        Me.GridControlUsers2Menue.EmbeddedNavigator.AccessibleName = resources.GetString("GridControlUsers2Menue.EmbeddedNavigator.AccessibleName")
-        Me.GridControlUsers2Menue.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControlUsers2Menue.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
-        Me.GridControlUsers2Menue.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControlUsers2Menue.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridControlUsers2Menue.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControlUsers2Menue.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
-        Me.GridControlUsers2Menue.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControlUsers2Menue.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
-        Me.GridControlUsers2Menue.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControlUsers2Menue.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridControlUsers2Menue.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControlUsers2Menue.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
-        Me.GridControlUsers2Menue.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControlUsers2Menue.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridControlUsers2Menue.EmbeddedNavigator.ToolTip = resources.GetString("GridControlUsers2Menue.EmbeddedNavigator.ToolTip")
-        Me.GridControlUsers2Menue.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControlUsers2Menue.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridControlUsers2Menue.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControlUsers2Menue.EmbeddedNavigator.ToolTipTitle")
        Me.GridControlUsers2Menue.MainView = Me.GridViewlUsers2Menue
        Me.GridControlUsers2Menue.Name = "GridControlUsers2Menue"
        Me.GridControlUsers2Menue.ShowOnlyPredefinedDetails = True
@@ -1535,18 +1499,9 @@ Partial Class frmConstructorDesigner
        'GridViewlUsers2Menue
        '
        Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.EvenRow.BackColor"), System.Drawing.Color)
-        Me.GridViewlUsers2Menue.Appearance.EvenRow.FontSizeDelta = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.EvenRow.FontSizeDelta"), Integer)
-        Me.GridViewlUsers2Menue.Appearance.EvenRow.FontStyleDelta = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.EvenRow.FontStyleDelta"), System.Drawing.FontStyle)
-        Me.GridViewlUsers2Menue.Appearance.EvenRow.GradientMode = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.EvenRow.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
-        Me.GridViewlUsers2Menue.Appearance.EvenRow.Image = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.EvenRow.Image"), System.Drawing.Image)
        Me.GridViewlUsers2Menue.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridViewlUsers2Menue.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
-        Me.GridViewlUsers2Menue.Appearance.FocusedRow.FontSizeDelta = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.FocusedRow.FontSizeDelta"), Integer)
-        Me.GridViewlUsers2Menue.Appearance.FocusedRow.FontStyleDelta = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.FocusedRow.FontStyleDelta"), System.Drawing.FontStyle)
-        Me.GridViewlUsers2Menue.Appearance.FocusedRow.GradientMode = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.FocusedRow.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
-        Me.GridViewlUsers2Menue.Appearance.FocusedRow.Image = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.FocusedRow.Image"), System.Drawing.Image)
        Me.GridViewlUsers2Menue.Appearance.FocusedRow.Options.UseBackColor = True
-        resources.ApplyResources(Me.GridViewlUsers2Menue, "GridViewlUsers2Menue")
        Me.GridViewlUsers2Menue.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelect, Me.GridColumn1, Me.GridColumn2, Me.colID})
        Me.GridViewlUsers2Menue.GridControl = Me.GridControlUsers2Menue
        Me.GridViewlUsers2Menue.Name = "GridViewlUsers2Menue"
@@ -1567,21 +1522,20 @@ Partial Class frmConstructorDesigner
        '
        'GridColumn1
        '
-        resources.ApplyResources(Me.GridColumn1, "GridColumn1")
        Me.GridColumn1.FieldName = "Username"
        Me.GridColumn1.Name = "GridColumn1"
        Me.GridColumn1.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn1, "GridColumn1")
        '
        'GridColumn2
        '
-        resources.ApplyResources(Me.GridColumn2, "GridColumn2")
        Me.GridColumn2.FieldName = "Email"
        Me.GridColumn2.Name = "GridColumn2"
        Me.GridColumn2.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn2, "GridColumn2")
        '
        'colID
        '
-        resources.ApplyResources(Me.colID, "colID")
        Me.colID.FieldName = "ID"
        Me.colID.Name = "colID"
        '
--- a/app/DD-Record-Organiser/frmConstructorDesigner.en-US.resx
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.en-US.resx
@@ -296,7 +296,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
-        CQAAAk1TRnQBSQFMAgEBAgEAAWgBCgFoAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAAXABCgFwAQoBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -489,71 +489,6 @@
  <data name="XtraTabPage4.Text" xml:space="preserve">
    <value>windream-search</value>
  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="GridControlUserSQL.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="GridControlUserSQL.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <assembly alias="DevExpress.Data.v15.1" name="DevExpress.Data.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControlUserSQL.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v15.1">
-    <value>Default</value>
-  </data>
-  <data name="GridControlUserSQL.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left</value>
-  </data>
-  <data name="GridControlUserSQL.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="GridControlUserSQL.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-    <value>Tile</value>
-  </data>
-  <data name="GridControlUserSQL.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>Inherit</value>
-  </data>
-  <data name="GridControlUserSQL.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <assembly alias="DevExpress.XtraEditors.v15.1" name="DevExpress.XtraEditors.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControlUserSQL.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v15.1">
-    <value>Center</value>
-  </data>
-  <data name="GridControlUserSQL.EmbeddedNavigator.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <assembly alias="DevExpress.Utils.v15.1" name="DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="GridControlUserSQL.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.1">
-    <value>None</value>
-  </data>
-  <data name="GridControlUserSQL.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
-    <value />
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="GridViewUserSQL.Appearance.EvenRow.FontSizeDelta" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="GridViewUserSQL.Appearance.EvenRow.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
-    <value>Regular</value>
-  </data>
-  <data name="GridViewUserSQL.Appearance.EvenRow.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
-    <value>Horizontal</value>
-  </data>
-  <data name="GridViewUserSQL.Appearance.EvenRow.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="GridViewUserSQL.Appearance.FocusedRow.FontSizeDelta" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="GridViewUserSQL.Appearance.FocusedRow.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
-    <value>Regular</value>
-  </data>
-  <data name="GridViewUserSQL.Appearance.FocusedRow.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
-    <value>Horizontal</value>
-  </data>
-  <data name="GridViewUserSQL.Appearance.FocusedRow.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
  <data name="Label12.Size" type="System.Drawing.Size, System.Drawing">
    <value>77, 15</value>
  </data>
@@ -647,6 +582,7 @@ selected clients</value>
  <data name="lblSave.Text" xml:space="preserve">
    <value>Record saved!</value>
  </data>
+  <assembly alias="DevExpress.Utils.v15.1" name="DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYxNS4xLCBWZXJzaW9uPTE1LjEu
@@ -5728,66 +5664,6 @@ selected clients</value>
  <data name="Label16.Text" xml:space="preserve">
    <value>Only the related Users will be able to start/choose the Constructor from Quick menu.</value>
  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v15.1">
-    <value>Default</value>
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left</value>
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
-    <value>Tile</value>
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>Inherit</value>
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v15.1">
-    <value>Center</value>
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.1">
-    <value>None</value>
-  </data>
-  <data name="GridControlUsers2Menue.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
-    <value />
-  </data>
-  <data name="GridViewlUsers2Menue.Appearance.EvenRow.FontSizeDelta" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="GridViewlUsers2Menue.Appearance.EvenRow.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
-    <value>Regular</value>
-  </data>
-  <data name="GridViewlUsers2Menue.Appearance.EvenRow.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
-    <value>Horizontal</value>
-  </data>
-  <data name="GridViewlUsers2Menue.Appearance.EvenRow.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
-  <data name="GridViewlUsers2Menue.Appearance.FocusedRow.FontSizeDelta" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="GridViewlUsers2Menue.Appearance.FocusedRow.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
-    <value>Regular</value>
-  </data>
-  <data name="GridViewlUsers2Menue.Appearance.FocusedRow.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
-    <value>Horizontal</value>
-  </data>
-  <data name="GridViewlUsers2Menue.Appearance.FocusedRow.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
-    <value />
-  </data>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAQAEBAQAAAAAAAoAQAARgAAABAQAAAAAAAAaAUAAG4BAAAgIBAAAAAAAOgCAADWBgAAICAAAAAA
--- a/app/DD-Record-Organiser/frmConstructorDesigner.resx
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx
--- a/app/DD-Record-Organiser/frmConstructorDesigner.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb
@@ -539,7 +539,7 @@ Public Class frmConstructorDesigner
    End Sub
    Public Sub Load_UserSQL()
        Try
-            Dim sql = String.Format("SELECT DISTINCT T.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T, TBDD_CLIENT_USER T1 WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID = T1.USER_ID AND T1.CLIENT_ID IN ({0}) ORDER BY T.USERNAME", USER_CLIENTS_COMMA_SEPERATED)
+            Dim sql = String.Format("SELECT T.GUID, T.USERNAME, T.EMAIL FROM TBDD_USER T WHERE T.MODULE_RECORD_ORG = 1 AND T.GUID IN (SELECT USER_ID FROM TBPMO_CONSTRUCTOR_USER WHERE CONSTRUCT_ID = {0}) ORDER BY T.USERNAME", CONSTRUCTOR_IDTextBox.Text)
            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
            DD_ECMAdmin.TBWH_Users1.Clear()
            For Each row As DataRow In DT.Rows
@@ -746,6 +746,9 @@ Public Class frmConstructorDesigner
    Private Sub btnAddUserSQL_Click(sender As Object, e As EventArgs) Handles btnAddUserSQL.Click
        If GUIDTextBox.Text = "" Then
            TBPMO_CONSTRUCTOR_USER_SQLBindingSource.AddNew()
+            SQL_COMMANDTextBox.Enabled = True
+            SQL_COMMANDTextBox.BackColor = Color.PapayaWhip
+            SQL_COMMANDTextBox.Focus()
        End If
    End Sub

@@ -767,8 +770,10 @@ Public Class frmConstructorDesigner
    Private Sub SQL_COMMANDTextBox_TextChanged(sender As Object, e As EventArgs) Handles SQL_COMMANDTextBox.TextChanged
        If SQL_COMMANDTextBox.Text.Trim().Count = 0 Then
            dgvPlaceholders.Enabled = False
+            SQL_COMMANDTextBox.BackColor = Color.LightGray
        Else
            dgvPlaceholders.Enabled = True
+            SQL_COMMANDTextBox.BackColor = Color.PapayaWhip
        End If

        CheckForPlaceholders()
@@ -859,6 +864,12 @@ Public Class frmConstructorDesigner
                If Not USERID Is Nothing Then
                    Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Connection.ConnectionString = MyConnectionString
                    Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_CONSTRUCTOR_USER_SQL, SELECTED_CONSTRUCTOR_DETAIL_ID, USERID)
+                    If SQL_COMMANDTextBox.Text <> "" Then
+                        SQL_COMMANDTextBox.Enabled = True
+                    Else
+                        SQL_COMMANDTextBox.Enabled = False
+                    End If
+
                End If

            Catch ex As System.Exception
--- a/app/DD-Record-Organiser/frmConstructor_Main.resx
+++ b/app/DD-Record-Organiser/frmConstructor_Main.resx
@@ -415,40 +415,40 @@
    <value>187, 65</value>
  </metadata>
  <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
+    <value>148, 22</value>
  </data>
  <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
    <value>Datei Öffnen</value>
  </data>
  <data name="ToolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 6</value>
+    <value>145, 6</value>
  </data>
  <data name="CopyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
+    <value>148, 22</value>
  </data>
  <data name="CopyToolStripMenuItem.Text" xml:space="preserve">
    <value>Kopieren</value>
  </data>
  <data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 6</value>
+    <value>145, 6</value>
  </data>
  <data name="DeleteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
+    <value>148, 22</value>
  </data>
  <data name="DeleteToolStripMenuItem.Text" xml:space="preserve">
    <value>Löschen</value>
  </data>
  <data name="ToolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 6</value>
+    <value>145, 6</value>
  </data>
  <data name="PropertiesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 22</value>
+    <value>148, 22</value>
  </data>
  <data name="PropertiesToolStripMenuItem.Text" xml:space="preserve">
    <value>Eigenschaften</value>
  </data>
  <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 132</value>
+    <value>149, 110</value>
  </data>
  <data name="&gt;&gt;ContextMenuStripResultFiles.Name" xml:space="preserve">
    <value>ContextMenuStripResultFiles</value>
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@@ -1455,6 +1455,7 @@ Public Class frmConstructor_Main
        ' Abhängige Listen laden
        CtrlBuilder.WatchRecordChanges = False
        ClassControlValues.LoadControlValuesListWithPlaceholders(ENTITY_ID, RECORD_ID, PARENT_ID, CtrlBuilder.AllControls, ENTITY_ID)
+        ClassControlValues.Enable_Depending_Controls(ENTITY_ID, RECORD_ID, PARENT_ID, CtrlBuilder.AllControls, ENTITY_ID)
        CtrlBuilder.WatchRecordChanges = True

        RECORD_ENABLED = True
--- a/app/DD-Record-Organiser/frmWD_Import_Doc_Record.vb
+++ b/app/DD-Record-Organiser/frmWD_Import_Doc_Record.vb
@@ -14,6 +14,7 @@ Public Class frmWD_Import_Doc_Record
    Private _RecordsAdded As Integer = 0
    Private IMPORT_REC_ID
    Private IMP_REC_EXISTS As Boolean = False
+    Private REC_ADDED As Boolean = False
    Private IMP_PARENT_REC_ID

    Private Sub TBPMO_WD_IMPORT_PROFILEBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Handles TBPMO_WD_IMPORT_PROFILEBindingNavigatorSaveItem.Click
@@ -440,7 +441,11 @@ Public Class frmWD_Import_Doc_Record
            Else
                ClassLogger.Add(">> No doctype-ID found", False)
                ClassLogger.Add(">> SQL: " & SQL_FILE_DOCTYPE, False)
-                Return False
+                If REC_ADDED = True Then
+                    Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & IMPORT_REC_ID
+                    ClassDatabase.Execute_non_Query(del, True)
+                    Return False
+            End If
            End If
        Catch ex As Exception
            ClassLogger.Add(">> Unexpected Error in Import/IndexFile: " & ex.Message, False)
@@ -452,6 +457,7 @@ Public Class frmWD_Import_Doc_Record
    Function Create_Record()
        Try
            IMP_REC_EXISTS = False
+            REC_ADDED = False
            Dim SQL_UNIQUE_FILE
            If PROFILE_SQL_UNIQUE <> "" Then
                SQL_UNIQUE_FILE = PROFILE_SQL_UNIQUE
@@ -486,6 +492,7 @@ Public Class frmWD_Import_Doc_Record
                'Den Record inserten
                ClassControlCommandsUI.CreateRecord(PROFILE_ENTITY)
                IMPORT_REC_ID = ClassControlCommandsUI.GetLastRecord()
+                REC_ADDED = True
                If LogErrorsOnly = False Then ClassLogger.Add(" >> New Record-ID: " & IMPORT_REC_ID.ToString, False)
                _RecordsAdded += 1
            Else
@@ -538,7 +545,7 @@ Public Class frmWD_Import_Doc_Record
                If LogErrorsOnly = False Then ClassLogger.Add(" >> New PARENT_RECORD-ID: " & IMP_PARENT_REC_ID.ToString, False)
                _RecordsAdded += 1
            Else
-                ClassLogger.Add(">> ## RECORD already exists - PARENT_RECORD-ID: '" & IMP_PARENT_REC_ID.ToString & "' ##", False)
+                ClassLogger.Add(">> ## PARENT_RECORD already exists - PARENT_RECORD-ID: '" & IMP_PARENT_REC_ID.ToString & "' ##", False)
                If LogErrorsOnly = True Then ClassLogger.Add(">> parent SQL: " & SQL_PARENT, False)
            End If
            Dim sql = String.Format("SELECT GUID FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = {0} AND  RECORD2_ID = {1}", IMP_PARENT_REC_ID, IMPORT_REC_ID)