MS1808

app/DD-Record-Organiser/ClassControlCommandsUI.vb

@@ -304,26 +304,7 @@ Public Class ClassControlCommandsUI
     End Sub
 
     Function DeleteRecord(RecordID As Integer)
-        Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & RecordID
+        Return ClassHelper.DeleteRecord(RecordID)
-        Return ClassDatabase.Execute_non_Query(del, True) = True
-
-
-
-        'Dim sql As String = "DELETE FROM TBPMO_RECORD_CONNECT WHERE RECORD1_ID = " & RecordID & " OR RECORD2_ID = " & RecordID
-        'If ClassDatabase.Execute_non_Query(sql) = True Then
-        '    sql = "DELETE FROM TBPMO_WORKFLOW_TASK WHERE RECORD_ID = " & RecordID
-        '    If ClassDatabase.Execute_non_Query(sql) = True Then
-        '        sql = "DELETE FROM TBPMO_CONTROL_VALUE WHERE RECORD_ID = " & RecordID
-        '        If ClassDatabase.Execute_non_Query(sql) = True Then ' Delete der Controls erfolgreich ausgeführt, jetzt der Record
-        '            sql = "DELETE FROM TBPMO_RECORD WHERE GUID = " & RecordID
-        '            If ClassDatabase.Execute_non_Query(sql) = True Then
-        '                Return True
-        '            End If
-        '        End If
-        '    End If
-        'End If
-
-        'Return False
     End Function
 
 

app/DD-Record-Organiser/ClassDOC_SEARCH.vb

@@ -266,13 +266,13 @@ Public Class ClassDOC_SEARCH
             Return False
         End Try
     End Function
-    Public Shared Function SET_WD_RIGHTS(ByVal RESULT_DOC_PATH)
+    Public Shared Function SET_WD_RIGHTS(ByVal RESULT_DOCID, ByVal RESULT_DOC_PATH)
         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.File_DeleteAndSetRight(RESULT_DOC_PATH, 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)
                                 Return False

app/DD-Record-Organiser/ClassHelper.vb

@@ -233,5 +233,24 @@ Public Class ClassHelper
         End Try
 
     End Function
+    Public Shared Function InsertEssential_Log(REFERENCE_KEY As Integer, REFERENCE_STRING As String, COMMENT As String)
+        Try
+            Dim insert = String.Format("INSERT INTO TBPMO_LOG_ESSENTIALS (REFERENCE_KEY,REFERENCE_STRING,COMMENT,ADDED_WHO) VALUES ({0},'{1}','{2}','{3}')", REFERENCE_KEY, REFERENCE_STRING, COMMENT, Environment.UserName)
+            Return ClassDatabase.Execute_non_Query(insert)
+        Catch ex As Exception
+            ClassLogger.Add("Unexpected Error in InsertEssential_Log: " & ex.Message, True)
+            Return False
+        End Try
+    End Function
+    Public Shared Function DeleteRecord(ByVal SELECTED_RECORD_ID)
+        Try
+            Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0} {1}", SELECTED_RECORD_ID, Environment.UserName)
+            Return ClassDatabase.Execute_non_Query_withConn(DeleteRecordSQL, 1)
+        Catch ex As Exception
+            ClassLogger.Add("Unexpected Error in DeleteRecord: " & ex.Message, True)
+            Return False
+        End Try
+       
+    End Function
 
 End Class

app/DD-Record-Organiser/ClassInit.vb

@@ -40,8 +40,8 @@ Public Class ClassInit
     Public Sub InitAddons()
         Try
             Dim CurrentDir As String = My.Application.Info.DirectoryPath
-            Dim Sql As String = "SELECT PATH_ADDONS from TBPMO_KONFIGURATION WHERE GUID = 1"
+            ' Dim Sql As String = "SELECT PATH_ADDONS from TBPMO_KONFIGURATION WHERE GUID = 1"
-            Dim AddonPath As String = ClassDatabase.Execute_Scalar(Sql)
+            Dim AddonPath As String = MY_ADDON_PATH ' ClassDatabase.Execute_Scalar(Sql)
             Dim Dev_AddonPath As String = System.IO.Path.GetFullPath(System.IO.Path.Combine(CurrentDir, "..\..\..\..\app"))
 
             If AddonPath Is Nothing OrElse AddonPath = "" Then
@@ -70,9 +70,8 @@ Public Class ClassInit
                 End If
             End If
 
