MS

2016-09-27 13:23:30 +02:00
parent 8f3122c24b
commit 51bd2cdb1d
27 changed files with 2750 additions and 1921 deletions
--- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
@@ -22,6 +22,7 @@ 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
@@ -36,7 +37,6 @@ Partial Class frmConstructorDesigner
        Dim ADDED_WHENLabel1 As System.Windows.Forms.Label
        Dim CHANGED_WHOLabel1 As System.Windows.Forms.Label
        Dim CHANGED_WHENLabel1 As System.Windows.Forms.Label
-        Dim SQL_SELECT_EBENE1Label As System.Windows.Forms.Label
        Dim COLUMN_NAME1Label1 As System.Windows.Forms.Label
        Dim GUIDLabel2 As System.Windows.Forms.Label
        Dim SQL_COMMANDLabel As System.Windows.Forms.Label
@@ -47,14 +47,14 @@ Partial Class frmConstructorDesigner
        Dim Label19 As System.Windows.Forms.Label
        Dim SQL_RIGHT_READ_AND_VIEW_ONLYLabel As System.Windows.Forms.Label
        Dim SQL_RIGHT_WINDREAM_VIEWLabel 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.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        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.TBPMO_FORM_CONSTRUCTORBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
        Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
        Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
@@ -67,11 +67,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.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.TreeViewDetails = New System.Windows.Forms.TreeView()
-        Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip()
+        Me.cmstrpEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ImageList1 = New System.Windows.Forms.ImageList()
+        Me.ImageList1 = New System.Windows.Forms.ImageList(Me.components)
        Me.CONSTRUCTOR_IDTextBox = New System.Windows.Forms.TextBox()
        Me.FORM_TITLETextBox = New System.Windows.Forms.TextBox()
        Me.SEQUENCE_MENUNumericUpDown = New System.Windows.Forms.NumericUpDown()
@@ -93,7 +93,6 @@ Partial Class frmConstructorDesigner
        Me.Label4 = New System.Windows.Forms.Label()
        Me.COLUMN_NAME1ComboBox = New System.Windows.Forms.ComboBox()
        Me.Label2 = New System.Windows.Forms.Label()
-        Me.SQL_SELECT_EBENE1TextBox = New System.Windows.Forms.TextBox()
        Me.CHANGED_WHENTextBox1 = New System.Windows.Forms.TextBox()
        Me.CHANGED_WHOTextBox1 = New System.Windows.Forms.TextBox()
        Me.ADDED_WHENTextBox1 = New System.Windows.Forms.TextBox()
@@ -114,41 +113,48 @@ Partial Class frmConstructorDesigner
        Me.listBoxControls = New System.Windows.Forms.ListBox()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage()
-        Me.btndeleteSupervisorControl = New System.Windows.Forms.Button()
-        Me.btnAddSupervisorControl = New System.Windows.Forms.Button()
-        Me.Label15 = New System.Windows.Forms.Label()
-        Me.CheckedListBoxSupervisorControls = New System.Windows.Forms.CheckedListBox()
-        Me.Label14 = New System.Windows.Forms.Label()
-        Me.cmbSupervisorControls = New System.Windows.Forms.ComboBox()
-        Me.Label13 = New System.Windows.Forms.Label()
+        Me.XtraTabControlSV = New DevExpress.XtraTab.XtraTabControl()
+        Me.XtraTabPage7 = New DevExpress.XtraTab.XtraTabPage()
+        Me.Label20 = New System.Windows.Forms.Label()
        Me.GridControl2 = New DevExpress.XtraGrid.GridControl()
-        Me.TBWH_Users2BindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBWH_Users2BindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.GridColumn14 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colSurname3 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn15 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn16 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn17 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.Label7 = New System.Windows.Forms.Label()
+        Me.Label9 = New System.Windows.Forms.Label()
+        Me.Label11 = New System.Windows.Forms.Label()
+        Me.cmbRight = New System.Windows.Forms.ComboBox()
        Me.GridControlSupervisorAdd = New DevExpress.XtraGrid.GridControl()
