ms

2016-08-22 15:22:33 +02:00
parent 98a527c8b8
commit 7a9b460360
16 changed files with 1061 additions and 119 deletions
--- a/app/DD-Record-Organiser/ClassDOC_SEARCH.vb
+++ b/app/DD-Record-Organiser/ClassDOC_SEARCH.vb
@@ -266,12 +266,12 @@ Public Class ClassDOC_SEARCH
            Return False
        End Try
    End Function
-    Public Shared Function SET_WD_RIGHTS(ByVal RESULT_DOCID, ByVal RESULT_DOC_PATH)
+    Public Shared Function SET_WD_RIGHTS(ByVal RESULT_DOCID, ByVal RESULT_DOC_PATH, ByVal ENTITY_ID)
        Try
            DD_Rights.ClassLogger.Init(Application.UserAppDataPath() & "\Log", Environment.UserName)
            If DD_Rights.ClassDatabase.Init(MyConnectionString) = True Then
                If DD_Rights.ClassRights.Init(ENTITY_ID, LogErrorsOnly) = True Then
-                    If DD_Rights.ClassRights.Collect_Users(RECORD_ID) = True Then
+                    If DD_Rights.ClassRights.Collect_Users(RECORD_ID, ENTITY_ID) = True Then
                        If DD_Rights.ClassRights.File_DeleteAndSetRight(RESULT_DOCID, RESULT_DOC_PATH, True) Then
                            If DD_Rights.ClassRights.MSG_RESULT <> "" Then
                                MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation)
--- a/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb
@@ -115,6 +115,14 @@ Partial Class frmConstructorDesigner
        Me.listBoxControls = New System.Windows.Forms.ListBox()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage()
+        Me.GroupBoxSupervisorControls = New System.Windows.Forms.GroupBox()
+        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.GroupBoxDocSearch = New System.Windows.Forms.GroupBox()
        Me.GridControl2 = New DevExpress.XtraGrid.GridControl()
        Me.TBWH_Users2BindingSource = New System.Windows.Forms.BindingSource(Me.components)
@@ -136,8 +144,8 @@ Partial Class frmConstructorDesigner
        Me.btnAddUser2Supervisor = New System.Windows.Forms.Button()
        Me.Label9 = New System.Windows.Forms.Label()
        Me.Label7 = New System.Windows.Forms.Label()
-        Me.lblSaveDocSearch = 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()
@@ -250,6 +258,7 @@ Partial Class frmConstructorDesigner
        Me.XtraTabPage3.SuspendLayout()
        Me.XtraTabPage5.SuspendLayout()
        Me.XtraTabPage4.SuspendLayout()
+        Me.GroupBoxSupervisorControls.SuspendLayout()
        Me.GroupBoxDocSearch.SuspendLayout()
        CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBWH_Users2BindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -847,11 +856,66 @@ Partial Class frmConstructorDesigner
        'XtraTabPage4
        '
        resources.ApplyResources(Me.XtraTabPage4, "XtraTabPage4")
-        Me.XtraTabPage4.Controls.Add(Me.chkWDSearch_Active)
+        Me.XtraTabPage4.Controls.Add(Me.GroupBoxSupervisorControls)
        Me.XtraTabPage4.Controls.Add(Me.GroupBoxDocSearch)
+        Me.XtraTabPage4.Controls.Add(Me.chkWDSearch_Active)
        Me.XtraTabPage4.Controls.Add(Me.lblSaveDocSearch)
        Me.XtraTabPage4.Name = "XtraTabPage4"
        '
+        'GroupBoxSupervisorControls
+        '
+        resources.ApplyResources(Me.GroupBoxSupervisorControls, "GroupBoxSupervisorControls")
+        Me.GroupBoxSupervisorControls.Controls.Add(Me.btndeleteSupervisorControl)
+        Me.GroupBoxSupervisorControls.Controls.Add(Me.btnAddSupervisorControl)
+        Me.GroupBoxSupervisorControls.Controls.Add(Me.Label15)
+        Me.GroupBoxSupervisorControls.Controls.Add(Me.CheckedListBoxSupervisorControls)
+        Me.GroupBoxSupervisorControls.Controls.Add(Me.Label14)
+        Me.GroupBoxSupervisorControls.Controls.Add(Me.cmbSupervisorControls)
+        Me.GroupBoxSupervisorControls.Controls.Add(Me.Label13)
+        Me.GroupBoxSupervisorControls.Name = "GroupBoxSupervisorControls"
+        Me.GroupBoxSupervisorControls.TabStop = False
+        '
+        'btndeleteSupervisorControl
+        '
+        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
+        '
+        'Label15
+        '
+        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"
+        '
        'GroupBoxDocSearch
        '
        resources.ApplyResources(Me.GroupBoxDocSearch, "GroupBoxDocSearch")
@@ -987,9 +1051,9 @@ Partial Class frmConstructorDesigner
        '
        'cmbRight
        '
+        resources.ApplyResources(Me.cmbRight, "cmbRight")
        Me.cmbRight.FormattingEnabled = True
        Me.cmbRight.Items.AddRange(New Object() {resources.GetString("cmbRight.Items"), resources.GetString("cmbRight.Items1"), resources.GetString("cmbRight.Items2")})
-        resources.ApplyResources(Me.cmbRight, "cmbRight")
        Me.cmbRight.Name = "cmbRight"
        '
        'btnDeleteUserSupervisor
@@ -1014,18 +1078,18 @@ Partial Class frmConstructorDesigner
        resources.ApplyResources(Me.Label7, "Label7")
        Me.Label7.Name = "Label7"
        '
-        'lblSaveDocSearch
-        '
-        resources.ApplyResources(Me.lblSaveDocSearch, "lblSaveDocSearch")
-        Me.lblSaveDocSearch.BackColor = System.Drawing.Color.Yellow
-        Me.lblSaveDocSearch.Name = "lblSaveDocSearch"
-        '
        'chkWDSearch_Active
        '
        resources.ApplyResources(Me.chkWDSearch_Active, "chkWDSearch_Active")
        Me.chkWDSearch_Active.Name = "chkWDSearch_Active"
        Me.chkWDSearch_Active.UseVisualStyleBackColor = True
        '