-            Sql = String.Format("UPDATE TBPMO_KONFIGURATION SET PATH_ADDONS = '{0}' WHERE GUID = 1", AddonPath)
+            MY_ADDON_PATH = AddonPath
-            ClassDatabase.Execute_non_Query(Sql)
+            SaveMySettingsValue("PATH_ADDON", MY_ADDON_PATH, "ConfigMain")
-
         Catch ex As Exception
             MsgBox("Unexpected Error in InitAddons:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try

app/DD-Record-Organiser/DD-Record-Organiser.vbproj

@@ -81,8 +81,7 @@
     <Reference Include="CommandLine">
       <HintPath>..\..\3rdparty\lib\Commandline\CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="DD_Rights, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DD_Rights">
-      <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\DDLibraries\DD_Libraries\bin\Debug\DD_Rights.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.BonusSkins.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">

app/DD-Record-Organiser/ModuleHelperMethods.vb

@@ -340,9 +340,10 @@
         frm.Show()
     End Sub
     Public Sub OpenRightsmanager()
-        Dim path As String = ClassDatabase.Execute_Scalar("SELECT PATH_ADDONS FROm TBPMO_KONFIGURATION WHERE GUID = 1")
+        'Dim path As String = ClassDatabase.Execute_Scalar("SELECT PATH_ADDONS FROm TBPMO_KONFIGURATION WHERE GUID = 1")
-        Dim ProductionPath As String = System.IO.Path.Combine(path, "RightManager", "RecordOrganizer_RightManager.exe")
+        Try
-        Dim DevelPath As String = System.IO.Path.Combine(path, "RecordOrganizer_RightManager\bin\Debug", "RecordOrganizer_RightManager.exe")
+            Dim ProductionPath As String = System.IO.Path.Combine(MY_ADDON_PATH, "RightManager", "RecordOrganizer_RightManager.exe")
+            Dim DevelPath As String = System.IO.Path.Combine(MY_ADDON_PATH, "RecordOrganizer_RightManager\bin\Debug", "RecordOrganizer_RightManager.exe")
 
             Dim startInfo As New ProcessStartInfo()
             startInfo.Arguments = """" & MyConnectionString & """"
@@ -354,6 +355,10 @@
             End If
 
             Process.Start(startInfo)
+        Catch ex As Exception
+            MsgBox("Could not find Right manager: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+       
     End Sub
     Public Sub OpenWindream_Files()
         Dim frm As New frmWD_Import_Doc_Record

app/DD-Record-Organiser/ModuleMySettings.vb

@@ -13,6 +13,7 @@ Module ModuleMySettings
     Public Task_Popup_minutes As Integer = 2
     Public Sett_ShowQuickMenue As Boolean = True
     Public Sett_ConstructorStart As Integer
+    Public MY_ADDON_PATH As String
 
     Public WD_ShowEnitityDocs As Boolean = True
     Public WD_ShowDocs As Boolean = False
@@ -167,6 +168,12 @@ Module ModuleMySettings
                         Else
                             Task_Popup_minutes = CInt(Row.Item("Value"))
                         End If
+                    Case "PATH_ADDON"
+                        If Row.Item("Value") = String.Empty Then
+                            MY_ADDON_PATH = ""
+                        Else
+                            MY_ADDON_PATH = Row.Item("Value")
+                        End If
                 End Select
             Next
             'update 1.1
@@ -198,6 +205,13 @@ Module ModuleMySettings
                 DT.Rows.Add(newRow)
                 DT.WriteXml(ConfigPath)
             End If
+            If rowresult.Contains("PATH_ADDON") = False Then
+                Dim newRow As DataRow = DT.NewRow()
+                newRow("ConfigName") = "PATH_ADDON"
+                newRow("Value") = ""
+                DT.Rows.Add(newRow)
+                DT.WriteXml(ConfigPath)
+            End If
         Catch ex As Exception
             MsgBox("Error in LoadMyConfig" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             ClassLogger.Add("Error in LoadMyConfig: " & ex.Message, True)
@@ -290,6 +304,10 @@ Module ModuleMySettings
             newRow12("ConfigName") = "WAN_ENVIRONMENT"
             newRow12("Value") = "False"
             table.Rows.Add(newRow12)
+            Dim newRow13 As DataRow = table.NewRow()
+            newRow13("ConfigName") = "PATH_ADDON"
+            newRow13("Value") = ""
+            table.Rows.Add(newRow13)
 
             table.AcceptChanges()
             ClassLogger.Add(">> CreateConfigTable su...", False)

app/DD-Record-Organiser/ModuleRuntimeVariables.vb

@@ -5,12 +5,14 @@
     Public CtrlCommandUI As ClassControlCommandsUI
 
     ' Diese Werte müssen später zur Laufzeit geladen werden
+
     Public CURRENT_FORM_ID As Integer
     Public CURRENT_PARENT_ENTITY_ID As Integer
     Public CURRENT_PARENT_RECORD_ID As Integer
     Public CURRENT_ACT_LEVEL As Integer
 
 
+
     Public CURRENT_ENTITYSTRING As String = ""
     Public CURRENT_ENTITYSQL As String
     'Public CURRENT_ENTITYSQL As String

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

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.6.9")> 
+<Assembly: AssemblyVersion("2.4.7.0")> 
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

app/DD-Record-Organiser/frmConfiguration_Basic.Designer.vb

@@ -93,20 +93,20 @@ Partial Class frmConfiguration_Basic
         '
         'GroupBox1
         '
+        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
         Me.GroupBox1.Controls.Add(Me.Label1)
         Me.GroupBox1.Controls.Add(Me.Label3)
         Me.GroupBox1.Controls.Add(Me.txtDelimiterFile)
         Me.GroupBox1.Controls.Add(Me.txtDelimiterVersion)
-        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.TabStop = False
         '
         'GroupBox2
         '
+        resources.ApplyResources(Me.GroupBox2, "GroupBox2")
         Me.GroupBox2.Controls.Add(Me.chkUnicode)
         Me.GroupBox2.Controls.Add(Me.Label2)
         Me.GroupBox2.Controls.Add(Me.txtwddriveletter)
-        resources.ApplyResources(Me.GroupBox2, "GroupBox2")
         Me.GroupBox2.Name = "GroupBox2"
         Me.GroupBox2.TabStop = False
         '
@@ -124,10 +124,10 @@ Partial Class frmConfiguration_Basic
         '
         'GroupBox3
         '
+        resources.ApplyResources(Me.GroupBox3, "GroupBox3")
         Me.GroupBox3.Controls.Add(Me.btnResetBackground)
         Me.GroupBox3.Controls.Add(Me.btnSelectBackground)
         Me.GroupBox3.Controls.Add(Me.pbBackground)
-        resources.ApplyResources(Me.GroupBox3, "GroupBox3")
         Me.GroupBox3.Name = "GroupBox3"
         Me.GroupBox3.TabStop = False
         '
@@ -152,11 +152,12 @@ Partial Class frmConfiguration_Basic
         'OpenFileDialog1
         '
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
+        resources.ApplyResources(Me.OpenFileDialog1, "OpenFileDialog1")
         '
         'GroupBox4
         '
-        Me.GroupBox4.Controls.Add(Me.txtProductName)
         resources.ApplyResources(Me.GroupBox4, "GroupBox4")
+        Me.GroupBox4.Controls.Add(Me.txtProductName)
         Me.GroupBox4.Name = "GroupBox4"
         Me.GroupBox4.TabStop = False
         '
@@ -183,6 +184,7 @@ Partial Class frmConfiguration_Basic
         '
         'GroupBox5
         '
+        resources.ApplyResources(Me.GroupBox5, "GroupBox5")
         Me.GroupBox5.Controls.Add(Me.btnTest_Anmeldung)
         Me.GroupBox5.Controls.Add(Me.txtServername)
         Me.GroupBox5.Controls.Add(Me.Label5)
@@ -193,15 +195,14 @@ Partial Class frmConfiguration_Basic
         Me.GroupBox5.Controls.Add(Me.txtDomäne)
         Me.GroupBox5.Controls.Add(Me.Label7)
         Me.GroupBox5.Controls.Add(Me.Label8)
-        resources.ApplyResources(Me.GroupBox5, "GroupBox5")
         Me.GroupBox5.Name = "GroupBox5"
         Me.GroupBox5.TabStop = False
         '
         'btnTest_Anmeldung
         '
+        resources.ApplyResources(Me.btnTest_Anmeldung, "btnTest_Anmeldung")
         Me.btnTest_Anmeldung.BackColor = System.Drawing.SystemColors.Control
         Me.btnTest_Anmeldung.Image = Global.DD_Record_Organiser.My.Resources.Resources.database_connect
-        resources.ApplyResources(Me.btnTest_Anmeldung, "btnTest_Anmeldung")
         Me.btnTest_Anmeldung.Name = "btnTest_Anmeldung"
         Me.btnTest_Anmeldung.UseVisualStyleBackColor = False
         '

app/DD-Record-Organiser/frmConfiguration_Basic.en-US.resx

@@ -149,12 +149,12 @@
   <data name="GroupBox1.Text" xml:space="preserve">
     <value>General Settings:</value>
   </data>
-  <data name="chkUnicode.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
   <data name="GroupBox2.Text" xml:space="preserve">
     <value>Global windream-Settings</value>
   </data>
+  <data name="chkUnicode.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="lblSaveresult.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
@@ -164,15 +164,8 @@
   <data name="lblSaveresult.Text" xml:space="preserve">
     <value>Changes saved successfully!</value>
   </data>
-  <data name="chkChildWindow.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+  <data name="GroupBox3.Text" xml:space="preserve">
-    <value>NoControl</value>
+    <value>Application background</value>
-  </data>
-  <data name="chkChildWindow.Size" type="System.Drawing.Size, System.Drawing">
-    <value>198, 30</value>
-  </data>
-  <data name="chkChildWindow.Text" xml:space="preserve">
-    <value>Call Design-Panels as child forms 
-(Embedded in Mainform)</value>
   </data>
   <data name="btnResetBackground.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -189,9 +182,6 @@
   <data name="pbBackground.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="GroupBox3.Text" xml:space="preserve">
-    <value>Application background</value>
-  </data>
   <data name="GroupBox4.Text" xml:space="preserve">
     <value>Application name</value>
   </data>
@@ -201,6 +191,46 @@
   <data name="btnsave.Text" xml:space="preserve">
     <value>Save</value>
   </data>
+  <data name="chkChildWindow.Size" type="System.Drawing.Size, System.Drawing">
+    <value>198, 30</value>
+  </data>
+  <data name="chkChildWindow.Text" xml:space="preserve">
+    <value>Call Design-Panels as child forms 
+(Embedded in Mainform)</value>
+  </data>
+  <data name="btnTest_Anmeldung.Location" type="System.Drawing.Point, System.Drawing">
+    <value>355, 99</value>
+  </data>
+  <data name="btnTest_Anmeldung.Text" xml:space="preserve">
+    <value>Check login and save</value>
+  </data>
+  <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>46, 13</value>
+  </data>
+  <data name="Label5.Text" xml:space="preserve">
+    <value>Server:*</value>
+  </data>
+  <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 13</value>
+  </data>
+  <data name="Label4.Text" xml:space="preserve">
+    <value>password:</value>
+  </data>
+  <data name="Label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>54, 13</value>
+  </data>
+  <data name="Label7.Text" xml:space="preserve">
+    <value>domain:*</value>
+  </data>
+  <data name="Label8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>268, 15</value>
+  </data>
+  <data name="Label8.Text" xml:space="preserve">
+    <value>Define the login data of the windream-Mainuser. </value>
+  </data>
+  <data name="GroupBox5.Text" xml:space="preserve">
+    <value>Userauth windream rights:</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Basic Configuration</value>
   </data>

app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb

@@ -48,8 +48,8 @@ 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 DataGridViewCellStyle3 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle1 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
-        Dim DataGridViewCellStyle4 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
+        Dim DataGridViewCellStyle2 As System.Windows.Forms.DataGridViewCellStyle = New System.Windows.Forms.DataGridViewCellStyle()
         Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
         Me.TBPMO_FORM_CONSTRUCTORBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TBPMO_FORM_CONSTRUCTORTableAdapter = New DD_Record_Organiser.DD_ECMAdminTableAdapters.TBPMO_FORM_CONSTRUCTORTableAdapter()
@@ -116,20 +116,33 @@ Partial Class frmConstructorDesigner
         Me.Label3 = New System.Windows.Forms.Label()
         Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage()
         Me.GroupBoxDocSearch = New System.Windows.Forms.GroupBox()
+        Me.GridControl2 = New DevExpress.XtraGrid.GridControl()
         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.GridColumn15 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn16 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridColumn17 = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.GridControlSupervisorAdd = New DevExpress.XtraGrid.GridControl()
+        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.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.TBWH_Users1BindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.lblSaveDocSearch = New System.Windows.Forms.Label()
         Me.chkWDSearch_Active = New System.Windows.Forms.CheckBox()
         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.components)
         Me.GridViewUserSQL = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -187,7 +200,6 @@ Partial Class frmConstructorDesigner
         Me.TableAdapterManager3 = New DD_Record_Organiser.DD_DMSDataSetCalendarTableAdapters.TableAdapterManager()
         Me.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_CONSTRUCTOR_USER_SQLTableAdapter()
         Me.GridControlUsers2Menue = New DevExpress.XtraGrid.GridControl()
-        Me.TBAD_UsersBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.GridViewlUsers2Menue = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.colSelect = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn()
@@ -199,18 +211,6 @@ Partial Class frmConstructorDesigner
         Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn8 = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.GridColumn9 = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.GridControlSupervisorAdd = New DevExpress.XtraGrid.GridControl()
-        Me.GridViewSupervisorsAdd = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.GridColumn10 = 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.GridControl2 = New DevExpress.XtraGrid.GridControl()
-        Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.GridColumn14 = 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()
         GUIDLabel = New System.Windows.Forms.Label()
         FORM_TITLELabel = New System.Windows.Forms.Label()
         SEQUENCE_MENULabel = New System.Windows.Forms.Label()
@@ -251,12 +251,17 @@ Partial Class frmConstructorDesigner
         Me.XtraTabPage5.SuspendLayout()
         Me.XtraTabPage4.SuspendLayout()
         Me.GroupBoxDocSearch.SuspendLayout()
+        CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBWH_Users2BindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TBWH_Users1BindingSource, 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.XtraTabPage2.SuspendLayout()
         Me.TabControl1.SuspendLayout()
         Me.TabPage1.SuspendLayout()
         CType(Me.GridControlUserSQL, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TBWH_Users1BindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridViewUserSQL, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvResult, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -269,14 +274,9 @@ Partial Class frmConstructorDesigner
         CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControlUsers2Menue, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridViewlUsers2Menue, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridControlSupervisorAdd, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridViewSupervisorsAdd, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'GUIDLabel
@@ -847,9 +847,9 @@ Partial Class frmConstructorDesigner
         'XtraTabPage4
         '
         resources.ApplyResources(Me.XtraTabPage4, "XtraTabPage4")
+        Me.XtraTabPage4.Controls.Add(Me.chkWDSearch_Active)
         Me.XtraTabPage4.Controls.Add(Me.GroupBoxDocSearch)
         Me.XtraTabPage4.Controls.Add(Me.lblSaveDocSearch)
-        Me.XtraTabPage4.Controls.Add(Me.chkWDSearch_Active)
         Me.XtraTabPage4.Name = "XtraTabPage4"
         '
         'GroupBoxDocSearch
@@ -866,11 +866,120 @@ Partial Class frmConstructorDesigner
         Me.GroupBoxDocSearch.Name = "GroupBoxDocSearch"
         Me.GroupBoxDocSearch.TabStop = False
         '
+        'GridControl2
+        '
+        resources.ApplyResources(Me.GridControl2, "GridControl2")
+        Me.GridControl2.DataSource = Me.TBWH_Users2BindingSource
+        Me.GridControl2.MainView = Me.GridView2
+        Me.GridControl2.Name = "GridControl2"
+        Me.GridControl2.ShowOnlyPredefinedDetails = True
+        Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2})
+        '
         'TBWH_Users2BindingSource
         '
         Me.TBWH_Users2BindingSource.DataMember = "TBWH_Users2"
         Me.TBWH_Users2BindingSource.DataSource = Me.DD_ECMAdmin
         '
+        'GridView2
+        '
+        Me.GridView2.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView2.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        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.GridControl = Me.GridControl2
+        Me.GridView2.Name = "GridView2"
+        Me.GridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView2.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView2.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridView2.OptionsView.ColumnAutoWidth = False
+        Me.GridView2.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridView2.OptionsView.ShowAutoFilterRow = True
+        Me.GridView2.OptionsView.ShowGroupPanel = False
+        '
+        'GridColumn14
+        '
+        resources.ApplyResources(Me.GridColumn14, "GridColumn14")
+        Me.GridColumn14.FieldName = "Select"
+        Me.GridColumn14.Name = "GridColumn14"
+        '
+        'GridColumn15
+        '
+        Me.GridColumn15.FieldName = "Username"
+        Me.GridColumn15.Name = "GridColumn15"
+        Me.GridColumn15.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn15, "GridColumn15")
+        '
+        'GridColumn16
+        '
+        Me.GridColumn16.FieldName = "Email"
+        Me.GridColumn16.Name = "GridColumn16"
+        Me.GridColumn16.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn16, "GridColumn16")
+        '
+        'GridColumn17
+        '
+        Me.GridColumn17.FieldName = "ID"
+        Me.GridColumn17.Name = "GridColumn17"
+        '
+        'GridControlSupervisorAdd
+        '
+        resources.ApplyResources(Me.GridControlSupervisorAdd, "GridControlSupervisorAdd")
+        Me.GridControlSupervisorAdd.DataSource = Me.TBAD_UsersBindingSource
+        Me.GridControlSupervisorAdd.MainView = Me.GridViewSupervisorsAdd
+        Me.GridControlSupervisorAdd.Name = "GridControlSupervisorAdd"
+        Me.GridControlSupervisorAdd.ShowOnlyPredefinedDetails = True
+        Me.GridControlSupervisorAdd.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSupervisorsAdd})
+        '
+        'TBAD_UsersBindingSource
+        '
+        Me.TBAD_UsersBindingSource.DataMember = "TBAD_Users"
+        Me.TBAD_UsersBindingSource.DataSource = Me.DD_ECMAdmin
+        '
+        'GridViewSupervisorsAdd
+        '
+        Me.GridViewSupervisorsAdd.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewSupervisorsAdd.Appearance.EvenRow.BackColor"), System.Drawing.Color)
+        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.GridControl = Me.GridControlSupervisorAdd
+        Me.GridViewSupervisorsAdd.Name = "GridViewSupervisorsAdd"
+        Me.GridViewSupervisorsAdd.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewSupervisorsAdd.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewSupervisorsAdd.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewSupervisorsAdd.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridViewSupervisorsAdd.OptionsView.ColumnAutoWidth = False
+        Me.GridViewSupervisorsAdd.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridViewSupervisorsAdd.OptionsView.ShowAutoFilterRow = True
+        Me.GridViewSupervisorsAdd.OptionsView.ShowGroupPanel = False
+        '
+        'GridColumn10
+        '
+        resources.ApplyResources(Me.GridColumn10, "GridColumn10")
+        Me.GridColumn10.FieldName = "Select"
+        Me.GridColumn10.Name = "GridColumn10"
+        '
+        'GridColumn11
+        '
+        Me.GridColumn11.FieldName = "Username"
+        Me.GridColumn11.Name = "GridColumn11"
+        Me.GridColumn11.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn11, "GridColumn11")
+        '
+        'GridColumn12
+        '
+        Me.GridColumn12.FieldName = "Email"
+        Me.GridColumn12.Name = "GridColumn12"
+        Me.GridColumn12.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.GridColumn12, "GridColumn12")
+        '
+        'GridColumn13
+        '
+        Me.GridColumn13.FieldName = "ID"
+        Me.GridColumn13.Name = "GridColumn13"
+        '
         'Label11
         '
         resources.ApplyResources(Me.Label11, "Label11")
