MS admin

2022-03-09 09:49:54 +01:00
parent 41b0cd535c
commit 8d4f327d96
13 changed files with 1840 additions and 127 deletions
--- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_Doctype.Designer.vb
+++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_Doctype.Designer.vb
@@ -373,6 +373,7 @@ Partial Class frmAdmin_Doctype
        Me.TableAdapterManager.TBIDB_CATALOG_USERTableAdapter = Nothing
        Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing
        Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_DOCTYPETableAdapter = Nothing
        Me.TableAdapterManager.TBIDB_LANGUAGETableAdapter = Me.TBIDB_LANGUAGETableAdapter
        Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing
        Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing
@@ -395,7 +396,7 @@ Partial Class frmAdmin_Doctype
        Me.Name = "frmAdmin_Doctype"
        Me.Ribbon = Me.RibbonControl1
        Me.StatusBar = Me.RibbonStatusBar1
-        Me.Text = "Doctypes"
+        Me.Text = "Dokumentarten Definition"
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.pnlAddDoctype, System.ComponentModel.ISupportInitialize).EndInit()
        Me.pnlAddDoctype.ResumeLayout(False)
--- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBBERelations.Designer.vb
+++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBBERelations.Designer.vb
@@ -28,8 +28,8 @@ Partial Class frmAdmin_IDBBERelations
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
-        Me.SimpleButton2 = New DevExpress.XtraEditors.SimpleButton()
-        Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnRemoveAttribute = New DevExpress.XtraEditors.SimpleButton()
+        Me.btnAddAttribute = New DevExpress.XtraEditors.SimpleButton()
        Me.GridControlAttributesRelated = New DevExpress.XtraGrid.GridControl()
        Me.GridViewRelatedAttributes = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.GridControlBusinessEntities = New DevExpress.XtraGrid.GridControl()
@@ -45,6 +45,9 @@ Partial Class frmAdmin_IDBBERelations
        Me.SimpleLabelItem3 = New DevExpress.XtraLayout.SimpleLabelItem()
        Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.bsiInfo = New DevExpress.XtraBars.BarStaticItem()
+        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.LayoutControl1.SuspendLayout()
@@ -68,29 +71,31 @@ Partial Class frmAdmin_IDBBERelations
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bsiInfo, Me.BarButtonItem1})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
        Me.RibbonControl1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
-        Me.RibbonControl1.MaxItemId = 1
+        Me.RibbonControl1.MaxItemId = 3
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl1.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False]
-        Me.RibbonControl1.Size = New System.Drawing.Size(1169, 160)
+        Me.RibbonControl1.Size = New System.Drawing.Size(1169, 158)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
        'RibbonPage1
        '
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
        Me.RibbonPage1.Name = "RibbonPage1"
        Me.RibbonPage1.Text = "Start"
        '
        'RibbonStatusBar1
        '
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 824)
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiInfo)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 822)
        Me.RibbonStatusBar1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1169, 22)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1169, 24)
        '
        'RibbonPage2
        '
@@ -99,44 +104,44 @@ Partial Class frmAdmin_IDBBERelations
        '
        'LayoutControl1
        '
-        Me.LayoutControl1.Controls.Add(Me.SimpleButton2)
-        Me.LayoutControl1.Controls.Add(Me.SimpleButton1)
+        Me.LayoutControl1.Controls.Add(Me.btnRemoveAttribute)
+        Me.LayoutControl1.Controls.Add(Me.btnAddAttribute)
        Me.LayoutControl1.Controls.Add(Me.GridControlAttributesRelated)
        Me.LayoutControl1.Controls.Add(Me.GridControlBusinessEntities)
        Me.LayoutControl1.Controls.Add(Me.GridControlFreeAttributes)
        Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.LayoutControl1.Location = New System.Drawing.Point(0, 160)
+        Me.LayoutControl1.Location = New System.Drawing.Point(0, 158)
        Me.LayoutControl1.Name = "LayoutControl1"
        Me.LayoutControl1.Root = Me.Root
        Me.LayoutControl1.Size = New System.Drawing.Size(1169, 664)
        Me.LayoutControl1.TabIndex = 6
        Me.LayoutControl1.Text = "LayoutControl1"
        '
-        'SimpleButton2
+        'btnRemoveAttribute
        '