-        Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource()
+        Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.GridViewSupervisorsAdd = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.GridColumn10 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colSurname2 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn11 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn12 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn13 = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.Label11 = New System.Windows.Forms.Label()
-        Me.cmbRight = New System.Windows.Forms.ComboBox()
        Me.btnDeleteUserSupervisor = New System.Windows.Forms.Button()
        Me.btnAddUser2Supervisor = New System.Windows.Forms.Button()
-        Me.Label9 = New System.Windows.Forms.Label()
-        Me.Label7 = New System.Windows.Forms.Label()
+        Me.XtraTabPage8 = New DevExpress.XtraTab.XtraTabPage()
+        Me.btndeleteSupervisorControl = New System.Windows.Forms.Button()
+        Me.btnAddSupervisorControl = New System.Windows.Forms.Button()
+        Me.Label13 = New System.Windows.Forms.Label()
+        Me.Label15 = New System.Windows.Forms.Label()
+        Me.cmbSupervisorControls = New System.Windows.Forms.ComboBox()
+        Me.CheckedListBoxSupervisorControls = New System.Windows.Forms.CheckedListBox()
+        Me.Label14 = New System.Windows.Forms.Label()
        Me.chkWDSearch_Active = New System.Windows.Forms.CheckBox()
        Me.lblSaveDocSearch = New System.Windows.Forms.Label()
        Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
        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.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.GridViewUserSQL = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.colSurname4 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -163,7 +169,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.TBPMO_CONSTRUCTOR_USER_SQLBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        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()
@@ -183,17 +189,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.TBTEMP_QUICKDISPLAYBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.ListBox1 = New System.Windows.Forms.ListBox()
        Me.Label1 = New System.Windows.Forms.Label()
-        Me.TBPMO_FORM_CONSTRUCTORBindingSource1 = New System.Windows.Forms.BindingSource()
+        Me.TBPMO_FORM_CONSTRUCTORBindingSource1 = New System.Windows.Forms.BindingSource(Me.components)
        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.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
        Me.btndeleteUserConstructorRel = New System.Windows.Forms.Button()
        Me.btnAddUser2ConstructorREL = New System.Windows.Forms.Button()
        Me.lblConfiguredUsers = New System.Windows.Forms.Label()
@@ -207,19 +213,17 @@ Partial Class frmConstructorDesigner
        Me.GridControlUsers2Menue = New DevExpress.XtraGrid.GridControl()
        Me.GridViewlUsers2Menue = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.colSelect = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colSurname = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.colID = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
        Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.colSurname1 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn8 = New DevExpress.XtraGrid.Columns.GridColumn()
        Me.GridColumn9 = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.XtraTabControlSV = New DevExpress.XtraTab.XtraTabControl()
-        Me.XtraTabPage7 = New DevExpress.XtraTab.XtraTabPage()
-        Me.XtraTabPage8 = New DevExpress.XtraTab.XtraTabPage()
-        Me.Label20 = New System.Windows.Forms.Label()
        GUIDLabel = New System.Windows.Forms.Label()
        FORM_TITLELabel = New System.Windows.Forms.Label()
        SEQUENCE_MENULabel = New System.Windows.Forms.Label()
@@ -233,7 +237,6 @@ Partial Class frmConstructorDesigner
        ADDED_WHENLabel1 = New System.Windows.Forms.Label()
        CHANGED_WHOLabel1 = New System.Windows.Forms.Label()
        CHANGED_WHENLabel1 = New System.Windows.Forms.Label()
-        SQL_SELECT_EBENE1Label = New System.Windows.Forms.Label()
        COLUMN_NAME1Label1 = New System.Windows.Forms.Label()
        GUIDLabel2 = New System.Windows.Forms.Label()
        SQL_COMMANDLabel = New System.Windows.Forms.Label()