+        'lblSaveDocSearch
+        '
+        resources.ApplyResources(Me.lblSaveDocSearch, "lblSaveDocSearch")
+        Me.lblSaveDocSearch.BackColor = System.Drawing.Color.Yellow
+        Me.lblSaveDocSearch.Name = "lblSaveDocSearch"
+        '
        'XtraTabPage2
        '
        Me.XtraTabPage2.Controls.Add(Me.TabControl1)
@@ -1327,10 +1391,10 @@ Partial Class frmConstructorDesigner
        '
        'ListBox1
        '
-        resources.ApplyResources(Me.ListBox1, "ListBox1")
        Me.ListBox1.DataSource = Me.TBPMO_FORM_CONSTRUCTORBindingSource
        Me.ListBox1.DisplayMember = "FORM_TITLE"
        Me.ListBox1.FormattingEnabled = True
+        resources.ApplyResources(Me.ListBox1, "ListBox1")
        Me.ListBox1.Name = "ListBox1"
        Me.ListBox1.ValueMember = "GUID"
        '
@@ -1478,8 +1542,8 @@ Partial Class frmConstructorDesigner
        '
        'GridControlUsers2Menue
        '
-        resources.ApplyResources(Me.GridControlUsers2Menue, "GridControlUsers2Menue")
        Me.GridControlUsers2Menue.DataSource = Me.TBAD_UsersBindingSource
+        resources.ApplyResources(Me.GridControlUsers2Menue, "GridControlUsers2Menue")
        Me.GridControlUsers2Menue.MainView = Me.GridViewlUsers2Menue
        Me.GridControlUsers2Menue.Name = "GridControlUsers2Menue"
        Me.GridControlUsers2Menue.ShowOnlyPredefinedDetails = True
@@ -1636,6 +1700,8 @@ Partial Class frmConstructorDesigner
        Me.XtraTabPage5.PerformLayout()
        Me.XtraTabPage4.ResumeLayout(False)
        Me.XtraTabPage4.PerformLayout()
+        Me.GroupBoxSupervisorControls.ResumeLayout(False)
+        Me.GroupBoxSupervisorControls.PerformLayout()
        Me.GroupBoxDocSearch.ResumeLayout(False)
        Me.GroupBoxDocSearch.PerformLayout()
        CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1833,4 +1899,12 @@ Partial Class frmConstructorDesigner
    Friend WithEvents GridColumn15 As DevExpress.XtraGrid.Columns.GridColumn
    Friend WithEvents GridColumn16 As DevExpress.XtraGrid.Columns.GridColumn
    Friend WithEvents GridColumn17 As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents GroupBoxSupervisorControls As System.Windows.Forms.GroupBox
+    Friend WithEvents cmbSupervisorControls As System.Windows.Forms.ComboBox
+    Friend WithEvents Label13 As System.Windows.Forms.Label
+    Friend WithEvents btnAddSupervisorControl As System.Windows.Forms.Button
+    Friend WithEvents Label15 As System.Windows.Forms.Label
+    Friend WithEvents CheckedListBoxSupervisorControls As System.Windows.Forms.CheckedListBox
+    Friend WithEvents Label14 As System.Windows.Forms.Label
+    Friend WithEvents btndeleteSupervisorControl As System.Windows.Forms.Button
 End Class
--- a/app/DD-Record-Organiser/frmConstructorDesigner.resx
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.resx
@@ -252,7 +252,7 @@
    <value>Segoe UI, 8.25pt, style=Italic</value>
  </data>
  <data name="ADDED_WHOLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>248, 154</value>
+    <value>247, 203</value>
  </data>
  <data name="ADDED_WHOLabel.Size" type="System.Drawing.Size, System.Drawing">
    <value>61, 13</value>
@@ -285,7 +285,7 @@
    <value>Segoe UI, 8.25pt, style=Italic</value>
  </data>
  <data name="ADDED_WHENLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>413, 154</value>
+    <value>412, 203</value>
  </data>
  <data name="ADDED_WHENLabel.Size" type="System.Drawing.Size, System.Drawing">
    <value>70, 13</value>
@@ -318,7 +318,7 @@
    <value>Segoe UI, 8.25pt, style=Italic</value>
  </data>
  <data name="CHANGED_WHOLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>248, 195</value>
+    <value>247, 244</value>
  </data>
  <data name="CHANGED_WHOLabel.Size" type="System.Drawing.Size, System.Drawing">
    <value>73, 13</value>
@@ -351,7 +351,7 @@
    <value>Segoe UI, 8.25pt, style=Italic</value>
  </data>
  <data name="CHANGED_WHENLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>413, 195</value>
+    <value>412, 244</value>
  </data>
  <data name="CHANGED_WHENLabel.Size" type="System.Drawing.Size, System.Drawing">
    <value>82, 13</value>
@@ -1129,7 +1129,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABS
-        CQAAAk1TRnQBSQFMAgEBAgEAAfQBCwH0AQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBAgEAATwBDAE8AQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1178,7 +1178,7 @@
    <value>1</value>
  </data>
  <data name="TreeViewDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>292, 408</value>
+    <value>292, 394</value>
  </data>
  <data name="TreeViewDetails.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1286,7 +1286,7 @@
    <value>Segoe UI, 8.25pt, style=Italic</value>
  </data>
  <data name="ADDED_WHOTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>251, 170</value>
+    <value>250, 219</value>
  </data>
  <data name="ADDED_WHOTextBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>149, 22</value>
@@ -1310,7 +1310,7 @@
    <value>Segoe UI, 8.25pt, style=Italic</value>
  </data>
  <data name="ADDED_WHENTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>417, 170</value>
+    <value>416, 219</value>
  </data>
  <data name="ADDED_WHENTextBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>144, 22</value>