@@ -905,11 +1014,6 @@ Partial Class frmConstructorDesigner
         resources.ApplyResources(Me.Label7, "Label7")
         Me.Label7.Name = "Label7"
         '
-        'TBWH_Users1BindingSource
-        '
-        Me.TBWH_Users1BindingSource.DataMember = "TBWH_Users1"
-        Me.TBWH_Users1BindingSource.DataSource = Me.DD_ECMAdmin
-        '
         'lblSaveDocSearch
         '
         resources.ApplyResources(Me.lblSaveDocSearch, "lblSaveDocSearch")
@@ -972,6 +1076,11 @@ Partial Class frmConstructorDesigner
         Me.GridControlUserSQL.ShowOnlyPredefinedDetails = True
         Me.GridControlUserSQL.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewUserSQL})
         '
+        'TBWH_Users1BindingSource
+        '
+        Me.TBWH_Users1BindingSource.DataMember = "TBWH_Users1"
+        Me.TBWH_Users1BindingSource.DataSource = Me.DD_ECMAdmin
+        '
         'GridViewUserSQL
         '
         Me.GridViewUserSQL.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewUserSQL.Appearance.EvenRow.BackColor"), System.Drawing.Color)
@@ -1028,8 +1137,8 @@ Partial Class frmConstructorDesigner
         '
         Me.dgvResult.AllowUserToAddRows = False
         Me.dgvResult.AllowUserToDeleteRows = False