@@ -259,12 +262,16 @@ Partial Class frmConstructorDesigner
        Me.XtraTabPage3.SuspendLayout()
        Me.XtraTabPage5.SuspendLayout()
        Me.XtraTabPage4.SuspendLayout()
+        CType(Me.XtraTabControlSV, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.XtraTabControlSV.SuspendLayout()
+        Me.XtraTabPage7.SuspendLayout()
        CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBWH_Users2BindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControlSupervisorAdd, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridViewSupervisorsAdd, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.XtraTabPage8.SuspendLayout()
        Me.XtraTabPage2.SuspendLayout()
        Me.TabControl1.SuspendLayout()
        Me.TabPage1.SuspendLayout()
@@ -285,10 +292,6 @@ Partial Class frmConstructorDesigner
        CType(Me.GridViewlUsers2Menue, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.XtraTabControlSV, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.XtraTabControlSV.SuspendLayout()
-        Me.XtraTabPage7.SuspendLayout()
-        Me.XtraTabPage8.SuspendLayout()
        Me.SuspendLayout()
        '
        'GUIDLabel
@@ -356,11 +359,6 @@ Partial Class frmConstructorDesigner
        resources.ApplyResources(CHANGED_WHENLabel1, "CHANGED_WHENLabel1")
        CHANGED_WHENLabel1.Name = "CHANGED_WHENLabel1"
        '
-        'SQL_SELECT_EBENE1Label
-        '
-        resources.ApplyResources(SQL_SELECT_EBENE1Label, "SQL_SELECT_EBENE1Label")
-        SQL_SELECT_EBENE1Label.Name = "SQL_SELECT_EBENE1Label"
-        '
        'COLUMN_NAME1Label1
        '
        resources.ApplyResources(COLUMN_NAME1Label1, "COLUMN_NAME1Label1")
@@ -663,10 +661,8 @@ Partial Class frmConstructorDesigner
        Me.XtraTabPage3.Controls.Add(COLUMN_NAME1Label1)
        Me.XtraTabPage3.Controls.Add(Me.COLUMN_NAME1ComboBox)
        Me.XtraTabPage3.Controls.Add(Me.Label2)
-        Me.XtraTabPage3.Controls.Add(Me.SQL_SELECT_EBENE1TextBox)
        Me.XtraTabPage3.Controls.Add(CHANGED_WHENLabel1)
        Me.XtraTabPage3.Controls.Add(Me.CHANGED_WHENTextBox1)
-        Me.XtraTabPage3.Controls.Add(SQL_SELECT_EBENE1Label)
        Me.XtraTabPage3.Controls.Add(CHANGED_WHOLabel1)
        Me.XtraTabPage3.Controls.Add(Me.CHANGED_WHOTextBox1)
        Me.XtraTabPage3.Controls.Add(ADDED_WHENLabel1)
@@ -720,12 +716,6 @@ Partial Class frmConstructorDesigner
        resources.ApplyResources(Me.Label2, "Label2")
        Me.Label2.Name = "Label2"
        '
-        '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
        '
        Me.CHANGED_WHENTextBox1.BackColor = System.Drawing.Color.WhiteSmoke
@@ -865,46 +855,31 @@ Partial Class frmConstructorDesigner
        Me.XtraTabPage4.Controls.Add(Me.lblSaveDocSearch)
        Me.XtraTabPage4.Name = "XtraTabPage4"
        '
-        'btndeleteSupervisorControl
+        'XtraTabControlSV
        '
-        resources.ApplyResources(Me.btndeleteSupervisorControl, "btndeleteSupervisorControl")
-        Me.btndeleteSupervisorControl.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
-        Me.btndeleteSupervisorControl.Name = "btndeleteSupervisorControl"
-        Me.btndeleteSupervisorControl.UseVisualStyleBackColor = True
+        resources.ApplyResources(Me.XtraTabControlSV, "XtraTabControlSV")
+        Me.XtraTabControlSV.Name = "XtraTabControlSV"
+        Me.XtraTabControlSV.SelectedTabPage = Me.XtraTabPage7
+        Me.XtraTabControlSV.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage7, Me.XtraTabPage8})
        '
