MS

2016-05-02 14:03:34 +02:00 · 2016-05-02 14:03:34 +02:00 · 3d8a88515c
commit 3d8a88515c
parent dfadd6d53a
14 changed files with 292 additions and 172 deletions
--- a/app/DD-Record-Organiser/ClassControlBuilder.vb
+++ b/app/DD-Record-Organiser/ClassControlBuilder.vb
@ -241,12 +241,12 @@ Public Class ClassControlBuilder
                    Dim ctrlvalID = ClassDatabase.Execute_Scalar(sqlguid)
                    If Not IsNothing(ctrlvalID) Then
                        Dim upd1 = String.Format("UPDATE TBPMO_CONTROL_VALUE SET VALUE = '{0}' WHERE CONTROL_ID = {1} AND RECORD_ID = {2}", value.ToString, CONTROL_ID, CURRENT_RECORD_ID)
-                        ClassDatabase.Execute_non_Query(upd1)
+                        ' ClassDatabase.Execute_non_Query(upd1)
                    Else
                        Dim ins = String.Format("INSERT INTO TBPMO_CONTROL_VALUE (CONTROL_ID,RECORD_ID,VALUE,ADDED_WHO) VALUES ({0},{1},'{2}','{3}')", CONTROL_ID, CURRENT_RECORD_ID, value, Environment.UserName)
-                        If ClassDatabase.Execute_non_Query(ins) = True Then
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
-                        End If
+                        'If ClassDatabase.Execute_non_Query(ins) = True Then
+                        '    If LogErrorsOnly = False Then ClassLogger.Add(" >> Value was nothing - Inserted the ControlValue '" & ins & "'")
+                        'End If
                    End If


@ -264,6 +264,7 @@ Public Class ClassControlBuilder

                    Dim dt As DataTable = ClassDatabase.Return_Datatable(sqlcommand)
                    Dim type = dependingControl.GetType().Name
+
                    Select Case type
                        Case "DateEdit"
                            If dt.Rows.Count = 1 Then
@ -301,6 +302,8 @@ Public Class ClassControlBuilder
                            End If
                        Case "CustomComboBox"
                            ControlLoader.Combobox.SetDataSource(DirectCast(dependingControl, CustomComboBox), dt)
+                        Case "CheckedListBoxControl"
+                            ControlLoader.CheckedListBox.SetDataSource(DirectCast(dependingControl, DevExpress.XtraEditors.CheckedListBoxControl), dt)
                        Case "Label"
                            If dt.Rows.Count = 1 Then
                                Try
@ -392,6 +395,49 @@ Public Class ClassControlBuilder
            Depending_Controls(control, datatable, value)
            Enable_Controls(control, datatable1, value)
            