-        DataGridViewCellStyle3.BackColor = System.Drawing.Color.Cyan
+        DataGridViewCellStyle1.BackColor = System.Drawing.Color.Cyan
-        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle3
+        Me.dgvResult.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle1
         resources.ApplyResources(Me.dgvResult, "dgvResult")
         Me.dgvResult.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvResult.Name = "dgvResult"
@@ -1039,8 +1148,8 @@ Partial Class frmConstructorDesigner
         '
         Me.dgvPlaceholders.AllowUserToAddRows = False
         Me.dgvPlaceholders.AllowUserToDeleteRows = False
-        DataGridViewCellStyle4.BackColor = System.Drawing.Color.Cyan
+        DataGridViewCellStyle2.BackColor = System.Drawing.Color.Cyan
-        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle4
+        Me.dgvPlaceholders.AlternatingRowsDefaultCellStyle = DataGridViewCellStyle2
         resources.ApplyResources(Me.dgvPlaceholders, "dgvPlaceholders")
         Me.dgvPlaceholders.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize
         Me.dgvPlaceholders.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colPlaceholder, Me.colReplace})
@@ -1376,11 +1485,6 @@ Partial Class frmConstructorDesigner
         Me.GridControlUsers2Menue.ShowOnlyPredefinedDetails = True
         Me.GridControlUsers2Menue.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewlUsers2Menue})
         '
-        'TBAD_UsersBindingSource
-        '
-        Me.TBAD_UsersBindingSource.DataMember = "TBAD_Users"
-        Me.TBAD_UsersBindingSource.DataSource = Me.DD_ECMAdmin
-        '
         'GridViewlUsers2Menue
         '
         Me.GridViewlUsers2Menue.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewlUsers2Menue.Appearance.EvenRow.BackColor"), System.Drawing.Color)
@@ -1476,110 +1580,6 @@ Partial Class frmConstructorDesigner
         Me.GridColumn9.FieldName = "ID"
         Me.GridColumn9.Name = "GridColumn9"
         '
-        'GridControlSupervisorAdd
-        '
-        resources.ApplyResources(Me.GridControlSupervisorAdd, "GridControlSupervisorAdd")
-        Me.GridControlSupervisorAdd.DataSource = Me.TBAD_UsersBindingSource
-        Me.GridControlSupervisorAdd.MainView = Me.GridViewSupervisorsAdd
-        Me.GridControlSupervisorAdd.Name = "GridControlSupervisorAdd"
-        Me.GridControlSupervisorAdd.ShowOnlyPredefinedDetails = True
-        Me.GridControlSupervisorAdd.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSupervisorsAdd})
-        '
-        'GridViewSupervisorsAdd
-        '
-        Me.GridViewSupervisorsAdd.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView3.Appearance.EvenRow.BackColor"), System.Drawing.Color)
-        Me.GridViewSupervisorsAdd.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridViewSupervisorsAdd.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridView3.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.GridControl = Me.GridControlSupervisorAdd
-        Me.GridViewSupervisorsAdd.Name = "GridViewSupervisorsAdd"
-        Me.GridViewSupervisorsAdd.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridViewSupervisorsAdd.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridViewSupervisorsAdd.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridViewSupervisorsAdd.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.GridViewSupervisorsAdd.OptionsView.ColumnAutoWidth = False
-        Me.GridViewSupervisorsAdd.OptionsView.EnableAppearanceEvenRow = True
-        Me.GridViewSupervisorsAdd.OptionsView.ShowAutoFilterRow = True
-        Me.GridViewSupervisorsAdd.OptionsView.ShowGroupPanel = False
-        '
-        'GridColumn10
-        '
-        resources.ApplyResources(Me.GridColumn10, "GridColumn10")
-        Me.GridColumn10.FieldName = "Select"
-        Me.GridColumn10.Name = "GridColumn10"
-        '
-        'GridColumn11
-        '
-        Me.GridColumn11.FieldName = "Username"
-        Me.GridColumn11.Name = "GridColumn11"
-        Me.GridColumn11.OptionsColumn.AllowEdit = False
-        resources.ApplyResources(Me.GridColumn11, "GridColumn11")
-        '
-        'GridColumn12
-        '
-        Me.GridColumn12.FieldName = "Email"
-        Me.GridColumn12.Name = "GridColumn12"
-        Me.GridColumn12.OptionsColumn.AllowEdit = False
-        resources.ApplyResources(Me.GridColumn12, "GridColumn12")
-        '
-        'GridColumn13
-        '
-        Me.GridColumn13.FieldName = "ID"
-        Me.GridColumn13.Name = "GridColumn13"
-        '
-        'GridControl2
-        '
-        resources.ApplyResources(Me.GridControl2, "GridControl2")
-        Me.GridControl2.DataSource = Me.TBWH_Users2BindingSource
-        Me.GridControl2.MainView = Me.GridView2
-        Me.GridControl2.Name = "GridControl2"
-        Me.GridControl2.ShowOnlyPredefinedDetails = True
-        Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2})
-        '
-        'GridView2
-        '
-        Me.GridView2.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridView2.Appearance.EvenRow.BackColor"), System.Drawing.Color)
-        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.GridControl = Me.GridControl2
-        Me.GridView2.Name = "GridView2"
-        Me.GridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridView2.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridView2.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridView2.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.GridView2.OptionsView.ColumnAutoWidth = False
-        Me.GridView2.OptionsView.EnableAppearanceEvenRow = True
-        Me.GridView2.OptionsView.ShowAutoFilterRow = True
-        Me.GridView2.OptionsView.ShowGroupPanel = False
-        '
-        'GridColumn14
-        '
-        resources.ApplyResources(Me.GridColumn14, "GridColumn14")
-        Me.GridColumn14.FieldName = "Select"
-        Me.GridColumn14.Name = "GridColumn14"
-        '
-        'GridColumn15
-        '
-        Me.GridColumn15.FieldName = "Username"
-        Me.GridColumn15.Name = "GridColumn15"
-        Me.GridColumn15.OptionsColumn.AllowEdit = False
-        resources.ApplyResources(Me.GridColumn15, "GridColumn15")
-        '
-        'GridColumn16
-        '
-        Me.GridColumn16.FieldName = "Email"
-        Me.GridColumn16.Name = "GridColumn16"
-        Me.GridColumn16.OptionsColumn.AllowEdit = False
-        resources.ApplyResources(Me.GridColumn16, "GridColumn16")
-        '
-        'GridColumn17
-        '
-        Me.GridColumn17.FieldName = "ID"
-        Me.GridColumn17.Name = "GridColumn17"
-        '
         'frmConstructorDesigner
         '
         resources.ApplyResources(Me, "$this")
@@ -1638,13 +1638,18 @@ Partial Class frmConstructorDesigner
         Me.XtraTabPage4.PerformLayout()
         Me.GroupBoxDocSearch.ResumeLayout(False)
         Me.GroupBoxDocSearch.PerformLayout()