-        'btnAddSupervisorControl
+        'XtraTabPage7
        '
-        resources.ApplyResources(Me.btnAddSupervisorControl, "btnAddSupervisorControl")
-        Me.btnAddSupervisorControl.Name = "btnAddSupervisorControl"
-        Me.btnAddSupervisorControl.UseVisualStyleBackColor = True
+        Me.XtraTabPage7.Controls.Add(Me.Label20)
+        Me.XtraTabPage7.Controls.Add(Me.GridControl2)
+        Me.XtraTabPage7.Controls.Add(Me.Label7)
+        Me.XtraTabPage7.Controls.Add(Me.Label9)
+        Me.XtraTabPage7.Controls.Add(Me.Label11)
+        Me.XtraTabPage7.Controls.Add(Me.cmbRight)
+        Me.XtraTabPage7.Controls.Add(Me.GridControlSupervisorAdd)
+        Me.XtraTabPage7.Controls.Add(Me.btnDeleteUserSupervisor)
+        Me.XtraTabPage7.Controls.Add(Me.btnAddUser2Supervisor)
+        Me.XtraTabPage7.Name = "XtraTabPage7"
+        resources.ApplyResources(Me.XtraTabPage7, "XtraTabPage7")
        '
-        'Label15
+        'Label20
        '
-        resources.ApplyResources(Me.Label15, "Label15")
-        Me.Label15.Name = "Label15"
-        '
-        'CheckedListBoxSupervisorControls
-        '
-        resources.ApplyResources(Me.CheckedListBoxSupervisorControls, "CheckedListBoxSupervisorControls")
-        Me.CheckedListBoxSupervisorControls.BackColor = System.Drawing.SystemColors.GradientActiveCaption
-        Me.CheckedListBoxSupervisorControls.FormattingEnabled = True
-        Me.CheckedListBoxSupervisorControls.Name = "CheckedListBoxSupervisorControls"
-        '
-        'Label14
-        '
-        resources.ApplyResources(Me.Label14, "Label14")
-        Me.Label14.Name = "Label14"
-        '
-        'cmbSupervisorControls
-        '
-        resources.ApplyResources(Me.cmbSupervisorControls, "cmbSupervisorControls")
-        Me.cmbSupervisorControls.FormattingEnabled = True
-        Me.cmbSupervisorControls.Name = "cmbSupervisorControls"
-        '
-        'Label13
-        '
-        resources.ApplyResources(Me.Label13, "Label13")
-        Me.Label13.Name = "Label13"
+        resources.ApplyResources(Me.Label20, "Label20")
+        Me.Label20.Name = "Label20"
        '
        'GridControl2
        '
@@ -926,7 +901,7 @@ Partial Class frmConstructorDesigner
        Me.GridView2.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridView2.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView2.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
        Me.GridView2.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn14, Me.GridColumn15, Me.GridColumn16, Me.GridColumn17})
+        Me.GridView2.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn14, Me.colSurname3, Me.GridColumn15, Me.GridColumn16, Me.GridColumn17})
        Me.GridView2.GridControl = Me.GridControl2
        Me.GridView2.Name = "GridView2"
        Me.GridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -944,6 +919,12 @@ Partial Class frmConstructorDesigner
        Me.GridColumn14.FieldName = "Select"
        Me.GridColumn14.Name = "GridColumn14"
        '
+        'colSurname3
+        '
+        resources.ApplyResources(Me.colSurname3, "colSurname3")
+        Me.colSurname3.FieldName = "Surname"
+        Me.colSurname3.Name = "colSurname3"
+        '
        'GridColumn15
        '
        Me.GridColumn15.FieldName = "Username"