@@ -1334,7 +1334,7 @@
    <value>Segoe UI, 8.25pt, style=Italic</value>
  </data>
  <data name="CHANGED_WHOTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>251, 211</value>
+    <value>250, 260</value>
  </data>
  <data name="CHANGED_WHOTextBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>149, 22</value>
@@ -1358,7 +1358,7 @@
    <value>Segoe UI, 8.25pt, style=Italic</value>
  </data>
  <data name="CHANGED_WHENTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>416, 211</value>
+    <value>415, 260</value>
  </data>
  <data name="CHANGED_WHENTextBox.Size" type="System.Drawing.Size, System.Drawing">
    <value>144, 22</value>
@@ -1427,10 +1427,10 @@
    <value>23</value>
  </data>
  <data name="XtraTabControl1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left, Right</value>
+    <value>Top, Bottom, Left, Right</value>
  </data>
  <data name="XtraTabControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 294</value>
+    <value>15, 305</value>
  </data>
  <data name="XtraTabControl2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
    <value>Fill</value>
@@ -1742,7 +1742,7 @@
    <value>21</value>
  </data>
  <data name="XtraTabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>976, 333</value>
+    <value>976, 319</value>
  </data>
  <data name="XtraTabPage3.Text" xml:space="preserve">
    <value>Allgemein</value>
@@ -1760,7 +1760,7 @@
    <value>1</value>
  </data>
  <data name="XtraTabControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>982, 361</value>
+    <value>982, 347</value>
  </data>
  <data name="XtraTabControl2.TabIndex" type="System.Int32, mscorlib">
    <value>35</value>
@@ -2211,7 +2211,7 @@
    <value>13</value>
  </data>
  <data name="XtraTabPage5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>976, 333</value>
+    <value>976, 319</value>
  </data>
  <data name="XtraTabPage5.Text" xml:space="preserve">
    <value>Quick View Konfiguration</value>
@@ -2231,31 +2231,265 @@
  <data name="XtraTabPage4.AutoScroll" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <data name="chkWDSearch_Active.AutoSize" type="System.Boolean, mscorlib">
+  <data name="GroupBoxSupervisorControls.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left</value>
+  </data>
+  <data name="btndeleteSupervisorControl.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <data name="btndeleteSupervisorControl.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleRight</value>
+  </data>
+  <data name="btndeleteSupervisorControl.Location" type="System.Drawing.Point, System.Drawing">
+    <value>293, 81</value>
+  </data>
+  <data name="btndeleteSupervisorControl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>112, 23</value>
+  </data>
+  <data name="btndeleteSupervisorControl.TabIndex" type="System.Int32, mscorlib">
+    <value>98</value>
+  </data>
+  <data name="btndeleteSupervisorControl.Text" xml:space="preserve">
+    <value>Remove Control</value>
+  </data>
+  <data name="btndeleteSupervisorControl.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="&gt;&gt;btndeleteSupervisorControl.Name" xml:space="preserve">
+    <value>btndeleteSupervisorControl</value>
+  </data>
+  <data name="&gt;&gt;btndeleteSupervisorControl.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btndeleteSupervisorControl.Parent" xml:space="preserve">
+    <value>GroupBoxSupervisorControls</value>
+  </data>
+  <data name="&gt;&gt;btndeleteSupervisorControl.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnAddSupervisorControl.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <data name="btnAddSupervisorControl.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        xAAADsQBlSsOGwAAALhJREFUOE+tk8ENhCAQRSnFWqiEOiiAO42sJXjmRCnsXriy83VIZCQE153kJcKf
+        /yM6KFk5Z0NsRBFgz3DbtUhciBhCKNbaorVuwB409KCXbUexOTnnLkaJ9x4hqQmhRYTQM/TgkFjNBq8m
+        m9bXWt7ps4NnqfNxDAK23pnBKAQeeBHQCJJRCLxNQG0ccQ75f0CPmSM8/ojPfiPPQpyZwkozSCha7KM8
+        M43dUUZxyG+X6Vwk3rjOSn0Bs2pSjcG3D98AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="btnAddSupervisorControl.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleRight</value>
+  </data>
+  <data name="btnAddSupervisorControl.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnAddSupervisorControl.Location" type="System.Drawing.Point, System.Drawing">
+    <value>293, 52</value>
+  </data>
+  <data name="btnAddSupervisorControl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>112, 23</value>
+  </data>
+  <data name="btnAddSupervisorControl.TabIndex" type="System.Int32, mscorlib">
+    <value>97</value>
+  </data>
+  <data name="btnAddSupervisorControl.Text" xml:space="preserve">
+    <value>Add Control</value>
+  </data>
+  <data name="btnAddSupervisorControl.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="&gt;&gt;btnAddSupervisorControl.Name" xml:space="preserve">
+    <value>btnAddSupervisorControl</value>
+  </data>
+  <data name="&gt;&gt;btnAddSupervisorControl.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnAddSupervisorControl.Parent" xml:space="preserve">
+    <value>GroupBoxSupervisorControls</value>
+  </data>
+  <data name="&gt;&gt;btnAddSupervisorControl.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="Label15.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <data name="chkWDSearch_Active.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 14</value>
+  <data name="Label15.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
  </data>
-  <data name="chkWDSearch_Active.Size" type="System.Drawing.Size, System.Drawing">
-    <value>110, 17</value>
+  <data name="Label15.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
  </data>
-  <data name="chkWDSearch_Active.TabIndex" type="System.Int32, mscorlib">
-    <value>79</value>
+  <data name="Label15.Location" type="System.Drawing.Point, System.Drawing">
+    <value>408, 38</value>
  </data>
-  <data name="chkWDSearch_Active.Text" xml:space="preserve">
-    <value>Dateisuche aktiv?</value>
+  <data name="Label15.Size" type="System.Drawing.Size, System.Drawing">
+    <value>99, 13</value>
  </data>