+            Console.WriteLine("value changed")
+        Catch ex As Exception
+            If ex.Message.Contains("Objektverweis") Or ex.Message.Contains("reference not set") Then
+
+            Else
+                MsgBox("Error in OnComboBoxValueChanged - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical)
+            End If
+        End Try
+    End Sub
+    Public Sub OnCheckedItemChanged(sender As Object, ByVal e As EventArgs)
+        If CURRENT_RECORD_ENABLED = False Then Exit Sub
+
+        Try
+            Dim control As Control = DirectCast(sender, Control)
+            Dim controlId As Integer = DirectCast(control.Tag, ClassControlMetadata).Id
+            CONTROL_ID = controlId
+            control.Update()
+            If CONTROL_ID = 993 Then
+                Console.WriteLine("Obacht")
+            End If
+            'SQL für abhängige Auswahllisten
+            Dim SQL As String = String.Format("SELECT GUID, SQL_COMMAND_1 FROM TBPMO_CONTROL WHERE SQL_COMMAND_1 LIKE '%@{0}@%'", controlId)
+            'SQL für enable control
+            Dim SQLenable As String = String.Format("SELECT GUID, SQL_COMMAND_2 FROM TBPMO_CONTROL WHERE SQL_COMMAND_2 LIKE '%@{0}@%'", controlId)
+
+
+            Dim CONTROL_VALUE As String = ClassControlCommandsUI.GetControlValue(control)
+
+            If CURRENT_RECORD_ID = 0 Then
+                Exit Sub
+            End If
+            If CtrlCommandUI.IsInsert = False Then
+                ClassControlCommandsUI.UpdateMultipleValues(controlId, CURRENT_RECORD_ID, CONTROL_VALUE)
+            End If
+
+
+            Dim datatable As DataTable = ClassDatabase.Return_Datatable(SQL)
+            Dim datatable1 As DataTable = ClassDatabase.Return_Datatable(SQLenable)
+            Depending_Controls(control, datatable, CONTROL_VALUE)
+            Enable_Controls(control, datatable1, CONTROL_VALUE)
+            Dim values = New List(Of Object)(CONTROL_VALUE.Split(";").ToArray())
+            'Jetzt noch die checked Items setzen
+            ClassControlValues.LoadControlValue(CURRENT_RECORD_ID, CURRENT_PARENT_ID, controlId, control, values, 99)

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

@ -428,7 +474,7 @@ Public Class ClassControlBuilder
            If ex.Message.Contains("Objektverweis") Or ex.Message.Contains("reference not set") Then

            Else
-                MsgBox("Error in OnComboBoxValueChanged - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical)
+                MsgBox("Error in OnCheckedItemChanged - " & CONTROL_ID.ToString & ": " & ex.Message, MsgBoxStyle.Critical)
            End If
        End Try
    End Sub
@ -567,6 +613,7 @@ Public Class ClassControlBuilder
            Case "CheckedListBoxControl"
                Dim chklistbox As DevExpress.XtraEditors.CheckedListBoxControl = CType(control, DevExpress.XtraEditors.CheckedListBoxControl)
                AddHandler chklistbox.ItemCheck, AddressOf RecordChanged
+                AddHandler chklistbox.ItemCheck, AddressOf OnCheckedItemChanged
                ' AddHandler chklistbox.EnabledChanged, AddressOf OnEnabledChanged

            Case "DataGridView"
--- a/app/DD-Record-Organiser/ClassControlCommandsUI.vb
+++ b/app/DD-Record-Organiser/ClassControlCommandsUI.vb
@ -545,7 +545,7 @@ Public Class ClassControlCommandsUI

    End Sub

-    Public Sub UpdateMultipleValues(ControlId As Integer, RecordId As Integer, value As String)
+    Public Shared Sub UpdateMultipleValues(ControlId As Integer, RecordId As Integer, value As String)
        Try
            If IsNothing(value) Then
                Exit Sub
@ -576,7 +576,7 @@ Public Class ClassControlCommandsUI
        End Try
    End Sub

-    Function GetControlValue(ctrl As Control) As String
+    Public Shared Function GetControlValue(ctrl As Control) As String

        Dim type = ctrl.GetType().Name
        Dim CONTROL_ID As Integer = DirectCast(ctrl.Tag, ClassControlMetadata).Id ' GetControlID_for_RecordID(ctrl.Name, CURRENT_RECORD_ID)
@ -678,7 +678,7 @@ Public Class ClassControlCommandsUI

                    Next
                Else
-                   
+
                    For Each item As Object In DirectCast(ctrl, DevExpress.XtraEditors.CheckedListBoxControl).CheckedItems
                        Dim row As DataRowView = CType(item, DataRowView)
                        If row.DataView.Table.Columns.Count = 1 Then
@ -690,12 +690,12 @@ Public Class ClassControlCommandsUI
                        End If
                        checked_result_string = String.Join(";", checked_result)
                    Next
-                 
+



                End If
-                
+
                ' Hier wird ein String zurückgegeben, der als VALUE gespeichert werden soll
                ' Überspringt den Rest der funktion
                If Not IsNothing(checked_result_string) Then
--- a/app/DD-Record-Organiser/ClassControlLoader.vb
+++ b/app/DD-Record-Organiser/ClassControlLoader.vb
@ -370,6 +370,7 @@
    Public Class CheckedListBox : Inherits _ListControl

        Public Shared Sub LoadValue(control As DevExpress.XtraEditors.CheckedListBoxControl, values As List(Of Object))
+
            If IsNothing(values) Then
                Exit Sub
            End If
--- a/app/DD-Record-Organiser/ClassControlValues.vb
+++ b/app/DD-Record-Organiser/ClassControlValues.vb
@ -219,7 +219,7 @@ Public Class ClassControlValues

    End Sub

-    Private Shared Sub LoadControlValue(recordId As Integer, parentRecordId As Integer, controlId As Integer, control As Control, values As List(Of Object), entity_ID As Integer)
+    Public Shared Sub LoadControlValue(recordId As Integer, parentRecordId As Integer, controlId As Integer, control As Control, values As List(Of Object), entity_ID As Integer)
        Try
            ' Für die meisten Controls wird nur das erste Element der Liste benötigt
            Dim value As String = Nothing
@ -240,7 +240,7 @@ Public Class ClassControlValues
                    ControlLoader.Label.LoadValue(label, recordId, parentRecordId, value, entity_ID)

                Case GetType(CustomComboBox)
-                   
+
                    Dim combobox As CustomComboBox = DirectCast(control, CustomComboBox)
                    ControlLoader.Combobox.LoadValue(combobox, recordId, parentRecordId, value)

--- a/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
+++ b/app/DD-Record-Organiser/DD-Record-Organiser.vbproj
@ -1166,6 +1166,8 @@
    <None Include="Resources\brick.png" />
  </ItemGroup>
  <ItemGroup>
+    <None Include="Resources\dwg.png" />
+    <None Include="Resources\doc_excel_csv.png" />
    <None Include="Resources\windream-Logo-transparent_klein.png" />
    <None Include="Resources\windream-Logo_261x100.jpg" />
    <None Include="Resources\windream-Logo-transparent1.png" />
@ -1242,6 +1244,7 @@
    <None Include="Resources\arrow_Down_16xLG.png" />
    <None Include="Resources\changechartlegendalignment_32x32.png" />
    <None Include="Resources\calendar_32x32.png" />
+    <None Include="Resources\csv.png" />
    <Content Include="Resources\cube.ico" />
    <Content Include="Resources\138_PushPin_32x42_72.png" />
    <None Include="Resources\PropertyGridEditorPart_6041.png" />
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@ -760,6 +760,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property doc_excel_csv() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("doc_excel_csv", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@ -780,6 +790,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property dwg() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("dwg", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/app/DD-Record-Organiser/My
+++ b/app/DD-Record-Organiser/My
@ -616,4 +616,10 @@
  <data name="windream_Logo_transparent_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\windream-Logo-transparent_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="doc_excel_csv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\doc_excel_csv.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
--- a/app/DD-Record-Organiser/Resources/csv.png
+++ b/app/DD-Record-Organiser/Resources/csv.png
--- a/app/DD-Record-Organiser/Resources/doc_excel_csv.png
+++ b/app/DD-Record-Organiser/Resources/doc_excel_csv.png
--- a/app/DD-Record-Organiser/Resources/dwg.png
+++ b/app/DD-Record-Organiser/Resources/dwg.png
--- a/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.Designer.vb
@ -22,6 +22,7 @@ Partial Class frmConstructor_Main
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmConstructor_Main))
        Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
        Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode()
@ -29,12 +30,12 @@ Partial Class frmConstructor_Main
        Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
        Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl()
        Me.TreeViewMain = New System.Windows.Forms.TreeView()
-        Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip()
+        Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.FormDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.GridControlMain = New DevExpress.XtraGrid.GridControl()
-        Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.FunktionenDataGridToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
        Me.AnsichtUmschaltenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@ -58,7 +59,7 @@ Partial Class frmConstructor_Main
        Me.pnlDetails = New System.Windows.Forms.Panel()
        Me.TabWindream = New DevExpress.XtraTab.XtraTabPage()
        Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl()
-        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip()
+        Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator7 = New System.Windows.Forms.ToolStripSeparator()
        Me.CopyToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@ -93,7 +94,7 @@ Partial Class frmConstructor_Main
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.GridControlPos = New DevExpress.XtraGrid.GridControl()
        Me.grvwGridPos = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator()
+        Me.BindingNavigatorPOS = New System.Windows.Forms.BindingNavigator(Me.components)
        Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
        Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
@ -128,6 +129,7 @@ Partial Class frmConstructor_Main
        Me.GridControlParent = New DevExpress.XtraGrid.GridControl()
        Me.GridViewParent = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.btnRelinkParentID = New System.Windows.Forms.Button()
+        Me.BindingSource_Entity = New System.Windows.Forms.BindingSource(Me.components)
        Me.NavPane = New DevExpress.XtraBars.Navigation.TileNavPane()
        Me.NavButtonHome = New DevExpress.XtraBars.Navigation.NavButton()
        Me.NavButtonRefresh = New DevExpress.XtraBars.Navigation.NavButton()
@ -135,32 +137,19 @@ Partial Class frmConstructor_Main
        Me.tsslblStatus = New System.Windows.Forms.ToolStripStatusLabel()
        Me.tsslblRecord = New System.Windows.Forms.ToolStripStatusLabel()
        Me.tsslblWorkflowstate = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.BindingSource_Entity = New System.Windows.Forms.BindingSource()
        Me.DD_ECMAdmin = New DD_Record_Organiser.DD_ECMAdmin()
-        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection()
-        Me.ttToolTip = New System.Windows.Forms.ToolTip()
-        Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip()
+        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
+        Me.ttToolTip = New System.Windows.Forms.ToolTip(Me.components)
+        Me.ContextMenuDetails = New System.Windows.Forms.ContextMenuStrip(Me.components)
        Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
-        Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
+        Me.VWPMO_WF_USER_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.VWPMO_WF_USER_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
        Me.TableAdapterManager = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager()
        Me.TBPMO_FILES_USERTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FILES_USERTableAdapter()
-        Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource()
+        Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
-        Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource()
-        Me.ToolTipController = New DevExpress.Utils.ToolTipController()
-        Me.BindingNavigator1 = New System.Windows.Forms.BindingNavigator()
-        Me.BindingNavigatorMoveFirstItem1 = New System.Windows.Forms.ToolStripButton()
-        Me.BindingNavigatorMovePreviousItem1 = New System.Windows.Forms.ToolStripButton()
-        Me.BindingNavigatorSeparator3 = New System.Windows.Forms.ToolStripSeparator()
-        Me.BindingNavigatorPositionItem1 = New System.Windows.Forms.ToolStripTextBox()
-        Me.BindingNavigatorCountItem1 = New System.Windows.Forms.ToolStripLabel()
-        Me.BindingNavigatorSeparator4 = New System.Windows.Forms.ToolStripSeparator()
-        Me.BindingNavigatorMoveNextItem1 = New System.Windows.Forms.ToolStripButton()
-        Me.BindingNavigatorMoveLastItem1 = New System.Windows.Forms.ToolStripButton()
-        Me.BindingNavigatorSeparator5 = New System.Windows.Forms.ToolStripSeparator()
-        Me.BindingNavigatorAddNewItem1 = New System.Windows.Forms.ToolStripButton()
-        Me.BindingNavigatorDeleteItem1 = New System.Windows.Forms.ToolStripButton()
+        Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.ToolTipController = New DevExpress.Utils.ToolTipController(Me.components)
        CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerMain.SuspendLayout()
        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit()
@ -195,16 +184,14 @@ Partial Class frmConstructor_Main
        Me.Panel2.SuspendLayout()
        CType(Me.GridControlParent, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridViewParent, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.StatusStrip_Main.SuspendLayout()
        CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.StatusStrip_Main.SuspendLayout()
        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.BindingNavigator1.SuspendLayout()
        Me.SuspendLayout()
        '
        'SplitContainerMain
@ -225,7 +212,6 @@ Partial Class frmConstructor_Main
        Me.SplitContainerTop.Name = "SplitContainerTop"
        Me.SplitContainerTop.Panel1.Controls.Add(Me.TreeViewMain)
        resources.ApplyResources(Me.SplitContainerTop.Panel1, "SplitContainerTop.Panel1")
-        Me.SplitContainerTop.Panel2.Controls.Add(Me.BindingNavigator1)
        Me.SplitContainerTop.Panel2.Controls.Add(Me.GridControlMain)
        resources.ApplyResources(Me.SplitContainerTop.Panel2, "SplitContainerTop.Panel2")
        Me.SplitContainerTop.SplitterPosition = 283
@ -1058,82 +1044,6 @@ Partial Class frmConstructor_Main
        Me.TBPMO_FILES_USERBindingSource.DataMember = "TBPMO_FILES_USER"
        Me.TBPMO_FILES_USERBindingSource.DataSource = Me.DD_DMSDataSet
        '
-        'BindingNavigator1
-        '
-        Me.BindingNavigator1.AddNewItem = Me.BindingNavigatorAddNewItem1
-        Me.BindingNavigator1.BindingSource = Me.BindingSource_Entity
-        Me.BindingNavigator1.CountItem = Me.BindingNavigatorCountItem1
-        Me.BindingNavigator1.DeleteItem = Me.BindingNavigatorDeleteItem1
-        resources.ApplyResources(Me.BindingNavigator1, "BindingNavigator1")
-        Me.BindingNavigator1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem1, Me.BindingNavigatorMovePreviousItem1, Me.BindingNavigatorSeparator3, Me.BindingNavigatorPositionItem1, Me.BindingNavigatorCountItem1, Me.BindingNavigatorSeparator4, Me.BindingNavigatorMoveNextItem1, Me.BindingNavigatorMoveLastItem1, Me.BindingNavigatorSeparator5, Me.BindingNavigatorAddNewItem1, Me.BindingNavigatorDeleteItem1})
-        Me.BindingNavigator1.MoveFirstItem = Me.BindingNavigatorMoveFirstItem1
-        Me.BindingNavigator1.MoveLastItem = Me.BindingNavigatorMoveLastItem1
-        Me.BindingNavigator1.MoveNextItem = Me.BindingNavigatorMoveNextItem1
-        Me.BindingNavigator1.MovePreviousItem = Me.BindingNavigatorMovePreviousItem1
-        Me.BindingNavigator1.Name = "BindingNavigator1"
-        Me.BindingNavigator1.PositionItem = Me.BindingNavigatorPositionItem1
-        '
-        'BindingNavigatorMoveFirstItem1
-        '
-        Me.BindingNavigatorMoveFirstItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        resources.ApplyResources(Me.BindingNavigatorMoveFirstItem1, "BindingNavigatorMoveFirstItem1")
-        Me.BindingNavigatorMoveFirstItem1.Name = "BindingNavigatorMoveFirstItem"
-        '
-        'BindingNavigatorMovePreviousItem1
-        '
-        Me.BindingNavigatorMovePreviousItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        resources.ApplyResources(Me.BindingNavigatorMovePreviousItem1, "BindingNavigatorMovePreviousItem1")
-        Me.BindingNavigatorMovePreviousItem1.Name = "BindingNavigatorMovePreviousItem"
-        '
-        'BindingNavigatorSeparator3
-        '
-        Me.BindingNavigatorSeparator3.Name = "BindingNavigatorSeparator"
-        resources.ApplyResources(Me.BindingNavigatorSeparator3, "BindingNavigatorSeparator3")
-        '
-        'BindingNavigatorPositionItem1
-        '
-        resources.ApplyResources(Me.BindingNavigatorPositionItem1, "BindingNavigatorPositionItem1")
-        Me.BindingNavigatorPositionItem1.Name = "BindingNavigatorPositionItem"
-        '
-        'BindingNavigatorCountItem1
-        '
-        Me.BindingNavigatorCountItem1.Name = "BindingNavigatorCountItem"
-        resources.ApplyResources(Me.BindingNavigatorCountItem1, "BindingNavigatorCountItem1")
-        '
-        'BindingNavigatorSeparator4
-        '
-        Me.BindingNavigatorSeparator4.Name = "BindingNavigatorSeparator"
-        resources.ApplyResources(Me.BindingNavigatorSeparator4, "BindingNavigatorSeparator4")
-        '
-        'BindingNavigatorMoveNextItem1
-        '
-        Me.BindingNavigatorMoveNextItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        resources.ApplyResources(Me.BindingNavigatorMoveNextItem1, "BindingNavigatorMoveNextItem1")
-        Me.BindingNavigatorMoveNextItem1.Name = "BindingNavigatorMoveNextItem"
-        '
-        'BindingNavigatorMoveLastItem1
-        '
-        Me.BindingNavigatorMoveLastItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        resources.ApplyResources(Me.BindingNavigatorMoveLastItem1, "BindingNavigatorMoveLastItem1")
-        Me.BindingNavigatorMoveLastItem1.Name = "BindingNavigatorMoveLastItem"
-        '
-        'BindingNavigatorSeparator5
-        '
-        Me.BindingNavigatorSeparator5.Name = "BindingNavigatorSeparator"
-        resources.ApplyResources(Me.BindingNavigatorSeparator5, "BindingNavigatorSeparator5")
-        '
-        'BindingNavigatorAddNewItem1
-        '
-        Me.BindingNavigatorAddNewItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        resources.ApplyResources(Me.BindingNavigatorAddNewItem1, "BindingNavigatorAddNewItem1")
-        Me.BindingNavigatorAddNewItem1.Name = "BindingNavigatorAddNewItem"
-        '
-        'BindingNavigatorDeleteItem1
-        '
-        Me.BindingNavigatorDeleteItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        resources.ApplyResources(Me.BindingNavigatorDeleteItem1, "BindingNavigatorDeleteItem1")
-        Me.BindingNavigatorDeleteItem1.Name = "BindingNavigatorDeleteItem"
-        '
        'frmConstructor_Main
        '
        resources.ApplyResources(Me, "$this")
@ -1184,18 +1094,15 @@ Partial Class frmConstructor_Main
        Me.Panel2.ResumeLayout(False)
        CType(Me.GridControlParent, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridViewParent, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).EndInit()
        Me.StatusStrip_Main.ResumeLayout(False)
        Me.StatusStrip_Main.PerformLayout()
-        CType(Me.BindingSource_Entity, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.DD_ECMAdmin, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.BindingNavigator1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.BindingNavigator1.ResumeLayout(False)
-        Me.BindingNavigator1.PerformLayout()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@ -1323,16 +1230,4 @@ Partial Class frmConstructor_Main
    Friend WithEvents DeleteToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents ToolStripSeparator9 As System.Windows.Forms.ToolStripSeparator
    Friend WithEvents PropertiesToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
-    Friend WithEvents BindingNavigator1 As System.Windows.Forms.BindingNavigator
-    Friend WithEvents BindingNavigatorAddNewItem1 As System.Windows.Forms.ToolStripButton
-    Friend WithEvents BindingNavigatorCountItem1 As System.Windows.Forms.ToolStripLabel
-    Friend WithEvents BindingNavigatorDeleteItem1 As System.Windows.Forms.ToolStripButton
-    Friend WithEvents BindingNavigatorMoveFirstItem1 As System.Windows.Forms.ToolStripButton
-    Friend WithEvents BindingNavigatorMovePreviousItem1 As System.Windows.Forms.ToolStripButton
-    Friend WithEvents BindingNavigatorSeparator3 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents BindingNavigatorPositionItem1 As System.Windows.Forms.ToolStripTextBox
-    Friend WithEvents BindingNavigatorSeparator4 As System.Windows.Forms.ToolStripSeparator
-    Friend WithEvents BindingNavigatorMoveNextItem1 As System.Windows.Forms.ToolStripButton
-    Friend WithEvents BindingNavigatorMoveLastItem1 As System.Windows.Forms.ToolStripButton
-    Friend WithEvents BindingNavigatorSeparator5 As System.Windows.Forms.ToolStripSeparator
 End Class
--- a/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx
+++ b/app/DD-Record-Organiser/frmConstructor_Main.en-US.resx
@ -219,8 +219,17 @@
  <data name="DatenNeuLadenToolStripMenuItem.Text" xml:space="preserve">
    <value>Refresh Data</value>
  </data>
+  <data name="ToolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>179, 6</value>
+  </data>
+  <data name="tsmi_RecordDelete.Size" type="System.Drawing.Size, System.Drawing">
+    <value>182, 22</value>
+  </data>
+  <data name="tsmi_RecordDelete.Text" xml:space="preserve">
+    <value>Delete record</value>
+  </data>
  <data name="ContextMenuGrid.Size" type="System.Drawing.Size, System.Drawing">
-    <value>183, 170</value>
+    <value>183, 198</value>
  </data>
  <data name="ContextMenuGrid.Title" xml:space="preserve">
    <value />
@ -336,6 +345,108 @@
  <data name="TabDetails.ToolTip" xml:space="preserve">
    <value />
  </data>
+  <data name="ContextMenuStripResultFiles.AllowHtmlText" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v15.1">
+    <value>Default</value>
+  </data>
+  <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>127, 22</value>
+  </data>
+  <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Open file</value>
+  </data>
+  <data name="ToolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>124, 6</value>
+  </data>
+  <data name="CopyToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>127, 22</value>
+  </data>
+  <data name="CopyToolStripMenuItem.Text" xml:space="preserve">
+    <value>Copy file</value>
+  </data>
+  <data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>124, 6</value>
+  </data>
+  <data name="DeleteToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>127, 22</value>
+  </data>
+  <data name="DeleteToolStripMenuItem.Text" xml:space="preserve">
+    <value>Delete file</value>
+  </data>
+  <data name="ToolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
+    <value>124, 6</value>
+  </data>
+  <data name="PropertiesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>127, 22</value>
+  </data>
+  <data name="PropertiesToolStripMenuItem.Text" xml:space="preserve">
+    <value>Properties</value>
+  </data>
+  <data name="ContextMenuStripResultFiles.Size" type="System.Drawing.Size, System.Drawing">
+    <value>128, 110</value>
+  </data>
+  <data name="ContextMenuStripResultFiles.Title" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ContextMenuStripResultFiles.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ContextMenuStripResultFiles.ToolTip1" xml:space="preserve">
+    <value />
+  </data>
+  <data name="ContextMenuStripResultFiles.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.1">
+    <value>None</value>
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v15.1">
+    <value>Default</value>
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left</value>
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>Tile</value>
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Inherit</value>
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v15.1">
+    <value>Center</value>
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v15.1">
+    <value>None</value>
+  </data>
+  <data name="GridControlDocSearch.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
+    <value />
+  </data>
+  <data name="GridViewDoc_Search.Appearance.OddRow.FontSizeDelta" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="GridViewDoc_Search.Appearance.OddRow.FontStyleDelta" type="System.Drawing.FontStyle, System.Drawing">
+    <value>Regular</value>
+  </data>
+  <data name="GridViewDoc_Search.Appearance.OddRow.GradientMode" type="System.Drawing.Drawing2D.LinearGradientMode, System.Drawing">
+    <value>Horizontal</value>
+  </data>
+  <data name="GridViewDoc_Search.Appearance.OddRow.Image" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="GridControlDocSearch.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="AxObjectListControl.AllowHtmlText" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v15.1">
    <value>Default</value>
  </data>
--- a/app/DD-Record-Organiser/frmConstructor_Main.resx
+++ b/app/DD-Record-Organiser/frmConstructor_Main.resx
@ -132,7 +132,7 @@
    <value>0, 0</value>
  </data>
  <metadata name="CMSEntity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1693, 54</value>
+    <value>17, 134</value>
  </metadata>
  <data name="ResetEbenenAuswahlToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>194, 22</value>
@ -193,7 +193,7 @@
    <value>Panel1</value>
  </data>
  <metadata name="ContextMenuGrid.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>477, 15</value>
+    <value>615, 17</value>
  </metadata>
  <data name="FunktionenDataGridToolStripMenuItem.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 9pt, style=Bold</value>
@ -412,7 +412,7 @@
    <value>1</value>
  </data>
  <metadata name="ContextMenuStripResultFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>187, 65</value>
+    <value>124, 134</value>
  </metadata>
  <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
    <value>148, 22</value>
@ -519,7 +519,7 @@
    <value>1</value>
  </data>
  <metadata name="ToolStripDokumente.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1157, 15</value>
+    <value>179, 56</value>
  </metadata>
  <data name="tslblWindreamView.Font" type="System.Drawing.Font, System.Drawing">
    <value>Segoe UI, 8.25pt, style=Bold, Italic</value>
@ -1083,7 +1083,7 @@
    <value>0</value>
  </data>
  <metadata name="BindingNavigatorPOS.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 93</value>
+    <value>332, 134</value>
  </metadata>
  <data name="BindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@ -1299,7 +1299,7 @@
    <value>0</value>
  </data>
  <metadata name="ToolStripEdit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>773, 15</value>
+    <value>911, 17</value>
  </metadata>
  <data name="tsButtonAdd.Enabled" type="System.Boolean, mscorlib">
    <value>False</value>
@ -1609,6 +1609,9 @@
  <data name="&gt;&gt;SplitContainerMain.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
+  <metadata name="BindingSource_Entity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>314, 17</value>
+  </metadata>
  <data name="NavButtonHome.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
@ -1664,7 +1667,7 @@
    <value>6</value>
  </data>
  <metadata name="StatusStrip_Main.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>171, 17</value>
  </metadata>
  <data name="tsslblStatus.Size" type="System.Drawing.Size, System.Drawing">
    <value>53, 17</value>
@ -1711,14 +1714,11 @@
  <data name="&gt;&gt;StatusStrip_Main.ZOrder" xml:space="preserve">
    <value>5</value>
  </data>
-  <metadata name="BindingSource_Entity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>162, 11</value>
-  </metadata>
  <metadata name="DD_ECMAdmin.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>342, 15</value>
+    <value>480, 17</value>
  </metadata>
  <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>626, 15</value>
+    <value>764, 17</value>
  </metadata>
  <assembly alias="DevExpress.Utils.v15.1" name="DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -1729,10 +1729,10 @@
 </value>
  </data>
  <metadata name="ttToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>894, 15</value>
+    <value>1032, 17</value>
  </metadata>
  <metadata name="ContextMenuDetails.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>995, 15</value>
+    <value>17, 56</value>
  </metadata>
  <data name="ContextMenuDetails.Size" type="System.Drawing.Size, System.Drawing">
    <value>61, 4</value>
@ -1744,31 +1744,31 @@
    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1322, 15</value>
+    <value>344, 56</value>
  </metadata>
  <metadata name="VWPMO_WF_USER_ACTIVEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 54</value>
+    <value>634, 56</value>
  </metadata>
  <metadata name="VWPMO_WF_USER_ACTIVETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>295, 54</value>
+    <value>912, 56</value>
  </metadata>
  <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>567, 54</value>
+    <value>17, 95</value>
  </metadata>
  <metadata name="TBPMO_FILES_USERTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1460, 54</value>
+    <value>910, 95</value>
  </metadata>
  <metadata name="VWPMO_WF_ACTIVEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>740, 54</value>
+    <value>190, 95</value>
  </metadata>
  <metadata name="VWPMO_WF_ACTIVETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>984, 54</value>
+    <value>434, 95</value>
  </metadata>
  <metadata name="TBPMO_FILES_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1222, 54</value>
+    <value>672, 95</value>
  </metadata>
  <metadata name="ToolTipController.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1465, 15</value>
+    <value>487, 56</value>
  </metadata>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
@ -2621,6 +2621,12 @@
  <data name="&gt;&gt;GridViewParent.Type" xml:space="preserve">
    <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;BindingSource_Entity.Name" xml:space="preserve">
+    <value>BindingSource_Entity</value>
+  </data>
+  <data name="&gt;&gt;BindingSource_Entity.Type" xml:space="preserve">
+    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="&gt;&gt;TileNavCategory1.Name" xml:space="preserve">
    <value>TileNavCategory1</value>
  </data>
@ -2657,12 +2663,6 @@
  <data name="&gt;&gt;tsslblWorkflowstate.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;BindingSource_Entity.Name" xml:space="preserve">
-    <value>BindingSource_Entity</value>
-  </data>
-  <data name="&gt;&gt;BindingSource_Entity.Type" xml:space="preserve">
-    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;DD_ECMAdmin.Name" xml:space="preserve">
    <value>DD_ECMAdmin</value>
  </data>
--- a/app/DD-Record-Organiser/frmConstructor_Main.vb
+++ b/app/DD-Record-Organiser/frmConstructor_Main.vb
@ -263,18 +263,45 @@ Public Class frmConstructor_Main
            MsgBox("Error in Save_Grid_Layout:" & vbNewLine & ex.Message)
        End Try
    End Sub
-
+    Sub Save_DocGrid_Layout()
+        Try
+            If ACT_EBENE_STRING Is Nothing Then
+                Exit Sub
+            End If
+            Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)")
+            Dim EntityName As String = EntityRegex.Replace(ACT_EBENE_STRING, "")
+            Dim Filename As String = String.Format("{0}-{1}-{2}-UserLayout.xml", GridViewDoc_Search.Name, GetSafeFilename(EntityName), CONSTRUCTORID)
+            Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
+            GridViewDoc_Search.SaveLayoutToXml(XMLPath)
+            ' Update_Status_Label(True, "Grid Layout Loaded")
+        Catch ex As Exception
+            MsgBox("Error in Save_DocGrid_Layout:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
+    Sub Load_DocGrid_Layout()
+        Try
+            If ACT_EBENE_STRING Is Nothing Then
+                Exit Sub
+            End If
+            Dim EntityRegex As New RegularExpressions.Regex("\s+\(\d+\)")
+            Dim EntityName As String = EntityRegex.Replace(ACT_EBENE_STRING, "")
+            Dim Filename As String = String.Format("{0}-{1}-{2}-UserLayout.xml", GridViewDoc_Search.Name, GetSafeFilename(EntityName), CONSTRUCTORID)
+            Dim XMLPath = System.IO.Path.Combine(Application.UserAppDataPath(), Filename)
+            If File.Exists(XMLPath) Then
+                GridViewDoc_Search.RestoreLayoutFromXml(XMLPath)
+                GridViewDoc_Search.GuessAutoFilterRowValuesFromFilter()
+            End If
+           
+        Catch ex As Exception
+            MsgBox("Error in Load_DocGrid_Layout:" & vbNewLine & ex.Message)
+        End Try
+    End Sub
    Sub Load_Grid_Layout()
        Try
            Dim XMLPath = Get_Grid_Layout_Filename()
            If File.Exists(XMLPath) And GRID_TYPE = GridType.Grid Then
                grvwGrid.RestoreLayoutFromXml(XMLPath)
-
-                'grvwGrid.ClearGrouping()
-                ' grvwGrid.ClearSelection()
-                'grvwGrid.OptionsView.ShowPreview = False
-                grvwGridPos.GuessAutoFilterRowValuesFromFilter()
-                'Update_Status_Label(True, "Grid Layout Loaded")
+                grvwGrid.GuessAutoFilterRowValuesFromFilter()
            End If
        Catch ex As Exception
            MsgBox("Error in Load_Grid_Layout: " & vbNewLine & ex.Message)
@ -1983,7 +2010,6 @@ Public Class frmConstructor_Main
            ' Datatable laden
            GridControlMain.DataSource = DT
            BindingSource_Entity.DataSource = DT
-            BindingNavigator1.BindingSource = BindingSource_Entity


            grvwTiles.TileTemplate.Clear()
@ -2289,8 +2315,7 @@ Public Class frmConstructor_Main
                'Databinding Neu
                BindingSource_Entity.DataSource = DT_SELECTION
                GridControlMain.DataSource = BindingSource_Entity
-                BindingNavigator1.BindingSource = BindingSource_Entity
-
+              
                ' Den Editor Initialisieren und Optionen setzen
                Dim CheckBoxEditorForDisplay = New RepositoryItemCheckEdit()
                CheckBoxEditorForDisplay.ValueChecked = 1
@ -3543,6 +3568,7 @@ Public Class frmConstructor_Main
                            'Icon zuweisen
                            Select Case extension
                                Case ".csv"
+                                    NewRow.Item(0) = My.Resources.doc_excel_csv
                                Case ".txt"
                                    NewRow.Item(0) = My.Resources.text
                                Case ".pdf"
@ -3559,6 +3585,8 @@ Public Class frmConstructor_Main
                                    NewRow.Item(0) = My.Resources.ppt
                                Case ".pptx"
                                    NewRow.Item(0) = My.Resources.ppt
+                                Case ".dwg"
+                                    NewRow.Item(0) = My.Resources.dwg
                                Case Else
                                    NewRow.Item(0) = My.Resources._blank
                            End Select
@ -3781,6 +3809,7 @@ Public Class frmConstructor_Main
            Load_POSGrid_Layout()
        End If
        If TCDetails.SelectedTabPage.Text.ToLower.StartsWith("windr") Then
+            Load_DocGrid_Layout()
            tsButtonEdit.Enabled = False
            If RECORD_ID = 0 Then
                RUN_WD_SEARCH(WD_Suche, "ENTITY")
@ -4836,4 +4865,12 @@ Public Class frmConstructor_Main
        End Try
        File_open()
    End Sub
+
+    Private Sub TabWindream_Leave(sender As Object, e As EventArgs) Handles TabWindream.Leave
+        Save_DocGrid_Layout()
+    End Sub
+
+    Private Sub GridControlDocSearch_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlDocSearch.DragDrop
+        Drag_Drop(e)
+    End Sub
 End Class