@@ -963,6 +944,28 @@ Partial Class frmConstructorDesigner
        Me.GridColumn17.FieldName = "ID"
        Me.GridColumn17.Name = "GridColumn17"
        '
+        'Label7
+        '
+        resources.ApplyResources(Me.Label7, "Label7")
+        Me.Label7.Name = "Label7"
+        '
+        'Label9
+        '
+        resources.ApplyResources(Me.Label9, "Label9")
+        Me.Label9.Name = "Label9"
+        '
+        'Label11
+        '
+        resources.ApplyResources(Me.Label11, "Label11")
+        Me.Label11.Name = "Label11"
+        '
+        'cmbRight
+        '
+        resources.ApplyResources(Me.cmbRight, "cmbRight")
+        Me.cmbRight.FormattingEnabled = True
+        Me.cmbRight.Items.AddRange(New Object() {resources.GetString("cmbRight.Items"), resources.GetString("cmbRight.Items1")})
+        Me.cmbRight.Name = "cmbRight"
+        '
        'GridControlSupervisorAdd
        '
        resources.ApplyResources(Me.GridControlSupervisorAdd, "GridControlSupervisorAdd")
@@ -983,7 +986,7 @@ Partial Class frmConstructorDesigner
        Me.GridViewSupervisorsAdd.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridViewSupervisorsAdd.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewSupervisorsAdd.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
        Me.GridViewSupervisorsAdd.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridViewSupervisorsAdd.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn10, Me.GridColumn11, Me.GridColumn12, Me.GridColumn13})
+        Me.GridViewSupervisorsAdd.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn10, Me.colSurname2, Me.GridColumn11, Me.GridColumn12, Me.GridColumn13})
        Me.GridViewSupervisorsAdd.GridControl = Me.GridControlSupervisorAdd
        Me.GridViewSupervisorsAdd.Name = "GridViewSupervisorsAdd"
        Me.GridViewSupervisorsAdd.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -1001,6 +1004,12 @@ Partial Class frmConstructorDesigner
        Me.GridColumn10.FieldName = "Select"
        Me.GridColumn10.Name = "GridColumn10"
        '
+        'colSurname2
+        '
+        resources.ApplyResources(Me.colSurname2, "colSurname2")
+        Me.colSurname2.FieldName = "Surname"
+        Me.colSurname2.Name = "colSurname2"
+        '
        'GridColumn11
        '
        Me.GridColumn11.FieldName = "Username"
@@ -1020,18 +1029,6 @@ Partial Class frmConstructorDesigner
        Me.GridColumn13.FieldName = "ID"
        Me.GridColumn13.Name = "GridColumn13"
        '
-        'Label11
-        '
-        resources.ApplyResources(Me.Label11, "Label11")
-        Me.Label11.Name = "Label11"
-        '
-        'cmbRight
-        '
-        resources.ApplyResources(Me.cmbRight, "cmbRight")
-        Me.cmbRight.FormattingEnabled = True
-        Me.cmbRight.Items.AddRange(New Object() {resources.GetString("cmbRight.Items"), resources.GetString("cmbRight.Items1")})
-        Me.cmbRight.Name = "cmbRight"
-        '
        'btnDeleteUserSupervisor
        '
        resources.ApplyResources(Me.btnDeleteUserSupervisor, "btnDeleteUserSupervisor")
@@ -1044,15 +1041,58 @@ Partial Class frmConstructorDesigner
        Me.btnAddUser2Supervisor.Name = "btnAddUser2Supervisor"
        Me.btnAddUser2Supervisor.UseVisualStyleBackColor = True
        '
-        'Label9
+        'XtraTabPage8
        '