-  <data name="&gt;&gt;chkWDSearch_Active.Name" xml:space="preserve">
-    <value>chkWDSearch_Active</value>
+  <data name="Label15.TabIndex" type="System.Int32, mscorlib">
+    <value>96</value>
  </data>
-  <data name="&gt;&gt;chkWDSearch_Active.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="Label15.Text" xml:space="preserve">
+    <value>Gewählte Controls:</value>
  </data>
-  <data name="&gt;&gt;chkWDSearch_Active.Parent" xml:space="preserve">
+  <data name="&gt;&gt;Label15.Name" xml:space="preserve">
+    <value>Label15</value>
+  </data>
+  <data name="&gt;&gt;Label15.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label15.Parent" xml:space="preserve">
+    <value>GroupBoxSupervisorControls</value>
+  </data>
+  <data name="&gt;&gt;Label15.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="CheckedListBoxSupervisorControls.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left</value>
+  </data>
+  <data name="CheckedListBoxSupervisorControls.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <data name="CheckedListBoxSupervisorControls.Location" type="System.Drawing.Point, System.Drawing">
+    <value>411, 54</value>
+  </data>
+  <data name="CheckedListBoxSupervisorControls.Size" type="System.Drawing.Size, System.Drawing">
+    <value>253, 52</value>
+  </data>
+  <data name="CheckedListBoxSupervisorControls.TabIndex" type="System.Int32, mscorlib">
+    <value>95</value>
+  </data>
+  <data name="&gt;&gt;CheckedListBoxSupervisorControls.Name" xml:space="preserve">
+    <value>CheckedListBoxSupervisorControls</value>
+  </data>
+  <data name="&gt;&gt;CheckedListBoxSupervisorControls.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;CheckedListBoxSupervisorControls.Parent" xml:space="preserve">
+    <value>GroupBoxSupervisorControls</value>
+  </data>
+  <data name="&gt;&gt;CheckedListBoxSupervisorControls.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="Label14.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label14.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <data name="Label14.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="Label14.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 38</value>
+  </data>
+  <data name="Label14.Size" type="System.Drawing.Size, System.Drawing">
+    <value>99, 13</value>
+  </data>
+  <data name="Label14.TabIndex" type="System.Int32, mscorlib">
+    <value>94</value>
+  </data>
+  <data name="Label14.Text" xml:space="preserve">
+    <value>Supervisor wählen:</value>
+  </data>
+  <data name="&gt;&gt;Label14.Name" xml:space="preserve">
+    <value>Label14</value>
+  </data>
+  <data name="&gt;&gt;Label14.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label14.Parent" xml:space="preserve">
+    <value>GroupBoxSupervisorControls</value>
+  </data>
+  <data name="&gt;&gt;Label14.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="cmbSupervisorControls.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <data name="cmbSupervisorControls.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 54</value>
+  </data>
+  <data name="cmbSupervisorControls.Size" type="System.Drawing.Size, System.Drawing">
+    <value>275, 21</value>
+  </data>
+  <data name="cmbSupervisorControls.TabIndex" type="System.Int32, mscorlib">
+    <value>93</value>
+  </data>
+  <data name="&gt;&gt;cmbSupervisorControls.Name" xml:space="preserve">
+    <value>cmbSupervisorControls</value>
+  </data>
+  <data name="&gt;&gt;cmbSupervisorControls.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbSupervisorControls.Parent" xml:space="preserve">
+    <value>GroupBoxSupervisorControls</value>
+  </data>
+  <data name="&gt;&gt;cmbSupervisorControls.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="Label13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label13.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Italic</value>
+  </data>
+  <data name="Label13.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="Label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 17</value>
+  </data>
+  <data name="Label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>844, 13</value>
+  </data>
+  <data name="Label13.TabIndex" type="System.Int32, mscorlib">
+    <value>92</value>
+  </data>
+  <data name="Label13.Text" xml:space="preserve">
+    <value>Wählen Sie hier Controls aus der Entität welche Userangaben enthalten. Pro Datensatz werden die/der enthaltene User dann mit Supervisorrechten auf die Dateien versehen.</value>
+  </data>
+  <data name="&gt;&gt;Label13.Name" xml:space="preserve">
+    <value>Label13</value>
+  </data>
+  <data name="&gt;&gt;Label13.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label13.Parent" xml:space="preserve">
+    <value>GroupBoxSupervisorControls</value>
+  </data>
+  <data name="&gt;&gt;Label13.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="GroupBoxSupervisorControls.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="GroupBoxSupervisorControls.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold</value>
+  </data>
+  <data name="GroupBoxSupervisorControls.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 210</value>
+  </data>
+  <data name="GroupBoxSupervisorControls.Size" type="System.Drawing.Size, System.Drawing">
+    <value>964, 106</value>
+  </data>
+  <data name="GroupBoxSupervisorControls.TabIndex" type="System.Int32, mscorlib">
+    <value>82</value>
+  </data>
+  <data name="GroupBoxSupervisorControls.Text" xml:space="preserve">
+    <value>Supervisor-Controls</value>
+  </data>
+  <data name="&gt;&gt;GroupBoxSupervisorControls.Name" xml:space="preserve">
+    <value>GroupBoxSupervisorControls</value>
+  </data>
+  <data name="&gt;&gt;GroupBoxSupervisorControls.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;GroupBoxSupervisorControls.Parent" xml:space="preserve">
    <value>XtraTabPage4</value>
  </data>
-  <data name="&gt;&gt;chkWDSearch_Active.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;GroupBoxSupervisorControls.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <data name="GroupBoxDocSearch.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
@@ -2268,7 +2502,7 @@
    <value>223, 212</value>
  </metadata>
  <data name="GridControl2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>540, 42</value>
+    <value>540, 33</value>
  </data>
  <data name="GridView2.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Cyan</value>
@@ -2307,7 +2541,7 @@
    <value>190</value>
  </data>
  <data name="GridControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>408, 245</value>
+    <value>408, 123</value>
  </data>
  <data name="GridControl2.TabIndex" type="System.Int32, mscorlib">
    <value>99</value>
