diff --git a/GUIs.ZooFlow/Administration/ClassConstants.vb b/GUIs.ZooFlow/Administration/ClassConstants.vb index 8e87bf57..4a5e250c 100644 --- a/GUIs.ZooFlow/Administration/ClassConstants.vb +++ b/GUIs.ZooFlow/Administration/ClassConstants.vb @@ -2,6 +2,7 @@ Public Class ClassConstants Public Const MODULE_IDB = "IDB" Public Const PAGE_IDB_ATTRIBUTES = "IDB_ATTRIBUTES" + Public Const PAGE_IDB_ATTRIBUTE_REL = "ATTRIBUTE_RELATIONS" Public Const PAGE_IDB_BUSINESS_ENTITIES = "IDB_BUSINESS_ENTITIES" Public Const PAGE_IDB_SOURCE_SQL = "IDB_SOURCE_SQL" Public Const PAGE_IDB_OBJECT_STORES = "IDB_OBJECT_STORES" diff --git a/GUIs.ZooFlow/Administration/ClassDetailForm.vb b/GUIs.ZooFlow/Administration/ClassDetailForm.vb index b6c51db9..95b85603 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailForm.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailForm.vb @@ -16,8 +16,8 @@ Public Class ClassDetailForm }}, {PAGE_IDB_BUSINESS_ENTITIES, New DetailSettings With { - .GridTitle = "Geschäftseinheit", - .NewRecordTitle = "Neue Entität", + .GridTitle = "BusinessEntity", + .NewRecordTitle = "New BusinessEntity", .[Module] = MODULE_IDB, .Entity = PAGE_IDB_BUSINESS_ENTITIES }}, @@ -31,21 +31,28 @@ Public Class ClassDetailForm {PAGE_META_SOURCE_SQL, New DetailSettings With { .GridTitle = "Source SQL", - .NewRecordTitle = "Neuer Source SQL", + .NewRecordTitle = "New Source SQL", .[Module] = MODULE_META, .Entity = PAGE_META_SOURCE_SQL }}, {PAGE_GI_PROFILES, New DetailSettings With { .GridTitle = "Global Indexer Profile", - .NewRecordTitle = "Neues GLOBIX Profil", + .NewRecordTitle = "New GLOBIX profile", .[Module] = MODULE_GI, .Entity = PAGE_GI_PROFILES }}, {PAGE_CW_PROFILES, New DetailSettings With { .GridTitle = "Clipboard Watcher Profile", - .NewRecordTitle = "Neues CW Profil", + .NewRecordTitle = "New CW profile", + .[Module] = MODULE_CW, + .Entity = PAGE_CW_PROFILES + }}, + {PAGE_IDB_ATTRIBUTE_REL, + New DetailSettings With { + .GridTitle = "Attribute-Relations", + .NewRecordTitle = "", .[Module] = MODULE_CW, .Entity = PAGE_CW_PROFILES }} @@ -81,7 +88,10 @@ Public Class ClassDetailForm Case PAGE_META_SOURCE_SQL Load_SourceSQL(PrimaryKey, IsInsert) Return True - + Case PAGE_IDB_ATTRIBUTE_REL + Dim oForm As New frmAdmin_IDBBERelations + oForm.ShowDialog() + Return True Case Else Return False End Select diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb index 465d372d..7b88fad9 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.Designer.vb @@ -1538,7 +1538,7 @@ Partial Class frmAdmin_Globix Me.ComboBoxEditAAttrFileParam.MenuManager = Me.RibbonControl1 Me.ComboBoxEditAAttrFileParam.Name = "ComboBoxEditAAttrFileParam" Me.ComboBoxEditAAttrFileParam.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEditAAttrFileParam.Properties.Items.AddRange(New Object() {"Dateiname (mit Endung)", "Dateiname (ohne Endung)", "Dateiendung", "Datei Erstelldatum", "Datei Erstellt wer", "Aktuelles Datum (DD.MM.YYYY)", "Username", "Usercode"}) + Me.ComboBoxEditAAttrFileParam.Properties.Items.AddRange(New Object() {"FILENAME_EXT", "FILENAME", "EXTENSION", "DATE_CREATED", "DATE_MODIFIED"}) Me.ComboBoxEditAAttrFileParam.Size = New System.Drawing.Size(261, 20) Me.ComboBoxEditAAttrFileParam.StyleController = Me.LayoutControlAutoIndexe Me.ComboBoxEditAAttrFileParam.TabIndex = 11 @@ -1697,7 +1697,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem37.Name = "LayoutControlItem37" Me.LayoutControlItem37.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem37.Size = New System.Drawing.Size(437, 40) - Me.LayoutControlItem37.Text = "Variablen" + Me.LayoutControlItem37.Text = "FILE-Parameter" Me.LayoutControlItem37.TextSize = New System.Drawing.Size(163, 13) ' 'LayoutControlItem39 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx b/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx index 05ee9257..30d397ae 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.resx @@ -159,6 +159,9 @@ 350, 17 + + 350, 17 + 17, 17 @@ -206,9 +209,6 @@ NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 752, 56 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -278,6 +278,9 @@ 17, 95 + + 17, 95 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -316,26 +319,6 @@ MTBoLTR2NGg0VjEweiBNMTQsMTZoLTR2MTJoNFYxNnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQog IDxwYXRoIGQ9Ik0yNSwxNmwtNCw0aDNjMCwyLjItMS44LDQtNCw0di0zbC00LDRsNCw0di0zYzMuMyww LDYtMi43LDYtNmgzTDI1LDE2eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD - MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls - bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w - LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs - YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw - IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH - cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -354,22 +337,6 @@ MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw== - - - - 511, 95 - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj - aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r - K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml - rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz - xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR - 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh - zQ3o4jAe74EDiAAAAABJRU5ErkJggg== @@ -423,6 +390,76 @@ bDEuOCwxLjNsMS40LTEuNGwtMS4zLTEuOCAgIGMwLjMtMC41LDAuNi0xLjIsMC44LTEuOEwzMCwyNXog TTIyLDI2Yy0xLjEsMC0yLTAuOS0yLTJzMC45LTIsMi0yczIsMC45LDIsMlMyMy4xLDI2LDIyLDI2eiIg Y2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN + YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz + MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 + QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs + MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x + VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx + LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x + LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM + MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + 246, 56 + + + 1161, 17 + + + 752, 56 + + + 752, 56 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD + MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls + bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w + LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs + YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw + IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH + cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + 511, 95 + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj + aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r + K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml + rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz + xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR + 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh + zQ3o4jAe74EDiAAAAABJRU5ErkJggg== @@ -474,28 +511,6 @@ NFYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8L2c+DQogICAgPHJlY3QgeD0iMTgiIHk9IjE4IiB3 aWR0aD0iNCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0K PC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN - YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz - MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 - QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs - MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x - VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx - LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x - LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM - MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb index 725331a7..4817a5be 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Globix.vb @@ -98,6 +98,7 @@ Public Class frmAdmin_Globix End Sub Sub Load_TabData() Load_INDEXMAN() + Load_Attribute_Auto() End Sub Private Sub Load_INDEXMAN() Try @@ -135,10 +136,6 @@ Public Class frmAdmin_Globix Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) - End Sub - - Private Sub XtraTabControl1_Click(sender As Object, e As EventArgs) Handles XtraTabControl1.Click - End Sub Private Sub BarButtonSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonSave.ItemClick ResetMessages() @@ -477,21 +474,21 @@ Public Class frmAdmin_Globix If Not ComboBoxEditAAttrFileParam.SelectedItem Is Nothing Then If GUIDTextBoxAutoAttribute.Text <> "" Then Dim value As String + Dim oPattern = clsPatterns.WrapPatternValue(clsPatterns.PATTERN_FILE, ComboBoxEditAAttrFileParam.Text) + 'Select Case ComboBoxEditAAttrFileParam.SelectedIndex + ' Case 0 : value = "$filename_ext" + ' Case 1 : value = "$filename" + ' Case 2 : value = "$extension" + ' Case 3 : value = "$FileCreateDate" + ' Case 4 : value = "$FileCreatedWho" + ' Case 5 : value = "$DateDDMMYYY" + ' Case 6 : value = "$Username" + ' Case 7 : value = "$Usercode" + 'End Select - Select Case ComboBoxEditAAttrFileParam.SelectedIndex - Case 0 : value = "$filename_ext" - Case 1 : value = "$filename" - Case 2 : value = "$extension" - Case 3 : value = "$FileCreateDate" - Case 4 : value = "$FileCreatedWho" - Case 5 : value = "$DateDDMMYYY" - Case 6 : value = "$Username" - Case 7 : value = "$Usercode" - End Select - If value <> "" Then - VALUETextBox.Text = value - End If + VALUETextBox.Text = oPattern + End If End If End Sub @@ -606,4 +603,12 @@ Public Class frmAdmin_Globix ShowErrorMessage(ex) End Try End Sub + + Private Sub SQL_ACTIVECheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles SQL_ACTIVECheckBox.CheckedChanged + If SQL_ACTIVECheckBox.Checked Then + VALUETextBox.Text = String.Empty + Else + SQL_RESULTTextBox1.Text = String.Empty + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb index 9ac5dba8..585857e8 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmAdmin_IDBAttribute Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdmin_IDBAttribute)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() @@ -97,7 +98,6 @@ Partial Class frmAdmin_IDBAttribute ' 'RibbonControl1 ' - Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl1.ExpandCollapseItem.Id = 0 Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus, Me.BarButtonItem3}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) @@ -107,7 +107,7 @@ Partial Class frmAdmin_IDBAttribute Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(894, 66) + Me.RibbonControl1.Size = New System.Drawing.Size(894, 131) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -115,7 +115,7 @@ Partial Class frmAdmin_IDBAttribute ' Me.BarButtonItem1.Caption = "Speichern und Schließen" Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_check + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem1.Name = "BarButtonItem1" ' 'BarButtonItem2 @@ -180,10 +180,10 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit1) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 66) + Me.LayoutControl1.Location = New System.Drawing.Point(0, 131) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(894, 473) + Me.LayoutControl1.Size = New System.Drawing.Size(894, 408) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' @@ -332,7 +332,7 @@ Partial Class frmAdmin_IDBAttribute Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem3, Me.LayoutControlItem11, Me.LayoutControlItem9, Me.LayoutControlItem5, Me.LayoutControlItem8, Me.LayoutControlItem10}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(894, 473) + Me.Root.Size = New System.Drawing.Size(894, 408) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -343,7 +343,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem1.Size = New System.Drawing.Size(874, 40) - Me.LayoutControlItem1.Text = "GUID" + Me.LayoutControlItem1.Text = "ID" Me.LayoutControlItem1.TextSize = New System.Drawing.Size(145, 13) ' 'LayoutControlItem2 @@ -413,7 +413,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 278) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem9.Size = New System.Drawing.Size(436, 175) + Me.LayoutControlItem9.Size = New System.Drawing.Size(436, 110) Me.LayoutControlItem9.Text = "Geändert Wer" Me.LayoutControlItem9.TextSize = New System.Drawing.Size(145, 13) ' @@ -443,7 +443,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem10.Location = New System.Drawing.Point(436, 278) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(438, 175) + Me.LayoutControlItem10.Size = New System.Drawing.Size(438, 110) Me.LayoutControlItem10.Text = "Geändert Wann" Me.LayoutControlItem10.TextSize = New System.Drawing.Size(145, 13) ' diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx index 9842e9db..479a1577 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx @@ -117,6 +117,33 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGkEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU2F2ZUFuZENsb3NlIj4NCiAgICA8 + cGF0aCBkPSJNNiwxNlY2SDNDMi40LDYsMiw2LjQsMiw3djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYs + MCwxLTAuNCwxLTFWMTZINnogTTYsMjZ2LTZoMTZ2Nkg2eiBNMTYsNkg4djhoOFY2eiAgICBNMTIsMTJo + LTJWOGgyVjEyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yOSwySDE5Yy0wLjUsMC0x + LDAuNS0xLDF2MTBjMCwwLjUsMC41LDEsMSwxaDEwYzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41 + LDIsMjksMnogTTI3LjcsMTAuNCAgIGMwLjQsMC40LDAuNCwxLDAsMS4zYy0wLjQsMC40LTEsMC40LTEu + MywwTDI0LDkuM2wtMi40LDIuNGMtMC40LDAuNC0xLDAuNC0xLjMsMGMtMC40LTAuNC0wLjQtMSwwLTEu + M0wyMi43LDhsLTIuNC0yLjQgICBjLTAuNC0wLjQtMC40LTEsMC0xLjNjMC40LTAuNCwxLTAuNCwxLjMs + MEwyNCw2LjdsMi40LTIuNGMwLjQtMC40LDEtMC40LDEuMywwYzAuNCwwLjQsMC40LDEsMCwxLjNMMjUu + Myw4TDI3LjcsMTAuNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 350, 17 @@ -126,6 +153,9 @@ 17, 56 + + 17, 17 + 177, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.Designer.vb new file mode 100644 index 00000000..0d2f13b3 --- /dev/null +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.Designer.vb @@ -0,0 +1,365 @@ + +Partial Class frmAdmin_IDBBERelations + Inherits DevExpress.XtraBars.Ribbon.RibbonForm + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdmin_IDBBERelations)) + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + 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.GridControlAttributesRelated = New DevExpress.XtraGrid.GridControl() + Me.GridViewRelatedAttributes = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridControlBusinessEntities = New DevExpress.XtraGrid.GridControl() + Me.GridViewBusinessEntities = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridControlFreeAttributes = New DevExpress.XtraGrid.GridControl() + Me.GridViewFreeAttributes = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.SimpleLabelItem2 = New DevExpress.XtraLayout.SimpleLabelItem() + Me.SimpleLabelItem1 = New DevExpress.XtraLayout.SimpleLabelItem() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.SimpleLabelItem3 = New DevExpress.XtraLayout.SimpleLabelItem() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.GridControlAttributesRelated, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewRelatedAttributes, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControlBusinessEntities, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewBusinessEntities, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControlFreeAttributes, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridViewFreeAttributes, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SimpleLabelItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SimpleLabelItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SimpleLabelItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + 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.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, 159) + 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" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 824) + 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) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.SimpleButton2) + Me.LayoutControl1.Controls.Add(Me.SimpleButton1) + 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, 159) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(1169, 665) + Me.LayoutControl1.TabIndex = 6 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'SimpleButton2 + ' + 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, 617) + 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" + ' + 'SimpleButton1 + ' + 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, 577) + 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" + ' + 'GridControlAttributesRelated + ' + Me.GridControlAttributesRelated.AllowDrop = True + Me.GridControlAttributesRelated.EmbeddedNavigator.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.GridControlAttributesRelated.Location = New System.Drawing.Point(821, 49) + Me.GridControlAttributesRelated.MainView = Me.GridViewRelatedAttributes + Me.GridControlAttributesRelated.MenuManager = Me.RibbonControl1 + Me.GridControlAttributesRelated.Name = "GridControlAttributesRelated" + Me.GridControlAttributesRelated.Size = New System.Drawing.Size(336, 604) + Me.GridControlAttributesRelated.TabIndex = 7 + Me.GridControlAttributesRelated.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewRelatedAttributes}) + ' + 'GridViewRelatedAttributes + ' + Me.GridViewRelatedAttributes.GridControl = Me.GridControlAttributesRelated + Me.GridViewRelatedAttributes.Name = "GridViewRelatedAttributes" + ' + 'GridControlBusinessEntities + ' + Me.GridControlBusinessEntities.EmbeddedNavigator.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.GridControlBusinessEntities.Location = New System.Drawing.Point(431, 49) + Me.GridControlBusinessEntities.MainView = Me.GridViewBusinessEntities + Me.GridControlBusinessEntities.MenuManager = Me.RibbonControl1 + Me.GridControlBusinessEntities.Name = "GridControlBusinessEntities" + Me.GridControlBusinessEntities.Size = New System.Drawing.Size(386, 524) + Me.GridControlBusinessEntities.TabIndex = 6 + Me.GridControlBusinessEntities.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewBusinessEntities}) + ' + 'GridViewBusinessEntities + ' + Me.GridViewBusinessEntities.GridControl = Me.GridControlBusinessEntities + Me.GridViewBusinessEntities.Name = "GridViewBusinessEntities" + Me.GridViewBusinessEntities.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewBusinessEntities.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewBusinessEntities.OptionsBehavior.Editable = False + Me.GridViewBusinessEntities.OptionsSelection.EnableAppearanceFocusedCell = False + ' + 'GridControlFreeAttributes + ' + Me.GridControlFreeAttributes.AllowDrop = True + Me.GridControlFreeAttributes.EmbeddedNavigator.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.GridControlFreeAttributes.Location = New System.Drawing.Point(12, 49) + Me.GridControlFreeAttributes.MainView = Me.GridViewFreeAttributes + Me.GridControlFreeAttributes.MenuManager = Me.RibbonControl1 + Me.GridControlFreeAttributes.Name = "GridControlFreeAttributes" + Me.GridControlFreeAttributes.Size = New System.Drawing.Size(415, 604) + Me.GridControlFreeAttributes.TabIndex = 5 + Me.GridControlFreeAttributes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFreeAttributes}) + ' + 'GridViewFreeAttributes + ' + Me.GridViewFreeAttributes.GridControl = Me.GridControlFreeAttributes + Me.GridViewFreeAttributes.Name = "GridViewFreeAttributes" + Me.GridViewFreeAttributes.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewFreeAttributes.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False] + Me.GridViewFreeAttributes.OptionsBehavior.Editable = False + Me.GridViewFreeAttributes.OptionsSelection.EnableAppearanceFocusedCell = False + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem1, Me.SimpleLabelItem2, Me.SimpleLabelItem1, Me.LayoutControlItem3, Me.SimpleLabelItem3, Me.LayoutControlItem5, Me.LayoutControlItem4}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(1169, 665) + Me.Root.TextVisible = False + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.GridControlFreeAttributes + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 37) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Size = New System.Drawing.Size(419, 608) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem2.TextVisible = False + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.GridControlBusinessEntities + Me.LayoutControlItem1.Location = New System.Drawing.Point(419, 37) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Size = New System.Drawing.Size(390, 528) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem1.TextVisible = False + ' + 'SimpleLabelItem2 + ' + Me.SimpleLabelItem2.AllowHotTrack = False + Me.SimpleLabelItem2.AppearanceItemCaption.BackColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.SimpleLabelItem2.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.SimpleLabelItem2.AppearanceItemCaption.Options.UseBackColor = True + Me.SimpleLabelItem2.AppearanceItemCaption.Options.UseFont = True + Me.SimpleLabelItem2.Location = New System.Drawing.Point(419, 0) + Me.SimpleLabelItem2.Name = "SimpleLabelItem2" + Me.SimpleLabelItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.SimpleLabelItem2.Size = New System.Drawing.Size(390, 37) + Me.SimpleLabelItem2.Text = "Business Eintities" + Me.SimpleLabelItem2.TextSize = New System.Drawing.Size(162, 17) + ' + 'SimpleLabelItem1 + ' + Me.SimpleLabelItem1.AllowHotTrack = False + Me.SimpleLabelItem1.AppearanceItemCaption.BackColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.SimpleLabelItem1.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.SimpleLabelItem1.AppearanceItemCaption.Options.UseBackColor = True + Me.SimpleLabelItem1.AppearanceItemCaption.Options.UseFont = True + Me.SimpleLabelItem1.Location = New System.Drawing.Point(0, 0) + Me.SimpleLabelItem1.Name = "SimpleLabelItem1" + Me.SimpleLabelItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.SimpleLabelItem1.Size = New System.Drawing.Size(419, 37) + Me.SimpleLabelItem1.Text = "Nicht zugeordnete Attribute" + Me.SimpleLabelItem1.TextSize = New System.Drawing.Size(162, 17) + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.GridControlAttributesRelated + Me.LayoutControlItem3.Location = New System.Drawing.Point(809, 37) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Size = New System.Drawing.Size(340, 608) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem3.TextVisible = False + ' + 'SimpleLabelItem3 + ' + Me.SimpleLabelItem3.AllowHotTrack = False + Me.SimpleLabelItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer)) + Me.SimpleLabelItem3.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.SimpleLabelItem3.AppearanceItemCaption.Options.UseBackColor = True + Me.SimpleLabelItem3.AppearanceItemCaption.Options.UseFont = True + Me.SimpleLabelItem3.Location = New System.Drawing.Point(809, 0) + Me.SimpleLabelItem3.Name = "SimpleLabelItem3" + Me.SimpleLabelItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.SimpleLabelItem3.Size = New System.Drawing.Size(340, 37) + Me.SimpleLabelItem3.Text = "Zugeordnete Attribute" + Me.SimpleLabelItem3.TextSize = New System.Drawing.Size(162, 17) + ' + 'LayoutControlItem4 + ' + Me.LayoutControlItem4.Control = Me.SimpleButton1 + Me.LayoutControlItem4.Location = New System.Drawing.Point(419, 565) + 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 + ' + 'LayoutControlItem5 + ' + Me.LayoutControlItem5.Control = Me.SimpleButton2 + Me.LayoutControlItem5.Location = New System.Drawing.Point(419, 605) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem5.TextVisible = False + ' + 'frmAdmin_IDBBERelations + ' + Me.AllowDrop = True + Me.Appearance.Options.UseFont = True + Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1169, 846) + Me.Controls.Add(Me.LayoutControl1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmAdmin_IDBBERelations.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) + Me.Name = "frmAdmin_IDBBERelations" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "Attribut - BE Zuordnung" + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.GridControlAttributesRelated, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewRelatedAttributes, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControlBusinessEntities, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewBusinessEntities, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControlFreeAttributes, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridViewFreeAttributes, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SimpleLabelItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SimpleLabelItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SimpleLabelItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents GridControlAttributesRelated As DevExpress.XtraGrid.GridControl + Friend WithEvents GridViewRelatedAttributes As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents GridControlBusinessEntities As DevExpress.XtraGrid.GridControl + Friend WithEvents GridViewBusinessEntities As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents GridControlFreeAttributes As DevExpress.XtraGrid.GridControl + Friend WithEvents GridViewFreeAttributes As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents SimpleLabelItem2 As DevExpress.XtraLayout.SimpleLabelItem + 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 LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem +End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_relations.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.resx similarity index 54% rename from GUIs.ZooFlow/Administration/frmAdmin_relations.resx rename to GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.resx index 1af7de15..b42266c6 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_relations.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.resx @@ -117,4 +117,63 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAF4CAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlByZXZpb3VzVmlldyI+DQogICAgPHBhdGggZD0i + TTE2LDJDOC4zLDIsMiw4LjMsMiwxNnM2LjMsMTQsMTQsMTRzMTQtNi4zLDE0LTE0UzIzLjcsMiwxNiwy + eiBNMjQsMThoLTh2NmwtOC04bDgtOHY2aDhWMTh6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9z + dmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFsCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ik5leHRWaWV3Ij4NCiAgICA8cGF0aCBkPSJNMTYs + MkM4LjMsMiwyLDguMywyLDE2czYuMywxNCwxNCwxNHMxNC02LjMsMTQtMTRTMjMuNywyLDE2LDJ6IE0x + NiwyNHYtNkg4di00aDhWOGw4LDhMMTYsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+ + Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN + YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz + MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 + QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs + MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x + VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx + LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x + LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM + MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.vb new file mode 100644 index 00000000..ea0ee20a --- /dev/null +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBBERelations.vb @@ -0,0 +1,143 @@ +Imports DevExpress.XtraGrid +Imports DevExpress.XtraGrid.Views.Base +Imports DevExpress.XtraGrid.Views.Grid +Imports DevExpress.XtraGrid.Views.Grid.ViewInfo + +Public Class frmAdmin_IDBBERelations + Private GridCursorLocation As Point + Private SELECTED_BEID As Integer + Private SELECTED_FREE_ATTRID As Integer + Private SELECTED_ID2DELETE As Integer + Private DraggedAttributeID + Private DragDropManager As ClassDragDrop = Nothing + Private downHitInfo As GridHitInfo = Nothing + Private Function GetAvailableAttributesByBEID(beID As Integer) As DataTable + Try + Dim dt As DataTable + Dim oSQL = $"SELECT AttributeID,Attribute,AttributeType FROM VWIDB_ATTRIBUTE_LANG WHERE LANG_CODE = '{My.Application.User.Language}' AND AttributeID NOT IN (SELECT ATTR_ID FROM TBIDB_BE_ATTRIBUTE WHERE BE_ID = {beID})" + dt = My.DatabaseIDB.GetDatatable(oSQL) + Return dt + Catch ex As Exception + ShowErrorMessage($"Error in GetAvailableAttributesByBEID with groupId {beID}", ex) + + Return Nothing + End Try + End Function + Private Function GetRelatedAttributesByBEID(beID As Integer) As DataTable + Try + Dim dt As DataTable + Dim oSQL = $"select GUID as RelID, ATTR_TITLE as Attribute, [TYPE_NAME] as [AttributeType] FROM VWIDB_BE_ATTRIBUTE WHERE BE_ID = {beID} and LANG_CODE = '{My.Application.User.Language}'" + dt = My.DatabaseIDB.GetDatatable(oSQL) + Return dt + Catch ex As Exception + ShowErrorMessage($"Error in GetAvailableAttributesByBEID with groupId {beID}", ex) + + Return Nothing + End Try + End Function + Private Sub ShowErrorMessage(errorText As String, ex As Exception) + MsgBox(errorText & vbCrLf & vbCrLf & ex.Message, MsgBoxStyle.Critical, "BE Relations") + End Sub + + Private Sub frmAdmin_IDBBERelations_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + Dim oSQL = "Select Guid As ID,TITLE As BusinessEntity from TBIDB_BUSINESS_ENTITY" + Dim oDT As DataTable = My.DatabaseIDB.GetDatatable(oSQL) + GridControlBusinessEntities.DataSource = oDT + DragDropManager = New ClassDragDrop(My.LogConfig) + DragDropManager.AddGridView(GridViewFreeAttributes) + DragDropManager.AddGridView(GridViewRelatedAttributes) + + Catch ex As Exception + ShowErrorMessage($"Error in FormLoad", ex) + End Try + End Sub + + Private Sub GridViewBusinessEntities_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles GridViewBusinessEntities.FocusedRowChanged + Dim oBEID = GridViewBusinessEntities.GetFocusedRowCellValue(GridViewBusinessEntities.Columns("ID")) + SELECTED_BEID = oBEID + LoadFreeAttributes() + LoadRelatedAttributes() + End Sub + + Sub LoadRelatedAttributes() + Dim oDT = GetRelatedAttributesByBEID(SELECTED_BEID) + If Not IsNothing(oDT) Then + GridControlAttributesRelated.DataSource = oDT + End If + End Sub + Sub LoadFreeAttributes() + Dim oDT = GetAvailableAttributesByBEID(SELECTED_BEID) + If Not IsNothing(oDT) Then + GridControlFreeAttributes.DataSource = oDT + End If + End Sub + + Private Sub GridControlFreeAttributes_DragDrop(sender As Object, e As DragEventArgs) Handles GridControlFreeAttributes.DragDrop + Try + Dim data As String = e.Data.GetData(DataFormats.Text) + Dim AttrID As Integer = data.Split("|")(0) + + + If AddAttr2BE(AttrID, SELECTED_BEID) Then + Dim oDT = GetRelatedAttributesByBEID(SELECTED_BEID) + If Not IsNothing(oDT) Then + GridControlAttributesRelated.DataSource = Nothing + GridControlAttributesRelated.DataSource = oDT + End If + End If + Catch ex As Exception + LOGGER.Error(ex) + MsgBox(ex.Message, MsgBoxStyle.Critical, "Error Adding AttrID:") + End Try + End Sub + + Public Shared Function AddAttr2BE(AttrId As Integer, BeId As Integer) As Boolean + Try + Dim oSQL = $" + INSERT INTO TBIDB_BE_ATTRIBUTE (BE_ID,ATTR_ID,ADDED_WHO) + VALUES ({BeId},{AttrId},'{My.Application.User.UserName}') + " + Return My.DatabaseIDB.ExecuteNonQuery(oSQL) + Catch ex As Exception + LOGGER.Error(ex) + Return False + End Try + End Function + Public Shared Function DeleteAttrfromBE(ID As Integer) As Boolean + Try + Dim oSQL = $"DELETE FROM TBIDB_BE_ATTRIBUTE WHERE GUID = {ID}" + Return My.DatabaseIDB.ExecuteNonQuery(oSQL) + Catch ex As Exception + LOGGER.Error(ex) + Return False + 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() + End If + + End Sub + + Private Sub GridViewFreeAttributes_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewFreeAttributes.FocusedRowChanged + 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 + 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 + End If + End Sub +End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb index d8a307a9..0a7b4ae8 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmAdmin_IDBEntity _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdmin_IDBEntity)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() @@ -38,7 +39,6 @@ Partial Class frmAdmin_IDBEntity Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.TBIDB_BUSINESS_ENTITYBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() - Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit() @@ -50,7 +50,6 @@ Partial Class frmAdmin_IDBEntity Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() @@ -64,7 +63,6 @@ Partial Class frmAdmin_IDBEntity CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBIDB_BUSINESS_ENTITYBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -76,7 +74,6 @@ Partial Class frmAdmin_IDBEntity CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() @@ -103,7 +100,7 @@ Partial Class frmAdmin_IDBEntity ' Me.BarButtonItem1.Caption = "Speichern und Schließen" Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.markcomplete + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem1.Name = "BarButtonItem1" ' 'BarButtonItem2 @@ -138,7 +135,6 @@ Partial Class frmAdmin_IDBEntity ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Aktionen" ' @@ -158,7 +154,6 @@ Partial Class frmAdmin_IDBEntity 'LayoutControl1 ' Me.LayoutControl1.Controls.Add(Me.TextEdit1) - Me.LayoutControl1.Controls.Add(Me.TextEdit2) Me.LayoutControl1.Controls.Add(Me.TextEdit3) Me.LayoutControl1.Controls.Add(Me.CheckEdit1) Me.LayoutControl1.Controls.Add(Me.TextEdit4) @@ -181,7 +176,7 @@ Partial Class frmAdmin_IDBEntity Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(303, 20) + Me.TextEdit1.Size = New System.Drawing.Size(712, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' @@ -195,16 +190,6 @@ Partial Class frmAdmin_IDBEntity Me.DSIDB_Stammdaten.DataSetName = "DSIDB_Stammdaten" Me.DSIDB_Stammdaten.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' - 'TextEdit2 - ' - Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_BUSINESS_ENTITYBindingSource, "PARENT_ENT_ID", True)) - Me.TextEdit2.Location = New System.Drawing.Point(513, 20) - Me.TextEdit2.MenuManager = Me.RibbonControl1 - Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(304, 20) - Me.TextEdit2.StyleController = Me.LayoutControl1 - Me.TextEdit2.TabIndex = 5 - ' 'TextEdit3 ' Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_BUSINESS_ENTITYBindingSource, "TITLE", True)) @@ -280,7 +265,7 @@ Partial Class frmAdmin_IDBEntity ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem2, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9}) Me.Root.Name = "Root" Me.Root.Size = New System.Drawing.Size(837, 334) Me.Root.TextVisible = False @@ -291,7 +276,7 @@ Partial Class frmAdmin_IDBEntity Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem1.Size = New System.Drawing.Size(408, 40) + Me.LayoutControlItem1.Size = New System.Drawing.Size(817, 40) Me.LayoutControlItem1.Text = "ID" Me.LayoutControlItem1.TextSize = New System.Drawing.Size(82, 13) ' @@ -315,16 +300,6 @@ Partial Class frmAdmin_IDBEntity Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem4.TextVisible = False ' - 'LayoutControlItem2 - ' - Me.LayoutControlItem2.Control = Me.TextEdit2 - Me.LayoutControlItem2.Location = New System.Drawing.Point(408, 0) - Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem2.Size = New System.Drawing.Size(409, 40) - Me.LayoutControlItem2.Text = "Parent Id" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(82, 13) - ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.TextEdit4 @@ -410,7 +385,6 @@ Partial Class frmAdmin_IDBEntity CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBIDB_BUSINESS_ENTITYBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -422,7 +396,6 @@ Partial Class frmAdmin_IDBEntity CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() @@ -443,11 +416,9 @@ Partial Class frmAdmin_IDBEntity Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit2 As DevExpress.XtraEditors.TextEdit Friend WithEvents TextEdit3 As DevExpress.XtraEditors.TextEdit Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx index bb650dbd..48512134 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.resx @@ -117,6 +117,33 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGkEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iU2F2ZUFuZENsb3NlIj4NCiAgICA8 + cGF0aCBkPSJNNiwxNlY2SDNDMi40LDYsMiw2LjQsMiw3djIyYzAsMC42LDAuNCwxLDEsMWgyMmMwLjYs + MCwxLTAuNCwxLTFWMTZINnogTTYsMjZ2LTZoMTZ2Nkg2eiBNMTYsNkg4djhoOFY2eiAgICBNMTIsMTJo + LTJWOGgyVjEyeiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxwYXRoIGQ9Ik0yOSwySDE5Yy0wLjUsMC0x + LDAuNS0xLDF2MTBjMCwwLjUsMC41LDEsMSwxaDEwYzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41 + LDIsMjksMnogTTI3LjcsMTAuNCAgIGMwLjQsMC40LDAuNCwxLDAsMS4zYy0wLjQsMC40LTEsMC40LTEu + MywwTDI0LDkuM2wtMi40LDIuNGMtMC40LDAuNC0xLDAuNC0xLjMsMGMtMC40LTAuNC0wLjQtMSwwLTEu + M0wyMi43LDhsLTIuNC0yLjQgICBjLTAuNC0wLjQtMC40LTEsMC0xLjNjMC40LTAuNCwxLTAuNCwxLjMs + MEwyNCw2LjdsMi40LTIuNGMwLjQtMC40LDEtMC40LDEuMywwYzAuNCwwLjQsMC40LDEsMCwxLjNMMjUu + Myw4TDI3LjcsMTAuNHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + 177, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb index 4cb551f8..1dda7aef 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBEntity.vb @@ -18,7 +18,13 @@ Public Class frmAdmin_IDBEntity Private Sub frmAdmin_IDBEntity_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try - TBIDB_BUSINESS_ENTITYTableAdapter.Fill(DSIDB_Stammdaten.TBIDB_BUSINESS_ENTITY, PrimaryKey) + If IsInsert Then + DSIDB_Stammdaten.TBIDB_BUSINESS_ENTITY.ADDED_WHOColumn.DefaultValue = My.Application.User.UserName + TBIDB_BUSINESS_ENTITYBindingSource.AddNew() + Else + TBIDB_BUSINESS_ENTITYTableAdapter.Fill(DSIDB_Stammdaten.TBIDB_BUSINESS_ENTITY, PrimaryKey) + End If + Catch ex As Exception ShowErrorMessage(ex) End Try @@ -44,7 +50,7 @@ Public Class frmAdmin_IDBEntity ResetMessages() If SaveData() And HasChanges Then - ShowStatus("Attribute gespeichert!") + ShowStatus("Business Entity saved!") End If End Sub diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 2a9540fb..aa6ebc4c 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -58,9 +58,11 @@ Partial Class frmAdmin_Start Me.BarButtonItem25 = New DevExpress.XtraBars.BarButtonItem() Me.btnAddRecord = New DevExpress.XtraBars.BarButtonItem() Me.btnEditRecord = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup20 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.TreeListMenu = New DevExpress.XtraTreeList.TreeList() @@ -110,8 +112,6 @@ Partial Class frmAdmin_Start Me.RibbonGroup_ClipboardWatcher_DocSearch = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonGroup_ClipboardWatcher_Profile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPage_ClipboardWatcher = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup20 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TreeListMenu, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MainTreeImages, System.ComponentModel.ISupportInitialize).BeginInit() @@ -358,6 +358,13 @@ Partial Class frmAdmin_Start Me.btnEditRecord.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_edit2 Me.btnEditRecord.Name = "btnEditRecord" ' + 'BarButtonItem26 + ' + Me.BarButtonItem26.Caption = "Zuordnungen" + Me.BarButtonItem26.Id = 34 + Me.BarButtonItem26.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem26.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem26.Name = "BarButtonItem26" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1, Me.RibbonPageGroup20}) @@ -379,6 +386,12 @@ Partial Class frmAdmin_Start Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Datensätze" ' + 'RibbonPageGroup20 + ' + Me.RibbonPageGroup20.ItemLinks.Add(Me.BarButtonItem26) + Me.RibbonPageGroup20.Name = "RibbonPageGroup20" + Me.RibbonPageGroup20.Text = "RibbonPageGroup20" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) @@ -405,17 +418,17 @@ Partial Class frmAdmin_Start Me.TreeListMenu.MenuManager = Me.RibbonControl1 Me.TreeListMenu.Name = "TreeListMenu" Me.TreeListMenu.BeginUnboundLoad() - Me.TreeListMenu.AppendNode(New Object() {"Entitäten"}, -1, "") + Me.TreeListMenu.AppendNode(New Object() {"Entities"}, -1, "") Me.TreeListMenu.AppendNode(New Object() {"Attribute"}, 0, 2, 2, -1, "IDB_ATTRIBUTES") + Me.TreeListMenu.AppendNode(New Object() {"Attribute Relations"}, 1, 9, 9, -1, "ATTRIBUTE_RELATIONS") Me.TreeListMenu.AppendNode(New Object() {"Business Entities"}, 0, 1, 1, -1, "IDB_BUSINESS_ENTITIES") Me.TreeListMenu.AppendNode(New Object() {"Object Stores"}, 0, "IDB_OBJECT_STORES") Me.TreeListMenu.AppendNode(New Object() {"Global Indexer"}, -1, 6, 6, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 4, 4, 4, -1, "GI_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 5, 4, 4, -1, "GI_PROFILES") Me.TreeListMenu.AppendNode(New Object() {"Clipboard Watcher"}, -1, 7, 7, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 6, 4, 4, -1, "CW_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 7, 4, 4, -1, "CW_PROFILES") Me.TreeListMenu.AppendNode(New Object() {"Administration"}, -1) - Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 8, 3, 3, -1, "META_SOURCE_SQL") - Me.TreeListMenu.AppendNode(New Object() {"Zuordnungen"}, -1, 9, 9, -1, "Relations") + Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 9, 3, 3, -1, "META_SOURCE_SQL") Me.TreeListMenu.EndUnboundLoad() Me.TreeListMenu.OptionsBehavior.Editable = False Me.TreeListMenu.OptionsView.ShowColumns = False @@ -786,19 +799,6 @@ Partial Class frmAdmin_Start Me.RibbonPage_ClipboardWatcher.Name = "RibbonPage_ClipboardWatcher" Me.RibbonPage_ClipboardWatcher.Text = "Clipboard Watcher" ' - 'RibbonPageGroup20 - ' - Me.RibbonPageGroup20.ItemLinks.Add(Me.BarButtonItem26) - Me.RibbonPageGroup20.Name = "RibbonPageGroup20" - Me.RibbonPageGroup20.Text = "RibbonPageGroup20" - ' - 'BarButtonItem26 - ' - Me.BarButtonItem26.Caption = "Zuordnungen" - Me.BarButtonItem26.Id = 34 - Me.BarButtonItem26.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem26.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem26.Name = "BarButtonItem26" - ' 'frmAdmin_Start ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index f97a6b0f..93a4d239 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -44,6 +44,11 @@ Public Class frmAdmin_Start CurrentModule = oNode.Module labelTitle.Text = oNode.GridTitle btnAddRecord.Caption = oNode.NewRecordTitle + If btnAddRecord.Caption = "" Then + btnAddRecord.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + Else + btnAddRecord.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + End If Else MsgBox($"Tag [{Page}] not found! Exiting." & vbNewLine & $"Check the [ENTITY_TITLE] Column in Table [TBZF_ADMIN_SOURCE_SQL]. It must match with the Tag [{Page}] of the corresponding Tree List nodes!", MsgBoxStyle.Critical, Text) @@ -74,12 +79,13 @@ Public Class frmAdmin_Start DetailForm.DetailDataList.Clear() For Each oRow As DataRow In oTable.Rows + Dim oCHeck = oRow.Item("ENTITY_TITLE").ToString Dim oItem As New ClassDetailForm.DetailData With { .Guid = CInt(oRow.Item("GUID")), .ParentId = CInt(oRow.Item("PARENT_ID")), .Entity = oRow.Item("ENTITY_TITLE").ToString, .Scope = oRow.Item("SCOPE").ToString, - .SQLCommand = oRow.Item("SQL_COMMAND").ToString, + .SQLCommand = oRow.Item("SQL_COMMAND").ToString.Replace("@LANG_CODE", My.Application.User.Language), .PrimaryKey = NotNull(oRow.Item("PK_COLUMN"), String.Empty) } @@ -109,13 +115,11 @@ Public Class frmAdmin_Start Exit Sub End If - If Handle_LoadPage(e.Node.Tag.ToString) And e.Node.Tag <> "Relations" Then + If Handle_LoadPage(e.Node.Tag.ToString) Then RibbonPageGroup1.Enabled = True CurrentPage = e.Node.Tag.ToString End If - If e.Node.Tag = "Relations" Then - frmAdmin_relations.ShowDialog() - End If + Catch ex As Exception ShowErrorMessage(ex) End Try diff --git a/GUIs.ZooFlow/Administration/frmAdmin_relations.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_relations.Designer.vb deleted file mode 100644 index ad972f6a..00000000 --- a/GUIs.ZooFlow/Administration/frmAdmin_relations.Designer.vb +++ /dev/null @@ -1,139 +0,0 @@ - _ -Partial Class frmAdmin_relations - Inherits DevExpress.XtraBars.Ribbon.RibbonForm - - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Wird vom Windows Form-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ - Private Sub InitializeComponent() - Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() - Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() - Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.XtraTabControl1.SuspendLayout() - Me.SuspendLayout() - ' - 'RibbonControl1 - ' - Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) - 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.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(933, 159) - Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 - ' - 'RibbonPage1 - ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) - Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "Start" - ' - 'RibbonPageGroup1 - ' - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" - ' - 'RibbonPageGroup2 - ' - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" - ' - 'RibbonStatusBar1 - ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 566) - 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(933, 22) - ' - 'RibbonPage2 - ' - Me.RibbonPage2.Name = "RibbonPage2" - Me.RibbonPage2.Text = "RibbonPage2" - ' - 'XtraTabControl1 - ' - Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl1.Location = New System.Drawing.Point(0, 159) - Me.XtraTabControl1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.XtraTabControl1.Name = "XtraTabControl1" - Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.Size = New System.Drawing.Size(933, 407) - Me.XtraTabControl1.TabIndex = 2 - Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) - ' - 'XtraTabPage1 - ' - Me.XtraTabPage1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(931, 384) - Me.XtraTabPage1.Text = "XtraTabPage1" - ' - 'XtraTabPage2 - ' - Me.XtraTabPage2.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(246, 88) - Me.XtraTabPage2.Text = "XtraTabPage2" - ' - 'frmAdmin_relations - ' - Me.Appearance.Options.UseFont = True - Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(933, 588) - Me.Controls.Add(Me.XtraTabControl1) - Me.Controls.Add(Me.RibbonStatusBar1) - Me.Controls.Add(Me.RibbonControl1) - Me.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) - Me.Name = "frmAdmin_relations" - Me.Ribbon = Me.RibbonControl1 - Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "frmAdmin_relations" - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.XtraTabControl1.ResumeLayout(False) - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl - Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar - Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl - Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage - Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage -End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_relations.vb b/GUIs.ZooFlow/Administration/frmAdmin_relations.vb deleted file mode 100644 index b4ec196b..00000000 --- a/GUIs.ZooFlow/Administration/frmAdmin_relations.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class frmAdmin_relations - -End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index 0879ceb3..3b7f841b 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -805,13 +805,14 @@ Partial Public Class DSIDB_Stammdaten Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true Me.columnPARENT_ENT_ID.AllowDBNull = false + Me.columnPARENT_ENT_ID.DefaultValue = CType(0,Integer) Me.columnTITLE.AllowDBNull = false Me.columnTITLE.MaxLength = 500 Me.columnINHERITS_ATTRIBUTES.AllowDBNull = false + Me.columnINHERITS_ATTRIBUTES.DefaultValue = CType(false,Boolean) Me.columnCOMMENT.MaxLength = 1000 Me.columnADDED_WHO.AllowDBNull = false Me.columnADDED_WHO.MaxLength = 30 - Me.columnADDED_WHEN.AllowDBNull = false Me.columnCHANGED_WHO.MaxLength = 30 End Sub @@ -4199,7 +4200,11 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property ADDED_WHEN() As Date Get - Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn),Date) + Try + Return CType(Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBIDB_BUSINESS_ENTITY ist DBNull.", e) + End Try End Get Set Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) = value @@ -4248,6 +4253,18 @@ Partial Public Class DSIDB_Stammdaten Me(Me.tableTBIDB_BUSINESS_ENTITY.COMMENTColumn) = Global.System.Convert.DBNull End Sub + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBIDB_BUSINESS_ENTITY.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function IsCHANGED_WHONull() As Boolean @@ -6264,39 +6281,30 @@ Namespace DSIDB_StammdatenTableAdapters Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBIDB_BUSINESS_ENTITY] ([PARENT_ENT_ID], [TITLE], [INHERITS_ATTRIBUT"& _ - "ES], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES"& _ - " (@PARENT_ENT_ID, @TITLE, @INHERITS_ATTRIBUTES, @COMMENT, @ADDED_WHO, @ADDED_WHE"& _ - "N, @CHANGED_WHO, @CHANGED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PARENT_ENT_ID, TITLE, INHERITS_AT"& _ - "TRIBUTES, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_B"& _ - "USINESS_ENTITY WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBIDB_BUSINESS_ENTITY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PARENT_ENT_ID, TITLE"& _ + ", INHERITS_ATTRIBUTES, COMMENT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PARENT_ENT_ID,@TITLE"& _ + ",@INHERITS_ATTRIBUTES,@COMMENT,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PARENT_ENT_ID, TITLE,"& _ + " INHERITS_ATTRIBUTES, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN "& _ + "FROM TBIDB_BUSINESS_ENTITY WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_ENT_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_ENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERITS_ATTRIBUTES", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERITS_ATTRIBUTES", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_ENT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_ENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERITS_ATTRIBUTES", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERITS_ATTRIBUTES", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBIDB_BUSINESS_ENTITY"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PARENT_ENT_ID = @PARENT_EN"& _ "T_ID, TITLE = @TITLE, INHERITS_ATTRIBUTES = @INHERITS_ATTRIBUTES, COMMENT = @COM"& _ - "MENT, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID "& _ - "= @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PARENT_ENT_ID, TITLE, INHERITS_ATTRIBUTES, COM"& _ - "MENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_BUSINESS_ENTIT"& _ - "Y WHERE (GUID = @GUID)" + "MENT, CHANGED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELEC"& _ + "T GUID, PARENT_ENT_ID, TITLE, INHERITS_ATTRIBUTES, COMMENT, ADDED_WHO, ADDED_WHE"& _ + "N, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_BUSINESS_ENTITY WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PARENT_ENT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PARENT_ENT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INHERITS_ATTRIBUTES", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "INHERITS_ATTRIBUTES", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -6400,7 +6408,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal PARENT_ENT_ID As Integer, ByVal TITLE As String, ByVal INHERITS_ATTRIBUTES As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + Public Overloads Overridable Function Insert(ByVal PARENT_ENT_ID As Integer, ByVal TITLE As String, ByVal INHERITS_ATTRIBUTES As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer Me.Adapter.InsertCommand.Parameters(0).Value = CType(PARENT_ENT_ID,Integer) If (TITLE Is Nothing) Then Throw New Global.System.ArgumentNullException("TITLE") @@ -6418,17 +6426,6 @@ Namespace DSIDB_StammdatenTableAdapters Else Me.Adapter.InsertCommand.Parameters(4).Value = CType(ADDED_WHO,String) End If - Me.Adapter.InsertCommand.Parameters(5).Value = CType(ADDED_WHEN,Date) - If (CHANGED_WHO Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value - Else - Me.Adapter.InsertCommand.Parameters(6).Value = CType(CHANGED_WHO,String) - End If - If (CHANGED_WHEN.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(7).Value = CType(CHANGED_WHEN.Value,Date) - Else - Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value - End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -6448,7 +6445,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ - Public Overloads Overridable Function Update(ByVal PARENT_ENT_ID As Integer, ByVal TITLE As String, ByVal INHERITS_ATTRIBUTES As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Update(ByVal PARENT_ENT_ID As Integer, ByVal TITLE As String, ByVal INHERITS_ATTRIBUTES As Boolean, ByVal COMMENT As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PARENT_ENT_ID,Integer) If (TITLE Is Nothing) Then Throw New Global.System.ArgumentNullException("TITLE") @@ -6461,24 +6458,13 @@ Namespace DSIDB_StammdatenTableAdapters Else Me.Adapter.UpdateCommand.Parameters(3).Value = CType(COMMENT,String) End If - If (ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("ADDED_WHO") - Else - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(ADDED_WHO,String) - End If - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(ADDED_WHEN,Date) If (CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(CHANGED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String) End If - If (CHANGED_WHEN.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(7).Value = CType(CHANGED_WHEN.Value,Date) - Else - Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value - End If - Me.Adapter.UpdateCommand.Parameters(8).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(9).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index c4e70caf..8151d31c 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -21,18 +21,17 @@ WHERE (GUID = @Original_GUID) - - INSERT INTO [TBIDB_BUSINESS_ENTITY] ([PARENT_ENT_ID], [TITLE], [INHERITS_ATTRIBUTES], [COMMENT], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@PARENT_ENT_ID, @TITLE, @INHERITS_ATTRIBUTES, @COMMENT, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN); + + INSERT INTO TBIDB_BUSINESS_ENTITY + (PARENT_ENT_ID, TITLE, INHERITS_ATTRIBUTES, COMMENT, ADDED_WHO) +VALUES (@PARENT_ENT_ID,@TITLE,@INHERITS_ATTRIBUTES,@COMMENT,@ADDED_WHO); SELECT GUID, PARENT_ENT_ID, TITLE, INHERITS_ATTRIBUTES, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_BUSINESS_ENTITY WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - + + + + + @@ -49,21 +48,17 @@ WHERE GUID = @GUID UPDATE TBIDB_BUSINESS_ENTITY -SET PARENT_ENT_ID = @PARENT_ENT_ID, TITLE = @TITLE, INHERITS_ATTRIBUTES = @INHERITS_ATTRIBUTES, COMMENT = @COMMENT, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, - CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN -WHERE (GUID = @Original_GUID); +SET PARENT_ENT_ID = @PARENT_ENT_ID, TITLE = @TITLE, INHERITS_ATTRIBUTES = @INHERITS_ATTRIBUTES, COMMENT = @COMMENT, CHANGED_WHO = @CHANGED_WHO +WHERE (GUID = @Original_GUID); SELECT GUID, PARENT_ENT_ID, TITLE, INHERITS_ATTRIBUTES, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_BUSINESS_ENTITY WHERE (GUID = @GUID) - - - - - - - - - - + + + + + + + @@ -623,7 +618,7 @@ FROM TBIDB_ATTRIBUTE_TYPE - + @@ -631,7 +626,7 @@ FROM TBIDB_ATTRIBUTE_TYPE - + @@ -646,7 +641,7 @@ FROM TBIDB_ATTRIBUTE_TYPE - + diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index f2462b1d..1a4248df 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -172,10 +172,10 @@ Form - - frmAdmin_relations.vb + + frmAdmin_IDBBERelations.vb - + Form @@ -398,8 +398,8 @@ frmAdmin_IDBObjectStore.vb - - frmAdmin_relations.vb + + frmAdmin_IDBBERelations.vb frmAdmin_SourceSQL.vb diff --git a/GUIs.ZooFlow/clsPatterns.vb b/GUIs.ZooFlow/clsPatterns.vb index 32a5adb3..5c1a6e7a 100644 --- a/GUIs.ZooFlow/clsPatterns.vb +++ b/GUIs.ZooFlow/clsPatterns.vb @@ -22,6 +22,7 @@ Public Class clsPatterns Public Const PATTERN_ATTR_AUTO = "ATTR_A" Public Const PATTERN_ATTR_MAN = "ATTR_M" Public Const PATTERN_IDBA = "IDBA" + Public Const PATTERN_FILE = "FILE" ' Kinds of CTRL Placeholder ' ' Normal Control