-        resources.ApplyResources(Me.Label9, "Label9")
-        Me.Label9.Name = "Label9"
+        Me.XtraTabPage8.Controls.Add(Me.btndeleteSupervisorControl)
+        Me.XtraTabPage8.Controls.Add(Me.btnAddSupervisorControl)
+        Me.XtraTabPage8.Controls.Add(Me.Label13)
+        Me.XtraTabPage8.Controls.Add(Me.Label15)
+        Me.XtraTabPage8.Controls.Add(Me.cmbSupervisorControls)
+        Me.XtraTabPage8.Controls.Add(Me.CheckedListBoxSupervisorControls)
+        Me.XtraTabPage8.Controls.Add(Me.Label14)
+        Me.XtraTabPage8.Name = "XtraTabPage8"
+        resources.ApplyResources(Me.XtraTabPage8, "XtraTabPage8")
        '
-        'Label7
+        'btndeleteSupervisorControl
        '
-        resources.ApplyResources(Me.Label7, "Label7")
-        Me.Label7.Name = "Label7"
+        resources.ApplyResources(Me.btndeleteSupervisorControl, "btndeleteSupervisorControl")
+        Me.btndeleteSupervisorControl.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
+        Me.btndeleteSupervisorControl.Name = "btndeleteSupervisorControl"
+        Me.btndeleteSupervisorControl.UseVisualStyleBackColor = True
+        '
+        'btnAddSupervisorControl
+        '
+        resources.ApplyResources(Me.btnAddSupervisorControl, "btnAddSupervisorControl")
+        Me.btnAddSupervisorControl.Name = "btnAddSupervisorControl"
+        Me.btnAddSupervisorControl.UseVisualStyleBackColor = True
+        '
+        'Label13
+        '
+        resources.ApplyResources(Me.Label13, "Label13")
+        Me.Label13.Name = "Label13"
+        '
+        'Label15
+        '
+        resources.ApplyResources(Me.Label15, "Label15")
+        Me.Label15.Name = "Label15"
+        '
+        'cmbSupervisorControls
+        '
+        resources.ApplyResources(Me.cmbSupervisorControls, "cmbSupervisorControls")
+        Me.cmbSupervisorControls.FormattingEnabled = True
+        Me.cmbSupervisorControls.Name = "cmbSupervisorControls"
+        '
+        'CheckedListBoxSupervisorControls
+        '
+        resources.ApplyResources(Me.CheckedListBoxSupervisorControls, "CheckedListBoxSupervisorControls")
+        Me.CheckedListBoxSupervisorControls.BackColor = System.Drawing.SystemColors.GradientActiveCaption
+        Me.CheckedListBoxSupervisorControls.FormattingEnabled = True
+        Me.CheckedListBoxSupervisorControls.Name = "CheckedListBoxSupervisorControls"
+        '
+        'Label14
+        '
+        resources.ApplyResources(Me.Label14, "Label14")
+        Me.Label14.Name = "Label14"
        '
        'chkWDSearch_Active
        '
@@ -1127,7 +1167,7 @@ Partial Class frmConstructorDesigner
        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.Options.UseBackColor = True
-        Me.GridViewUserSQL.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn4, Me.GridColumn5, Me.GridColumn6, Me.colID1})
+        Me.GridViewUserSQL.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSurname4, Me.GridColumn4, Me.GridColumn5, Me.GridColumn6, Me.colID1})
        Me.GridViewUserSQL.GridControl = Me.GridControlUserSQL
        Me.GridViewUserSQL.Name = "GridViewUserSQL"
        Me.GridViewUserSQL.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -1139,6 +1179,12 @@ Partial Class frmConstructorDesigner
        Me.GridViewUserSQL.OptionsView.ShowAutoFilterRow = True
        Me.GridViewUserSQL.OptionsView.ShowGroupPanel = False
        '
+        'colSurname4
+        '
+        resources.ApplyResources(Me.colSurname4, "colSurname4")
+        Me.colSurname4.FieldName = "Surname"
+        Me.colSurname4.Name = "colSurname4"
+        '
        'GridColumn4
        '
        Me.GridColumn4.FieldName = "Username"