@@ -2331,7 +2565,7 @@
    <value>984, 173</value>
  </metadata>
  <data name="GridControlSupervisorAdd.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 42</value>
+    <value>9, 33</value>
  </data>
  <data name="GridViewSupervisorsAdd.Appearance.EvenRow.BackColor" type="System.Drawing.Color, System.Drawing">
    <value>Cyan</value>
@@ -2370,7 +2604,7 @@
    <value>167</value>
  </data>
  <data name="GridControlSupervisorAdd.Size" type="System.Drawing.Size, System.Drawing">
-    <value>377, 245</value>
+    <value>377, 123</value>
  </data>
  <data name="GridControlSupervisorAdd.TabIndex" type="System.Int32, mscorlib">
    <value>98</value>
@@ -2390,6 +2624,9 @@
  <data name="Label11.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
+  <data name="Label11.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
  <data name="Label11.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
@@ -2417,6 +2654,9 @@
  <data name="&gt;&gt;Label11.ZOrder" xml:space="preserve">
    <value>2</value>
  </data>
+  <data name="cmbRight.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
  <data name="cmbRight.Items" xml:space="preserve">
    <value>Admin</value>
  </data>
@@ -2447,6 +2687,9 @@
  <data name="&gt;&gt;cmbRight.ZOrder" xml:space="preserve">
    <value>3</value>
  </data>
+  <data name="btnDeleteUserSupervisor.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
  <data name="btnDeleteUserSupervisor.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29m
@@ -2497,6 +2740,9 @@
  <data name="&gt;&gt;btnDeleteUserSupervisor.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
+  <data name="btnAddUser2Supervisor.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
  <data name="btnAddUser2Supervisor.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -2542,11 +2788,14 @@
  <data name="Label9.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
+  <data name="Label9.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
  <data name="Label9.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
  <data name="Label9.Location" type="System.Drawing.Point, System.Drawing">
-    <value>538, 26</value>
+    <value>537, 17</value>
  </data>
  <data name="Label9.Size" type="System.Drawing.Size, System.Drawing">
    <value>127, 13</value>
@@ -2572,17 +2821,20 @@
  <data name="Label7.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
+  <data name="Label7.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
  <data name="Label7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 19</value>
+    <value>6, 17</value>
  </data>
  <data name="Label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>151, 13</value>
+    <value>99, 13</value>
  </data>
  <data name="Label7.TabIndex" type="System.Int32, mscorlib">
    <value>91</value>
  </data>
  <data name="Label7.Text" xml:space="preserve">
-    <value>Supervisor für Entität wählen:</value>
+    <value>Supervisor wählen:</value>
  </data>
  <data name="&gt;&gt;Label7.Name" xml:space="preserve">
    <value>Label7</value>
@@ -2599,17 +2851,20 @@
  <data name="GroupBoxDocSearch.Enabled" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
+  <data name="GroupBoxDocSearch.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt, style=Bold</value>
+  </data>
  <data name="GroupBoxDocSearch.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 37</value>
+    <value>9, 28</value>
  </data>
  <data name="GroupBoxDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>968, 293</value>
+    <value>964, 162</value>
  </data>
  <data name="GroupBoxDocSearch.TabIndex" type="System.Int32, mscorlib">
    <value>81</value>
  </data>
  <data name="GroupBoxDocSearch.Text" xml:space="preserve">
-    <value>Eigenschaften Dokumentensuche</value>
+    <value>Supervisor-Definition-(User erhalten Vollzugriff auf Entitätzugehörige Dateien)</value>
  </data>
  <data name="&gt;&gt;GroupBoxDocSearch.Name" xml:space="preserve">
    <value>GroupBoxDocSearch</value>
@@ -2623,6 +2878,33 @@
  <data name="&gt;&gt;GroupBoxDocSearch.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
+  <data name="chkWDSearch_Active.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="chkWDSearch_Active.Location" type="System.Drawing.Point, System.Drawing">
+    <value>18, 8</value>
+  </data>
+  <data name="chkWDSearch_Active.Size" type="System.Drawing.Size, System.Drawing">
+    <value>110, 17</value>
+  </data>
+  <data name="chkWDSearch_Active.TabIndex" type="System.Int32, mscorlib">
+    <value>79</value>
+  </data>
+  <data name="chkWDSearch_Active.Text" xml:space="preserve">
+    <value>Dateisuche aktiv?</value>
+  </data>
+  <data name="&gt;&gt;chkWDSearch_Active.Name" xml:space="preserve">
+    <value>chkWDSearch_Active</value>
+  </data>
+  <data name="&gt;&gt;chkWDSearch_Active.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;chkWDSearch_Active.Parent" xml:space="preserve">
+    <value>XtraTabPage4</value>
+  </data>
+  <data name="&gt;&gt;chkWDSearch_Active.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
  <data name="lblSaveDocSearch.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
@@ -2633,7 +2915,7 @@
    <value>NoControl</value>
  </data>
  <data name="lblSaveDocSearch.Location" type="System.Drawing.Point, System.Drawing">
-    <value>123, 15</value>
+    <value>828, 12</value>
  </data>
  <data name="lblSaveDocSearch.Size" type="System.Drawing.Size, System.Drawing">
    <value>129, 13</value>
@@ -2657,13 +2939,13 @@
    <value>XtraTabPage4</value>
  </data>
  <data name="&gt;&gt;lblSaveDocSearch.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
  </data>
  <data name="XtraTabPage4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>976, 333</value>
+    <value>976, 319</value>
  </data>
  <data name="XtraTabPage4.Text" xml:space="preserve">
-    <value>Dateisuche Konfiguration</value>
+    <value>Konfiguration ECM-Zugriff</value>
  </data>
  <data name="&gt;&gt;XtraTabPage4.Name" xml:space="preserve">
    <value>XtraTabPage4</value>
@@ -2714,7 +2996,7 @@
    <value>102</value>
  </data>
  <data name="GridControlUserSQL.Size" type="System.Drawing.Size, System.Drawing">