+        CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBWH_Users2BindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TBWH_Users1BindingSource, 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.XtraTabPage2.ResumeLayout(False)
         Me.TabControl1.ResumeLayout(False)
         Me.TabPage1.ResumeLayout(False)
         Me.TabPage1.PerformLayout()
         CType(Me.GridControlUserSQL, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TBWH_Users1BindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridViewUserSQL, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.dgvResult, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.dgvPlaceholders, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1660,14 +1665,9 @@ Partial Class frmConstructorDesigner
         CType(Me.TBPMO_FORM_CONSTRUCTORBindingSource1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridControlUsers2Menue, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TBAD_UsersBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridViewlUsers2Menue, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridControlSupervisorAdd, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridViewSupervisorsAdd, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 

app/DD-Record-Organiser/frmConstructor_Main.en-US.resx

@@ -417,6 +417,12 @@
   <data name="TSMI_linkRecord.Text" xml:space="preserve">
     <value>Link file to record</value>
   </data>
+  <data name="tsmiRights.Size" type="System.Drawing.Size, System.Drawing">
+    <value>190, 22</value>
+  </data>
+  <data name="tsmiRights.Text" xml:space="preserve">
+    <value>Check and set rights</value>
+  </data>
   <data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
     <value>187, 6</value>
   </data>
@@ -442,7 +448,7 @@
     <value>Set stored layout back</value>
   </data>
   <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
-    <value>191, 226</value>
+    <value>191, 248</value>
   </data>
   <data name="ContextMenuStripResultFiles.Title" xml:space="preserve">
     <value />
@@ -504,9 +510,6 @@
   <data name="GridViewDoc_Search.Appearance.OddRow.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
     <value />
   </data>
-  <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1360, 318</value>
-  </data>
   <data name="GridControlDocSearch.ToolTip" xml:space="preserve">
     <value />
   </data>
@@ -538,9 +541,6 @@
   <data name="ToolStripDropDownButton2.Text" xml:space="preserve">
     <value>configuration windream-View</value>
   </data>
-  <data name="ToolStripDokumente.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1360, 25</value>
-  </data>
   <data name="ToolStripDokumente.Title" xml:space="preserve">
     <value />
   </data>
@@ -553,9 +553,6 @@
   <data name="ToolStripDokumente.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.2">
     <value>None</value>
   </data>
-  <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1360, 343</value>
-  </data>
   <data name="TabWindream.Text" xml:space="preserve">
     <value>windream-files</value>
   </data>
@@ -816,9 +813,6 @@
   <data name="Label5.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.2">
     <value>None</value>
   </data>
-  <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1360, 343</value>
-  </data>
   <data name="TabFollowUp.Text" xml:space="preserve">
     <value>Follow Up</value>
   </data>
@@ -876,15 +870,9 @@
   <data name="grvwGridPos.Appearance.EvenRow.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
     <value />
   </data>
-  <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1360, 318</value>
-  </data>
   <data name="GridControlPos.ToolTip" xml:space="preserve">
     <value />
   </data>
-  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1360, 318</value>
-  </data>
   <data name="Panel1.Title" xml:space="preserve">
     <value />
   </data>
@@ -964,9 +952,6 @@
         8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="BindingNavigatorPOS.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1360, 25</value>
-  </data>
   <data name="BindingNavigatorPOS.Title" xml:space="preserve">
     <value />
   </data>
@@ -987,9 +972,6 @@
         wwXEYqyCpGCsgqRgMEGxF6CaQYEzGogjMRD/MwAARTWKOO3Nn7MAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1360, 343</value>
-  </data>
   <data name="TabPos.Text" xml:space="preserve">
     <value>positions</value>
   </data>

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -2151,8 +2151,7 @@ Public Class frmConstructor_Main
         Dim result As MsgBoxResult
         result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If result = MsgBoxResult.Yes Then
-            Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID
+            If ClassHelper.DeleteRecord(SELECTED_RECORD_ID) = True Then
-            If ClassDatabase.Execute_non_Query_withConn(del, 1) = True Then
                 RECORD_CHANGED = False
                 EDIT_STATE = EditState.None
                 CURRENT_RECORD_ENABLED = False
@@ -3010,8 +3009,7 @@ Public Class frmConstructor_Main
             Else
                 ' Wenn nicht gespeichert werden soll, den Record wieder löschen
                 If CtrlCommandUI.IsInsert = True Then
-                    Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID
+                    ClassHelper.DeleteRecord(SELECTED_RECORD_ID)
-                    ClassDatabase.Execute_non_Query_withConn(del, 1)
                 End If
 
                 tsButtonAdd.Enabled = True
@@ -5634,6 +5632,7 @@ Public Class frmConstructor_Main
                                     If ClassDatabase.Execute_non_Query(del) = True Then
                                         del = "DELETE FROM TBPMO_DOCRESULT_LIST WHERE DocID = " & RESULT_DOC_ID
                                         If ClassDatabase.Execute_non_Query(del) = True Then
+                                            ClassHelper.InsertEssential_Log(RESULT_DOC_ID, "DOC-ID", "RECORD LINK REMOVED FROM DOC-SEARCH")
                                             RUN_WDSEARCH_GRID("RECORD")
                                         End If
                                     End If
@@ -5656,6 +5655,7 @@ Public Class frmConstructor_Main
                         If Not IsNothing(RESULT_DOC_ID) Then
                             If ClassWindream.Delete_WDFile(RESULT_DOC_PATH) = True Then
                                 If ClassFileResult.Delete_ResultFile(RESULT_DOC_ID) = True Then
+                                    ClassHelper.InsertEssential_Log(RESULT_DOC_ID, "DOC-ID", "FILE DELETED BY USER")
                                     RUN_WDSEARCH_GRID("RECORD")
                                 End If
                             End If
@@ -5715,8 +5715,7 @@ Public Class frmConstructor_Main
 
     Private Sub tsButtonCancel_Click(sender As Object, e As EventArgs) Handles tsButtonCancel.Click
         If CtrlCommandUI.IsInsert = True Then
-            Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & SELECTED_RECORD_ID
+            ClassHelper.DeleteRecord(SELECTED_RECORD_ID)
-            ClassDatabase.Execute_non_Query_withConn(del, 1)
         End If
         tsButtonCancel.Visible = False
         tsButtonAdd.Enabled = True
@@ -5850,8 +5849,7 @@ Public Class frmConstructor_Main
                 Else
                     ' Angelegten Record löschen
                     If CtrlCommandUI.IsInsert Then
-                        Dim DeleteRecordSQL = String.Format("EXEC [dbo].[PRPMO_DELETE_RECORD] {0}", SELECTED_RECORD_ID)
+                        ClassHelper.DeleteRecord(SELECTED_RECORD_ID)
-                        ClassDatabase.Execute_non_Query_withConn(DeleteRecordSQL, 1)
                     End If
 
                     ' Änderungen sollen nicht gespeichert werden
@@ -6173,7 +6171,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_PATH) = True Then
+        If ClassDOC_SEARCH.SET_WD_RIGHTS(RESULT_DOC_ID, RESULT_DOC_PATH) = True Then
             If USER_LANGUAGE <> "de-DE" Then
                 msg = "The rights were successfully renewed!"
             End If

app/DD-Record-Organiser/frmWD_Dokumentart_Konfig.en-US.resx

@@ -214,12 +214,6 @@
   <data name="OBJEKTTYPLabel.Text" xml:space="preserve">
     <value>windream objecttype:</value>
   </data>
-  <data name="SQL_RESULTLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 13</value>
-  </data>
-  <data name="SQL_RESULTLabel.Text" xml:space="preserve">
-    <value>sql-command:</value>
-  </data>
   <data name="BindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -232,12 +226,6 @@
         rkJggg==
 </value>
   </data>
-  <data name="BindingNavigatorCountItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>121, 22</value>
-  </data>
-  <data name="BindingNavigatorCountItem.Text" xml:space="preserve">
-    <value>of {0} documenttypes</value>
-  </data>
   <data name="BindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -303,6 +291,12 @@
   <data name="ToolStripButton17.Text" xml:space="preserve">
     <value>load all documenttypes</value>
   </data>
+  <data name="colBEZEICHNUNG.Caption" xml:space="preserve">
+    <value>Doctype</value>
+  </data>
+  <data name="colOBJEKTTYP.Caption" xml:space="preserve">
+    <value>objecttype</value>
+  </data>
   <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
     <value>110, 15</value>
   </data>
@@ -324,6 +318,92 @@
   <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
     <value>1312, 298</value>
   </data>
+  <data name="GroupBox1.Text" xml:space="preserve">
+    <value>Doctypes</value>
+  </data>
+  <data name="XtraTabPage1.Text" xml:space="preserve">
+    <value>Automated indices</value>
+  </data>
+  <data name="ToolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
+        pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
+        Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
+        /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
+        zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
+        IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
+        rkJggg==
+</value>
+  </data>
+  <data name="ToolStripButton18.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC
+        DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC
+        rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV
+        i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG
+        86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG
+        QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX
+        bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="ToolStripButton19.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77
+        wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0
+        v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg
+        UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA
+        Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu
+        lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="ToolStripButton20.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w
+        5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f
+        Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+
+        08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="ToolStripButton21.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78
+        n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI
+        N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f
+        oAc0QjgAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="ToolStripButton22.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+//
+        h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B
+        twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA
+        kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG
+        WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9
+        8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="ToolStripButton23.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo
+        dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="XtraTabPage3.Text" xml:space="preserve">
+    <value>manually indices</value>
+  </data>
+  <data name="XtraTabPage2.Text" xml:space="preserve">
+    <value>Mapping documenttype  - Entity</value>
+  </data>
+  <data name="XtraTabPage4.Text" xml:space="preserve">
+    <value>variable folderpath</value>
+  </data>
   <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
     <value>363, 19</value>
   </data>
@@ -345,6 +425,9 @@
   <data name="ACTIVECheckBox.Text" xml:space="preserve">
     <value>active</value>
   </data>
+  <data name="ListBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>305, 224</value>
+  </data>
   <data name="ToolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -416,8 +499,8 @@
         dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="XtraTabPage1.Text" xml:space="preserve">
+  <data name="TBDD_INDEX_AUTOMBindingNavigator.Size" type="System.Drawing.Size, System.Drawing">
-    <value>Automated indices</value>
+    <value>1261, 25</value>
   </data>
   <data name="Label3.Size" type="System.Drawing.Size, System.Drawing">
     <value>307, 19</value>
@@ -437,24 +520,6 @@
   <data name="btnAddDokart_Entity.Text" xml:space="preserve">
     <value>Add entity to documenttype</value>
   </data>
-  <data name="ToolStripButton8.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC
-        pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++
-        Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ
-        /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA
-        zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/
-        IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E
-        rkJggg==
-</value>
-  </data>
-  <data name="ToolStripLabel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 22</value>
-  </data>
-  <data name="ToolStripLabel2.Text" xml:space="preserve">
-    <value>of {0} Mappings</value>
-  </data>
   <data name="ToolStripButton9.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -514,8 +579,38 @@
         dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="XtraTabPage2.Text" xml:space="preserve">
+  <data name="Button3.Text" xml:space="preserve">
-    <value>Mapping documenttype  - Entity</value>
+    <value>Save</value>
+  </data>
+  <data name="grbxFolderforIndex.Text" xml:space="preserve">
+    <value>New Subfolder:</value>
+  </data>
+  <data name="Label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>118, 15</value>
+  </data>
+  <data name="Label7.Text" xml:space="preserve">
+    <value>from entity-controls:</value>
+  </data>
+  <data name="Label20.Size" type="System.Drawing.Size, System.Drawing">
+    <value>85, 15</value>
+  </data>
+  <data name="Label20.Text" xml:space="preserve">
+    <value>date structure:</value>
+  </data>
+  <data name="btnaddcrFolderParameter.Text" xml:space="preserve">
+    <value>Create folder</value>
+  </data>
+  <data name="Label18.Size" type="System.Drawing.Size, System.Drawing">
+    <value>121, 15</value>
+  </data>
+  <data name="Label18.Text" xml:space="preserve">
+    <value>from manual Values:</value>
+  </data>
+  <data name="Label17.Size" type="System.Drawing.Size, System.Drawing">
+    <value>61, 13</value>
+  </data>
+  <data name="Label17.Text" xml:space="preserve">
+    <value>PathString:</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

app/DD-Record-Organiser/frmWD_Import_Doc_Record.vb

@@ -442,8 +442,7 @@ Public Class frmWD_Import_Doc_Record
                 ClassLogger.Add(">> No doctype-ID found", False)
                 ClassLogger.Add(">> SQL: " & SQL_FILE_DOCTYPE, False)
                 If REC_ADDED = True Then
-                    Dim del = "EXEC [dbo].[PRPMO_DELETE_RECORD] " & IMPORT_REC_ID
+                    ClassHelper.DeleteRecord(IMPORT_REC_ID)
-                    ClassDatabase.Execute_non_Query(del, True)
                     Return False
                 End If
             End If

app/DD-Record-Organiser/frmWD_IndexFile.vb

@@ -175,11 +175,11 @@ Public Class frmWD_IndexFile
                                 'Die temporäre Datei löschen
                                 File.Delete(aktFiledropped)
                             End If
-                            ClassDOC_SEARCH.SET_WD_RIGHTS(CURRENT_FILEIN_WD)
                             ClassDOC_SEARCH.REFRESH_DOC_TABLE_RESULTS()
                             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)
                                 ClassFileResult.DocID = CURRENT_DOC_ID
                                 ClassFileResult.SET_DOCID_INDICES()
                                 If ClassDOC_SEARCH.SET_RECORD_DOCID_LINK(CURRENT_DOC_ID, CURRENT_RECORD_ID) = True Then