@@ -1177,8 +1223,8 @@ Partial Class frmConstructorDesigner
        '
        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"
@@ -1188,11 +1234,11 @@ Partial Class frmConstructorDesigner
        '
        Me.dgvPlaceholders.AllowUserToAddRows = False
        Me.dgvPlaceholders.AllowUserToDeleteRows = False
-        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
-        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
-        resources.ApplyResources(Me.dgvPlaceholders, "dgvPlaceholders")
+        DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan
+        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
        Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
        Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace})
+        resources.ApplyResources(Me.dgvPlaceholders, "dgvPlaceholders")
        Me.dgvPlaceholders.Name = "dgvPlaceholders"
        '
        'colPlaceholder
@@ -1532,7 +1578,7 @@ Partial Class frmConstructorDesigner
        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.Options.UseBackColor = True
-        Me.GridViewlUsers2Menue.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelect, Me.GridColumn1, Me.GridColumn2, Me.colID})
+        Me.GridViewlUsers2Menue.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelect, Me.colSurname, Me.GridColumn1, Me.GridColumn2, Me.colID})
        Me.GridViewlUsers2Menue.GridControl = Me.GridControlUsers2Menue
        Me.GridViewlUsers2Menue.Name = "GridViewlUsers2Menue"
        Me.GridViewlUsers2Menue.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -1550,6 +1596,12 @@ Partial Class frmConstructorDesigner
        Me.colSelect.FieldName = "Select"
        Me.colSelect.Name = "colSelect"
        '
+        'colSurname
+        '
+        resources.ApplyResources(Me.colSurname, "colSurname")
+        Me.colSurname.FieldName = "Surname"
+        Me.colSurname.Name = "colSurname"
+        '
        'GridColumn1
        '
        Me.GridColumn1.FieldName = "Username"
@@ -1584,7 +1636,7 @@ Partial Class frmConstructorDesigner
        Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True
        Me.GridView1.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView1.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
        Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True
-        Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn7, Me.GridColumn8, Me.GridColumn9})
+        Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.colSurname1, Me.GridColumn7, Me.GridColumn8, Me.GridColumn9})
        Me.GridView1.GridControl = Me.GridControl1
        Me.GridView1.Name = "GridView1"
        Me.GridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -1602,6 +1654,12 @@ Partial Class frmConstructorDesigner
        Me.GridColumn3.FieldName = "Select"
        Me.GridColumn3.Name = "GridColumn3"
        '
+        'colSurname1
+        '
+        resources.ApplyResources(Me.colSurname1, "colSurname1")
+        Me.colSurname1.FieldName = "Surname"
+        Me.colSurname1.Name = "colSurname1"
+        '
        'GridColumn7
        '
        Me.GridColumn7.FieldName = "Username"
@@ -1621,44 +1679,6 @@ Partial Class frmConstructorDesigner
        Me.GridColumn9.FieldName = "ID"
        Me.GridColumn9.Name = "GridColumn9"
        '