-    <value>272, 274</value>
+    <value>272, 121</value>
  </data>
  <data name="GridControlUserSQL.TabIndex" type="System.Int32, mscorlib">
    <value>89</value>
@@ -2744,7 +3026,7 @@
    <value>NoControl</value>
  </data>
  <data name="Label12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>283, 143</value>
+    <value>283, -10</value>
  </data>
  <data name="Label12.Size" type="System.Drawing.Size, System.Drawing">
    <value>132, 15</value>
@@ -2780,7 +3062,7 @@
    <value>NoControl</value>
  </data>
  <data name="Label17.Location" type="System.Drawing.Point, System.Drawing">
-    <value>536, 143</value>
+    <value>536, -10</value>
  </data>
  <data name="Label17.Size" type="System.Drawing.Size, System.Drawing">
    <value>55, 15</value>
@@ -2807,7 +3089,7 @@
    <value>Bottom, Left</value>
  </data>
  <data name="dgvResult.Location" type="System.Drawing.Point, System.Drawing">
-    <value>539, 161</value>
+    <value>539, 8</value>
  </data>
  <data name="dgvResult.Size" type="System.Drawing.Size, System.Drawing">
    <value>449, 140</value>
@@ -2846,7 +3128,7 @@
    <value>False</value>
  </data>
  <data name="dgvPlaceholders.Location" type="System.Drawing.Point, System.Drawing">
-    <value>287, 161</value>
+    <value>287, 8</value>
  </data>
  <data name="dgvPlaceholders.Size" type="System.Drawing.Size, System.Drawing">
    <value>246, 140</value>
@@ -2879,7 +3161,7 @@
    <value>NoControl</value>
  </data>
  <data name="btnTestSQL.Location" type="System.Drawing.Point, System.Drawing">
-    <value>733, 127</value>
+    <value>733, -26</value>
  </data>
  <data name="btnTestSQL.Size" type="System.Drawing.Size, System.Drawing">
    <value>255, 31</value>
@@ -3164,7 +3446,7 @@
    <value>3, 3, 3, 3</value>
  </data>
  <data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>993, 307</value>
+    <value>968, 307</value>
  </data>
  <data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -3191,7 +3473,7 @@
    <value>3, 3, 3, 3</value>
  </data>
  <data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>993, 307</value>
+    <value>968, 307</value>
  </data>
  <data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -3218,7 +3500,7 @@
    <value>0, 0</value>
  </data>
  <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>976, 333</value>
+    <value>976, 319</value>
  </data>
  <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -3236,7 +3518,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>976, 333</value>
+    <value>976, 319</value>
  </data>
  <data name="XtraTabPage2.Text" xml:space="preserve">
    <value>Einschränkungen User</value>
@@ -3429,7 +3711,7 @@ Mandanten hinzu</value>
    <value>5</value>
  </data>
  <data name="XtraTabPage6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>976, 333</value>
+    <value>976, 319</value>
  </data>
  <data name="XtraTabPage6.Text" xml:space="preserve">
    <value>Zuordnung Entität-Client</value>
@@ -3471,7 +3753,7 @@ Mandanten hinzu</value>
    <value>False</value>
  </data>
  <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>292, 386</value>
+    <value>292, 372</value>
  </data>
  <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
    <value>982, 22</value>
@@ -3539,7 +3821,7 @@ Mandanten hinzu</value>
    <value>2</value>
  </data>
  <data name="XtraTabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1274, 408</value>
+    <value>1274, 394</value>
  </data>
  <data name="XtraTabPage1.Text" xml:space="preserve">
    <value>Entitäten-Übersicht</value>
@@ -3557,7 +3839,7 @@ Mandanten hinzu</value>
    <value>0</value>
  </data>
  <data name="XtraTabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1280, 436</value>
+    <value>1280, 422</value>
  </data>
  <data name="XtraTabControl1.TabIndex" type="System.Int32, mscorlib">
    <value>40</value>
@@ -3577,9 +3859,6 @@ Mandanten hinzu</value>
  <metadata name="TBTEMP_QUICKDISPLAYBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>442, 134</value>
  </metadata>
-  <data name="ListBox1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left</value>
-  </data>
  <data name="ListBox1.Location" type="System.Drawing.Point, System.Drawing">
    <value>15, 44</value>
  </data>
@@ -8782,9 +9061,6 @@ Mandanten hinzu</value>
  <data name="&gt;&gt;btndeleteUserConstructorRel.ZOrder" xml:space="preserve">
    <value>6</value>
  </data>
-  <data name="btnAddUser2ConstructorREL.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
  <data name="btnAddUser2ConstructorREL.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -8932,9 +9208,6 @@ Mandanten hinzu</value>
  <data name="&gt;&gt;LANGUAGETextBox.ZOrder" xml:space="preserve">
    <value>5</value>
  </data>
-  <data name="CheckBoxHome.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom, Left</value>
-  </data>
  <data name="CheckBoxHome.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
@@ -8970,7 +9243,7 @@ Home Tab</value>
    <value>NoControl</value>
  </data>
  <data name="btnChangeHOMESTANDARD.Location" type="System.Drawing.Point, System.Drawing">
-    <value>841, 211</value>
+    <value>841, 170</value>
  </data>
  <data name="btnChangeHOMESTANDARD.Size" type="System.Drawing.Size, System.Drawing">
    <value>95, 48</value>
@@ -9002,9 +9275,6 @@ Home Tab</value>
  <metadata name="TBPMO_CONSTRUCTOR_USER_SQLTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>667, 173</value>
  </metadata>
-  <data name="GridControlUsers2Menue.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left</value>
-  </data>
  <data name="GridControlUsers2Menue.Location" type="System.Drawing.Point, System.Drawing">
    <value>579, 69</value>
  </data>
@@ -9045,7 +9315,7 @@ Home Tab</value>
    <value>102</value>
  </data>
  <data name="GridControlUsers2Menue.Size" type="System.Drawing.Size, System.Drawing">