app/DD-Record-Organiser/frmWD_Link_to_Record.vb

@@ -738,6 +738,7 @@ Public Class frmWD_Link_to_Record
                             msg = "The record was successfully added to the file!"
                         End If
                         MsgBox(msg, MsgBoxStyle.Information)
+                        ClassHelper.InsertEssential_Log(CURRENT_DOC_ID, "DOC-ID", "FILE LINK CREATED FOR RECORD: " & RecordId.ToString)
                     End If
                 End If
             Catch ex As Exception

app/RecordOrganizer_RightManager/ModuleMySettings.vb

@@ -8,4 +8,6 @@
     Public USER_WAN As Boolean = False
     Public DT_WORK_USER_RIGHTS As DataTable
     Public DT_SUPERVISOR_ENTITY As DataTable
+
+    Public SQL_USER_RIGHTS_CHANGED = "SELECT T.GUID,T1.USERNAME + 'Reason: ' + T.COMMENT AS USER_COMMENT FROM TBPMO_USER_RIGHTS_JOBS T, TBDD_USER T1 WHERE T.USER_ID = T1.GUID AND T.WORKED = 0"
 End Module

app/RecordOrganizer_RightManager/frmCheckRightsEntity.Designer.vb

@@ -29,11 +29,12 @@ Partial Class frmCheckRightsEntity
         Me.ProgressBar1 = New System.Windows.Forms.ProgressBar()
         Me.btncancel = New System.Windows.Forms.Button()
         Me.chklogging = New System.Windows.Forms.CheckBox()
-        Me.SuspendLayout
+        Me.lblstate = New System.Windows.Forms.Label()
+        Me.SuspendLayout()
         '
         'Label1
         '
-        Me.Label1.AutoSize = true
+        Me.Label1.AutoSize = True
         Me.Label1.Location = New System.Drawing.Point(25, 9)
         Me.Label1.Name = "Label1"
         Me.Label1.Size = New System.Drawing.Size(147, 16)
@@ -42,7 +43,7 @@ Partial Class frmCheckRightsEntity
         '
         'cmbentity
         '
-        Me.cmbentity.FormattingEnabled = true
+        Me.cmbentity.FormattingEnabled = True
         Me.cmbentity.Location = New System.Drawing.Point(28, 29)
         Me.cmbentity.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.cmbentity.Name = "cmbentity"
@@ -56,49 +57,60 @@ Partial Class frmCheckRightsEntity
         Me.btnCheckRights.Size = New System.Drawing.Size(335, 39)
         Me.btnCheckRights.TabIndex = 2
         Me.btnCheckRights.Text = "Check rights for all documents in this entity"
-        Me.btnCheckRights.UseVisualStyleBackColor = true
+        Me.btnCheckRights.UseVisualStyleBackColor = True
         '
         'BW_RightsEntity
         '
         '
         'ProgressBar1
         '