-        Me.SimpleButton2.Appearance.Options.UseTextOptions = True
-        Me.SimpleButton2.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
-        Me.SimpleButton2.ImageOptions.Location = DevExpress.XtraEditors.ImageLocation.MiddleRight
-        Me.SimpleButton2.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.SimpleButton2.Location = New System.Drawing.Point(431, 616)
-        Me.SimpleButton2.Name = "SimpleButton2"
-        Me.SimpleButton2.RightToLeft = System.Windows.Forms.RightToLeft.No
-        Me.SimpleButton2.Size = New System.Drawing.Size(386, 36)
-        Me.SimpleButton2.StyleController = Me.LayoutControl1
-        Me.SimpleButton2.TabIndex = 9
-        Me.SimpleButton2.Text = "Attribut entfernen"
+        Me.btnRemoveAttribute.Appearance.Options.UseTextOptions = True
+        Me.btnRemoveAttribute.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
+        Me.btnRemoveAttribute.ImageOptions.Location = DevExpress.XtraEditors.ImageLocation.MiddleRight
+        Me.btnRemoveAttribute.ImageOptions.SvgImage = CType(resources.GetObject("btnRemoveAttribute.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.btnRemoveAttribute.Location = New System.Drawing.Point(431, 616)
+        Me.btnRemoveAttribute.Name = "btnRemoveAttribute"
+        Me.btnRemoveAttribute.RightToLeft = System.Windows.Forms.RightToLeft.No
+        Me.btnRemoveAttribute.Size = New System.Drawing.Size(386, 36)
+        Me.btnRemoveAttribute.StyleController = Me.LayoutControl1
+        Me.btnRemoveAttribute.TabIndex = 9
+        Me.btnRemoveAttribute.Text = "Attribut entfernen"
        '
-        'SimpleButton1
+        'btnAddAttribute
        '
-        Me.SimpleButton1.Appearance.Options.UseTextOptions = True
-        Me.SimpleButton1.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far
-        Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.SimpleButton1.Location = New System.Drawing.Point(431, 576)
-        Me.SimpleButton1.Name = "SimpleButton1"
-        Me.SimpleButton1.Size = New System.Drawing.Size(386, 36)
-        Me.SimpleButton1.StyleController = Me.LayoutControl1
-        Me.SimpleButton1.TabIndex = 8
-        Me.SimpleButton1.Text = "Attribut zuordnen"
+        Me.btnAddAttribute.Appearance.Options.UseTextOptions = True
+        Me.btnAddAttribute.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far
+        Me.btnAddAttribute.ImageOptions.SvgImage = CType(resources.GetObject("btnAddAttribute.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.btnAddAttribute.Location = New System.Drawing.Point(431, 576)
+        Me.btnAddAttribute.Name = "btnAddAttribute"
+        Me.btnAddAttribute.Size = New System.Drawing.Size(386, 36)
+        Me.btnAddAttribute.StyleController = Me.LayoutControl1
+        Me.btnAddAttribute.TabIndex = 8
+        Me.btnAddAttribute.Text = "Attribut zuordnen"
        '
        'GridControlAttributesRelated
        '
@@ -277,7 +282,7 @@ Partial Class frmAdmin_IDBBERelations
        '
        'LayoutControlItem5
        '
-        Me.LayoutControlItem5.Control = Me.SimpleButton2
+        Me.LayoutControlItem5.Control = Me.btnRemoveAttribute
        Me.LayoutControlItem5.Location = New System.Drawing.Point(419, 604)
        Me.LayoutControlItem5.Name = "LayoutControlItem5"
        Me.LayoutControlItem5.Size = New System.Drawing.Size(390, 40)
@@ -286,13 +291,35 @@ Partial Class frmAdmin_IDBBERelations
        '
        'LayoutControlItem4
        '
-        Me.LayoutControlItem4.Control = Me.SimpleButton1
+        Me.LayoutControlItem4.Control = Me.btnAddAttribute
        Me.LayoutControlItem4.Location = New System.Drawing.Point(419, 564)
        Me.LayoutControlItem4.Name = "LayoutControlItem4"
        Me.LayoutControlItem4.Size = New System.Drawing.Size(390, 40)
        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0)
        Me.LayoutControlItem4.TextVisible = False
        '
+        'bsiInfo
+        '
+        Me.bsiInfo.Caption = "BarStaticItem1"
+        Me.bsiInfo.Id = 1
+        Me.bsiInfo.ImageOptions.SvgImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bsiInfo.Name = "bsiInfo"
+        Me.bsiInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
+        Me.bsiInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
+        '
+        'RibbonPageGroup1
+        '
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+        Me.RibbonPageGroup1.Text = "Funktionen"
+        '
+        'BarButtonItem1
+        '
+        Me.BarButtonItem1.Caption = "Schliessen"
+        Me.BarButtonItem1.Id = 2
+        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem1.Name = "BarButtonItem1"
+        '
        'frmAdmin_IDBBERelations
        '
        Me.AllowDrop = True
@@ -351,8 +378,11 @@ Partial Class frmAdmin_IDBBERelations
    Friend WithEvents SimpleLabelItem1 As DevExpress.XtraLayout.SimpleLabelItem
    Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents SimpleLabelItem3 As DevExpress.XtraLayout.SimpleLabelItem
-    Friend WithEvents SimpleButton2 As DevExpress.XtraEditors.SimpleButton
-    Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnRemoveAttribute As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnAddAttribute As DevExpress.XtraEditors.SimpleButton
    Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
    Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents bsiInfo As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
 End Class
--- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBBERelations.resx
+++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBBERelations.resx
@@ -118,7 +118,44 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-  <data name="SimpleButton2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="BarStaticItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+        MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
+        MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
+        bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQWJvdXQiPg0KICAgIDxwYXRoIGQ9
+        Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs
+        MnogTTE2LDZjMS4xLDAsMiwwLjksMiwycy0wLjksMi0yLDJzLTItMC45LTItMiAgIFMxNC45LDYsMTYs
+        NnogTTIwLDI0aC04di0yaDJ2LThoLTJ2LTJoMmg0djEwaDJWMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg
+        PC9nPg0KPC9zdmc+Cw==
+</value>
+  </data>
+  <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPoBAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iQ2xlYXJIZWFkZXJBbmRGb290ZXIiIHN0eWxlPSJlbmFibGUtYmFja2dy
+        b3VuZDpuZXcgMCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5SZWR7ZmlsbDoj
+        RDExQzFDO30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI3LDRINUM0LjUsNCw0LDQuNSw0LDV2MjJjMCww
+        LjUsMC41LDEsMSwxaDIyYzAuNSwwLDEtMC41LDEtMVY1QzI4LDQuNSwyNy41LDQsMjcsNHogTTIyLDIw
+        bC0yLDJsLTQtNGwtNCw0ICBsLTItMmw0LTRsLTQtNGwyLTJsNCw0bDQtNGwyLDJsLTQsNEwyMiwyMHoi
+        IGNsYXNzPSJSZWQiIC8+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="btnRemoveAttribute.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -136,7 +173,7 @@
        dmc+Cw==
 </value>
  </data>
-  <data name="SimpleButton1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnAddAttribute.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
--- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBBERelations.vb
+++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBBERelations.vb
@@ -120,30 +120,56 @@ Public Class frmAdmin_IDBBERelations
        End Try
    End Function

-    Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click
-        If AddAttr2BE(SELECTED_FREE_ATTRID, SELECTED_BEID) Then
-            LoadFreeAttributes()
-            LoadRelatedAttributes()
+    Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles btnAddAttribute.Click
+        SELECTED_FREE_ATTRID = 0
+        GetFreeAttributeID()
+
+        If SELECTED_FREE_ATTRID <> 0 Then
+            If AddAttr2BE(SELECTED_FREE_ATTRID, SELECTED_BEID) Then
+                LoadFreeAttributes()
+                LoadRelatedAttributes()
+                Show_bsiInfo("Attribute related")
+            End If
+        Else
+            Show_bsiInfo("Error in AttributeRelation - No AttributeID")
        End If

+
    End Sub

-    Private Sub GridViewFreeAttributes_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewFreeAttributes.FocusedRowChanged
+    Private Sub GetFreeAttributeID()
        Dim oID = GridViewFreeAttributes.GetFocusedRowCellValue(GridViewFreeAttributes.Columns("AttributeID"))
        SELECTED_FREE_ATTRID = oID

    End Sub

-    Private Sub GridViewRelatedAttributes_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewRelatedAttributes.FocusedRowChanged
+    Private Sub GetRelatedAttributeGUID()
        Dim oID = GridViewRelatedAttributes.GetFocusedRowCellValue(GridViewRelatedAttributes.Columns("RelID"))
        SELECTED_ID2DELETE = oID
    End Sub

-    Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles SimpleButton2.Click
-        If DeleteAttrfromBE(SELECTED_ID2DELETE) Then
-            LoadFreeAttributes()
-            LoadRelatedAttributes()
-            SELECTED_ID2DELETE = 0
+    Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles btnRemoveAttribute.Click
+        SELECTED_ID2DELETE = 0
+        GetRelatedAttributeGUID()
+
+        If SELECTED_ID2DELETE <> 0 Then
+            If DeleteAttrfromBE(SELECTED_ID2DELETE) Then
+                LoadFreeAttributes()
+                LoadRelatedAttributes()
+                SELECTED_ID2DELETE = 0
+                Show_bsiInfo("Attribute removed")
+            End If
+        Else
+            Show_bsiInfo("Error in RemoveAttribute - No ID")
        End If
+
+    End Sub
+    Sub Show_bsiInfo(pInfo As String)
+        bsiInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+        bsiInfo.Caption = pInfo & " - " & Now.ToString
+    End Sub
+
+    Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+        Me.Close()
    End Sub
 End Class