-    <value>256, 213</value>
+    <value>256, 224</value>
  </data>
  <data name="GridControlUsers2Menue.TabIndex" type="System.Int32, mscorlib">
    <value>88</value>
@@ -9063,7 +9333,7 @@ Home Tab</value>
    <value>2</value>
  </data>
  <data name="GridControl1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left, Right</value>
+    <value>Top, Left, Right</value>
  </data>
  <data name="GridControl1.Location" type="System.Drawing.Point, System.Drawing">
    <value>941, 69</value>
@@ -9105,7 +9375,7 @@ Home Tab</value>
    <value>102</value>
  </data>
  <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>352, 213</value>
+    <value>352, 224</value>
  </data>
  <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
    <value>89</value>
@@ -9132,7 +9402,7 @@ Home Tab</value>
    <value>6, 13</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>1315, 733</value>
+    <value>1315, 730</value>
  </data>
  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt</value>
--- a/app/DD-Record-Organiser/frmConstructorDesigner.vb
+++ b/app/DD-Record-Organiser/frmConstructorDesigner.vb
@@ -372,13 +372,17 @@ Public Class frmConstructorDesigner
            'Dim check = ClassDatabase.Execute_Scalar("SELECT DOCUMENT_VIEW FROM TBPMO_FORM_VIEW WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID)
            If chkWDSearch_Active.Checked Then
                GroupBoxDocSearch.Enabled = True
+                GroupBoxSupervisorControls.Enabled = True
                Load_TBAD_Users()
                Load_Supervisor()
+                Load_Supervisor_Controls_Choose()
+                Load_Supervisor_Controls()
                'If check = False Then
                '    ClassDatabase.Execute_Scalar("UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = 1 WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID, True)
                'End If
            Else
                GroupBoxDocSearch.Enabled = False
+                GroupBoxSupervisorControls.Enabled = False
                'If check = True Then
                '    ClassDatabase.Execute_Scalar("UPDATE TBPMO_FORM_VIEW SET DOCUMENT_VIEW = 1 WHERE FORM_ID = " & SELECTED_ENTITY_ID & " and SCREEN_ID = " & CURRENT_SCREEN_ID, True)
                'End If
@@ -506,8 +510,7 @@ Public Class frmConstructorDesigner

    Public Sub Load_Supervisor()
        Try
-            Dim ENTITY_ID = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID)
-            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_ENTITY_SUPERVISOR WHERE ENTITY_ID = {0}) ORDER BY T.USERNAME", ENTITY_ID)
+            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_ENTITY_SUPERVISOR WHERE ENTITY_ID = {0}) ORDER BY T.USERNAME", SELECTED_ENTITY_ID)
            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
            DD_ECMAdmin.TBWH_Users2.Clear()
            For Each row As DataRow In DT.Rows
@@ -528,6 +531,30 @@ Public Class frmConstructorDesigner
            MsgBox("UnexpectedError Load_Supervisor:" & vbNewLine & ex.Message)
        End Try
    End Sub