-        Me.ProgressBar1.Location = New System.Drawing.Point(28, 108)
+        Me.ProgressBar1.Location = New System.Drawing.Point(28, 130)
         Me.ProgressBar1.Name = "ProgressBar1"
         Me.ProgressBar1.Size = New System.Drawing.Size(335, 31)
         Me.ProgressBar1.TabIndex = 3
-        Me.ProgressBar1.Visible = false
+        Me.ProgressBar1.Visible = False
         '
         'btncancel
         '
         Me.btncancel.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources.cancel1
         Me.btncancel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btncancel.Location = New System.Drawing.Point(369, 108)
+        Me.btncancel.Location = New System.Drawing.Point(369, 130)
         Me.btncancel.Name = "btncancel"
         Me.btncancel.Size = New System.Drawing.Size(75, 31)
         Me.btncancel.TabIndex = 4
         Me.btncancel.Text = "Cancel"
         Me.btncancel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btncancel.UseVisualStyleBackColor = true
+        Me.btncancel.UseVisualStyleBackColor = True
-        Me.btncancel.Visible = false
+        Me.btncancel.Visible = False
         '
         'chklogging
         '
-        Me.chklogging.AutoSize = true
+        Me.chklogging.AutoSize = True
-        Me.chklogging.Checked = true
+        Me.chklogging.Checked = True
         Me.chklogging.CheckState = System.Windows.Forms.CheckState.Checked
         Me.chklogging.Location = New System.Drawing.Point(379, 31)
         Me.chklogging.Name = "chklogging"
         Me.chklogging.Size = New System.Drawing.Size(113, 20)
         Me.chklogging.TabIndex = 5
         Me.chklogging.Text = "Log errors only"
-        Me.chklogging.UseVisualStyleBackColor = true
+        Me.chklogging.UseVisualStyleBackColor = True
+        '
+        'lblstate
+        '
+        Me.lblstate.AutoSize = True
+        Me.lblstate.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblstate.Location = New System.Drawing.Point(28, 111)
+        Me.lblstate.Name = "lblstate"
+        Me.lblstate.Size = New System.Drawing.Size(38, 13)
+        Me.lblstate.TabIndex = 6
+        Me.lblstate.Text = "Label2"
         '
         'frmCheckRightsEntity
         '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(7!, 16!)
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(503, 161)
+        Me.ClientSize = New System.Drawing.Size(503, 173)
+        Me.Controls.Add(Me.lblstate)
         Me.Controls.Add(Me.chklogging)
         Me.Controls.Add(Me.btncancel)
         Me.Controls.Add(Me.ProgressBar1)
@@ -111,7 +123,8 @@ Partial Class frmCheckRightsEntity
         Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "frmCheckRightsEntity"
-        Me.ShowInTaskbar = false
+        Me.ShowInTaskbar = False
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
         Me.Text = "Check Rights for Entity"
         Me.ResumeLayout(false)
         Me.PerformLayout
@@ -124,4 +137,5 @@ End Sub
     Friend WithEvents ProgressBar1 As System.Windows.Forms.ProgressBar
     Friend WithEvents btncancel As System.Windows.Forms.Button
     Friend WithEvents chklogging As System.Windows.Forms.CheckBox
+    Friend WithEvents lblstate As System.Windows.Forms.Label
 End Class

app/RecordOrganizer_RightManager/frmCheckRightsEntity.vb

@@ -1,9 +1,11 @@
-Imports DD
+Imports DD_Rights
 Imports System.ComponentModel
 
 Public Class frmCheckRightsEntity
     Private DT_FILES As DataTable
     Private _error As Boolean = False
+    Private countfiles As Integer = 0
+    Private WorkingFiles As Integer = 0
     Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
             Dim sql = String.Format("SELECT T.FORM_ID, [dbo].[FNPMO_GETOBJECTCAPTION]('{0}','FORMVIEW_TITLE' + CONVERT(VARCHAR(5), T.[FORM_VIEW_ID]), 1) AS FORM_TITLE FROM VWPMO_CONSTRUCTOR_FORMS T WHERE DOCUMENT_VIEW = 1", USER_LANGUAGE)
@@ -11,6 +13,7 @@ Public Class frmCheckRightsEntity
             cmbentity.DataSource = DT
             cmbentity.ValueMember = DT.Columns(0).ColumnName
             cmbentity.DisplayMember = DT.Columns(1).ColumnName
+            lblstate.Visible = False
         Catch ex As Exception
             MsgBox("Unexpected error in load form: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -28,6 +31,11 @@ Public Class frmCheckRightsEntity
                     MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical)
                     Exit Sub
                 End If
+                btncancel.Visible = True
+                lblstate.Visible = True
+                lblstate.Text = "Starting Background Worker...."
+                countfiles = DT_FILES.Rows.Count - 1
+                WorkingFiles = 0
                 ProgressBar1.Maximum = DT_FILES.Rows.Count
                 AddHandler BW_RightsEntity.DoWork, AddressOf bw_DoWork
                 '.. und starten
@@ -40,6 +48,8 @@ Public Class frmCheckRightsEntity
     End Sub
 
     Private Sub BW_RightsEntity_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles BW_RightsEntity.ProgressChanged
+        Dim state = "Working on file '" & WorkingFiles.ToString & "' of '" & countfiles.ToString & "'"
+        lblstate.Text = state
         Me.ProgressBar1.Value = e.ProgressPercentage
     End Sub
     Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs)
@@ -53,7 +63,8 @@ Public Class frmCheckRightsEntity
                 Exit For
             Else
                 If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID")) = True Then
-                    If DD_Rights.ClassRights.File_DeleteAndSetRight(row.Item("FULL_FILENAME"), True) Then
+                    WorkingFiles += 1
+                    If DD_Rights.ClassRights.File_DeleteAndSetRight(row.Item("DocID"), row.Item("FULL_FILENAME"), True) Then
                         If DD_Rights.ClassRights.MSG_RESULT <> "" Then
                             MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation)
                             _error = True
@@ -81,6 +92,7 @@ Public Class frmCheckRightsEntity
     Private Sub BW_RightsEntity_RunWorkerCompleted(sender As Object, e As RunWorkerCompletedEventArgs) Handles BW_RightsEntity.RunWorkerCompleted
         Try
             btncancel.Visible = False
+            lblstate.Visible = False
             ProgressBar1.Visible = False
             If _error = False Then
                 MsgBox("All rights of files belonging to entity were checked and refreshed successfully!", MsgBoxStyle.Information)

app/RecordOrganizer_RightManager/frmReworkUsers.Designer.vb

@@ -29,6 +29,7 @@ Partial Class frmReworkUsers
         Me.chklogging = New System.Windows.Forms.CheckBox()
         Me.btncancel = New System.Windows.Forms.Button()
         Me.btnCheckRights = New System.Windows.Forms.Button()
+        Me.lblstate = New System.Windows.Forms.Label()
         Me.SuspendLayout()
         '
         'Label1
@@ -54,7 +55,7 @@ Partial Class frmReworkUsers
         '
         'ProgressBar1
         '
-        Me.ProgressBar1.Location = New System.Drawing.Point(28, 108)
+        Me.ProgressBar1.Location = New System.Drawing.Point(28, 128)
         Me.ProgressBar1.Name = "ProgressBar1"
         Me.ProgressBar1.Size = New System.Drawing.Size(335, 31)
         Me.ProgressBar1.TabIndex = 3
@@ -76,7 +77,7 @@ Partial Class frmReworkUsers
         '
         Me.btncancel.Image = Global.RecordOrganizer_RightManager.My.Resources.Resources.cancel1
         Me.btncancel.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btncancel.Location = New System.Drawing.Point(369, 108)
+        Me.btncancel.Location = New System.Drawing.Point(369, 128)
         Me.btncancel.Name = "btncancel"
         Me.btncancel.Size = New System.Drawing.Size(75, 31)
         Me.btncancel.TabIndex = 4
@@ -97,11 +98,22 @@ Partial Class frmReworkUsers
         Me.btnCheckRights.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnCheckRights.UseVisualStyleBackColor = True
         '