-        'XtraTabControlSV
-        '
-        resources.ApplyResources(Me.XtraTabControlSV, "XtraTabControlSV")
-        Me.XtraTabControlSV.Name = "XtraTabControlSV"
-        Me.XtraTabControlSV.SelectedTabPage = Me.XtraTabPage7
-        Me.XtraTabControlSV.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage7, Me.XtraTabPage8})
-        '
-        'XtraTabPage7
-        '
-        Me.XtraTabPage7.Controls.Add(Me.Label20)
-        Me.XtraTabPage7.Controls.Add(Me.GridControl2)
-        Me.XtraTabPage7.Controls.Add(Me.Label7)
-        Me.XtraTabPage7.Controls.Add(Me.Label9)
-        Me.XtraTabPage7.Controls.Add(Me.Label11)
-        Me.XtraTabPage7.Controls.Add(Me.cmbRight)
-        Me.XtraTabPage7.Controls.Add(Me.GridControlSupervisorAdd)
-        Me.XtraTabPage7.Controls.Add(Me.btnDeleteUserSupervisor)
-        Me.XtraTabPage7.Controls.Add(Me.btnAddUser2Supervisor)
-        Me.XtraTabPage7.Name = "XtraTabPage7"
-        resources.ApplyResources(Me.XtraTabPage7, "XtraTabPage7")
-        '
-        'XtraTabPage8
-        '
-        Me.XtraTabPage8.Controls.Add(Me.btndeleteSupervisorControl)
-        Me.XtraTabPage8.Controls.Add(Me.btnAddSupervisorControl)
-        Me.XtraTabPage8.Controls.Add(Me.Label13)
-        Me.XtraTabPage8.Controls.Add(Me.Label15)
-        Me.XtraTabPage8.Controls.Add(Me.cmbSupervisorControls)
-        Me.XtraTabPage8.Controls.Add(Me.CheckedListBoxSupervisorControls)
-        Me.XtraTabPage8.Controls.Add(Me.Label14)
-        Me.XtraTabPage8.Name = "XtraTabPage8"
-        resources.ApplyResources(Me.XtraTabPage8, "XtraTabPage8")
-        '
-        'Label20
-        '
-        resources.ApplyResources(Me.Label20, "Label20")
-        Me.Label20.Name = "Label20"
-        '
        'frmConstructorDesigner
        '
        resources.ApplyResources(Me, "$this")
@@ -1715,12 +1735,18 @@ Partial Class frmConstructorDesigner
        Me.XtraTabPage5.PerformLayout()
        Me.XtraTabPage4.ResumeLayout(False)
        Me.XtraTabPage4.PerformLayout()
+        CType(Me.XtraTabControlSV, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.XtraTabControlSV.ResumeLayout(False)
+        Me.XtraTabPage7.ResumeLayout(False)
+        Me.XtraTabPage7.PerformLayout()
        CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBWH_Users2BindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridControlSupervisorAdd, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridViewSupervisorsAdd, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.XtraTabPage8.ResumeLayout(False)
+        Me.XtraTabPage8.PerformLayout()
        Me.XtraTabPage2.ResumeLayout(False)
        Me.TabControl1.ResumeLayout(False)
        Me.TabPage1.ResumeLayout(False)
@@ -1745,12 +1771,6 @@ Partial Class frmConstructorDesigner
        CType(Me.GridViewlUsers2Menue, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.XtraTabControlSV, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.XtraTabControlSV.ResumeLayout(False)
-        Me.XtraTabPage7.ResumeLayout(False)
-        Me.XtraTabPage7.PerformLayout()
-        Me.XtraTabPage8.ResumeLayout(False)
-        Me.XtraTabPage8.PerformLayout()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -1805,7 +1825,6 @@ Partial Class frmConstructorDesigner
    Friend WithEvents ADDED_WHENTextBox1 As System.Windows.Forms.TextBox
    Friend WithEvents ADDED_WHOTextBox1 As System.Windows.Forms.TextBox
    Friend WithEvents XtraTabPage5 As DevExpress.XtraTab.XtraTabPage
-    Friend WithEvents SQL_SELECT_EBENE1TextBox As System.Windows.Forms.TextBox
    Friend WithEvents Label2 As System.Windows.Forms.Label
    Friend WithEvents COLUMN_NAME1ComboBox As System.Windows.Forms.ComboBox
    Friend WithEvents Label4 As System.Windows.Forms.Label
@@ -1926,4 +1945,9 @@ Partial Class frmConstructorDesigner
    Friend WithEvents XtraTabPage7 As DevExpress.XtraTab.XtraTabPage
    Friend WithEvents Label20 As System.Windows.Forms.Label
    Friend WithEvents XtraTabPage8 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents colSurname3 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colSurname2 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colSurname As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colSurname1 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents colSurname4 As DevExpress.XtraGrid.Columns.GridColumn
 End Class