+    Public Sub Load_Supervisor_Controls_Choose()
+        Try
+            Dim sql = String.Format("select GUID, NAME + '/' + COL_NAME as control from tbpmo_Control where FORM_ID = {0} and CONTROL_TYPE_ID IN (2,3,12) ORDER BY NAME", SELECTED_ENTITY_ID)
+            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
+            cmbSupervisorControls.DataSource = DT
+            cmbSupervisorControls.DisplayMember = DT.Columns(1).ColumnName
+            cmbSupervisorControls.ValueMember = DT.Columns(0).ColumnName
+        Catch ex As Exception
+            MsgBox("UnexpectedError Load_Supervisor_Controls_Choose:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
+    Public Sub Load_Supervisor_Controls()
+        Try
+            Dim sql = String.Format("select T1.GUID, T.NAME + '/' + T.COL_NAME as [control] from tbpmo_Control T, TBPMO_SUPERVISOR_CONTROLS T1 " & _
+                        "where T.GUID = T1.CONTROL_ID AND T.FORM_ID = {0} ORDER BY T.NAME", SELECTED_ENTITY_ID)
+            Dim DT As DataTable = ClassDatabase.Return_Datatable(sql)
+            CheckedListBoxSupervisorControls.Items.Clear()
+            For Each row1 As DataRow In DT.Rows
+                CheckedListBoxSupervisorControls.Items.Add(New MyListBoxItem() With {.Text = row1.Item(1), .ExtraData = row1.Item(0)})
+            Next
+        Catch ex As Exception
+            MsgBox("UnexpectedError Load_Supervisor_Controls:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
    Private Sub btnAddControl_Click(sender As Object, e As EventArgs) Handles btnAddControl.Click
        Try
            Dim i = listBoxControls.SelectedValue
@@ -773,8 +800,7 @@ Public Class frmConstructorDesigner

    Private Sub btnTestSQL_Click(sender As Object, e As EventArgs) Handles btnTestSQL.Click
        Try
-            Dim ENTITY_ID = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID)
-            Dim EntSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & ENTITY_ID.ToString & " T"
+            Dim EntSQL = "SELECT T.* FROM VWTEMP_PMO_FORM" & SELECTED_ENTITY_ID.ToString & " T"
            Dim query As String = EntSQL & " " & SQL_COMMANDTextBox.Text

            For Each row As DataGridViewRow In dgvPlaceholders.Rows
@@ -802,12 +828,12 @@ Public Class frmConstructorDesigner
    End Sub

    Private Sub btnsaddUser2Client_Click(sender As Object, e As EventArgs) Handles btnsaddUser2Client.Click
-        Dim ENTITY_ID = ClassDatabase.Execute_Scalar("SELECT FORM_ID FROM TBPMO_FORM_CONSTRUCTOR_DETAIL WHERE GUID = " & SELECTED_CONSTRUCTOR_DETAIL_ID)
+
        For Each obj As Object In chklbxClient.CheckedItems
            Dim item As MyListBoxItem = CType(obj, MyListBoxItem)
-            Dim sql = "select count(*) from TBPMO_CLIENT_ENTITY Where CLIENT_ID = " & item.ExtraData & " AND ENTITY_ID = " & ENTITY_ID
+            Dim sql = "select count(*) from TBPMO_CLIENT_ENTITY Where CLIENT_ID = " & item.ExtraData & " AND ENTITY_ID = " & SELECTED_ENTITY_ID
            If ClassDatabase.Execute_Scalar(sql) = 0 Then
-                sql = String.Format("INSERT INTO TBPMO_CLIENT_ENTITY (CLIENT_ID, ENTITY_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", item.ExtraData, ENTITY_ID, Environment.UserName)
+                sql = String.Format("INSERT INTO TBPMO_CLIENT_ENTITY (CLIENT_ID, ENTITY_ID, ADDED_WHO) VALUES ({0}, {1}, '{2}')", item.ExtraData, SELECTED_ENTITY_ID, Environment.UserName)
                If ClassDatabase.Execute_non_Query(sql) = False Then
                    MsgBox("Error in Adding Entity to Client!", MsgBoxStyle.Critical)
                End If
@@ -931,4 +957,30 @@ Public Class frmConstructorDesigner
            MsgBox("Error while deleting user to Constructor-Relation: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
    End Sub
+
+    Private Sub btnAddSupervisorControl_Click(sender As Object, e As EventArgs) Handles btnAddSupervisorControl.Click
+        If cmbSupervisorControls.SelectedIndex <> -1 Then
+            Dim sql = "select count(*) from TBPMO_SUPERVISOR_CONTROLS Where CONTROL_ID = " & cmbSupervisorControls.SelectedValue
+            If ClassDatabase.Execute_Scalar(sql) = 0 Then
+                sql = String.Format("INSERT INTO TBPMO_SUPERVISOR_CONTROLS (CONTROL_ID, ADDED_WHO) VALUES ({0},'{1}')", cmbSupervisorControls.SelectedValue, Environment.UserName)
+                If ClassDatabase.Execute_non_Query(sql) = False Then
+                    MsgBox("Error in Adding Supervisor-Control! Check log", MsgBoxStyle.Critical)
+                Else
+                    Load_Supervisor_Controls()
+                End If
+            End If
+        End If
+    End Sub
+
+    Private Sub btndeleteSupervisorControl_Click(sender As Object, e As EventArgs) Handles btndeleteSupervisorControl.Click
+        For Each obj As Object In CheckedListBoxSupervisorControls.CheckedItems
+            Dim item As MyListBoxItem = CType(obj, MyListBoxItem)
+            Dim sql
+            sql = String.Format("DELETE FROM TBPMO_SUPERVISOR_CONTROLS  WHERE GUID = {0}", item.ExtraData)
+            If ClassDatabase.Execute_non_Query(sql, True) = False Then
+                MsgBox(String.Format("Error in deleting SupervisorControl", item.Text), MsgBoxStyle.Critical)
+            End If
+        Next
+        Load_Supervisor_Controls()
+    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@@ -4656,7 +4656,7 @@ Public Class frmConstructor_Main
                End Try

            End If
-
+            CURRENT_FORM_ID = ENTITY_ID
            If e.Data.GetDataPresent(DataFormats.StringFormat) Then
                Dim Wert As String = CType(e.Data.GetData(DataFormats.StringFormat), Object)
                Console.WriteLine("DragDrop-Wert: " & Wert)
@@ -6179,7 +6179,7 @@ Public Class frmConstructor_Main

    Private Sub TestToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles tsmiRights.Click
        Dim msg = "Die Rechte wurden erfolgreich überprüft und aktualisiert!"
-        If ClassDOC_SEARCH.SET_WD_RIGHTS(RESULT_DOC_ID, RESULT_DOC_PATH) = True Then
+        If ClassDOC_SEARCH.SET_WD_RIGHTS(RESULT_DOC_ID, RESULT_DOC_PATH, ENTITY_ID) = True Then
            If USER_LANGUAGE <> "de-DE" Then
                msg = "The rights were successfully renewed!"
            End If
--- a/app/DD-Record-Organiser/frmWD_IndexFile.vb
+++ b/app/DD-Record-Organiser/frmWD_IndexFile.vb
@@ -179,7 +179,7 @@ Public Class frmWD_IndexFile
                            sql = String.Format("SELECT DocID FROM  VWPMO_WD_DOC_SYNC WHERE UPPER(FULL_FILENAME) = UPPER('{0}') AND CONVERT(DATE,Change_DateTime) = CONVERT(DATE,GETDATE())", CURRENT_FILEIN_WD)
                            CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(sql)
                            If Not IsNothing(CURRENT_DOC_ID) Then
-                                ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD)
+                                ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_DOC_ID, CURRENT_FILEIN_WD, CURRENT_FORM_ID)
                                ClassFileResult.DocID = CURRENT_DOC_ID
                                ClassFileResult.SET_DOCID_INDICES()
                                If ClassDOC_SEARCH.SET_RECORD_DOCID_LINK(CURRENT_DOC_ID, CURRENT_RECORD_ID) = True Then
@@ -1092,7 +1092,13 @@ Public Class frmWD_IndexFile
            Me.Activate()
            Me.BringToFront()
            If CURRENT_CONTROL_DOCTYPE_MATCH <> "" Then
+                'Me.cmbDokumentart.SelectedItem = Me.cmbDokumentart.Items.IndexOf(CURRENT_CONTROL_DOCTYPE_MATCH)
                cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_CONTROL_DOCTYPE_MATCH)
+                If cmbDokumentart.SelectedIndex = 0 And CURRENT_CONTROL_DOCTYPE_MATCH = cmbDokumentart.Text Then
+                    CURRENT_DOKARTID = cmbDokumentart.SelectedValue
+                    CURRENT_DOKARTSTRING = cmbDokumentart.Text
+                    Refresh_indices()
+                End If
            End If
        Catch ex As Exception
            MsgBox("Error in Form Shown:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)