+        'lblstate
+        '
+        Me.lblstate.AutoSize = True
+        Me.lblstate.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblstate.Location = New System.Drawing.Point(25, 112)
+        Me.lblstate.Name = "lblstate"
+        Me.lblstate.Size = New System.Drawing.Size(38, 13)
+        Me.lblstate.TabIndex = 7
+        Me.lblstate.Text = "Label2"
+        '
         'frmReworkUsers
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(503, 161)
+        Me.ClientSize = New System.Drawing.Size(503, 169)
+        Me.Controls.Add(Me.lblstate)
         Me.Controls.Add(Me.chklogging)
         Me.Controls.Add(Me.btncancel)
         Me.Controls.Add(Me.ProgressBar1)
@@ -128,4 +140,5 @@ End Sub
     Friend WithEvents ProgressBar1 As System.Windows.Forms.ProgressBar
     Friend WithEvents btncancel As System.Windows.Forms.Button
     Friend WithEvents chklogging As System.Windows.Forms.CheckBox
+    Friend WithEvents lblstate As System.Windows.Forms.Label
 End Class

app/RecordOrganizer_RightManager/frmReworkUsers.vb

@@ -8,7 +8,10 @@ Public Class frmReworkUsers
     Private COUNT_ENTITIES As Integer = 0
     Private ENTITIES_WORKED As Integer = 0
     Private CURR_ENTITY As Integer = 0
+    Private countfiles As Integer = 0
+    Private WorkingFiles As Integer = 0
     Private Sub frmCheckRightsEntity_Load(sender As Object, e As EventArgs) Handles Me.Load
+        lblstate.Visible = False
         Refresh_Combo()
     End Sub
     Sub Refresh_Combo()
@@ -17,6 +20,10 @@ Public Class frmReworkUsers
             cmbUser.DataSource = DT_WORK_USER_RIGHTS
             cmbUser.ValueMember = DT_WORK_USER_RIGHTS.Columns(0).ColumnName
             cmbUser.DisplayMember = DT_WORK_USER_RIGHTS.Columns(1).ColumnName
+            If DT_WORK_USER_RIGHTS.Rows.Count = 0 Then
+                MsgBox("No more Users to rework. Form will be closed!", MsgBoxStyle.Information)
+                Me.Close()
+            End If
         Catch ex As Exception
             MsgBox("Unexpected error in load Users List: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -43,6 +50,7 @@ Public Class frmReworkUsers
                     CURR_ENTITY = row.Item("ENTITY_ID")
                     sql = String.Format("SELECT * FROM VWPMO_WD_DOC_SEARCH where DocID in (SELECT [dwObjectID] FROM VWPMO_WD_OBJECT_RIGHTS  WHERE dwUserOrGroupID = {0}) AND ENTITY_ID = {1}", ECM_USER_ID, row.Item("ENTITY_ID"))
                     DT_FILES = ClassDatabase.Return_Datatable(sql)
+
                     If DD_Rights.ClassRights.Init(row.Item("ENTITY_ID"), chklogging.Checked, DT_FILES.Rows.Count) = False Then
                         MsgBox("Could not init rights management. " & vbNewLine & "Check logfile", MsgBoxStyle.Critical)
                         Exit Sub
@@ -51,6 +59,10 @@ Public Class frmReworkUsers
                     BW_RightsEntity = New BackgroundWorker
                     BW_RightsEntity.WorkerReportsProgress = True
                     ProgressBar1.Maximum = DT_FILES.Rows.Count
+                    countfiles = DT_FILES.Rows.Count
+                    WorkingFiles = 0
+                    lblstate.Visible = True
+                    lblstate.Text = "Starting Background Worker...."
                     Me.ProgressBar1.Visible = True
                     GUID_WORKING = cmbUser.SelectedValue
                     AddHandler BW_RightsEntity.DoWork, AddressOf bw_DoWork
@@ -69,6 +81,8 @@ Public Class frmReworkUsers
     End Sub
 
     Private Sub BW_RightsEntity_ProgressChanged(sender As Object, e As ProgressChangedEventArgs) Handles BW_RightsEntity.ProgressChanged
+        Dim state = "Working on file '" & WorkingFiles.ToString & "' of '" & countfiles.ToString & "'"
+        lblstate.Text = state
         Me.ProgressBar1.Value = e.ProgressPercentage
     End Sub
     Private Sub bw_DoWork(ByVal sender As Object, ByVal e As DoWorkEventArgs)
@@ -82,7 +96,8 @@ Public Class frmReworkUsers
                 Exit For
             Else
                 If DD_Rights.ClassRights.Collect_Users(row.Item("RECORD_ID")) = True Then
-                    If DD_Rights.ClassRights.File_DeleteAndSetRight(row.Item("FULL_FILENAME"), True) Then
+                    WorkingFiles += 1
+                    If DD_Rights.ClassRights.File_DeleteAndSetRight(row.Item("DocID"), row.Item("FULL_FILENAME"), True) Then
                         If DD_Rights.ClassRights.MSG_RESULT <> "" Then
                             MsgBox("Unexpected Errors in setting rights: " & vbNewLine & DD_Rights.ClassRights.MSG_RESULT, MsgBoxStyle.Exclamation)
                             _error = True
@@ -117,12 +132,13 @@ Public Class frmReworkUsers
         Try
             btncancel.Visible = False
             ProgressBar1.Visible = False
+            lblstate.Visible = False
             If _error = False Then
                 If ENTITIES_WORKED = COUNT_ENTITIES Then
                     Dim upd = String.Format("UPDATE TBPMO_USER_RIGHTS_JOBS SET WORKED = 1, CHANGED_WHO = 'JOB-RIGHTS FINISHER' WHERE GUID = {0}", GUID_WORKING)
                     If ClassDatabase.Execute_non_Query(upd) = True Then
                         'Überprüfen ob es User gibt die aktualisiert werden müssen
-                        Dim Sql = "SELECT T.GUID,T1.USERNAME + 'Reason: ' + T.COMMENT AS USER_COMMENT FROM TBPMO_USER_RIGHTS_JOBS T, TBDD_USER T1 WHERE T.USER_ID = T1.GUID AND T.WORKED = 0"
+                        Dim Sql = SQL_USER_RIGHTS_CHANGED
                         DT_WORK_USER_RIGHTS = ClassDatabase.Return_Datatable(Sql)
                         Refresh_Combo()
                     End If

app/RecordOrganizer_RightManager/frmStart.vb

@@ -64,15 +64,7 @@ Public Class frmStart
                         Me.Close()
                     End If
 
-                    'Überprüfen ob es User gibt die aktualisiert werden müssen
+                    Check_USER_REWORK()
-                    sql = "SELECT T.GUID,T1.USERNAME + 'Reason: ' + T.COMMENT AS USER_COMMENT FROM TBPMO_USER_RIGHTS_JOBS T, TBDD_USER T1 WHERE T.USER_ID = T1.GUID AND T.WORKED = 0"
-                    DT_WORK_USER_RIGHTS = ClassDatabase.Return_Datatable(sql)
-                    If DT_WORK_USER_RIGHTS.Rows.Count > 0 Then
-                        btnWorkUserRights.Text = "Userrelations were changed." & vbNewLine & DT_WORK_USER_RIGHTS.Rows.Count.ToString & " Users need to be refreshed!"
-                        btnWorkUserRights.Visible = True
-                    Else
-                        btnWorkUserRights.Visible = False
-                    End If
 
                 End If
             End If
@@ -81,7 +73,16 @@ Public Class frmStart
             MsgBox("Unexpected Error in InitUserLogin: " & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
-
+    Sub Check_USER_REWORK()
+        'Überprüfen ob es User gibt die aktualisiert werden müssen
+        DT_WORK_USER_RIGHTS = ClassDatabase.Return_Datatable(SQL_USER_RIGHTS_CHANGED)
+        If DT_WORK_USER_RIGHTS.Rows.Count > 0 Then
+            btnWorkUserRights.Text = "Userrelations were changed." & vbNewLine & DT_WORK_USER_RIGHTS.Rows.Count.ToString & " Users need to be refreshed!"
+            btnWorkUserRights.Visible = True
+        Else
+            btnWorkUserRights.Visible = False
+        End If
+    End Sub
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
         ' Me.Visible = False
         frmCheckRightsEntity.ShowDialog()
@@ -94,5 +95,6 @@ Public Class frmStart
 
     Private Sub btnWorkUserRights_Click(sender As Object, e As EventArgs) Handles btnWorkUserRights.Click
         frmReworkUsers.ShowDialog()
+        Check_USER_REWORK()
     End Sub
 End Class