diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 5a509861..19c7c3bf 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -44,10 +44,12 @@ On + + @@ -64,11 +66,16 @@ ..\packages\NLog.4.7.10\lib\net45\NLog.dll + + + + + @@ -107,6 +114,7 @@ Form + @@ -124,10 +132,6 @@ - - True - Application.myapp - True True @@ -138,13 +142,19 @@ Settings.settings True + + ctrlObjectPropertyDialog.vb + + + UserControl + frmObjectPropertyDialog.vb Form - + @@ -166,6 +176,9 @@ My.Resources Designer + + ctrlObjectPropertyDialog.vb + frmObjectPropertyDialog.vb @@ -174,7 +187,6 @@ MyApplicationCodeGenerator - Application.Designer.vb SettingsSingleFileGenerator @@ -317,5 +329,11 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Common.vbproj.bak b/GUIs.Common/Common.vbproj.bak deleted file mode 100644 index 4dd0b234..00000000 --- a/GUIs.Common/Common.vbproj.bak +++ /dev/null @@ -1,287 +0,0 @@ - - - - - Debug - AnyCPU - {D20A6BF2-C7C6-4A7A-B34D-FA27D775A049} - Library - DigitalData.GUIs.Common - DigitalData.GUIs.Common - 512 - Windows - v4.6.1 - - - true - full - true - true - bin\Debug\ - DigitalData.GUIs.Common.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - pdbonly - false - true - true - bin\Release\ - DigitalData.GUIs.Common.xml - 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 - - - On - - - Binary - - - Off - - - On - - - - - - - - - - - - - - - D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll - - - - ..\packages\NLog.4.7.10\lib\net45\NLog.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Form - - - - Form - - - - - - frmDataResultList.vb - - - Form - - - - - - - frmDocumentResultList.vb - - - Form - - - - - - - True - Application.myapp - - - True - True - Resources.resx - - - True - Settings.settings - True - - - frmObjectPropertyDialog.vb - - - Form - - - - - - frmDataResultList.vb - - - frmDocumentResultList.vb - - - frmDocumentResultList.vb - - - frmDocumentResultList.vb - - - - VbMyResourcesResXFileCodeGenerator - Resources.Designer.vb - My.Resources - Designer - - - frmObjectPropertyDialog.vb - - - - - - MyApplicationCodeGenerator - Application.Designer.vb - - - SettingsSingleFileGenerator - My - Settings.Designer.vb - - - - - {0958cddf-4a16-41f6-8837-8335f71d599c} - DocumentViewer - - - {3DCD6D1A-C830-4241-B7E4-27430E7EA483} - LookupControl - - - {44982f9b-6116-44e2-85d0-f39650b1ef99} - Config - - - {EAF0EA75-5FA7-485D-89C7-B2D843B03A96} - Database - - - {25017513-0d97-49d3-98d7-ba76d9b251b0} - EDMI.API - - - {991d0231-4623-496d-8bd0-9ca906029cbc} - Filesystem - - - {d3c8cfed-d6f6-43a8-9bdf-454145d0352f} - Language - - - {903B2D7D-3B80-4BE9-8713-7447B704E1B0} - Logging - - - {81cac44f-3711-4c8f-ae98-e02a7448782a} - ZooFlow - - - {5EFAEF9B-90B9-4F05-9F70-F79AD77FFF86} - Windows - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/GUIs.Common/DocumentResultList/Layout.vb b/GUIs.Common/DocumentResultList/Layout.vb new file mode 100644 index 00000000..32d86590 --- /dev/null +++ b/GUIs.Common/DocumentResultList/Layout.vb @@ -0,0 +1,74 @@ +Imports DevExpress.Utils +Imports DevExpress.XtraBars.Docking +Imports DevExpress.XtraGrid.Views.Grid +Imports DigitalData.Modules.Base +Imports DigitalData.Modules.Config +Imports DigitalData.Modules.Logging + +Namespace DocumentResultList + Public Class Layout + Inherits BaseClass + + Private Config As ConfigManager(Of Config) + + Public Sub New(pLogConfig As LogConfig, pConfig As ConfigManager(Of DocumentResultList.Config)) + MyBase.New(pLogConfig) + Config = pConfig + End Sub + + Public Sub DockManager_SaveLayout(pDockManager As DockManager) + Try + Dim oXml As String = GetDockmanager_LayoutName() + pDockManager.SaveLayoutToXml(oXml) + Catch ex As Exception + Logger.Error(ex) + Logger.Info("Error while saving GridLayout: " & ex.Message) + End Try + End Sub + + Public Sub DockManager_RestoreLayout(pDockManager As DockManager) + Try + Dim oXml As String = GetDockmanager_LayoutName() + pDockManager.RestoreLayoutFromXml(oXml) + Catch ex As Exception + Logger.Error(ex) + Logger.Info("Error while restoring GridLayout: " & ex.Message) + End Try + End Sub + + Public Sub GridView_RestoreLayout(pGridView As GridView) + Try + Dim oLayoutFile As String = GetGrid_LayoutName(pGridView) + If IO.File.Exists(oLayoutFile) Then + pGridView.RestoreLayoutFromXml(oLayoutFile, OptionsLayoutBase.FullLayout) + End If + Catch ex As Exception + Logger.Error(ex) + Logger.Info("Error while restoring layout: " & ex.Message) + End Try + End Sub + + Public Sub GridView_SaveLayout(pGridView As GridView) + Try + Dim oXml As String = GetGrid_LayoutName(pGridView) + pGridView.SaveLayoutToXml(oXml, OptionsLayoutBase.FullLayout) + Catch ex As Exception + Logger.Error(ex) + Logger.Info("Error while saving GridLayout: " & ex.Message) + End Try + End Sub + + Public Function GetDockmanager_LayoutName() As String + Dim Filename As String = $"DockManagerDocResult_UserLayout.xml" + Dim oDirectory As String = IO.Path.GetDirectoryName(Config.UserConfigPath) + Return IO.Path.Combine(oDirectory, Filename) + End Function + + Public Function GetGrid_LayoutName(pGridView As GridView) As String + Dim Filename As String = $"DevExpressGridViewDocResult_{pGridView.Name}UserLayout.xml" + Dim oDirectory As String = IO.Path.GetDirectoryName(Config.UserConfigPath) + Return IO.Path.Combine(oDirectory, Filename) + End Function + End Class + +End Namespace \ No newline at end of file diff --git a/GUIs.Common/DocumentResultList/Watcher.vb b/GUIs.Common/DocumentResultList/Watcher.vb index 8f8a5c18..fffe768b 100644 --- a/GUIs.Common/DocumentResultList/Watcher.vb +++ b/GUIs.Common/DocumentResultList/Watcher.vb @@ -111,7 +111,7 @@ Namespace DocumentResultList End Using End Using - Dim oProcessId = Await DoOpenFile(oFilePath) + Dim oProcessId = DoOpenFile(oFilePath) Return New Tuple(Of Integer, String)(oProcessId, oFilePath) @@ -124,7 +124,7 @@ Namespace DocumentResultList Private Async Function OpenFileFromPath(pDocument As Document) As Task(Of Tuple(Of Integer, String)) Try - Dim oProcessId = Await DoOpenFile(pDocument.FullPath) + Dim oProcessId = DoOpenFile(pDocument.FullPath) Return New Tuple(Of Integer, String)(oProcessId, pDocument.FullPath) Catch ex As Exception @@ -133,7 +133,7 @@ Namespace DocumentResultList End Try End Function - Private Async Function DoOpenFile(pFilePath As String) As Task(Of Integer) + Private Function DoOpenFile(pFilePath As String) As Integer Dim _Process = New Process _Process.StartInfo.FileName = pFilePath _Process.EnableRaisingEvents = True diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.en-US.resx.bak b/GUIs.Common/DocumentResultList/frmDocumentResultList.en-US.resx.bak deleted file mode 100644 index 6a2fedf0..00000000 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.en-US.resx.bak +++ /dev/null @@ -1,437 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Main Grid Horizontal - - - Detail Grid Horizontal - - - Export XLSX - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHYNAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5H - cmVlbntmaWxsOiMwMzlDMjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgkuc3Qwe29wYWNpdHk6MC4z - O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTgsNGgxOHY2aDJWM2MwLTAuNS0wLjUtMS0xLTFIN0M2LjUs - Miw2LDIuNSw2LDN2N2gyVjR6IiBjbGFzcz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0yNiwyNkg4di04 - SDZ2OWMwLDAuNSwwLjUsMSwxLDFoMjBjMC41LDAsMS0wLjUsMS0xdi05aC0yVjI2eiIgY2xhc3M9IkJs - YWNrIiAvPg0KICA8cGF0aCBkPSJNMzEsOEgzQzIuNCw4LDIsOC40LDIsOXYxMGMwLDAuNiwwLjQsMSwx - LDFoMjhjMC42LDAsMS0wLjQsMS0xVjlDMzIsOC40LDMxLjYsOCwzMSw4eiBNOS4xLDE4bC0xLjMtMi41 - ICBjLTAuMS0wLjEtMC4xLTAuMy0wLjItMC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDYuMSwxOEg0 - bDIuNS0zLjlsLTIuMi0zLjloMi4xbDEuMSwyLjNjMC4xLDAuMiwwLjIsMC40LDAuMiwwLjdoMCAgYzAt - MC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXogTTE2Ljcs - MThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45Yy0wLjIsMC4zLTAuNCwwLjUtMC43 - LDAuNyAgcy0wLjYsMC4zLTEsMC40Yy0wLjQsMC4xLTAuOCwwLjEtMS4yLDAuMWMtMC40LDAtMC44LDAt - MS4yLTAuMWMtMC40LTAuMS0wLjctMC4yLTEtMC4zVjE2YzAuMywwLjMsMC42LDAuNSwxLDAuNnMwLjcs - MC4yLDEuMSwwLjIgIGMwLjIsMCwwLjQsMCwwLjYtMC4xczAuMy0wLjEsMC40LTAuMmMwLjEtMC4xLDAu - Mi0wLjIsMC4yLTAuMmMwLjEtMC4xLDAuMS0wLjIsMC4xLTAuM2MwLTAuMiwwLTAuMy0wLjEtMC40ICBj - LTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0wLjctMC4zYy0w - LjYtMC4zLTEuMS0wLjYtMS4zLTAuOWMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjMgIGMwLTAuNCwwLjEt - MC43LDAuMi0xYzAuMi0wLjMsMC40LTAuNSwwLjctMC43YzAuMy0wLjIsMC42LTAuMywxLTAuNHMwLjgt - MC4xLDEuMi0wLjFjMC40LDAsMC44LDAsMS4xLDAuMWMwLjMsMCwwLjYsMC4xLDAuOSwwLjIgIHYxLjZj - LTAuMS0wLjEtMC4zLTAuMi0wLjQtMC4ycy0wLjMtMC4xLTAuNS0wLjJjLTAuMiwwLTAuMy0wLjEtMC41 - LTAuMXMtMC4zLDAtMC41LDBjLTAuMiwwLTAuNCwwLTAuNSwwLjFjLTAuMiwwLTAuMywwLjEtMC40LDAu - MiAgYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAuMSwwLjNjMCwwLjEs - MCwwLjIsMC4xLDAuM2MwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4xLDAuMywwLjIsMC41LDAu - MyAgczAuNCwwLjIsMC42LDAuM2MwLjMsMC4xLDAuNiwwLjMsMC44LDAuNGMwLjIsMC4xLDAuNSwwLjMs - MC42LDAuNWMwLjIsMC4yLDAuMywwLjQsMC40LDAuNnMwLjEsMC41LDAuMSwwLjggIEMyMi42LDE2LjMs - MjIuNSwxNi42LDIyLjQsMTYuOXogTTI4LjEsMThsLTEuMy0yLjVjLTAuMS0wLjEtMC4xLTAuMy0wLjIt - MC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDI1LjEsMThIMjNsMi41LTMuOWwtMi4yLTMuOSAgaDIu - MWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4xLTAuNCwwLjItMC43bDEu - Mi0yLjNoMS45bC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xh - c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTMxLDhIM0MyLjQsOCwyLDguNCwyLDl2MTBjMCwwLjYsMC40 - LDEsMSwxaDI4YzAuNiwwLDEtMC40LDEtMVY5QzMyLDguNCwzMS42LDgsMzEsOHogTTkuMSwxOGwtMS4z - LTIuNSAgIGMtMC4xLTAuMS0wLjEtMC4zLTAuMi0wLjVoMGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMNi4x - LDE4SDRsMi41LTMuOWwtMi4yLTMuOWgyLjFsMS4xLDIuM2MwLjEsMC4yLDAuMiwwLjQsMC4yLDAuN2gw - ICAgYzAtMC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXog - TTE2LjcsMThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45ICAgYy0wLjIsMC4zLTAu - NCwwLjUtMC43LDAuN3MtMC42LDAuMy0xLDAuNGMtMC40LDAuMS0wLjgsMC4xLTEuMiwwLjFjLTAuNCww - LTAuOCwwLTEuMi0wLjFjLTAuNC0wLjEtMC43LTAuMi0xLTAuM1YxNiAgIGMwLjMsMC4zLDAuNiwwLjUs - MSwwLjZzMC43LDAuMiwxLjEsMC4yYzAuMiwwLDAuNCwwLDAuNi0wLjFzMC4zLTAuMSwwLjQtMC4yYzAu - MS0wLjEsMC4yLTAuMiwwLjItMC4yYzAuMS0wLjEsMC4xLTAuMiwwLjEtMC4zICAgYzAtMC4yLDAtMC4z - LTAuMS0wLjRjLTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0w - LjctMC4zYy0wLjYtMC4zLTEuMS0wLjYtMS4zLTAuOSAgIGMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjNj - MC0wLjQsMC4xLTAuNywwLjItMWMwLjItMC4zLDAuNC0wLjUsMC43LTAuN2MwLjMtMC4yLDAuNi0wLjMs - MS0wLjRzMC44LTAuMSwxLjItMC4xICAgYzAuNCwwLDAuOCwwLDEuMSwwLjFjMC4zLDAsMC42LDAuMSww - LjksMC4ydjEuNmMtMC4xLTAuMS0wLjMtMC4yLTAuNC0wLjJzLTAuMy0wLjEtMC41LTAuMmMtMC4yLDAt - MC4zLTAuMS0wLjUtMC4xcy0wLjMsMC0wLjUsMCAgIGMtMC4yLDAtMC40LDAtMC41LDAuMWMtMC4yLDAt - MC4zLDAuMS0wLjQsMC4yYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAu - MSwwLjNjMCwwLjEsMCwwLjIsMC4xLDAuMyAgIGMwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4x - LDAuMywwLjIsMC41LDAuM3MwLjQsMC4yLDAuNiwwLjNjMC4zLDAuMSwwLjYsMC4zLDAuOCwwLjRjMC4y - LDAuMSwwLjUsMC4zLDAuNiwwLjUgICBjMC4yLDAuMiwwLjMsMC40LDAuNCwwLjZzMC4xLDAuNSwwLjEs - MC44QzIyLjYsMTYuMywyMi41LDE2LjYsMjIuNCwxNi45eiBNMjguMSwxOGwtMS4zLTIuNWMtMC4xLTAu - MS0wLjEtMC4zLTAuMi0wLjVoMCAgIGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMMjUuMSwxOEgyM2wyLjUt - My45bC0yLjItMy45aDIuMWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4x - LTAuNCwwLjItMC43bDEuMi0yLjNoMS45ICAgbC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJC - bHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEFydGljbGU7TG9hZDtPcGVuO0lz - c3VlwgbP1QAAAIJJREFUOE+lkQEOgCAIRb0gl+kIzUN1gM7TDRiBG8wlitrf3jKCp7NERL+wRc6ZFvAF - oyBieTYCfgEpqADOq4vEE5SCCqKEAm9nRRIKooQCb2dFUvVPn0AvuYG/uQJgrOm5D2CoA3wF0jwaaKgF - y8OMnWBrmCl3sD0s2P/cxS3OQ+kF2uLi3IrZfvEAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEFydGljbGU7TG9hZDtPcGVuO0lz - c3VlwgbP1QAAARFJREFUWEfdkkEOwkAIRb3gXMaNe9MLufMArj2KVxj5BpKh+dh2xtJEkpcCKZ9P01Ot - 9VBoMxPazIQ2M6FNME1T/RFU36BNgOHR+C8D5XpfRRubDcjLxYbwHA3TkjTEFTpADbBrGW2YlqQhrtAB - aqAnTEvSEFfoADXArmW0YVqShrhCB6iBnjAtSUNcoQPUALuW0YZpSRriCh2gBnrCtCQNcYUOUAPsWkYb - piVpiCt0gBpYiCI4LbC0HLii0wCWg/p6nLdS1hqgFyq9yz84scBAkRcBFRhk8Qvsulz4+g/svhxEBsrz - dtl9OWAGUi435gZSlwNnQBqpy8HcABseJVwOnIEjoM1MaDMT2syENvOopzdUfCMZg5IrCQAAAABJRU5E - rkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAE9wZW47Rm9sZGVyO0JhcnM7Umli - Ym9uO1N0YW5kYXJkO0xvYWTxw8RjAAAAb0lEQVQ4T6XQ0Q2AIAwEUBbsMs7Q0ZzHFeqVRIJ6VQof7+fC - XUiLmS2hYQYNM4qqChjhOS31fICVL8JKvb+BSBueHUB3cQCGB+oxmWjgVjj2TcAC8hzwx1+Fl34gXYb2 - g6ky1BtMl1295AoajrNyArCYwjN4ThJYAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAE9wZW47Rm9sZGVyO0JhcnM7Umli - Ym9uO1N0YW5kYXJkO0xvYWTxw8RjAAAA0UlEQVRYR8XU0RHCMAwD0C6YZZihozEPK5j4h4t0ShvSVP14 - H9bVleE4toh4lAydZOgkQycZOsnQSYZOMnSCYd/3UsWgfBb2Z8BABSNgfwYMouAM7M+AQRSsUNoOBoNY - XqLtYDCo5RXaDgaDWl6h7WAwqOUV2g4Gg1oeNP2fAAO9dFT5vF8pJpTRA7qfMF9CL/0LvIxKf+X1wUsl - B06/gVvLq8PfwO3lqXeApTypA2zliQ+wlic4oAbW8sQHqOWruuUJDniCDJ1k6CRDJxn6xPYFX3CGNwSC - woYAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENvcHk7QmFycztSaWJib247U3Rh - bmRhcmQ7Q2xvbmVtDt9bAAAAb0lEQVQ4T+2OwQ2AIBAE6ckW700HlOaXIny4cgbIokE5w9NNJhC4HXAA - GkQEHfa8LjzflBUd6kXvvPcrS8yClI0ltfREjFGLt3PtDr0aQqiSEpNAc5WYBExJ3r8LOL9gkoBJ+fSD - s1OYJxiFywDcAUEvVDi/LQTFAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENvcHk7QmFycztSaWJib247U3Rh - bmRhcmQ7Q2xvbmVtDt9bAAAA50lEQVRYR+2TwQqDMAyGfT6fq1dRevfJxFNhD7EdsvysgukSp1vtBusH - P5K0id9BGyL6atRmyajNNM45OpjAaTmYfcp6tyis8BA/9oP7XdfdxnFsuUx3iVoUVt4RmOdZlSgmADSJ - ogIgldgUwOCReO9pmiYeleBsTZS4QoLPxDtFkQ6+Avf7vqcQQuw80PYsEnwmvomPBbA4lUB/Ixe+kk8A - aBIWcSavANgrcZoA2CNxqgBYJLS/A2QXsDIMQ7wlwRmTR2ALa1cVqAJVoAr8l4AVpowAI/ZrEUUV+AmB - nFnvtqI2y4WaO7s+m1CnlB8XAAAAAElFTkSuQmCC - - - - Back - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAEJSURB - VDhPpZOhCgJBEIava7IICmIx+AZyRdM1X0EQfI8Ds3a70Re4ahKTb2BTsIhR0/p/x57MHmsQwwe788/8 - tzO7l0yXRZ1MrMVBPDysiaEF+XbTFyuxF7kYi5aHNTE0csgNDAhsxUYMnHNJDDSfQ25pUhngitCIFVrI - 8bnUlAb0xdGCL2vfFkfhxFPMjcZJqMnYMJy8VjwUZ0HxRYys7nOYyZoFEx4bYSLugmK0ji00eQz2wIJr - avngTLwExVGMAbfziBnQb7QYYgb1FlJxExQwxG6lWRT/tBAbYk+cBCZXkVrd53yG+O0am2InMKGthdGC - a4S/HhL8/ZQrE1w52s8/k+WH37lI3sUnQlO0bha7AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJwSURB - VFhHxZe/Sh1BFMZNJbeUKIhgZ5fOMp2teBsRkaRIlZA0AZ9AsRZrX8E3EO59A9H8gRAIBOxSpAkEIoaY - zfdb5pO54+ze8Rrd4ifuOd85c3b3zJm9U1VVdUr9p793XMKC2BIHYijOxUWA/7HhQ4M2l2OE0gKeiF3x - QVSFoCWG2FzOmnEFPBKvxakg6V8xEDtiTSyJXoD/seFDg5YYYslBrhtrtBUwL/aF7+hIrKMtAW2IcTy5 - yDmyDloHxCA8FAR+FdtiOl6gBGJCLDnIRc6RItBZbHhUvvN3YiNOOgnkCLn8JK5fB36LDO/Ld37nxQ25 - Qk5ys0a2ADrWDbcdJ0iRvy8ug9Z8EYs5PcjH60DHGvXuwG4nsG0Q0DyN71w+Gixd/LNYyOmN/PSEG5O1 - arudDA72Ltunsdvl2xS/Rbz4JzGf06dIR/GswVp1wXYwvUg2iANi5Hsm/gSdIdFcTt+E9MwJYre4tpER - inEnFhvZX4h08TPxOKdvQzEMK+IPuLaROY5xLRYH30txFfzmRMyk2hIUx8Qkx5BrGzlMMC4l4jfCY3Vi - kpyMbeznXNvIiYaxFwnfijsvDs4Z8nJ2YL/guq2AVyJ99BPhnCFvtoCmV/BcpM13a5Kc2VfQ1oS5wTPR - DgDFZZtw3DZcFb+CxnDA/LdtWDKIVsTPoIuLmM3pm5A+O4hKR/FT8UPERbwXRdNQusZRDKWH0bL4HrTF - RcjfehjBbY5jtN+C1nwUjUXIN/Y4hk4/SKDzTzLo9KPUIPSTAJrnwT7LDY+K9+XGZPs82A+TGDqWbcPe - 9R2NAy0xdbc3UVqAub8fp91RTf0DZ0rWioS6adsAAAAASUVORK5CYII= - - - - Reset Layout - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALICAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iUmVzZXRfUmFuZ2UiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg - MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbHVle2ZpbGw6IzExNzdENzt9 - CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPGcgY2xh - c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTI5LDJIM0MyLjUsMiwyLDIuNSwyLDN2MjZjMCwwLjUsMC41 - LDEsMSwxaDI2YzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41LDIsMjksMnogTTI4LDEyaC0zLjJs - LTQsNGwyLDIgICBIMjh2MTBINFYxNGg1LjJsLTItMkg0VjRoMTJ2NGgzLjJMMjAsNy4yTDIwLjgsOEgy - OFYxMnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQogIDxwb2x5Z29uIHBvaW50cz0iMjIsMTIgMjAs - MTAgMTYsMTQgMTIsMTAgMTAsMTIgMTQsMTYgMTAsMjAgMTIsMjIgMTYsMTggMjAsMjIgMjIsMjAgMTgs - MTYgIiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRlbGV0ZUNpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0x - Niw0QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHog - TTIzLjEsMjAuMmwtMi44LDIuOEwxNiwxOC44bC00LjIsNC4yICAgbC0yLjgtMi44bDQuMi00LjJsLTQu - Mi00LjJsMi44LTIuOGw0LjIsNC4ybDQuMi00LjJsMi44LDIuOEwxOC44LDE2TDIzLjEsMjAuMnoiIGNs - YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABkEAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk - aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp - c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 - O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 - ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp - c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBdHRlbnRpb24iPg0K - ICAgIDxwYXRoIGQ9Ik0xNS4xLDIuNUwyLjEsMjYuNUMxLjgsMjcuMiwyLjMsMjgsMy4xLDI4aDI1Ljlj - MC44LDAsMS4zLTAuOCwwLjktMS41TDE2LjksMi41ICAgQzE2LjUsMS44LDE1LjUsMS44LDE1LjEsMi41 - eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMjBjMS4xLDAsMiwwLjksMiwycy0w - LjksMi0yLDJzLTItMC45LTItMlMxNC45LDIwLDE2LDIweiBNMTQsMTBoNHY4aC00VjEweiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - - AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA - AAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA - AACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAP8AAAAAAAAPd/AAAA - AAAPd3fwAAAAAA93d38AAAAAAPd3d///8AAAD3d3d3d/8AAA93d3d3fwAAAPd3//d38AAA93///3fwAA - D3f///d/AAAPd///938AAA93f/93fwAAAPd3d3fwAAAA/3d3f/AAAAAA///wAP//AADn/wAAw/8AAIH/ - AACA/wAAwAcAAOABAADwAQAA+AAAAPgAAAD4AAAA+AAAAPgAAAD8AQAA/AEAAP8HAAAoAAAAEAAAACAA - AAABAAgAAAAAAAABAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgBNTU0AWFhYAGRkZABubW4AeXl5AIaG - hgDg4OAA5uTlAOvr6wDx7/AA9vb2APr6+gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAMDAAAAAAA - AAAAAAAAAAAKBAcMAAAAAAAAAAAAAAAMBAEBBwwAAAAAAAAAAAAADAQBAQEHDAAAAAAAAAAAAAAKBAEB - AQcMDAwMDAAAAAAAAAoEAQEBBAEBAQYIDQAAAAAACgQBAQEBAQEBAggAAAAAAAAKAwEGCAsIBQEGDAAA - AAAADAEBCAsLCwgBAQwAAAAAAAgBAQsLCwsLAwEMAAAAAAAMAQEICwsLCAEBDAAAAAAADAYBBggLCAUB - BgwAAAAAAAAIAgEBAQEBAggAAAAAAAAADQgGAQEBBggNAAAAAAAAAAAADAwMDAwAAAD//wAA5/8AAMP/ - AACB/wAAgP8AAMAHAADgAQAA8AEAAPgAAAD4AAAA+AAAAPgAAAD4AAAA/AEAAPwBAAD/BwAAKAAAABAA - AAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vYwAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vbv9vb27/b2 - 9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jDq6urvZGRk/4aG - hv/29vbv9vb2MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vbvZGRk/0JC - Qv9CQkL/hoaG//b29u/29vYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vYw9vb272Rk - ZP9CQkL/QkJC/0JCQv+Ghob/9vb27/b29jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb2 - 9jDq6urvZGRk/0JCQv9CQkL/QkJC/4aGhv/29vb/9vb2//b29v/29vb/9vb2z/b29lAAAAAAAAAAAAAA - AAAAAAAA9vb2MOrq6u9kZGT/QkJC/0JCQv9CQkL/ZGRk/0JCQv9CQkL/QkJC/3p6ev/g4OD/9vb2gAAA - AAAAAAAAAAAAAAAAAAD29vYw6urq72RkZP9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/TU1N/+Dg - 4P/29vZQAAAAAAAAAAAAAAAAAAAAAPb29jDr6+v/WVlZ/0JCQv95eHj/5uTl//Hv8P/m5OX/bm1u/0JC - Qv96enr/9vb2zwAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2/0JCQv9CQkL/5uTl//Hv8P/x7/D/8e/w/+bk - 5f9CQkL/QkJC//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAODg4P9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv - 8P/x7/D/WFhY/0JCQv/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/QkJC/0JCQv/m5OX/8e/w//Hv - 8P/x7/D/5uTl/0JCQv9CQkL/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2z3p6ev9CQkL/eXh4/+bk - 5f/x7/D/5uTl/25tbv9CQkL/enp6//b29s8AAAAAAAAAAAAAAAAAAAAAAAAAAPb29lDg4OD/TU1N/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/TU1N/+Dg4P/29vZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2gODg - 4P96enr/QkJC/0JCQv9CQkL/enp6/+Dg4P/29vaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD29vZQ9vb2z/b29v/29vb/9vb2//b29s/29vZQAAAAAAAAAADn/wAAw/8AAIH/AAAA/wAAAH8AAIAD - AADAAQAA4AAAAPAAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPwBAAD+AwAA - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMEAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk - aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp - c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 - O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 - ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp - c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBcHBlYXJhbmNlIj4N - CiAgICA8cmVjdCB4PSIxMiIgeT0iNCIgd2lkdGg9IjgiIGhlaWdodD0iNiIgcng9IjAiIHJ5PSIwIiBj - bGFzcz0iWWVsbG93IiAvPg0KICAgIDxyZWN0IHg9IjIiIHk9IjEyIiB3aWR0aD0iOCIgaGVpZ2h0PSI2 - IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJSZWQiIC8+DQogICAgPHJlY3QgeD0iMjIiIHk9IjIwIiB3aWR0 - aD0iOCIgaGVpZ2h0PSI2IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgICA8ZyBjbGFz - cz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0xMiwxMmg4djZoLThWMTJ6IE0xMCwxMFY0SDJ2NkgxMHog - TTIyLDEwaDhWNGgtOFYxMHogTTIyLDE4aDh2LTZoLThWMTh6IE0xMiwyMHY2aDh2LTZIMTJ6IE0xMCwy - NnYtNkgydjYgICAgSDEweiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgPC9nPg0KPC9zdmc+ - Cw== - - - - Document Search - - \ No newline at end of file diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.fr-FR.resx.bak b/GUIs.Common/DocumentResultList/frmDocumentResultList.fr-FR.resx.bak deleted file mode 100644 index fcdb3756..00000000 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.fr-FR.resx.bak +++ /dev/null @@ -1,452 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHYNAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5H - cmVlbntmaWxsOiMwMzlDMjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgkuc3Qwe29wYWNpdHk6MC4z - O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTgsNGgxOHY2aDJWM2MwLTAuNS0wLjUtMS0xLTFIN0M2LjUs - Miw2LDIuNSw2LDN2N2gyVjR6IiBjbGFzcz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0yNiwyNkg4di04 - SDZ2OWMwLDAuNSwwLjUsMSwxLDFoMjBjMC41LDAsMS0wLjUsMS0xdi05aC0yVjI2eiIgY2xhc3M9IkJs - YWNrIiAvPg0KICA8cGF0aCBkPSJNMzEsOEgzQzIuNCw4LDIsOC40LDIsOXYxMGMwLDAuNiwwLjQsMSwx - LDFoMjhjMC42LDAsMS0wLjQsMS0xVjlDMzIsOC40LDMxLjYsOCwzMSw4eiBNOS4xLDE4bC0xLjMtMi41 - ICBjLTAuMS0wLjEtMC4xLTAuMy0wLjItMC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDYuMSwxOEg0 - bDIuNS0zLjlsLTIuMi0zLjloMi4xbDEuMSwyLjNjMC4xLDAuMiwwLjIsMC40LDAuMiwwLjdoMCAgYzAt - MC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXogTTE2Ljcs - MThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45Yy0wLjIsMC4zLTAuNCwwLjUtMC43 - LDAuNyAgcy0wLjYsMC4zLTEsMC40Yy0wLjQsMC4xLTAuOCwwLjEtMS4yLDAuMWMtMC40LDAtMC44LDAt - MS4yLTAuMWMtMC40LTAuMS0wLjctMC4yLTEtMC4zVjE2YzAuMywwLjMsMC42LDAuNSwxLDAuNnMwLjcs - MC4yLDEuMSwwLjIgIGMwLjIsMCwwLjQsMCwwLjYtMC4xczAuMy0wLjEsMC40LTAuMmMwLjEtMC4xLDAu - Mi0wLjIsMC4yLTAuMmMwLjEtMC4xLDAuMS0wLjIsMC4xLTAuM2MwLTAuMiwwLTAuMy0wLjEtMC40ICBj - LTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0wLjctMC4zYy0w - LjYtMC4zLTEuMS0wLjYtMS4zLTAuOWMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjMgIGMwLTAuNCwwLjEt - MC43LDAuMi0xYzAuMi0wLjMsMC40LTAuNSwwLjctMC43YzAuMy0wLjIsMC42LTAuMywxLTAuNHMwLjgt - MC4xLDEuMi0wLjFjMC40LDAsMC44LDAsMS4xLDAuMWMwLjMsMCwwLjYsMC4xLDAuOSwwLjIgIHYxLjZj - LTAuMS0wLjEtMC4zLTAuMi0wLjQtMC4ycy0wLjMtMC4xLTAuNS0wLjJjLTAuMiwwLTAuMy0wLjEtMC41 - LTAuMXMtMC4zLDAtMC41LDBjLTAuMiwwLTAuNCwwLTAuNSwwLjFjLTAuMiwwLTAuMywwLjEtMC40LDAu - MiAgYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAuMSwwLjNjMCwwLjEs - MCwwLjIsMC4xLDAuM2MwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4xLDAuMywwLjIsMC41LDAu - MyAgczAuNCwwLjIsMC42LDAuM2MwLjMsMC4xLDAuNiwwLjMsMC44LDAuNGMwLjIsMC4xLDAuNSwwLjMs - MC42LDAuNWMwLjIsMC4yLDAuMywwLjQsMC40LDAuNnMwLjEsMC41LDAuMSwwLjggIEMyMi42LDE2LjMs - MjIuNSwxNi42LDIyLjQsMTYuOXogTTI4LjEsMThsLTEuMy0yLjVjLTAuMS0wLjEtMC4xLTAuMy0wLjIt - MC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDI1LjEsMThIMjNsMi41LTMuOWwtMi4yLTMuOSAgaDIu - MWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4xLTAuNCwwLjItMC43bDEu - Mi0yLjNoMS45bC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xh - c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTMxLDhIM0MyLjQsOCwyLDguNCwyLDl2MTBjMCwwLjYsMC40 - LDEsMSwxaDI4YzAuNiwwLDEtMC40LDEtMVY5QzMyLDguNCwzMS42LDgsMzEsOHogTTkuMSwxOGwtMS4z - LTIuNSAgIGMtMC4xLTAuMS0wLjEtMC4zLTAuMi0wLjVoMGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMNi4x - LDE4SDRsMi41LTMuOWwtMi4yLTMuOWgyLjFsMS4xLDIuM2MwLjEsMC4yLDAuMiwwLjQsMC4yLDAuN2gw - ICAgYzAtMC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXog - TTE2LjcsMThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45ICAgYy0wLjIsMC4zLTAu - NCwwLjUtMC43LDAuN3MtMC42LDAuMy0xLDAuNGMtMC40LDAuMS0wLjgsMC4xLTEuMiwwLjFjLTAuNCww - LTAuOCwwLTEuMi0wLjFjLTAuNC0wLjEtMC43LTAuMi0xLTAuM1YxNiAgIGMwLjMsMC4zLDAuNiwwLjUs - MSwwLjZzMC43LDAuMiwxLjEsMC4yYzAuMiwwLDAuNCwwLDAuNi0wLjFzMC4zLTAuMSwwLjQtMC4yYzAu - MS0wLjEsMC4yLTAuMiwwLjItMC4yYzAuMS0wLjEsMC4xLTAuMiwwLjEtMC4zICAgYzAtMC4yLDAtMC4z - LTAuMS0wLjRjLTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0w - LjctMC4zYy0wLjYtMC4zLTEuMS0wLjYtMS4zLTAuOSAgIGMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjNj - MC0wLjQsMC4xLTAuNywwLjItMWMwLjItMC4zLDAuNC0wLjUsMC43LTAuN2MwLjMtMC4yLDAuNi0wLjMs - MS0wLjRzMC44LTAuMSwxLjItMC4xICAgYzAuNCwwLDAuOCwwLDEuMSwwLjFjMC4zLDAsMC42LDAuMSww - LjksMC4ydjEuNmMtMC4xLTAuMS0wLjMtMC4yLTAuNC0wLjJzLTAuMy0wLjEtMC41LTAuMmMtMC4yLDAt - MC4zLTAuMS0wLjUtMC4xcy0wLjMsMC0wLjUsMCAgIGMtMC4yLDAtMC40LDAtMC41LDAuMWMtMC4yLDAt - MC4zLDAuMS0wLjQsMC4yYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAu - MSwwLjNjMCwwLjEsMCwwLjIsMC4xLDAuMyAgIGMwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4x - LDAuMywwLjIsMC41LDAuM3MwLjQsMC4yLDAuNiwwLjNjMC4zLDAuMSwwLjYsMC4zLDAuOCwwLjRjMC4y - LDAuMSwwLjUsMC4zLDAuNiwwLjUgICBjMC4yLDAuMiwwLjMsMC40LDAuNCwwLjZzMC4xLDAuNSwwLjEs - MC44QzIyLjYsMTYuMywyMi41LDE2LjYsMjIuNCwxNi45eiBNMjguMSwxOGwtMS4zLTIuNWMtMC4xLTAu - MS0wLjEtMC4zLTAuMi0wLjVoMCAgIGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMMjUuMSwxOEgyM2wyLjUt - My45bC0yLjItMy45aDIuMWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4x - LTAuNCwwLjItMC43bDEuMi0yLjNoMS45ICAgbC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJC - bHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEFydGljbGU7TG9hZDtPcGVuO0lz - c3VlwgbP1QAAAIJJREFUOE+lkQEOgCAIRb0gl+kIzUN1gM7TDRiBG8wlitrf3jKCp7NERL+wRc6ZFvAF - oyBieTYCfgEpqADOq4vEE5SCCqKEAm9nRRIKooQCb2dFUvVPn0AvuYG/uQJgrOm5D2CoA3wF0jwaaKgF - y8OMnWBrmCl3sD0s2P/cxS3OQ+kF2uLi3IrZfvEAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEFydGljbGU7TG9hZDtPcGVuO0lz - c3VlwgbP1QAAARFJREFUWEfdkkEOwkAIRb3gXMaNe9MLufMArj2KVxj5BpKh+dh2xtJEkpcCKZ9P01Ot - 9VBoMxPazIQ2M6FNME1T/RFU36BNgOHR+C8D5XpfRRubDcjLxYbwHA3TkjTEFTpADbBrGW2YlqQhrtAB - aqAnTEvSEFfoADXArmW0YVqShrhCB6iBnjAtSUNcoQPUALuW0YZpSRriCh2gBnrCtCQNcYUOUAPsWkYb - piVpiCt0gBpYiCI4LbC0HLii0wCWg/p6nLdS1hqgFyq9yz84scBAkRcBFRhk8Qvsulz4+g/svhxEBsrz - dtl9OWAGUi435gZSlwNnQBqpy8HcABseJVwOnIEjoM1MaDMT2syENvOopzdUfCMZg5IrCQAAAABJRU5E - rkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAE9wZW47Rm9sZGVyO0JhcnM7Umli - Ym9uO1N0YW5kYXJkO0xvYWTxw8RjAAAAb0lEQVQ4T6XQ0Q2AIAwEUBbsMs7Q0ZzHFeqVRIJ6VQof7+fC - XUiLmS2hYQYNM4qqChjhOS31fICVL8JKvb+BSBueHUB3cQCGB+oxmWjgVjj2TcAC8hzwx1+Fl34gXYb2 - g6ky1BtMl1295AoajrNyArCYwjN4ThJYAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAArdEVYdFRpdGxlAE9wZW47Rm9sZGVyO0JhcnM7Umli - Ym9uO1N0YW5kYXJkO0xvYWTxw8RjAAAA0UlEQVRYR8XU0RHCMAwD0C6YZZihozEPK5j4h4t0ShvSVP14 - H9bVleE4toh4lAydZOgkQycZOsnQSYZOMnSCYd/3UsWgfBb2Z8BABSNgfwYMouAM7M+AQRSsUNoOBoNY - XqLtYDCo5RXaDgaDWl6h7WAwqOUV2g4Gg1oeNP2fAAO9dFT5vF8pJpTRA7qfMF9CL/0LvIxKf+X1wUsl - B06/gVvLq8PfwO3lqXeApTypA2zliQ+wlic4oAbW8sQHqOWruuUJDniCDJ1k6CRDJxn6xPYFX3CGNwSC - woYAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENvcHk7QmFycztSaWJib247U3Rh - bmRhcmQ7Q2xvbmVtDt9bAAAAb0lEQVQ4T+2OwQ2AIBAE6ckW700HlOaXIny4cgbIokE5w9NNJhC4HXAA - GkQEHfa8LjzflBUd6kXvvPcrS8yClI0ltfREjFGLt3PtDr0aQqiSEpNAc5WYBExJ3r8LOL9gkoBJ+fSD - s1OYJxiFywDcAUEvVDi/LQTFAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENvcHk7QmFycztSaWJib247U3Rh - bmRhcmQ7Q2xvbmVtDt9bAAAA50lEQVRYR+2TwQqDMAyGfT6fq1dRevfJxFNhD7EdsvysgukSp1vtBusH - P5K0id9BGyL6atRmyajNNM45OpjAaTmYfcp6tyis8BA/9oP7XdfdxnFsuUx3iVoUVt4RmOdZlSgmADSJ - ogIgldgUwOCReO9pmiYeleBsTZS4QoLPxDtFkQ6+Avf7vqcQQuw80PYsEnwmvomPBbA4lUB/Ixe+kk8A - aBIWcSavANgrcZoA2CNxqgBYJLS/A2QXsDIMQ7wlwRmTR2ALa1cVqAJVoAr8l4AVpowAI/ZrEUUV+AmB - nFnvtqI2y4WaO7s+m1CnlB8XAAAAAElFTkSuQmCC - - - - Retour - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAEJSURB - VDhPpZOhCgJBEIava7IICmIx+AZyRdM1X0EQfI8Ds3a70Re4ahKTb2BTsIhR0/p/x57MHmsQwwe788/8 - tzO7l0yXRZ1MrMVBPDysiaEF+XbTFyuxF7kYi5aHNTE0csgNDAhsxUYMnHNJDDSfQ25pUhngitCIFVrI - 8bnUlAb0xdGCL2vfFkfhxFPMjcZJqMnYMJy8VjwUZ0HxRYys7nOYyZoFEx4bYSLugmK0ji00eQz2wIJr - avngTLwExVGMAbfziBnQb7QYYgb1FlJxExQwxG6lWRT/tBAbYk+cBCZXkVrd53yG+O0am2InMKGthdGC - a4S/HhL8/ZQrE1w52s8/k+WH37lI3sUnQlO0bha7AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJwSURB - VFhHxZe/Sh1BFMZNJbeUKIhgZ5fOMp2teBsRkaRIlZA0AZ9AsRZrX8E3EO59A9H8gRAIBOxSpAkEIoaY - zfdb5pO54+ze8Rrd4ifuOd85c3b3zJm9U1VVdUr9p793XMKC2BIHYijOxUWA/7HhQ4M2l2OE0gKeiF3x - QVSFoCWG2FzOmnEFPBKvxakg6V8xEDtiTSyJXoD/seFDg5YYYslBrhtrtBUwL/aF7+hIrKMtAW2IcTy5 - yDmyDloHxCA8FAR+FdtiOl6gBGJCLDnIRc6RItBZbHhUvvN3YiNOOgnkCLn8JK5fB36LDO/Ld37nxQ25 - Qk5ys0a2ADrWDbcdJ0iRvy8ug9Z8EYs5PcjH60DHGvXuwG4nsG0Q0DyN71w+Gixd/LNYyOmN/PSEG5O1 - arudDA72Ltunsdvl2xS/Rbz4JzGf06dIR/GswVp1wXYwvUg2iANi5Hsm/gSdIdFcTt+E9MwJYre4tpER - inEnFhvZX4h08TPxOKdvQzEMK+IPuLaROY5xLRYH30txFfzmRMyk2hIUx8Qkx5BrGzlMMC4l4jfCY3Vi - kpyMbeznXNvIiYaxFwnfijsvDs4Z8nJ2YL/guq2AVyJ99BPhnCFvtoCmV/BcpM13a5Kc2VfQ1oS5wTPR - DgDFZZtw3DZcFb+CxnDA/LdtWDKIVsTPoIuLmM3pm5A+O4hKR/FT8UPERbwXRdNQusZRDKWH0bL4HrTF - RcjfehjBbY5jtN+C1nwUjUXIN/Y4hk4/SKDzTzLo9KPUIPSTAJrnwT7LDY+K9+XGZPs82A+TGDqWbcPe - 9R2NAy0xdbc3UVqAub8fp91RTf0DZ0rWioS6adsAAAAASUVORK5CYII= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALICAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iUmVzZXRfUmFuZ2UiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg - MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbHVle2ZpbGw6IzExNzdENzt9 - CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPGcgY2xh - c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTI5LDJIM0MyLjUsMiwyLDIuNSwyLDN2MjZjMCwwLjUsMC41 - LDEsMSwxaDI2YzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41LDIsMjksMnogTTI4LDEyaC0zLjJs - LTQsNGwyLDIgICBIMjh2MTBINFYxNGg1LjJsLTItMkg0VjRoMTJ2NGgzLjJMMjAsNy4yTDIwLjgsOEgy - OFYxMnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQogIDxwb2x5Z29uIHBvaW50cz0iMjIsMTIgMjAs - MTAgMTYsMTQgMTIsMTAgMTAsMTIgMTQsMTYgMTAsMjAgMTIsMjIgMTYsMTggMjAsMjIgMjIsMjAgMTgs - MTYgIiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRlbGV0ZUNpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0x - Niw0QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHog - TTIzLjEsMjAuMmwtMi44LDIuOEwxNiwxOC44bC00LjIsNC4yICAgbC0yLjgtMi44bDQuMi00LjJsLTQu - Mi00LjJsMi44LTIuOGw0LjIsNC4ybDQuMi00LjJsMi44LDIuOEwxOC44LDE2TDIzLjEsMjAuMnoiIGNs - YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABkEAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk - aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp - c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 - O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 - ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp - c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBdHRlbnRpb24iPg0K - ICAgIDxwYXRoIGQ9Ik0xNS4xLDIuNUwyLjEsMjYuNUMxLjgsMjcuMiwyLjMsMjgsMy4xLDI4aDI1Ljlj - MC44LDAsMS4zLTAuOCwwLjktMS41TDE2LjksMi41ICAgQzE2LjUsMS44LDE1LjUsMS44LDE1LjEsMi41 - eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMjBjMS4xLDAsMiwwLjksMiwycy0w - LjksMi0yLDJzLTItMC45LTItMlMxNC45LDIwLDE2LDIweiBNMTQsMTBoNHY4aC00VjEweiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - 1189, 132 - - - 0, 647 - - - 1189, 24 - - - 382, 515 - - - 370, 282 - - - 370, 515 - - - 762, 515 - - - 0, 132 - - - 417, 515 - - - 1189, 515 - - - - AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA - AAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA - AACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAP8AAAAAAAAPd/AAAA - AAAPd3fwAAAAAA93d38AAAAAAPd3d///8AAAD3d3d3d/8AAA93d3d3fwAAAPd3//d38AAA93///3fwAA - D3f///d/AAAPd///938AAA93f/93fwAAAPd3d3fwAAAA/3d3f/AAAAAA///wAP//AADn/wAAw/8AAIH/ - AACA/wAAwAcAAOABAADwAQAA+AAAAPgAAAD4AAAA+AAAAPgAAAD8AQAA/AEAAP8HAAAoAAAAEAAAACAA - AAABAAgAAAAAAAABAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgBNTU0AWFhYAGRkZABubW4AeXl5AIaG - hgDg4OAA5uTlAOvr6wDx7/AA9vb2APr6+gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAMDAAAAAAA - AAAAAAAAAAAKBAcMAAAAAAAAAAAAAAAMBAEBBwwAAAAAAAAAAAAADAQBAQEHDAAAAAAAAAAAAAAKBAEB - AQcMDAwMDAAAAAAAAAoEAQEBBAEBAQYIDQAAAAAACgQBAQEBAQEBAggAAAAAAAAKAwEGCAsIBQEGDAAA - AAAADAEBCAsLCwgBAQwAAAAAAAgBAQsLCwsLAwEMAAAAAAAMAQEICwsLCAEBDAAAAAAADAYBBggLCAUB - BgwAAAAAAAAIAgEBAQEBAggAAAAAAAAADQgGAQEBBggNAAAAAAAAAAAADAwMDAwAAAD//wAA5/8AAMP/ - AACB/wAAgP8AAMAHAADgAQAA8AEAAPgAAAD4AAAA+AAAAPgAAAD4AAAA/AEAAPwBAAD/BwAAKAAAABAA - AAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vYwAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vbv9vb27/b2 - 9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jDq6urvZGRk/4aG - hv/29vbv9vb2MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vbvZGRk/0JC - Qv9CQkL/hoaG//b29u/29vYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vYw9vb272Rk - ZP9CQkL/QkJC/0JCQv+Ghob/9vb27/b29jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb2 - 9jDq6urvZGRk/0JCQv9CQkL/QkJC/4aGhv/29vb/9vb2//b29v/29vb/9vb2z/b29lAAAAAAAAAAAAAA - AAAAAAAA9vb2MOrq6u9kZGT/QkJC/0JCQv9CQkL/ZGRk/0JCQv9CQkL/QkJC/3p6ev/g4OD/9vb2gAAA - AAAAAAAAAAAAAAAAAAD29vYw6urq72RkZP9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/TU1N/+Dg - 4P/29vZQAAAAAAAAAAAAAAAAAAAAAPb29jDr6+v/WVlZ/0JCQv95eHj/5uTl//Hv8P/m5OX/bm1u/0JC - Qv96enr/9vb2zwAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2/0JCQv9CQkL/5uTl//Hv8P/x7/D/8e/w/+bk - 5f9CQkL/QkJC//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAODg4P9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv - 8P/x7/D/WFhY/0JCQv/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/QkJC/0JCQv/m5OX/8e/w//Hv - 8P/x7/D/5uTl/0JCQv9CQkL/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2z3p6ev9CQkL/eXh4/+bk - 5f/x7/D/5uTl/25tbv9CQkL/enp6//b29s8AAAAAAAAAAAAAAAAAAAAAAAAAAPb29lDg4OD/TU1N/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/TU1N/+Dg4P/29vZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2gODg - 4P96enr/QkJC/0JCQv9CQkL/enp6/+Dg4P/29vaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD29vZQ9vb2z/b29v/29vb/9vb2//b29s/29vZQAAAAAAAAAADn/wAAw/8AAIH/AAAA/wAAAH8AAIAD - AADAAQAA4AAAAPAAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPwBAAD+AwAA - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMEAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk - aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp - c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 - O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 - ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp - c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBcHBlYXJhbmNlIj4N - CiAgICA8cmVjdCB4PSIxMiIgeT0iNCIgd2lkdGg9IjgiIGhlaWdodD0iNiIgcng9IjAiIHJ5PSIwIiBj - bGFzcz0iWWVsbG93IiAvPg0KICAgIDxyZWN0IHg9IjIiIHk9IjEyIiB3aWR0aD0iOCIgaGVpZ2h0PSI2 - IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJSZWQiIC8+DQogICAgPHJlY3QgeD0iMjIiIHk9IjIwIiB3aWR0 - aD0iOCIgaGVpZ2h0PSI2IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgICA8ZyBjbGFz - cz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0xMiwxMmg4djZoLThWMTJ6IE0xMCwxMFY0SDJ2NkgxMHog - TTIyLDEwaDhWNGgtOFYxMHogTTIyLDE4aDh2LTZoLThWMTh6IE0xMiwyMHY2aDh2LTZIMTJ6IE0xMCwy - NnYtNkgydjYgICAgSDEweiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgPC9nPg0KPC9zdmc+ - Cw== - - - \ No newline at end of file diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.resx.bak b/GUIs.Common/DocumentResultList/frmDocumentResultList.resx.bak deleted file mode 100644 index eedb7081..00000000 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.resx.bak +++ /dev/null @@ -1,995 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Fill - - - - 0, 0 - - - Fill - - - 0, 0 - - - Tahoma, 9pt, style=Bold - - - GridBand1 - - - GridBand1 - - - Hauptgrid Horizontal - - - Detailgrid Horizontal - - - Als XLSX exportieren - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHYNAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5H - cmVlbntmaWxsOiMwMzlDMjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgkuc3Qwe29wYWNpdHk6MC4z - O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTgsNGgxOHY2aDJWM2MwLTAuNS0wLjUtMS0xLTFIN0M2LjUs - Miw2LDIuNSw2LDN2N2gyVjR6IiBjbGFzcz0iQmxhY2siIC8+DQogIDxwYXRoIGQ9Ik0yNiwyNkg4di04 - SDZ2OWMwLDAuNSwwLjUsMSwxLDFoMjBjMC41LDAsMS0wLjUsMS0xdi05aC0yVjI2eiIgY2xhc3M9IkJs - YWNrIiAvPg0KICA8cGF0aCBkPSJNMzEsOEgzQzIuNCw4LDIsOC40LDIsOXYxMGMwLDAuNiwwLjQsMSwx - LDFoMjhjMC42LDAsMS0wLjQsMS0xVjlDMzIsOC40LDMxLjYsOCwzMSw4eiBNOS4xLDE4bC0xLjMtMi41 - ICBjLTAuMS0wLjEtMC4xLTAuMy0wLjItMC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDYuMSwxOEg0 - bDIuNS0zLjlsLTIuMi0zLjloMi4xbDEuMSwyLjNjMC4xLDAuMiwwLjIsMC40LDAuMiwwLjdoMCAgYzAt - MC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXogTTE2Ljcs - MThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45Yy0wLjIsMC4zLTAuNCwwLjUtMC43 - LDAuNyAgcy0wLjYsMC4zLTEsMC40Yy0wLjQsMC4xLTAuOCwwLjEtMS4yLDAuMWMtMC40LDAtMC44LDAt - MS4yLTAuMWMtMC40LTAuMS0wLjctMC4yLTEtMC4zVjE2YzAuMywwLjMsMC42LDAuNSwxLDAuNnMwLjcs - MC4yLDEuMSwwLjIgIGMwLjIsMCwwLjQsMCwwLjYtMC4xczAuMy0wLjEsMC40LTAuMmMwLjEtMC4xLDAu - Mi0wLjIsMC4yLTAuMmMwLjEtMC4xLDAuMS0wLjIsMC4xLTAuM2MwLTAuMiwwLTAuMy0wLjEtMC40ICBj - LTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0wLjctMC4zYy0w - LjYtMC4zLTEuMS0wLjYtMS4zLTAuOWMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjMgIGMwLTAuNCwwLjEt - MC43LDAuMi0xYzAuMi0wLjMsMC40LTAuNSwwLjctMC43YzAuMy0wLjIsMC42LTAuMywxLTAuNHMwLjgt - MC4xLDEuMi0wLjFjMC40LDAsMC44LDAsMS4xLDAuMWMwLjMsMCwwLjYsMC4xLDAuOSwwLjIgIHYxLjZj - LTAuMS0wLjEtMC4zLTAuMi0wLjQtMC4ycy0wLjMtMC4xLTAuNS0wLjJjLTAuMiwwLTAuMy0wLjEtMC41 - LTAuMXMtMC4zLDAtMC41LDBjLTAuMiwwLTAuNCwwLTAuNSwwLjFjLTAuMiwwLTAuMywwLjEtMC40LDAu - MiAgYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAuMSwwLjNjMCwwLjEs - MCwwLjIsMC4xLDAuM2MwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4xLDAuMywwLjIsMC41LDAu - MyAgczAuNCwwLjIsMC42LDAuM2MwLjMsMC4xLDAuNiwwLjMsMC44LDAuNGMwLjIsMC4xLDAuNSwwLjMs - MC42LDAuNWMwLjIsMC4yLDAuMywwLjQsMC40LDAuNnMwLjEsMC41LDAuMSwwLjggIEMyMi42LDE2LjMs - MjIuNSwxNi42LDIyLjQsMTYuOXogTTI4LjEsMThsLTEuMy0yLjVjLTAuMS0wLjEtMC4xLTAuMy0wLjIt - MC41aDBjMCwwLjEtMC4xLDAuMy0wLjIsMC41TDI1LjEsMThIMjNsMi41LTMuOWwtMi4yLTMuOSAgaDIu - MWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4xLTAuNCwwLjItMC43bDEu - Mi0yLjNoMS45bC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPGcgY2xh - c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTMxLDhIM0MyLjQsOCwyLDguNCwyLDl2MTBjMCwwLjYsMC40 - LDEsMSwxaDI4YzAuNiwwLDEtMC40LDEtMVY5QzMyLDguNCwzMS42LDgsMzEsOHogTTkuMSwxOGwtMS4z - LTIuNSAgIGMtMC4xLTAuMS0wLjEtMC4zLTAuMi0wLjVoMGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMNi4x - LDE4SDRsMi41LTMuOWwtMi4yLTMuOWgyLjFsMS4xLDIuM2MwLjEsMC4yLDAuMiwwLjQsMC4yLDAuN2gw - ICAgYzAtMC4yLDAuMS0wLjQsMC4yLTAuN2wxLjItMi4zaDEuOWwtMi4zLDMuOGwyLjQsMy45SDkuMXog - TTE2LjcsMThoLTQuNnYtNy43aDEuN3Y2LjNoMi45VjE4eiBNMjIuNCwxNi45ICAgYy0wLjIsMC4zLTAu - NCwwLjUtMC43LDAuN3MtMC42LDAuMy0xLDAuNGMtMC40LDAuMS0wLjgsMC4xLTEuMiwwLjFjLTAuNCww - LTAuOCwwLTEuMi0wLjFjLTAuNC0wLjEtMC43LTAuMi0xLTAuM1YxNiAgIGMwLjMsMC4zLDAuNiwwLjUs - MSwwLjZzMC43LDAuMiwxLjEsMC4yYzAuMiwwLDAuNCwwLDAuNi0wLjFzMC4zLTAuMSwwLjQtMC4yYzAu - MS0wLjEsMC4yLTAuMiwwLjItMC4yYzAuMS0wLjEsMC4xLTAuMiwwLjEtMC4zICAgYzAtMC4yLDAtMC4z - LTAuMS0wLjRjLTAuMS0wLjEtMC4yLTAuMi0wLjQtMC4zUzIwLDE1LjEsMTkuOCwxNXMtMC40LTAuMi0w - LjctMC4zYy0wLjYtMC4zLTEuMS0wLjYtMS4zLTAuOSAgIGMtMC4zLTAuNC0wLjQtMC44LTAuNC0xLjNj - MC0wLjQsMC4xLTAuNywwLjItMWMwLjItMC4zLDAuNC0wLjUsMC43LTAuN2MwLjMtMC4yLDAuNi0wLjMs - MS0wLjRzMC44LTAuMSwxLjItMC4xICAgYzAuNCwwLDAuOCwwLDEuMSwwLjFjMC4zLDAsMC42LDAuMSww - LjksMC4ydjEuNmMtMC4xLTAuMS0wLjMtMC4yLTAuNC0wLjJzLTAuMy0wLjEtMC41LTAuMmMtMC4yLDAt - MC4zLTAuMS0wLjUtMC4xcy0wLjMsMC0wLjUsMCAgIGMtMC4yLDAtMC40LDAtMC41LDAuMWMtMC4yLDAt - MC4zLDAuMS0wLjQsMC4yYy0wLjEsMC4xLTAuMiwwLjEtMC4zLDAuMmMtMC4xLDAuMS0wLjEsMC4yLTAu - MSwwLjNjMCwwLjEsMCwwLjIsMC4xLDAuMyAgIGMwLjEsMC4xLDAuMiwwLjIsMC4zLDAuM2MwLjEsMC4x - LDAuMywwLjIsMC41LDAuM3MwLjQsMC4yLDAuNiwwLjNjMC4zLDAuMSwwLjYsMC4zLDAuOCwwLjRjMC4y - LDAuMSwwLjUsMC4zLDAuNiwwLjUgICBjMC4yLDAuMiwwLjMsMC40LDAuNCwwLjZzMC4xLDAuNSwwLjEs - MC44QzIyLjYsMTYuMywyMi41LDE2LjYsMjIuNCwxNi45eiBNMjguMSwxOGwtMS4zLTIuNWMtMC4xLTAu - MS0wLjEtMC4zLTAuMi0wLjVoMCAgIGMwLDAuMS0wLjEsMC4zLTAuMiwwLjVMMjUuMSwxOEgyM2wyLjUt - My45bC0yLjItMy45aDIuMWwxLjEsMi4zYzAuMSwwLjIsMC4yLDAuNCwwLjIsMC43aDBjMC0wLjIsMC4x - LTAuNCwwLjItMC43bDEuMi0yLjNoMS45ICAgbC0yLjMsMy44bDIuNCwzLjlIMjguMXoiIGNsYXNzPSJC - bHVlIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - {0} Ergebnisse - - - {0} Ergebnisse - - - Zurück - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAEJSURB - VDhPpZOhCgJBEIava7IICmIx+AZyRdM1X0EQfI8Ds3a70Re4ahKTb2BTsIhR0/p/x57MHmsQwwe788/8 - tzO7l0yXRZ1MrMVBPDysiaEF+XbTFyuxF7kYi5aHNTE0csgNDAhsxUYMnHNJDDSfQ25pUhngitCIFVrI - 8bnUlAb0xdGCL2vfFkfhxFPMjcZJqMnYMJy8VjwUZ0HxRYys7nOYyZoFEx4bYSLugmK0ji00eQz2wIJr - avngTLwExVGMAbfziBnQb7QYYgb1FlJxExQwxG6lWRT/tBAbYk+cBCZXkVrd53yG+O0am2InMKGthdGC - a4S/HhL8/ZQrE1w52s8/k+WH37lI3sUnQlO0bha7AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAEJhY2s7UHJldj1cl8kAAAJwSURB - VFhHxZe/Sh1BFMZNJbeUKIhgZ5fOMp2teBsRkaRIlZA0AZ9AsRZrX8E3EO59A9H8gRAIBOxSpAkEIoaY - zfdb5pO54+ze8Rrd4ifuOd85c3b3zJm9U1VVdUr9p793XMKC2BIHYijOxUWA/7HhQ4M2l2OE0gKeiF3x - QVSFoCWG2FzOmnEFPBKvxakg6V8xEDtiTSyJXoD/seFDg5YYYslBrhtrtBUwL/aF7+hIrKMtAW2IcTy5 - yDmyDloHxCA8FAR+FdtiOl6gBGJCLDnIRc6RItBZbHhUvvN3YiNOOgnkCLn8JK5fB36LDO/Ld37nxQ25 - Qk5ys0a2ADrWDbcdJ0iRvy8ug9Z8EYs5PcjH60DHGvXuwG4nsG0Q0DyN71w+Gixd/LNYyOmN/PSEG5O1 - arudDA72Ltunsdvl2xS/Rbz4JzGf06dIR/GswVp1wXYwvUg2iANi5Hsm/gSdIdFcTt+E9MwJYre4tpER - inEnFhvZX4h08TPxOKdvQzEMK+IPuLaROY5xLRYH30txFfzmRMyk2hIUx8Qkx5BrGzlMMC4l4jfCY3Vi - kpyMbeznXNvIiYaxFwnfijsvDs4Z8nJ2YL/guq2AVyJ99BPhnCFvtoCmV/BcpM13a5Kc2VfQ1oS5wTPR - DgDFZZtw3DZcFb+CxnDA/LdtWDKIVsTPoIuLmM3pm5A+O4hKR/FT8UPERbwXRdNQusZRDKWH0bL4HrTF - RcjfehjBbY5jtN+C1nwUjUXIN/Y4hk4/SKDzTzLo9KPUIPSTAJrnwT7LDY+K9+XGZPs82A+TGDqWbcPe - 9R2NAy0xdbc3UVqAub8fp91RTf0DZ0rWioS6adsAAAAASUVORK5CYII= - - - - Layout zurücksetzen - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALICAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iUmVzZXRfUmFuZ2UiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg - MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5CbHVle2ZpbGw6IzExNzdENzt9 - CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC41O30KPC9zdHlsZT4NCiAgPGcgY2xh - c3M9InN0MCI+DQogICAgPHBhdGggZD0iTTI5LDJIM0MyLjUsMiwyLDIuNSwyLDN2MjZjMCwwLjUsMC41 - LDEsMSwxaDI2YzAuNSwwLDEtMC41LDEtMVYzQzMwLDIuNSwyOS41LDIsMjksMnogTTI4LDEyaC0zLjJs - LTQsNGwyLDIgICBIMjh2MTBINFYxNGg1LjJsLTItMkg0VjRoMTJ2NGgzLjJMMjAsNy4yTDIwLjgsOEgy - OFYxMnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQogIDxwb2x5Z29uIHBvaW50cz0iMjIsMTIgMjAs - MTAgMTYsMTQgMTIsMTAgMTAsMTIgMTQsMTYgMTAsMjAgMTIsMjIgMTYsMTggMjAsMjIgMjIsMjAgMTgs - MTYgIiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw== - - - - Critical Error - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkRlbGV0ZUNpcmNsZWQiPg0KICAgIDxwYXRoIGQ9Ik0x - Niw0QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHog - TTIzLjEsMjAuMmwtMi44LDIuOEwxNiwxOC44bC00LjIsNC4yICAgbC0yLjgtMi44bDQuMi00LjJsLTQu - Mi00LjJsMi44LTIuOGw0LjIsNC4ybDQuMi00LjJsMi44LDIuOEwxOC44LDE2TDIzLjEsMjAuMnoiIGNs - YXNzPSJSZWQiIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - Warning - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABkEAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk - aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp - c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 - O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 - ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp - c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBdHRlbnRpb24iPg0K - ICAgIDxwYXRoIGQ9Ik0xNS4xLDIuNUwyLjEsMjYuNUMxLjgsMjcuMiwyLjMsMjgsMy4xLDI4aDI1Ljlj - MC44LDAsMS4zLTAuOCwwLjktMS41TDE2LjksMi41ICAgQzE2LjUsMS44LDE1LjUsMS44LDE1LjEsMi41 - eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgICA8cGF0aCBkPSJNMTYsMjBjMS4xLDAsMiwwLjksMiwycy0w - LjksMi0yLDJzLTItMC45LTItMlMxNC45LDIwLDE2LDIweiBNMTQsMTBoNHY4aC00VjEweiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - Datei öffnen - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOMCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlNpbmdsZVBhZ2VWaWV3Ij4NCiAgICA8cGF0aCBk - PSJNMjcsMEgzQzIuNCwwLDIsMC40LDIsMXYyOGMwLDAuNiwwLjQsMSwxLDFoMjRjMC42LDAsMS0wLjQs - MS0xVjFDMjgsMC40LDI3LjYsMCwyNywweiBNMjYsMjhINFYyaDIyVjI4eiIgY2xhc3M9IkJsYWNrIiAv - Pg0KICAgIDxwYXRoIGQ9Ik0yMiw4SDhWNmgxNFY4eiBNMjIsMTBIOHYyaDE0VjEweiBNMjIsMTRIOHYy - aDE0VjE0eiBNMjIsMThIOHYyaDE0VjE4eiBNMjIsMjJIOHYyaDE0VjIyeiIgY2xhc3M9IkJsdWUiIC8+ - DQogIDwvZz4NCjwvc3ZnPgs= - - - - Eigenschaften - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACcFAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3 - RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm - aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRWRpdENvbG9ycyI+DQogICAgPHBhdGggZD0i - TTI5LDBIMUMwLjUsMCwwLDAuNSwwLDF2MjhjMCwwLjUsMC41LDEsMSwxaDI4YzAuNSwwLDEtMC41LDEt - MVYxQzMwLDAuNSwyOS41LDAsMjksMHogTTI4LDI4SDJWMmgyNlYyOHoiIGNsYXNzPSJCbGFjayIgLz4N - CiAgICA8cGF0aCBkPSJNMTAsMTBINFY0aDZWMTB6IE0xOCw0aC02djZoNlY0eiBNMTAsMTJINHY2aDZW - MTJ6IiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDxwYXRoIGQ9Ik0xMCwyNkg0di02aDZWMjZ6IE0xOCwx - MmgtNnY2aDZWMTJ6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTI2LDEwaC02VjRoNlYx - MHogTTI2LDEyaC02djZoNlYxMnoiIGNsYXNzPSJSZWQiIC8+DQogICAgPHBhdGggZD0iTTI2LDI2aC02 - di02aDZWMjZ6IE0xOCwyMGgtNnY2aDZWMjB6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgICA8ZyBjbGFzcz0i - c3QxIj4NCiAgICAgIDxyZWN0IHg9IjQiIHk9IjEyIiB3aWR0aD0iNiIgaGVpZ2h0PSI2IiByeD0iMCIg - cnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgICAgIDxwYXRoIGQ9Ik0xOCwxMGgtNlY0aDZWMTB6IE0y - NiwyMGgtNnY2aDZWMjB6IiBjbGFzcz0iUmVkIiAvPg0KICAgICAgPHBhdGggZD0iTTI2LDE4aC02di02 - aDZWMTh6IE0xOCwxMmgtNnY2aDZWMTJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgICA8L2c+DQogICAgPGcg - Y2xhc3M9InN0MSI+DQogICAgICA8cmVjdCB4PSIyMCIgeT0iMjAiIHdpZHRoPSI2IiBoZWlnaHQ9IjYi - IHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsdWUiIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L - - - - Ordner öffnen - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAMDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iT3BlbjIiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcgMCAwIDMy - IDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5HcmVlbntmaWxsOiMwMzlDMjM7fQoJLlll - bGxvd3tmaWxsOiNGRkIxMTU7fQoJLnN0MHtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBjbGFz - cz0ic3QwIj4NCiAgICA8cGF0aCBkPSJNMTkuMiwxMEgxMlY3YzAtMC42LTAuNC0xLTEtMUgzQzIuNCw2 - LDIsNi41LDIsN3YxOGMwLDAuMiwwLDAuMywwLjEsMC40YzAsMCwwLjEtMC4xLDAuMS0wLjJsNS41LTEw - ICAgQzgsMTQuNSw4LjcsMTQsOS41LDE0aDEzLjdMMTkuMiwxMHoiIGNsYXNzPSJZZWxsb3ciIC8+DQog - IDwvZz4NCiAgPHBhdGggZD0iTTI5LjMsMTZIOS42TDQsMjZoMTkuOGMwLjUsMCwxLjEtMC4yLDEuMy0w - LjZsNC45LTguOUMzMC4xLDE2LjIsMjkuOCwxNiwyOS4zLDE2eiIgY2xhc3M9IlllbGxvdyIgLz4NCiAg - PHBhdGggZD0iTTI4LDhjMC0zLjMtMi43LTYtNi02cy02LDIuNy02LDZjMC0yLjIsMS44LTQsNC00czQs - MS44LDQsNGgtNGw2LDZsNi02SDI4eiIgY2xhc3M9IkdyZWVuIiAvPg0KPC9zdmc+Cw== - - - - Dateipfad in Zwischenablage - - - Ordnerpfad in Zwischenablage - - - Eigenschaften - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACcFAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3 - RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm - aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRWRpdENvbG9ycyI+DQogICAgPHBhdGggZD0i - TTI5LDBIMUMwLjUsMCwwLDAuNSwwLDF2MjhjMCwwLjUsMC41LDEsMSwxaDI4YzAuNSwwLDEtMC41LDEt - MVYxQzMwLDAuNSwyOS41LDAsMjksMHogTTI4LDI4SDJWMmgyNlYyOHoiIGNsYXNzPSJCbGFjayIgLz4N - CiAgICA8cGF0aCBkPSJNMTAsMTBINFY0aDZWMTB6IE0xOCw0aC02djZoNlY0eiBNMTAsMTJINHY2aDZW - MTJ6IiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDxwYXRoIGQ9Ik0xMCwyNkg0di02aDZWMjZ6IE0xOCwx - MmgtNnY2aDZWMTJ6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTI2LDEwaC02VjRoNlYx - MHogTTI2LDEyaC02djZoNlYxMnoiIGNsYXNzPSJSZWQiIC8+DQogICAgPHBhdGggZD0iTTI2LDI2aC02 - di02aDZWMjZ6IE0xOCwyMGgtNnY2aDZWMjB6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgICA8ZyBjbGFzcz0i - c3QxIj4NCiAgICAgIDxyZWN0IHg9IjQiIHk9IjEyIiB3aWR0aD0iNiIgaGVpZ2h0PSI2IiByeD0iMCIg - cnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgICAgIDxwYXRoIGQ9Ik0xOCwxMGgtNlY0aDZWMTB6IE0y - NiwyMGgtNnY2aDZWMjB6IiBjbGFzcz0iUmVkIiAvPg0KICAgICAgPHBhdGggZD0iTTI2LDE4aC02di02 - aDZWMTh6IE0xOCwxMmgtNnY2aDZWMTJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgICA8L2c+DQogICAgPGcg - Y2xhc3M9InN0MSI+DQogICAgICA8cmVjdCB4PSIyMCIgeT0iMjAiIHdpZHRoPSI2IiBoZWlnaHQ9IjYi - IHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsdWUiIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L - - - - 0, 0 - - - Navigation - - - Layout - - - Export - - - Ergebnisse - - - - False - - - False - - - 1189, 132 - - - 0, 647 - - - 1189, 24 - - - RibbonStatusBar - - - DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 1 - - - RibbonControl - - - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 2 - - - 382, 511 - - - 0 - - - GridControl1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl1.Panel1 - - - 0 - - - Panel1 - - - Fill - - - 0, 0 - - - Fill - - - 0, 0 - - - Tahoma, 9pt, style=Bold - - - GridBand2 - - - GridBand2 - - - 370, 223 - - - 0 - - - GridControl2 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl2.Panel1 - - - 0 - - - Panel1 - - - Fill - - - 0, 0 - - - Tahoma, 9pt, style=Bold - - - GridBand3 - - - GridBand3 - - - 370, 278 - - - 0 - - - GridControl3 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl2.Panel2 - - - 0 - - - Panel2 - - - 370, 511 - - - 0 - - - SplitContainerControl2 - - - SplitContainerControl2 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl1.Panel2 - - - 0 - - - Panel2 - - - 762, 511 - - - 2 - - - SplitContainerControl1 - - - SplitContainerControl1 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl3.Panel1 - - - 0 - - - Fill - - - 0, 132 - - - Panel1 - - - Fill - - - 0, 0 - - - 413, 511 - - - 0 - - - DocumentViewer1 - - - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.4.0, Culture=neutral, PublicKeyToken=null - - - SplitContainerControl3.Panel2 - - - 0 - - - Panel2 - - - 1189, 515 - - - 5 - - - SplitContainerControl3 - - - SplitContainerControl3 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 0 - - - 14, 16 - - - 167, 16 - - - 353, 18 - - - 522, 21 - - - True - - - 6, 13 - - - 1189, 671 - - - - AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA - AAAgAAAAAQAEAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAIAAAACAgACAAAAAgACAAICA - AACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAAAAAAAAAAAAAP8AAAAAAAAPd/AAAA - AAAPd3fwAAAAAA93d38AAAAAAPd3d///8AAAD3d3d3d/8AAA93d3d3fwAAAPd3//d38AAA93///3fwAA - D3f///d/AAAPd///938AAA93f/93fwAAAPd3d3fwAAAA/3d3f/AAAAAA///wAP//AADn/wAAw/8AAIH/ - AACA/wAAwAcAAOABAADwAQAA+AAAAPgAAAD4AAAA+AAAAPgAAAD8AQAA/AEAAP8HAAAoAAAAEAAAACAA - AAABAAgAAAAAAAABAAAAAAAAAAAAAAABAAAAAQAAAAAAAEJCQgBNTU0AWFhYAGRkZABubW4AeXl5AIaG - hgDg4OAA5uTlAOvr6wDx7/AA9vb2APr6+gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAMDAAAAAAA - AAAAAAAAAAAKBAcMAAAAAAAAAAAAAAAMBAEBBwwAAAAAAAAAAAAADAQBAQEHDAAAAAAAAAAAAAAKBAEB - AQcMDAwMDAAAAAAAAAoEAQEBBAEBAQYIDQAAAAAACgQBAQEBAQEBAggAAAAAAAAKAwEGCAsIBQEGDAAA - AAAADAEBCAsLCwgBAQwAAAAAAAgBAQsLCwsLAwEMAAAAAAAMAQEICwsLCAEBDAAAAAAADAYBBggLCAUB - BgwAAAAAAAAIAgEBAQEBAggAAAAAAAAADQgGAQEBBggNAAAAAAAAAAAADAwMDAwAAAD//wAA5/8AAMP/ - AACB/wAAgP8AAMAHAADgAQAA8AEAAPgAAAD4AAAA+AAAAPgAAAD4AAAA/AEAAPwBAAD/BwAAKAAAABAA - AAAgAAAAAQAgAAAAAABABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vYwAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vbv9vb27/b2 - 9jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jDq6urvZGRk/4aG - hv/29vbv9vb2MAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb29jD29vbvZGRk/0JC - Qv9CQkL/hoaG//b29u/29vYwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD29vYw9vb272Rk - ZP9CQkL/QkJC/0JCQv+Ghob/9vb27/b29jAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPb2 - 9jDq6urvZGRk/0JCQv9CQkL/QkJC/4aGhv/29vb/9vb2//b29v/29vb/9vb2z/b29lAAAAAAAAAAAAAA - AAAAAAAA9vb2MOrq6u9kZGT/QkJC/0JCQv9CQkL/ZGRk/0JCQv9CQkL/QkJC/3p6ev/g4OD/9vb2gAAA - AAAAAAAAAAAAAAAAAAD29vYw6urq72RkZP9CQkL/QkJC/0JCQv9CQkL/QkJC/0JCQv9CQkL/TU1N/+Dg - 4P/29vZQAAAAAAAAAAAAAAAAAAAAAPb29jDr6+v/WVlZ/0JCQv95eHj/5uTl//Hv8P/m5OX/bm1u/0JC - Qv96enr/9vb2zwAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2/0JCQv9CQkL/5uTl//Hv8P/x7/D/8e/w/+bk - 5f9CQkL/QkJC//b29v8AAAAAAAAAAAAAAAAAAAAAAAAAAODg4P9CQkL/QkJC//Hv8P/x7/D/8e/w//Hv - 8P/x7/D/WFhY/0JCQv/29vb/AAAAAAAAAAAAAAAAAAAAAAAAAAD29vb/QkJC/0JCQv/m5OX/8e/w//Hv - 8P/x7/D/5uTl/0JCQv9CQkL/9vb2/wAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2z3p6ev9CQkL/eXh4/+bk - 5f/x7/D/5uTl/25tbv9CQkL/enp6//b29s8AAAAAAAAAAAAAAAAAAAAAAAAAAPb29lDg4OD/TU1N/0JC - Qv9CQkL/QkJC/0JCQv9CQkL/TU1N/+Dg4P/29vZQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA9vb2gODg - 4P96enr/QkJC/0JCQv9CQkL/enp6/+Dg4P/29vaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD29vZQ9vb2z/b29v/29vb/9vb2//b29s/29vZQAAAAAAAAAADn/wAAw/8AAIH/AAAA/wAAAH8AAIAD - AADAAQAA4AAAAPAAAAD4AAAA+AAAAPgAAAD4AAAA+AAAAPwBAAD+AwAA - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMEAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk - aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp - c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 - O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 - ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp - c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJBcHBlYXJhbmNlIj4N - CiAgICA8cmVjdCB4PSIxMiIgeT0iNCIgd2lkdGg9IjgiIGhlaWdodD0iNiIgcng9IjAiIHJ5PSIwIiBj - bGFzcz0iWWVsbG93IiAvPg0KICAgIDxyZWN0IHg9IjIiIHk9IjEyIiB3aWR0aD0iOCIgaGVpZ2h0PSI2 - IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJSZWQiIC8+DQogICAgPHJlY3QgeD0iMjIiIHk9IjIwIiB3aWR0 - aD0iOCIgaGVpZ2h0PSI2IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgICA8ZyBjbGFz - cz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0xMiwxMmg4djZoLThWMTJ6IE0xMCwxMFY0SDJ2NkgxMHog - TTIyLDEwaDhWNGgtOFYxMHogTTIyLDE4aDh2LTZoLThWMTh6IE0xMiwyMHY2aDh2LTZIMTJ6IE0xMCwy - NnYtNkgydjYgICAgSDEweiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgPC9nPg0KPC9zdmc+ - Cw== - - - - Dokumenten Suche - - - GridView1 - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridBand1 - - - DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SwitchMainContainerHorizontal - - - DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SwitchDetailContainerHorizontal - - - DevExpress.XtraBars.BarToggleSwitchItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarButtonItemExportGrid1 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarStaticItem1 - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - labelResultCount - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarButtonBack - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - BarButtonItem5 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RepositoryItemTextEdit1 - - - DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RepositoryItemTextEdit2 - - - DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - labelCriticalError - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - labelWarning - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - MenuItemFileOpen - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - MenuItemPropertiesIDB - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - MenuItemFolderOpen - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - MenuItemFilepathCopy - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - MenuItemFolderpathCopy - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - MenuItemPropertiesECM - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPage1 - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup_Navigation - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup_Layout - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RibbonPageGroup_Export - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridView2 - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridBand2 - - - DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridView3 - - - DevExpress.XtraGrid.Views.BandedGrid.BandedGridView, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - GridBand3 - - - DevExpress.XtraGrid.Views.BandedGrid.GridBand, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraSaveFileDialog - - - DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - MenuFullAccess_IDB - - - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - MenuViewAccess_IDB - - - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - MenuFullAccess_EDM - - - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - frmDocumentResultList - - - DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - \ No newline at end of file diff --git a/GUIs.Common/My Project/Application.Designer.vb b/GUIs.Common/My Project/Application.Designer.vb deleted file mode 100644 index 8ab460ba..00000000 --- a/GUIs.Common/My Project/Application.Designer.vb +++ /dev/null @@ -1,13 +0,0 @@ -'------------------------------------------------------------------------------ -' -' Dieser Code wurde von einem Tool generiert. -' Laufzeitversion:4.0.30319.42000 -' -' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -' der Code erneut generiert wird. -' -'------------------------------------------------------------------------------ - -Option Strict On -Option Explicit On - diff --git a/GUIs.Common/My Project/Resources.Designer.vb b/GUIs.Common/My Project/Resources.Designer.vb index 1f5bff43..75aa3f72 100644 --- a/GUIs.Common/My Project/Resources.Designer.vb +++ b/GUIs.Common/My Project/Resources.Designer.vb @@ -110,6 +110,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property clearpivottable() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("clearpivottable", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -250,6 +260,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property save() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("save", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.Common/My Project/Resources.resx b/GUIs.Common/My Project/Resources.resx index 4885af69..bf5854a4 100644 --- a/GUIs.Common/My Project/Resources.resx +++ b/GUIs.Common/My Project/Resources.resx @@ -118,80 +118,38 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\zoom_less.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\doc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Copy_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\categorize.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\txt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\zoom_less.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\actions_question.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\grid.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\dxf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\singlepageview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -199,4 +157,52 @@ ..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\singlepageview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\txt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\categorize.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\png.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Copy_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + \ No newline at end of file diff --git a/GUIs.Common/My Project/licenses.licx b/GUIs.Common/My Project/licenses.licx index 4c23d9e3..3c8716d5 100644 --- a/GUIs.Common/My Project/licenses.licx +++ b/GUIs.Common/My Project/licenses.licx @@ -1,7 +1,8 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb b/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb new file mode 100644 index 00000000..d99cedc5 --- /dev/null +++ b/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb @@ -0,0 +1,185 @@ +Imports DevExpress.XtraEditors +Imports DevExpress.XtraLayout +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.ZooFlow +Imports DigitalData.Modules.Database +Imports DigitalData.Controls.LookupGrid +Imports DevExpress.XtraGrid +Imports System.Windows.Forms +Imports DevExpress.XtraGrid.Views.Grid +Imports DigitalData.Modules.EDMI.API +Imports DigitalData.Modules.Base + +Public Class AttributeControls + Inherits BaseClass + + Private ReadOnly Client As Client + Private ReadOnly Environment As Environment + + Public Event EditValueChanged As EventHandler + + Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pClient As Client) + MyBase.New(pLogConfig) + Client = pClient + Environment = pEnvironment + End Sub + + Public Function ShouldControlBeEditable(pAttribute As Attribute) As Boolean + If pAttribute.IsSystem Then + Return False + End If + + Return True + End Function + + Public Async Function GetAttributesForBusinessEntity(EntityId As Long) As Task(Of List(Of Attribute)) + Try + Dim oSQL = $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE BE_ID = {EntityId} AND LANG_CODE = '{Environment.User.Language}'" + Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) + + If oResult.OK = False Then + Throw New ApplicationException($"Attributes for Business Entity {EntityId} could not be retrieved!") + + ElseIf oResult.Table.Rows.Count = 0 Then + Throw New ApplicationException($"BusinessEntity {EntityId} does not have any attributes!") + + Else + Dim oAttributes As New List(Of Attribute) + + For Each oRow As DataRow In oResult.Table.Rows + oAttributes.Add(New Attribute() With { + .ID = oRow.Item("ATTR_ID"), + .Title = oRow.Item("ATTR_TITLE"), + .TypeID = oRow.Item("TYPE_ID"), + .TypeName = oRow.Item("TYPE_NAME"), + .IsSystem = Convert.ToBoolean(oRow.Item("SYS_ATTRIBUTE")) + }) + Next + + Return oAttributes + End If + Catch ex As Exception + Logger.Error(ex) + Return New List(Of Attribute) + End Try + End Function + + Public Async Function LoadControlsForAttributes(pObjectId As Long, pAttributes As List(Of Attribute), LayoutRoot As LayoutControlGroup) As Task + LayoutRoot.Clear() + + For Each oAttribute As Attribute In pAttributes + Dim oEditable = ShouldControlBeEditable(oAttribute) + Dim oControl = GetControlForAttribute(oAttribute, Not oEditable) + Dim oItem As LayoutControlItem = LayoutRoot.AddItem() + + oItem.Text = oAttribute.Title + oItem.Name = oAttribute.Title + oItem.Control = oControl + Next + + For Each oItem As LayoutControlItem In LayoutRoot.Items + If TypeOf oItem.Control Is BaseEdit Then + Dim oValue = Await GetAttributeValue(oItem.Name, pObjectId) + Dim oEdit = DirectCast(oItem.Control, BaseEdit) + + oEdit.EditValue = oValue + + AddHandler oEdit.EditValueChanged, Sub() RaiseEvent EditValueChanged(oItem, Nothing) + + ElseIf TypeOf oItem.Control Is GridControl Then + Dim oValueTable = Await GetAttributeValueAsTable(oItem.Name, pObjectId) + Dim oGrid = DirectCast(oItem.Control, GridControl) + oGrid.DataSource = oValueTable + + + End If + Next + End Function + + Public Async Function GetAttributeValue(AttributeName As String, ObjectId As Long, Optional LanguageCode As String = "de-DE", Optional IsForeign As Boolean = False) As Task(Of Object) + Dim oIsForeign = IIf(IsForeign, 1, 0) + Dim oSQL = $"SELECT TERM_VALUE FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({ObjectId}, '{AttributeName}', '{LanguageCode}', {oIsForeign})" + Dim oResult = Await Client.GetScalarValueFromIDBAsync(oSQL) + + Return oResult.Scalar + End Function + + Public Async Function GetAttributeValueAsTable(AttributeName As String, ObjectId As Long, Optional LanguageCode As String = "de-DE", Optional IsForeign As Boolean = False) As Task(Of DataTable) + Dim oIsForeign = IIf(IsForeign, 1, 0) + Dim oSQL = $"SELECT TERM_VALUE FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({ObjectId}, '{AttributeName}', '{LanguageCode}', {oIsForeign})" + Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) + + Return oResult.Table + End Function + + Public Function GetControlForAttribute(pAttribute As Attribute, pIsReadOnly As Boolean) As Control + Dim oControl As Control + + Select Case pAttribute.TypeName + Case Attribute.TYPE_BIT + Dim oCheckboxEdit As New CheckEdit With { + .Name = pAttribute.ID, + .Text = pAttribute.Title, + .[ReadOnly] = pIsReadOnly + } + oControl = oCheckboxEdit + + Case Attribute.TYPE_DATE + Dim oDateEdit As New DateEdit With { + .Name = pAttribute.ID, + .[ReadOnly] = pIsReadOnly + } + oControl = oDateEdit + + Case Attribute.TYPE_BIG_INTEGER + Dim oTextEdit As New TextEdit With { + .Name = pAttribute.ID, + .[ReadOnly] = pIsReadOnly + } + oControl = oTextEdit + + Case Attribute.TYPE_DECIMAL + Dim oTextEdit As New TextEdit With { + .Name = pAttribute.ID, + .[ReadOnly] = pIsReadOnly + } + oControl = oTextEdit + + Case Attribute.TYPE_FLOAT + Dim oTextEdit As New TextEdit With { + .Name = pAttribute.ID, + .[ReadOnly] = pIsReadOnly + } + oControl = oTextEdit + + Case Attribute.TYPE_VECTOR_STRING + ' Minimum size is picked up by the LayoutControl to determine the grids size + Dim oGrid As New GridControl With { + .Name = pAttribute.ID, + .MinimumSize = New System.Drawing.Size(0, 100) + } + + oGrid.ForceInitialize() + + Dim oView = DirectCast(oGrid.DefaultView, GridView) + oView.OptionsView.ShowGroupPanel = False + oView.OptionsView.ShowColumnHeaders = False + oView.OptionsView.ShowIndicator = False + oView.OptionsBehavior.ReadOnly = True + oView.OptionsBehavior.Editable = False + oControl = oGrid + + Case Else + Dim oTextEdit As New TextEdit With { + .Name = pAttribute.ID, + .[ReadOnly] = pIsReadOnly + } + oControl = oTextEdit + + End Select + + oControl.Tag = pAttribute + + Return oControl + End Function +End Class diff --git a/GUIs.Common/ObjectPropertyDialog/PropertyControls.vb b/GUIs.Common/ObjectPropertyDialog/PropertyControls.vb deleted file mode 100644 index 6588de42..00000000 --- a/GUIs.Common/ObjectPropertyDialog/PropertyControls.vb +++ /dev/null @@ -1,90 +0,0 @@ -Imports DevExpress.XtraEditors -Imports DevExpress.XtraLayout -Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.ZooFlow -Imports DigitalData.Modules.Database -Imports DigitalData.Controls.LookupGrid -Imports DevExpress.XtraGrid -Imports System.Windows.Forms -Imports DevExpress.XtraGrid.Views.Grid - -Public Class PropertyControls - Private _LogConfig As LogConfig - Private _Logger As Logger - Private _Db As MSSQLServer - - Public Sub New(LogConfig As LogConfig, Database As MSSQLServer) - _LogConfig = LogConfig - _Logger = LogConfig.GetLogger() - _Db = Database - End Sub - - Public Function GetControlForAttribute(pAttribute As Attribute, pIsReadOnly As Boolean) As Control - Dim oControl As Control - - Select Case pAttribute.TypeName - Case Attribute.TYPE_BIT - Dim oCheckboxEdit As New CheckEdit With { - .Name = pAttribute.ID, - .Text = pAttribute.Title, - .[ReadOnly] = pIsReadOnly - } - oControl = oCheckboxEdit - - Case Attribute.TYPE_DATE - Dim oDateEdit As New DateEdit With { - .Name = pAttribute.ID, - .[ReadOnly] = pIsReadOnly - } - oControl = oDateEdit - - Case Attribute.TYPE_BIG_INTEGER - Dim oTextEdit As New TextEdit With { - .Name = pAttribute.ID, - .[ReadOnly] = pIsReadOnly - } - oControl = oTextEdit - - Case Attribute.TYPE_DECIMAL - Dim oTextEdit As New TextEdit With { - .Name = pAttribute.ID, - .[ReadOnly] = pIsReadOnly - } - oControl = oTextEdit - - Case Attribute.TYPE_FLOAT - Dim oTextEdit As New TextEdit With { - .Name = pAttribute.ID, - .[ReadOnly] = pIsReadOnly - } - oControl = oTextEdit - - Case Attribute.TYPE_VECTOR_STRING - ' Minimum size is picked up by the LayoutControl to determine the grids size - Dim oGrid As New GridControl With { - .Name = pAttribute.ID, - .MinimumSize = New System.Drawing.Size(0, 100) - } - - oGrid.ForceInitialize() - - Dim oView = DirectCast(oGrid.DefaultView, GridView) - oView.OptionsView.ShowGroupPanel = False - oView.OptionsView.ShowColumnHeaders = False - oView.OptionsView.ShowIndicator = False - oView.OptionsBehavior.ReadOnly = True - oView.OptionsBehavior.Editable = False - oControl = oGrid - - Case Else - Dim oTextEdit As New TextEdit With { - .Name = pAttribute.ID, - .[ReadOnly] = pIsReadOnly - } - oControl = oTextEdit - - End Select - - Return oControl - End Function -End Class diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb new file mode 100644 index 00000000..99eb43cb --- /dev/null +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb @@ -0,0 +1,531 @@ + _ +Partial Class ctrlObjectPropertyDialog + Inherits System.Windows.Forms.UserControl + + 'UserControl ü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.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabPageObject = New DevExpress.XtraTab.XtraTabPage() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.ProgressBarControl1 = New DevExpress.XtraEditors.ProgressBarControl() + Me.RootMetadata = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.lbLifecycleStart = New DevExpress.XtraLayout.SimpleLabelItem() + Me.lbLifecycleEnd = New DevExpress.XtraLayout.SimpleLabelItem() + Me.XtraTabPageAttributes = New DevExpress.XtraTab.XtraTabPage() + Me.XtraTabPageAttributeHistory = New DevExpress.XtraTab.XtraTabPage() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.txtCreatedWho = New DevExpress.XtraEditors.TextEdit() + Me.TextEdit11 = New DevExpress.XtraEditors.TextEdit() + Me.txtAccessedWhen = New DevExpress.XtraEditors.TextEdit() + Me.txtObjectId = New DevExpress.XtraEditors.TextEdit() + Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() + Me.txtCreatedWhen = New DevExpress.XtraEditors.TextEdit() + Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() + Me.txtAccessedWho = New DevExpress.XtraLayout.LayoutControlItem() + Me.GridControl2 = New DevExpress.XtraGrid.GridControl() + Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.LayoutControl2 = New DevExpress.XtraLayout.LayoutControl() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.XtraTabPageObject.SuspendLayout() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lbLifecycleEnd, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabPageAttributes.SuspendLayout() + Me.XtraTabPageAttributeHistory.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtCreatedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAccessedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtObjectId.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtCreatedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAccessedWho, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'XtraTabControl1 + ' + Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageObject + Me.XtraTabControl1.Size = New System.Drawing.Size(505, 723) + Me.XtraTabControl1.TabIndex = 2 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageObject, Me.XtraTabPageAttributes, Me.XtraTabPageAttributeHistory}) + ' + 'XtraTabPageObject + ' + Me.XtraTabPageObject.Controls.Add(Me.LayoutControl1) + Me.XtraTabPageObject.Name = "XtraTabPageObject" + Me.XtraTabPageObject.Size = New System.Drawing.Size(503, 698) + Me.XtraTabPageObject.Text = "Objekt" + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.GridControl1) + Me.LayoutControl1.Controls.Add(Me.ProgressBarControl1) + Me.LayoutControl1.Controls.Add(Me.txtObjectId) + Me.LayoutControl1.Controls.Add(Me.txtCreatedWhen) + Me.LayoutControl1.Controls.Add(Me.txtCreatedWho) + Me.LayoutControl1.Controls.Add(Me.txtChangedWho) + Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) + Me.LayoutControl1.Controls.Add(Me.txtAccessedWhen) + Me.LayoutControl1.Controls.Add(Me.TextEdit11) + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1068, 351, 650, 400) + Me.LayoutControl1.Root = Me.RootMetadata + Me.LayoutControl1.Size = New System.Drawing.Size(503, 698) + Me.LayoutControl1.TabIndex = 0 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'ProgressBarControl1 + ' + Me.ProgressBarControl1.Location = New System.Drawing.Point(24, 656) + Me.ProgressBarControl1.Name = "ProgressBarControl1" + Me.ProgressBarControl1.Size = New System.Drawing.Size(455, 18) + Me.ProgressBarControl1.StyleController = Me.LayoutControl1 + Me.ProgressBarControl1.TabIndex = 7 + ' + 'RootMetadata + ' + Me.RootMetadata.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.RootMetadata.GroupBordersVisible = False + Me.RootMetadata.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.LayoutControlGroup2, Me.LayoutControlGroup3}) + Me.RootMetadata.Name = "Root" + Me.RootMetadata.Size = New System.Drawing.Size(503, 698) + Me.RootMetadata.TextVisible = False + ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2}) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 232) + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(483, 346) + Me.LayoutControlGroup1.Text = "Objekt Historie" + ' + 'LayoutControlGroup2 + ' + Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.EmptySpaceItem1, Me.LayoutControlItem1, Me.LayoutControlItem3, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.txtAccessedWho}) + Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlGroup2.Name = "LayoutControlGroup2" + Me.LayoutControlGroup2.Size = New System.Drawing.Size(483, 232) + Me.LayoutControlGroup2.Text = "Eigenschaften" + ' + 'LayoutControlGroup3 + ' + Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.lbLifecycleStart, Me.lbLifecycleEnd}) + Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 578) + Me.LayoutControlGroup3.Name = "LayoutControlGroup3" + Me.LayoutControlGroup3.Size = New System.Drawing.Size(483, 100) + Me.LayoutControlGroup3.Text = "Lebenszyklus" + ' + 'LayoutControlItem4 + ' + Me.LayoutControlItem4.Control = Me.ProgressBarControl1 + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 33) + Me.LayoutControlItem4.Name = "LayoutControlItem4" + Me.LayoutControlItem4.Size = New System.Drawing.Size(459, 22) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem4.TextVisible = False + ' + 'lbLifecycleStart + ' + Me.lbLifecycleStart.AllowHotTrack = False + Me.lbLifecycleStart.Location = New System.Drawing.Point(0, 0) + Me.lbLifecycleStart.Name = "lbLifecycleStart" + Me.lbLifecycleStart.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.lbLifecycleStart.Size = New System.Drawing.Size(229, 33) + Me.lbLifecycleStart.Text = "00.00.0000" + Me.lbLifecycleStart.TextSize = New System.Drawing.Size(70, 13) + ' + 'lbLifecycleEnd + ' + Me.lbLifecycleEnd.AllowHotTrack = False + Me.lbLifecycleEnd.AppearanceItemCaption.Options.UseTextOptions = True + Me.lbLifecycleEnd.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far + Me.lbLifecycleEnd.Location = New System.Drawing.Point(229, 0) + Me.lbLifecycleEnd.Name = "lbLifecycleEnd" + Me.lbLifecycleEnd.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.lbLifecycleEnd.Size = New System.Drawing.Size(230, 33) + Me.lbLifecycleEnd.Text = "99.99.9999" + Me.lbLifecycleEnd.TextSize = New System.Drawing.Size(70, 13) + ' + 'XtraTabPageAttributes + ' + Me.XtraTabPageAttributes.Controls.Add(Me.LayoutControl2) + Me.XtraTabPageAttributes.Name = "XtraTabPageAttributes" + Me.XtraTabPageAttributes.Size = New System.Drawing.Size(503, 698) + Me.XtraTabPageAttributes.Text = "Attribute" + ' + 'XtraTabPageAttributeHistory + ' + Me.XtraTabPageAttributeHistory.Controls.Add(Me.GridControl2) + Me.XtraTabPageAttributeHistory.Name = "XtraTabPageAttributeHistory" + Me.XtraTabPageAttributeHistory.Size = New System.Drawing.Size(503, 698) + Me.XtraTabPageAttributeHistory.Text = "Attribut Historie" + ' + 'GridControl1 + ' + Me.GridControl1.Location = New System.Drawing.Point(24, 277) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(455, 297) + Me.GridControl1.TabIndex = 9 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.GridControl1 + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Size = New System.Drawing.Size(459, 301) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem2.TextVisible = False + ' + 'EmptySpaceItem1 + ' + Me.EmptySpaceItem1.AllowHotTrack = False + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 120) + Me.EmptySpaceItem1.Name = "EmptySpaceItem1" + Me.EmptySpaceItem1.Size = New System.Drawing.Size(459, 67) + Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) + ' + 'txtCreatedWho + ' + Me.txtCreatedWho.Location = New System.Drawing.Point(338, 78) + Me.txtCreatedWho.Name = "txtCreatedWho" + Me.txtCreatedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.txtCreatedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.txtCreatedWho.Properties.ReadOnly = True + Me.txtCreatedWho.Size = New System.Drawing.Size(138, 20) + Me.txtCreatedWho.StyleController = Me.LayoutControl1 + Me.txtCreatedWho.TabIndex = 8 + ' + 'TextEdit11 + ' + Me.TextEdit11.Location = New System.Drawing.Point(338, 138) + Me.TextEdit11.Name = "TextEdit11" + Me.TextEdit11.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.TextEdit11.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.TextEdit11.Properties.ReadOnly = True + Me.TextEdit11.Size = New System.Drawing.Size(138, 20) + Me.TextEdit11.StyleController = Me.LayoutControl1 + Me.TextEdit11.TabIndex = 10 + ' + 'txtAccessedWhen + ' + Me.txtAccessedWhen.Location = New System.Drawing.Point(109, 138) + Me.txtAccessedWhen.Name = "txtAccessedWhen" + Me.txtAccessedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.txtAccessedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.txtAccessedWhen.Properties.ReadOnly = True + Me.txtAccessedWhen.Size = New System.Drawing.Size(137, 20) + Me.txtAccessedWhen.StyleController = Me.LayoutControl1 + Me.txtAccessedWhen.TabIndex = 6 + ' + 'txtObjectId + ' + Me.txtObjectId.Location = New System.Drawing.Point(109, 48) + Me.txtObjectId.Name = "txtObjectId" + Me.txtObjectId.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.txtObjectId.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.txtObjectId.Properties.ReadOnly = True + Me.txtObjectId.Size = New System.Drawing.Size(367, 20) + Me.txtObjectId.StyleController = Me.LayoutControl1 + Me.txtObjectId.TabIndex = 7 + ' + 'txtChangedWhen + ' + Me.txtChangedWhen.Location = New System.Drawing.Point(109, 108) + Me.txtChangedWhen.Name = "txtChangedWhen" + Me.txtChangedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.txtChangedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.txtChangedWhen.Properties.ReadOnly = True + Me.txtChangedWhen.Size = New System.Drawing.Size(137, 20) + Me.txtChangedWhen.StyleController = Me.LayoutControl1 + Me.txtChangedWhen.TabIndex = 5 + ' + 'txtCreatedWhen + ' + Me.txtCreatedWhen.Location = New System.Drawing.Point(109, 78) + Me.txtCreatedWhen.Name = "txtCreatedWhen" + Me.txtCreatedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.txtCreatedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.txtCreatedWhen.Properties.ReadOnly = True + Me.txtCreatedWhen.Size = New System.Drawing.Size(137, 20) + Me.txtCreatedWhen.StyleController = Me.LayoutControl1 + Me.txtCreatedWhen.TabIndex = 4 + ' + 'txtChangedWho + ' + Me.txtChangedWho.Location = New System.Drawing.Point(338, 108) + Me.txtChangedWho.Name = "txtChangedWho" + Me.txtChangedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.txtChangedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.txtChangedWho.Properties.ReadOnly = True + Me.txtChangedWho.Size = New System.Drawing.Size(138, 20) + Me.txtChangedWho.StyleController = Me.LayoutControl1 + Me.txtChangedWho.TabIndex = 9 + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.txtObjectId + Me.LayoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem1.CustomizationFormText = "Objekt Id" + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem1.Size = New System.Drawing.Size(459, 30) + Me.LayoutControlItem1.Text = "Objekt Id" + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(70, 13) + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.txtCreatedWhen + Me.LayoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem3.CustomizationFormText = "Erstellt" + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 30) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem3.Size = New System.Drawing.Size(229, 30) + Me.LayoutControlItem3.Text = "Erstellt" + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(70, 13) + ' + 'LayoutControlItem5 + ' + Me.LayoutControlItem5.Control = Me.txtCreatedWho + Me.LayoutControlItem5.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem5.CustomizationFormText = "von" + Me.LayoutControlItem5.Location = New System.Drawing.Point(229, 30) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem5.Size = New System.Drawing.Size(230, 30) + Me.LayoutControlItem5.Text = "von" + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(70, 13) + ' + 'LayoutControlItem6 + ' + Me.LayoutControlItem6.Control = Me.txtChangedWho + Me.LayoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem6.CustomizationFormText = "von" + Me.LayoutControlItem6.Location = New System.Drawing.Point(229, 60) + Me.LayoutControlItem6.Name = "LayoutControlItem6" + Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem6.Size = New System.Drawing.Size(230, 30) + Me.LayoutControlItem6.Text = "von" + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(70, 13) + ' + 'LayoutControlItem7 + ' + Me.LayoutControlItem7.Control = Me.txtChangedWhen + Me.LayoutControlItem7.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem7.CustomizationFormText = "Geändert" + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 60) + Me.LayoutControlItem7.Name = "LayoutControlItem7" + Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem7.Size = New System.Drawing.Size(229, 30) + Me.LayoutControlItem7.Text = "Geändert" + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(70, 13) + ' + 'LayoutControlItem8 + ' + Me.LayoutControlItem8.Control = Me.txtAccessedWhen + Me.LayoutControlItem8.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.LayoutControlItem8.CustomizationFormText = "Letzter Zugriff" + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 90) + Me.LayoutControlItem8.Name = "LayoutControlItem8" + Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem8.Size = New System.Drawing.Size(229, 30) + Me.LayoutControlItem8.Text = "Letzter Zugriff" + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(70, 13) + ' + 'txtAccessedWho + ' + Me.txtAccessedWho.Control = Me.TextEdit11 + Me.txtAccessedWho.ControlAlignment = System.Drawing.ContentAlignment.TopLeft + Me.txtAccessedWho.CustomizationFormText = "von" + Me.txtAccessedWho.Location = New System.Drawing.Point(229, 90) + Me.txtAccessedWho.Name = "txtAccessedWho" + Me.txtAccessedWho.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.txtAccessedWho.Size = New System.Drawing.Size(230, 30) + Me.txtAccessedWho.Text = "von" + Me.txtAccessedWho.TextSize = New System.Drawing.Size(70, 13) + ' + 'GridControl2 + ' + Me.GridControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl2.Location = New System.Drawing.Point(0, 0) + Me.GridControl2.MainView = Me.GridView2 + Me.GridControl2.Name = "GridControl2" + Me.GridControl2.Size = New System.Drawing.Size(503, 698) + Me.GridControl2.TabIndex = 0 + Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) + ' + 'GridView2 + ' + Me.GridView2.GridControl = Me.GridControl2 + Me.GridView2.Name = "GridView2" + ' + 'LayoutControl2 + ' + Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl2.Name = "LayoutControl2" + Me.LayoutControl2.Root = Me.Root + Me.LayoutControl2.Size = New System.Drawing.Size(503, 698) + Me.LayoutControl2.TabIndex = 0 + Me.LayoutControl2.Text = "LayoutControl2" + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(503, 698) + Me.Root.TextVisible = False + ' + 'ctrlObjectPropertyDialog + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.XtraTabControl1) + Me.Name = "ctrlObjectPropertyDialog" + Me.Size = New System.Drawing.Size(505, 723) + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.XtraTabPageObject.ResumeLayout(False) + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lbLifecycleEnd, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabPageAttributes.ResumeLayout(False) + Me.XtraTabPageAttributeHistory.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtCreatedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAccessedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtObjectId.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtCreatedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAccessedWho, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents XtraTabPageObject As DevExpress.XtraTab.XtraTabPage + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents ProgressBarControl1 As DevExpress.XtraEditors.ProgressBarControl + Friend WithEvents RootMetadata As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlGroup3 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents lbLifecycleStart As DevExpress.XtraLayout.SimpleLabelItem + Friend WithEvents lbLifecycleEnd As DevExpress.XtraLayout.SimpleLabelItem + Friend WithEvents XtraTabPageAttributes As DevExpress.XtraTab.XtraTabPage + Friend WithEvents XtraTabPageAttributeHistory As DevExpress.XtraTab.XtraTabPage + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem + Friend WithEvents txtObjectId As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtCreatedWhen As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtCreatedWho As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtChangedWho As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtChangedWhen As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtAccessedWhen As DevExpress.XtraEditors.TextEdit + Friend WithEvents TextEdit11 As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents txtAccessedWho As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents LayoutControl2 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup +End Class diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.resx b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.resx similarity index 100% rename from GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.resx rename to GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.resx diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb new file mode 100644 index 00000000..d4e15077 --- /dev/null +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb @@ -0,0 +1,7 @@ +Imports DevExpress.XtraTab + +Public Class ctrlObjectPropertyDialog + Private Sub ctrlObjectPropertyDialog_Load(sender As Object, e As EventArgs) Handles Me.Load + + End Sub +End Class diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb index e0231a28..85373fd0 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb @@ -32,6 +32,7 @@ Partial Class frmObjectPropertyDialog Me.TabFormControl1 = New DevExpress.XtraBars.TabFormControl() Me.cmbBusinessEntity = New DevExpress.XtraBars.BarEditItem() Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() + Me.btnSave = New DevExpress.XtraBars.BarButtonItem() Me.TabPageAttributes = New DevExpress.XtraBars.TabFormPage() Me.TabFormContentContainer1 = New DevExpress.XtraBars.TabFormContentContainer() Me.LayoutControlAttributes = New DevExpress.XtraLayout.LayoutControl() @@ -39,6 +40,10 @@ Partial Class frmObjectPropertyDialog Me.TabPageObject = New DevExpress.XtraBars.TabFormPage() Me.TabFormContentContainer2 = New DevExpress.XtraBars.TabFormContentContainer() Me.LayoutControlObject = New DevExpress.XtraLayout.LayoutControl() + Me.GridObjectHistory = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn() Me.GroupControl1 = New DevExpress.XtraEditors.GroupControl() Me.progressLifecycle = New DevExpress.XtraEditors.ProgressBarControl() Me.lbLifecycleEnd = New DevExpress.XtraEditors.LabelControl() @@ -51,16 +56,18 @@ Partial Class frmObjectPropertyDialog Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.LayoutObject = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() Me.SimpleSeparator1 = New DevExpress.XtraLayout.SimpleSeparator() + Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.txtAccessedWho = New DevExpress.XtraLayout.LayoutControlItem() - Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() - Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() Me.TabPageHistory = New DevExpress.XtraBars.TabFormPage() Me.TabFormContentContainer4 = New DevExpress.XtraBars.TabFormContentContainer() Me.GridValueHistory = New DevExpress.XtraGrid.GridControl() @@ -79,6 +86,8 @@ Partial Class frmObjectPropertyDialog Me.TabFormContentContainer2.SuspendLayout() CType(Me.LayoutControlObject, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControlObject.SuspendLayout() + CType(Me.GridObjectHistory, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.GroupControl1.SuspendLayout() CType(Me.progressLifecycle.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -90,16 +99,18 @@ Partial Class frmObjectPropertyDialog CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutObject, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtAccessedWho, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() Me.TabFormContentContainer4.SuspendLayout() CType(Me.GridValueHistory, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewValueHistory, System.ComponentModel.ISupportInitialize).BeginInit() @@ -118,13 +129,13 @@ Partial Class frmObjectPropertyDialog ' 'TabFormControl1 ' - Me.TabFormControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.cmbBusinessEntity, Me.BarStaticItem1}) + Me.TabFormControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.cmbBusinessEntity, Me.BarStaticItem1, Me.btnSave}) Me.TabFormControl1.Location = New System.Drawing.Point(0, 0) Me.TabFormControl1.Name = "TabFormControl1" Me.TabFormControl1.Pages.Add(Me.TabPageAttributes) Me.TabFormControl1.Pages.Add(Me.TabPageObject) Me.TabFormControl1.Pages.Add(Me.TabPageHistory) - Me.TabFormControl1.SelectedPage = Me.TabPageAttributes + Me.TabFormControl1.SelectedPage = Me.TabPageObject Me.TabFormControl1.ShowAddPageButton = False Me.TabFormControl1.ShowTabCloseButtons = False Me.TabFormControl1.Size = New System.Drawing.Size(572, 71) @@ -133,6 +144,7 @@ Partial Class frmObjectPropertyDialog Me.TabFormControl1.TabRightItemLinks.Add(Me.BarStaticItem1) Me.TabFormControl1.TabRightItemLinks.Add(Me.cmbBusinessEntity) Me.TabFormControl1.TabStop = False + Me.TabFormControl1.TitleItemLinks.Add(Me.btnSave) ' 'cmbBusinessEntity ' @@ -149,6 +161,13 @@ Partial Class frmObjectPropertyDialog Me.BarStaticItem1.Name = "BarStaticItem1" Me.BarStaticItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' + 'btnSave + ' + Me.btnSave.Caption = "BarButtonItem1" + Me.btnSave.Id = 0 + Me.btnSave.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.save + Me.btnSave.Name = "btnSave" + ' 'TabPageAttributes ' Me.TabPageAttributes.ContentContainer = Me.TabFormContentContainer1 @@ -199,6 +218,7 @@ Partial Class frmObjectPropertyDialog ' 'LayoutControlObject ' + Me.LayoutControlObject.Controls.Add(Me.GridObjectHistory) Me.LayoutControlObject.Controls.Add(Me.GroupControl1) Me.LayoutControlObject.Controls.Add(Me.txtCreatedWhen) Me.LayoutControlObject.Controls.Add(Me.txtChangedWhen) @@ -215,14 +235,47 @@ Partial Class frmObjectPropertyDialog Me.LayoutControlObject.TabIndex = 0 Me.LayoutControlObject.Text = "LayoutControl1" ' + 'GridObjectHistory + ' + Me.GridObjectHistory.Location = New System.Drawing.Point(24, 211) + Me.GridObjectHistory.MainView = Me.GridView1 + Me.GridObjectHistory.Name = "GridObjectHistory" + Me.GridObjectHistory.Size = New System.Drawing.Size(524, 199) + Me.GridObjectHistory.TabIndex = 11 + Me.GridObjectHistory.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn6, Me.GridColumn7}) + Me.GridView1.GridControl = Me.GridObjectHistory + Me.GridView1.Name = "GridView1" + ' + 'GridColumn6 + ' + Me.GridColumn6.Caption = "Status" + Me.GridColumn6.FieldName = "STATE_LANG" + Me.GridColumn6.Name = "GridColumn6" + Me.GridColumn6.Visible = True + Me.GridColumn6.VisibleIndex = 0 + ' + 'GridColumn7 + ' + Me.GridColumn7.Caption = "Datum " + Me.GridColumn7.FieldName = "ADDED_WHEN" + Me.GridColumn7.Name = "GridColumn7" + Me.GridColumn7.Visible = True + Me.GridColumn7.VisibleIndex = 1 + ' 'GroupControl1 ' Me.GroupControl1.Controls.Add(Me.progressLifecycle) Me.GroupControl1.Controls.Add(Me.lbLifecycleEnd) Me.GroupControl1.Controls.Add(Me.lbLifecycleStart) - Me.GroupControl1.Location = New System.Drawing.Point(12, 428) + Me.GroupControl1.Location = New System.Drawing.Point(12, 426) + Me.GroupControl1.MaximumSize = New System.Drawing.Size(0, 96) + Me.GroupControl1.MinimumSize = New System.Drawing.Size(0, 96) Me.GroupControl1.Name = "GroupControl1" - Me.GroupControl1.Size = New System.Drawing.Size(548, 94) + Me.GroupControl1.Size = New System.Drawing.Size(548, 96) Me.GroupControl1.TabIndex = 2 Me.GroupControl1.Text = "Lebenszyklus" ' @@ -230,15 +283,17 @@ Partial Class frmObjectPropertyDialog ' Me.progressLifecycle.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.progressLifecycle.Location = New System.Drawing.Point(5, 49) + Me.progressLifecycle.Location = New System.Drawing.Point(5, 51) Me.progressLifecycle.Name = "progressLifecycle" Me.progressLifecycle.Size = New System.Drawing.Size(538, 40) Me.progressLifecycle.TabIndex = 0 ' 'lbLifecycleEnd ' + Me.lbLifecycleEnd.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.lbLifecycleEnd.LineVisible = True - Me.lbLifecycleEnd.Location = New System.Drawing.Point(489, 30) + Me.lbLifecycleEnd.Location = New System.Drawing.Point(487, 30) Me.lbLifecycleEnd.Name = "lbLifecycleEnd" Me.lbLifecycleEnd.Size = New System.Drawing.Size(56, 13) Me.lbLifecycleEnd.TabIndex = 1 @@ -255,78 +310,78 @@ Partial Class frmObjectPropertyDialog ' 'txtCreatedWhen ' - Me.txtCreatedWhen.Location = New System.Drawing.Point(85, 37) + Me.txtCreatedWhen.Location = New System.Drawing.Point(109, 78) Me.txtCreatedWhen.Name = "txtCreatedWhen" Me.txtCreatedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtCreatedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtCreatedWhen.Properties.ReadOnly = True - Me.txtCreatedWhen.Size = New System.Drawing.Size(199, 20) + Me.txtCreatedWhen.Size = New System.Drawing.Size(172, 20) Me.txtCreatedWhen.StyleController = Me.LayoutControlObject Me.txtCreatedWhen.TabIndex = 4 ' 'txtChangedWhen ' - Me.txtChangedWhen.Location = New System.Drawing.Point(85, 61) + Me.txtChangedWhen.Location = New System.Drawing.Point(109, 108) Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtChangedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(199, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(172, 20) Me.txtChangedWhen.StyleController = Me.LayoutControlObject Me.txtChangedWhen.TabIndex = 5 ' 'txtAccessedWhen ' - Me.txtAccessedWhen.Location = New System.Drawing.Point(85, 85) + Me.txtAccessedWhen.Location = New System.Drawing.Point(109, 138) Me.txtAccessedWhen.Name = "txtAccessedWhen" Me.txtAccessedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtAccessedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtAccessedWhen.Properties.ReadOnly = True - Me.txtAccessedWhen.Size = New System.Drawing.Size(199, 20) + Me.txtAccessedWhen.Size = New System.Drawing.Size(172, 20) Me.txtAccessedWhen.StyleController = Me.LayoutControlObject Me.txtAccessedWhen.TabIndex = 6 ' 'txtObjectId ' - Me.txtObjectId.Location = New System.Drawing.Point(85, 12) + Me.txtObjectId.Location = New System.Drawing.Point(109, 48) Me.txtObjectId.Name = "txtObjectId" Me.txtObjectId.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtObjectId.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtObjectId.Properties.ReadOnly = True - Me.txtObjectId.Size = New System.Drawing.Size(475, 20) + Me.txtObjectId.Size = New System.Drawing.Size(436, 20) Me.txtObjectId.StyleController = Me.LayoutControlObject Me.txtObjectId.TabIndex = 7 ' 'txtCreatedWho ' - Me.txtCreatedWho.Location = New System.Drawing.Point(361, 37) + Me.txtCreatedWho.Location = New System.Drawing.Point(373, 78) Me.txtCreatedWho.Name = "txtCreatedWho" Me.txtCreatedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtCreatedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtCreatedWho.Properties.ReadOnly = True - Me.txtCreatedWho.Size = New System.Drawing.Size(199, 20) + Me.txtCreatedWho.Size = New System.Drawing.Size(172, 20) Me.txtCreatedWho.StyleController = Me.LayoutControlObject Me.txtCreatedWho.TabIndex = 8 ' 'txtChangedWho ' - Me.txtChangedWho.Location = New System.Drawing.Point(361, 61) + Me.txtChangedWho.Location = New System.Drawing.Point(373, 108) Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.txtChangedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(199, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(172, 20) Me.txtChangedWho.StyleController = Me.LayoutControlObject Me.txtChangedWho.TabIndex = 9 ' 'TextEdit1 ' - Me.TextEdit1.Location = New System.Drawing.Point(361, 85) + Me.TextEdit1.Location = New System.Drawing.Point(373, 138) Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White Me.TextEdit1.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(199, 20) + Me.TextEdit1.Size = New System.Drawing.Size(172, 20) Me.TextEdit1.StyleController = Me.LayoutControlObject Me.TextEdit1.TabIndex = 10 ' @@ -334,104 +389,128 @@ Partial Class frmObjectPropertyDialog ' Me.LayoutObject.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutObject.GroupBordersVisible = False - Me.LayoutObject.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.SimpleSeparator1, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.txtAccessedWho, Me.EmptySpaceItem1, Me.LayoutControlItem7}) - Me.LayoutObject.Name = "LayoutObject" + Me.LayoutObject.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.SimpleSeparator1, Me.LayoutControlItem7, Me.LayoutControlGroup1, Me.LayoutControlGroup2}) + Me.LayoutObject.Name = "Root" Me.LayoutObject.Size = New System.Drawing.Size(572, 534) Me.LayoutObject.TextVisible = False ' - 'LayoutControlItem1 + 'SimpleSeparator1 ' - Me.LayoutControlItem1.Control = Me.txtCreatedWhen - Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 25) - Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Size = New System.Drawing.Size(276, 24) - Me.LayoutControlItem1.Text = "Erstellt" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(70, 13) + Me.SimpleSeparator1.AllowHotTrack = False + Me.SimpleSeparator1.Location = New System.Drawing.Point(0, 165) + Me.SimpleSeparator1.Name = "SimpleSeparator1" + Me.SimpleSeparator1.Size = New System.Drawing.Size(552, 1) ' - 'LayoutControlItem2 + 'LayoutControlItem7 ' - Me.LayoutControlItem2.Control = Me.txtChangedWhen - Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 49) - Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(276, 24) - Me.LayoutControlItem2.Text = "Geändert" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlItem7.Control = Me.GroupControl1 + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 414) + Me.LayoutControlItem7.Name = "LayoutControlItem7" + Me.LayoutControlItem7.Size = New System.Drawing.Size(552, 100) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem7.TextVisible = False ' - 'LayoutControlItem3 + 'LayoutControlGroup1 ' - Me.LayoutControlItem3.Control = Me.txtAccessedWhen - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 73) - Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Size = New System.Drawing.Size(276, 24) - Me.LayoutControlItem3.Text = "Letzter Zugriff" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(70, 13) + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem8}) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 166) + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(552, 248) + Me.LayoutControlGroup1.Text = "Objekt Historie" + ' + 'LayoutControlItem8 + ' + Me.LayoutControlItem8.Control = Me.GridObjectHistory + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem8.Name = "LayoutControlItem8" + Me.LayoutControlItem8.Size = New System.Drawing.Size(528, 203) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem8.TextVisible = False + ' + 'LayoutControlGroup2 + ' + Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.LayoutControlItem1, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.txtAccessedWho}) + Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlGroup2.Name = "LayoutControlGroup2" + Me.LayoutControlGroup2.Size = New System.Drawing.Size(552, 165) + Me.LayoutControlGroup2.Text = "Eigenschaften" ' 'LayoutControlItem4 ' Me.LayoutControlItem4.Control = Me.txtObjectId Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(552, 24) + Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem4.Size = New System.Drawing.Size(528, 30) Me.LayoutControlItem4.Text = "Objekt Id" Me.LayoutControlItem4.TextSize = New System.Drawing.Size(70, 13) ' - 'SimpleSeparator1 + 'LayoutControlItem1 ' - Me.SimpleSeparator1.AllowHotTrack = False - Me.SimpleSeparator1.Location = New System.Drawing.Point(0, 24) - Me.SimpleSeparator1.Name = "SimpleSeparator1" - Me.SimpleSeparator1.Size = New System.Drawing.Size(552, 1) + Me.LayoutControlItem1.Control = Me.txtCreatedWhen + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 30) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem1.Size = New System.Drawing.Size(264, 30) + Me.LayoutControlItem1.Text = "Erstellt" + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(70, 13) ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.txtCreatedWho - Me.LayoutControlItem5.Location = New System.Drawing.Point(276, 25) + Me.LayoutControlItem5.Location = New System.Drawing.Point(264, 30) Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Size = New System.Drawing.Size(276, 24) + Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem5.Size = New System.Drawing.Size(264, 30) Me.LayoutControlItem5.Text = "von" Me.LayoutControlItem5.TextSize = New System.Drawing.Size(70, 13) ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.txtChangedWho - Me.LayoutControlItem6.Location = New System.Drawing.Point(276, 49) + Me.LayoutControlItem6.Location = New System.Drawing.Point(264, 60) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Size = New System.Drawing.Size(276, 24) + Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem6.Size = New System.Drawing.Size(264, 30) Me.LayoutControlItem6.Text = "von" Me.LayoutControlItem6.TextSize = New System.Drawing.Size(70, 13) ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.txtChangedWhen + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 60) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem2.Size = New System.Drawing.Size(264, 30) + Me.LayoutControlItem2.Text = "Geändert" + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(70, 13) + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.txtAccessedWhen + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 90) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem3.Size = New System.Drawing.Size(264, 30) + Me.LayoutControlItem3.Text = "Letzter Zugriff" + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(70, 13) + ' 'txtAccessedWho ' Me.txtAccessedWho.Control = Me.TextEdit1 Me.txtAccessedWho.CustomizationFormText = "von" - Me.txtAccessedWho.Location = New System.Drawing.Point(276, 73) + Me.txtAccessedWho.Location = New System.Drawing.Point(264, 90) Me.txtAccessedWho.Name = "txtAccessedWho" - Me.txtAccessedWho.Size = New System.Drawing.Size(276, 24) + Me.txtAccessedWho.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.txtAccessedWho.Size = New System.Drawing.Size(264, 30) Me.txtAccessedWho.Text = "von" Me.txtAccessedWho.TextSize = New System.Drawing.Size(70, 13) ' - 'EmptySpaceItem1 - ' - Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 97) - Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(552, 319) - Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) - ' - 'LayoutControlItem7 - ' - Me.LayoutControlItem7.Control = Me.GroupControl1 - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 416) - Me.LayoutControlItem7.Name = "LayoutControlItem7" - Me.LayoutControlItem7.Size = New System.Drawing.Size(552, 98) - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem7.TextVisible = False - ' 'TabPageHistory ' Me.TabPageHistory.ContentContainer = Me.TabFormContentContainer4 Me.TabPageHistory.Name = "TabPageHistory" - Me.TabPageHistory.Text = "Historie" + Me.TabPageHistory.Text = "Attribut Historie" ' 'TabFormContentContainer4 ' @@ -514,7 +593,7 @@ Partial Class frmObjectPropertyDialog Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(572, 605) - Me.Controls.Add(Me.TabFormContentContainer1) + Me.Controls.Add(Me.TabFormContentContainer2) Me.Controls.Add(Me.TabFormControl1) Me.IconOptions.SvgImage = CType(resources.GetObject("frmObjectPropertyDialog.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Name = "frmObjectPropertyDialog" @@ -528,6 +607,8 @@ Partial Class frmObjectPropertyDialog Me.TabFormContentContainer2.ResumeLayout(False) CType(Me.LayoutControlObject, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControlObject.ResumeLayout(False) + CType(Me.GridObjectHistory, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.GroupControl1.ResumeLayout(False) Me.GroupControl1.PerformLayout() @@ -540,16 +621,18 @@ Partial Class frmObjectPropertyDialog CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutObject, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SimpleSeparator1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtAccessedWho, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() Me.TabFormContentContainer4.ResumeLayout(False) CType(Me.GridValueHistory, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewValueHistory, System.ComponentModel.ISupportInitialize).EndInit() @@ -584,21 +667,28 @@ Partial Class frmObjectPropertyDialog Friend WithEvents txtChangedWhen As DevExpress.XtraEditors.TextEdit Friend WithEvents txtAccessedWhen As DevExpress.XtraEditors.TextEdit Friend WithEvents txtObjectId As DevExpress.XtraEditors.TextEdit - 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 SimpleSeparator1 As DevExpress.XtraLayout.SimpleSeparator Friend WithEvents txtCreatedWho As DevExpress.XtraEditors.TextEdit Friend WithEvents txtChangedWho As DevExpress.XtraEditors.TextEdit - Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit - Friend WithEvents txtAccessedWho As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents lbLifecycleStart As DevExpress.XtraEditors.LabelControl Friend WithEvents lbLifecycleEnd As DevExpress.XtraEditors.LabelControl Friend WithEvents progressLifecycle As DevExpress.XtraEditors.ProgressBarControl Friend WithEvents GroupControl1 As DevExpress.XtraEditors.GroupControl Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents GridObjectHistory As GridControl + Friend WithEvents GridView1 As GridView + Friend WithEvents LayoutControlItem4 As LayoutControlItem + Friend WithEvents LayoutControlItem1 As LayoutControlItem + Friend WithEvents LayoutControlItem2 As LayoutControlItem + Friend WithEvents LayoutControlItem5 As LayoutControlItem + Friend WithEvents LayoutControlItem6 As LayoutControlItem + Friend WithEvents LayoutControlItem3 As LayoutControlItem + Friend WithEvents txtAccessedWho As LayoutControlItem + Friend WithEvents LayoutControlItem8 As LayoutControlItem + Friend WithEvents btnSave As DevExpress.XtraBars.BarButtonItem + Friend WithEvents LayoutControlGroup1 As LayoutControlGroup + Friend WithEvents LayoutControlGroup2 As LayoutControlGroup + Friend WithEvents GridColumn6 As Columns.GridColumn + Friend WithEvents GridColumn7 As Columns.GridColumn End Class diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.resx b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.resx index fb61d3f3..7c3b9791 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.resx +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.resx @@ -120,7 +120,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACcFAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb index 4cac70d8..e45fe8f8 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb @@ -9,28 +9,39 @@ Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.Language Imports DevExpress.XtraGrid Imports DigitalData.Modules.EDMI.API +Imports DigitalData.GUIs.Common.Base +Imports DigitalData.Modules.Base Public Class frmObjectPropertyDialog - Private _LogConfig As LogConfig - Private _Logger As Logger - Private _Environment As Environment - Private ReadOnly _Client As Client - Private _ObjectId As Int64 - Private _Db As MSSQLServer - Private _Controls As PropertyControls + Implements IBaseForm - Public Sub New(LogConfig As LogConfig, Environment As Environment, Client As Client, ObjectId As Long) + Private ReadOnly Environment As Environment + Private ReadOnly Client As Client + Private ReadOnly ObjectId As Int64 + Private ReadOnly DatabaseIDB As MSSQLServer + Private ReadOnly ControlManager As AttributeControls + + Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig + Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger + Private ReadOnly Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler + + Private ReadOnly Changes As New Dictionary(Of String, Object) + + Public Sub New(pLogConfig As LogConfig, pEnvironment As Environment, pClient As Client, pObjectId As Long) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - _LogConfig = LogConfig - _Logger = LogConfig.GetLogger() - _Environment = Environment - _Client = Client - _ObjectId = ObjectId - _Db = _Environment.DatabaseIDB - _Controls = New PropertyControls(_LogConfig, _Db) + LogConfig = pLogConfig + Logger = pLogConfig.GetLogger() + Environment = pEnvironment + Client = pClient + ObjectId = pObjectId + DatabaseIDB = Environment.DatabaseIDB + ControlManager = New AttributeControls(LogConfig, Environment, pClient) + AddHandler ControlManager.EditValueChanged, AddressOf BaseEdit_EditValueChanged + + ErrorHandler = New BaseErrorHandler(LogConfig, Me) End Sub Private Async Sub frmObjectPropertyDialog_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -39,71 +50,38 @@ Public Class frmObjectPropertyDialog Try oHandle = SplashScreenManager.ShowOverlayForm(Me) - If IsNothing(_ObjectId) Then + If IsNothing(ObjectId) Then Throw New ApplicationException("No valid Object Id supplied!") End If - Dim oEntityIds = Await GetBusinessEntitiesForObjectId(_ObjectId) - Dim oHistoryDataTable = Await GetValueHistoryForObjectId(_ObjectId) - Dim oObjectProperties = Await GetPropertiesForObjectId(_ObjectId) + Dim oEntityIds = Await GetBusinessEntitiesForObjectId(ObjectId) + Dim oValueHistoryTable = Await GetValueHistoryForObjectId(ObjectId) + Dim oObjectHistoryTable = Await GetObjectHistoryForObjectID(ObjectId) + + Dim oObjectProperties = Await GetPropertiesForObjectId(ObjectId) Dim oCombobox As RepositoryItemComboBox = DirectCast(cmbBusinessEntity.Edit, RepositoryItemComboBox) oCombobox.Items.AddRange(oEntityIds) - ShowAttributeHistory(oHistoryDataTable) + ShowAttributeHistory(oValueHistoryTable) + ShowObjectHistory(oObjectHistoryTable) ShowObjectProperties(oObjectProperties) - 'If oEntityIds.Count = 1 Then - ' cmbBusinessEntity.EditValue = oEntityIds.First() - 'End If cmbBusinessEntity.EditValue = oEntityIds.First() - Catch ex As ApplicationException - _Logger.Error(ex) - MessageBox.Show(ex.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Error) Catch ex As Exception - _Logger.Error(ex) - MessageBox.Show("Unhandled exception occurred. Please check the log." & vbNewLine & ex.Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) + ErrorHandler.ShowErrorMessage(ex, "frmObjectPropertyDialog_Load") Finally - If oHandle IsNot Nothing + If oHandle IsNot Nothing Then SplashScreenManager.CloseOverlayForm(oHandle) End If End Try End Sub - Private Async Function GetAttributesForBusinessEntity(EntityId As Long) As Task(Of List(Of Attribute)) - Try - Dim oSQL = $"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE BE_ID = {EntityId} AND LANG_CODE = '{_Environment.User.Language}'" - Dim oResult = Await _Client.GetDatatableFromIDBAsync(oSQL) - If oResult.OK = False Then - Throw New ApplicationException($"Attributes for Business Entity {EntityId} could not be retrieved!") - - ElseIf oResult.Table.Rows.Count = 0 Then - Throw New ApplicationException($"BusinessEntity {EntityId} does not have any attributes!") - - Else - Dim oAttributes As New List(Of Attribute) - - For Each oRow As DataRow In oResult.Table.Rows - oAttributes.Add(New Attribute() With { - .ID = oRow.Item("ATTR_ID"), - .Title = oRow.Item("ATTR_TITLE"), - .TypeID = oRow.Item("TYPE_ID"), - .TypeName = oRow.Item("TYPE_NAME") - }) - Next - - Return oAttributes - End If - Catch ex As Exception - _Logger.Error(ex) - Return New List(Of Attribute) - End Try - End Function Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long)) Try Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WHERE IDB_OBJ_ID = {ObjectId}" - Dim oResult = Await _Client.GetDatatableFromIDBAsync(oSQL) + Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) If oResult.OK = False Then Throw New ApplicationException($"Business Entities could not be retrieved!") @@ -121,42 +99,41 @@ Public Class frmObjectPropertyDialog Return oEntities End If Catch ex As Exception - _Logger.Error(ex) + Logger.Error(ex) Return New List(Of Long) End Try End Function Private Async Function GetValueHistoryForObjectId(ObjectId As Long) As Task(Of DataTable) - Dim oSQL As String = $"SELECT * FROM VWIDB_CHANGE_LOG WHERE IDB_OBJ_ID = {ObjectId} ORDER BY ChangeID DESC" - Dim oResult = Await _Client.GetDatatableFromIDBAsync(oSQL) + Dim oSQL As String = $" + SELECT * FROM VWIDB_CHANGE_LOG + WHERE IDB_OBJ_ID = {ObjectId} AND + ORDER BY ChangeID DESC + " + Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) + + Return oResult.Table + End Function + + Private Async Function GetObjectHistoryForObjectId(ObjectId As Long) As Task(Of DataTable) + Dim oSQL As String = $" + SELECT * FROM VWIDB_DOC_STATES + WHERE IDB_OBJ_ID = {ObjectId} AND LANG_CODE = '{Environment.User.Language}' + ORDER BY ADDED_WHEN DESC + " + Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) Return oResult.Table End Function Private Async Function GetPropertiesForObjectId(ObjectId As Long) As Task(Of DataTable) Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WHERE IDB_OBJ_ID = {ObjectId}" - Dim oResult = Await _Client.GetDatatableFromIDBAsync(oSQL) + Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) Return oResult.Table End Function - Private Async Function GetAttributeValue(AttributeName As String, ObjectId As Long, Optional LanguageCode As String = "de-DE", Optional IsForeign As Boolean = False) As Task(Of Object) - Dim oIsForeign = IIf(IsForeign, 1, 0) - Dim oSQL = $"SELECT TERM_VALUE FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({ObjectId}, '{AttributeName}', '{LanguageCode}', {oIsForeign})" - Dim oResult = Await _Client.GetScalarValueFromIDBAsync(oSQL) - - Return oResult.Scalar - End Function - - Private Async Function GetAttributeValueAsTable(AttributeName As String, ObjectId As Long, Optional LanguageCode As String = "de-DE", Optional IsForeign As Boolean = False) As Task(Of DataTable) - Dim oIsForeign = IIf(IsForeign, 1, 0) - Dim oSQL = $"SELECT TERM_VALUE FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({ObjectId}, '{AttributeName}', '{LanguageCode}', {oIsForeign})" - Dim oResult = Await _Client.GetDatatableFromIDBAsync(oSQL) - - Return oResult.Table - End Function - - Private Async Sub cmbBusinessEntity_EditValueChanged(sender As Object, e As EventArgs) Handles cmbBusinessEntity.EditValueChanged + Private Sub cmbBusinessEntity_EditValueChanged(sender As Object, e As EventArgs) Handles cmbBusinessEntity.EditValueChanged Load_Attributes() End Sub Private Async Sub Load_Attributes() @@ -168,49 +145,50 @@ Public Class frmObjectPropertyDialog Exit Sub End If - Dim oAttributes = Await GetAttributesForBusinessEntity(oEntityId) + Dim oAttributes = Await ControlManager.GetAttributesForBusinessEntity(oEntityId) If oAttributes.Count = 0 Then - MsgBox($"Es konnten keine Attribute für das Objekt '{_ObjectId}' geladen werden!", MsgBoxStyle.Critical, Text) + MsgBox($"Es konnten keine Attribute für das Objekt '{ObjectId}' geladen werden!", MsgBoxStyle.Critical, Text) End If - For Each oAttribute As Attribute In oAttributes - Dim oControl = _Controls.GetControlForAttribute(oAttribute, True) - Dim oItem As LayoutControlItem = AttributeLayout.AddItem() - - oItem.Text = oAttribute.Title - oItem.Name = oAttribute.Title - oItem.Control = oControl - Next - - For Each oItem As LayoutControlItem In AttributeLayout.Items - If TypeOf oItem.Control Is BaseEdit Then - Dim oValue = Await GetAttributeValue(oItem.Name, _ObjectId) - Dim oEdit = DirectCast(oItem.Control, BaseEdit) - oEdit.EditValue = oValue - ElseIf TypeOf oItem.Control Is GridControl Then - Dim oValueTable = Await GetAttributeValueAsTable(oItem.Name, _ObjectId) - Dim oGrid = DirectCast(oItem.Control, GridControl) - oGrid.DataSource = oValueTable - - End If - Next + Await ControlManager.LoadControlsForAttributes(ObjectId, oAttributes, AttributeLayout) Catch ex As Exception - _Logger.Error(ex) + Logger.Error(ex) End Try - End Sub + + Private Sub BaseEdit_EditValueChanged(sender As Object, e As EventArgs) + Dim oControl As BaseEdit = sender + Dim oAttribute As Attribute = oControl.Tag + Dim oValue = oControl.EditValue + Dim oKey = oAttribute.Title + + If Changes.ContainsKey(oKey) Then + Changes.Item(oKey) = oValue + Else + Changes.Add(oAttribute.Title, oValue) + + End If + End Sub + Private Function ShowAttributeHistory(pDatatable As DataTable) As Boolean Try - If pDatatable.Rows.Count > 0 - GridValueHistory.DataSource = pDatatable - Else - TabPageHistory.Visible = False - End If + GridValueHistory.DataSource = pDatatable Return True Catch ex As Exception - _Logger.Error(ex) + Logger.Error(ex) + Return False + End Try + End Function + + Private Function ShowObjectHistory(pDatatable As DataTable) As Boolean + Try + GridObjectHistory.DataSource = pDatatable + + Return True + Catch ex As Exception + Logger.Error(ex) Return False End Try End Function @@ -230,12 +208,31 @@ Public Class frmObjectPropertyDialog Return True Catch ex As Exception - _Logger.Error(ex) + Logger.Error(ex) Return False End Try End Function - Private Sub TabFormControl1_Click(sender As Object, e As EventArgs) Handles TabFormControl1.Click + Private Async Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick + Try + For Each oChange As KeyValuePair(Of String, Object) In Changes + Logger.Info("Updating Attribute [{0}] with value [{1}]", oChange.Key, oChange.Value.ToString) + Await Client.SetAttributeValueAsync(ObjectId, oChange.Key, oChange.Value, New Options.SetAttributeValueOptions With { + .Language = Environment.User.Language, + .Username = Environment.User.UserName + }) + Logger.Info("Updating Object State for Object [{0}]", ObjectId) + Await Client.SetObjectStateAsync(ObjectId, IDB.FileStore.OBJECT_STATE_METADATA_CHANGED, New Options.SetObjectStateOptions With { + .Language = Environment.User.Language, + .Username = Environment.User.UserName + }) + Next + + ErrorHandler.ShowInfoMessage($"{Changes.Count} Änderungen gespeichert!") + Changes.Clear() + Catch ex As Exception + ErrorHandler.ShowErrorMessage(ex, "btnSave_ItemClick") + End Try End Sub End Class \ No newline at end of file diff --git a/GUIs.Common/Resources/clearpivottable.svg b/GUIs.Common/Resources/clearpivottable.svg new file mode 100644 index 00000000..0e4e7bb2 --- /dev/null +++ b/GUIs.Common/Resources/clearpivottable.svg @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/save.svg b/GUIs.Common/Resources/save.svg new file mode 100644 index 00000000..b09d6ee8 --- /dev/null +++ b/GUIs.Common/Resources/save.svg @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/GUIs.Common/frmDocumentResultList.Designer.vb b/GUIs.Common/frmDocumentResultList.Designer.vb index 4d9a79b8..caa3684c 100644 --- a/GUIs.Common/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/frmDocumentResultList.Designer.vb @@ -44,10 +44,24 @@ Partial Class frmDocumentResultList Me.MenuItemsOpenFileZooFlow = New DevExpress.XtraBars.BarButtonItem() Me.MenuItemPropertiesZooFlow = New DevExpress.XtraBars.BarButtonItem() Me.ButtonRefresh = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup5 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPage4 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup7 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupFilesystem = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup_Layout = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup_Export = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageExport = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.RepositoryItemTextEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -58,13 +72,34 @@ Partial Class frmDocumentResultList Me.GridControl3 = New DevExpress.XtraGrid.GridControl() Me.GridView3 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() Me.GridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() - Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.XtraSaveFileDialog = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) - Me.MenuFullAccess_IDB = New DevExpress.XtraBars.PopupMenu(Me.components) - Me.MenuViewAccess_IDB = New DevExpress.XtraBars.PopupMenu(Me.components) - Me.MenuFullAccess_EDM = New DevExpress.XtraBars.PopupMenu(Me.components) - Me.MenuFullAccess_ZOOFLOW = New DevExpress.XtraBars.PopupMenu(Me.components) + Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components) + Me.DockPanelFileList = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.DockPanelMetadata = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.RootMetadata = New DevExpress.XtraLayout.LayoutControlGroup() + Me.DockPanelDocViewer = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabPageAttributes = New DevExpress.XtraTab.XtraTabPage() + Me.XtraTabPageObject = New DevExpress.XtraTab.XtraTabPage() + Me.XtraTabPageAttributeHistory = New DevExpress.XtraTab.XtraTabPage() + Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.ProgressBarControl1 = New DevExpress.XtraEditors.ProgressBarControl() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.lbLifecycleEnd = New DevExpress.XtraLayout.SimpleLabelItem() + Me.lbLifecycleStart = New DevExpress.XtraLayout.SimpleLabelItem() + Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -86,16 +121,31 @@ Partial Class frmDocumentResultList CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainerControl3.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerControl3.Panel1.SuspendLayout() - CType(Me.SplitContainerControl3.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerControl3.Panel2.SuspendLayout() - Me.SplitContainerControl3.SuspendLayout() - CType(Me.MenuFullAccess_IDB, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.MenuViewAccess_IDB, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.MenuFullAccess_EDM, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.MenuFullAccess_ZOOFLOW, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanelFileList.SuspendLayout() + Me.DockPanel2_Container.SuspendLayout() + Me.DockPanelMetadata.SuspendLayout() + Me.DockPanel3_Container.SuspendLayout() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanelDocViewer.SuspendLayout() + Me.DockPanel1_Container.SuspendLayout() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.XtraTabPageAttributes.SuspendLayout() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lbLifecycleEnd, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplitContainerControl1 @@ -113,7 +163,7 @@ Partial Class frmDocumentResultList ' Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2) resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") - Me.SplitContainerControl1.SplitterPosition = 389 + Me.SplitContainerControl1.SplitterPosition = 325 ' 'GridControl1 ' @@ -150,15 +200,15 @@ Partial Class frmDocumentResultList ' 'RibbonControl ' + Me.RibbonControl.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemPropertiesECM, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.SwitchMainContainerHorizontal, Me.SwitchDetailContainerHorizontal, Me.BarButtonItemExportGrid1, Me.BarStaticItem1, Me.labelResultCount, Me.BarButtonBack, Me.BarButtonResetLayout, Me.labelCriticalError, Me.labelWarning, Me.MenuItemFileOpen, Me.MenuItemPropertiesIDB, Me.MenuItemFolderOpen, Me.MenuItemFilepathCopy, Me.MenuItemFolderpathCopy, Me.MenuItemPropertiesECM, Me.MenuItemsOpenFileZooFlow, Me.MenuItemPropertiesZooFlow, Me.ButtonRefresh, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6}) resources.ApplyResources(Me.RibbonControl, "RibbonControl") - Me.RibbonControl.MaxItemId = 30 + Me.RibbonControl.MaxItemId = 36 Me.RibbonControl.Name = "RibbonControl" - Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage4, Me.RibbonPage2, Me.RibbonPageExport}) Me.RibbonControl.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl.ShowToolbarCustomizeItem = False Me.RibbonControl.StatusBar = Me.RibbonStatusBar Me.RibbonControl.Toolbar.ShowCustomizeItem = False @@ -303,9 +353,46 @@ Partial Class frmDocumentResultList Me.ButtonRefresh.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.refreshallpivottable Me.ButtonRefresh.Name = "ButtonRefresh" ' + 'BarButtonItem1 + ' + resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") + Me.BarButtonItem1.Id = 30 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") + Me.BarButtonItem2.Id = 31 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + resources.ApplyResources(Me.BarButtonItem3, "BarButtonItem3") + Me.BarButtonItem3.Id = 32 + Me.BarButtonItem3.Name = "BarButtonItem3" + ' + 'BarButtonItem4 + ' + resources.ApplyResources(Me.BarButtonItem4, "BarButtonItem4") + Me.BarButtonItem4.Id = 33 + Me.BarButtonItem4.Name = "BarButtonItem4" + ' + 'BarButtonItem5 + ' + resources.ApplyResources(Me.BarButtonItem5, "BarButtonItem5") + Me.BarButtonItem5.Id = 34 + Me.BarButtonItem5.Name = "BarButtonItem5" + ' + 'BarButtonItem6 + ' + resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6") + Me.BarButtonItem6.Id = 35 + Me.BarButtonItem6.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.clearpivottable + Me.BarButtonItem6.Name = "BarButtonItem6" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroup_Layout, Me.RibbonPageGroup_Export}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroup5}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -313,25 +400,74 @@ Partial Class frmDocumentResultList ' Me.RibbonPageGroup_Navigation.AllowTextClipping = False Me.RibbonPageGroup_Navigation.ItemLinks.Add(Me.BarButtonBack) - Me.RibbonPageGroup_Navigation.ItemLinks.Add(Me.ButtonRefresh) Me.RibbonPageGroup_Navigation.Name = "RibbonPageGroup_Navigation" resources.ApplyResources(Me.RibbonPageGroup_Navigation, "RibbonPageGroup_Navigation") ' + 'RibbonPageGroup5 + ' + Me.RibbonPageGroup5.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup5.ItemLinks.Add(Me.ButtonRefresh) + Me.RibbonPageGroup5.Name = "RibbonPageGroup5" + resources.ApplyResources(Me.RibbonPageGroup5, "RibbonPageGroup5") + ' + 'RibbonPage4 + ' + Me.RibbonPage4.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup7, Me.RibbonPageGroupFilesystem}) + Me.RibbonPage4.Name = "RibbonPage4" + resources.ApplyResources(Me.RibbonPage4, "RibbonPage4") + ' + 'RibbonPageGroup3 + ' + Me.RibbonPageGroup3.ItemLinks.Add(Me.MenuItemFileOpen) + Me.RibbonPageGroup3.Name = "RibbonPageGroup3" + resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") + ' + 'RibbonPageGroup7 + ' + Me.RibbonPageGroup7.ItemLinks.Add(Me.MenuItemPropertiesECM, True) + Me.RibbonPageGroup7.Name = "RibbonPageGroup7" + resources.ApplyResources(Me.RibbonPageGroup7, "RibbonPageGroup7") + ' + 'RibbonPageGroupFilesystem + ' + Me.RibbonPageGroupFilesystem.ItemLinks.Add(Me.MenuItemFolderOpen) + Me.RibbonPageGroupFilesystem.ItemLinks.Add(Me.MenuItemFilepathCopy) + Me.RibbonPageGroupFilesystem.ItemLinks.Add(Me.MenuItemFolderpathCopy) + Me.RibbonPageGroupFilesystem.Name = "RibbonPageGroupFilesystem" + resources.ApplyResources(Me.RibbonPageGroupFilesystem, "RibbonPageGroupFilesystem") + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Layout, Me.RibbonPageGroup1}) + Me.RibbonPage2.Name = "RibbonPage2" + resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") + ' 'RibbonPageGroup_Layout ' - Me.RibbonPageGroup_Layout.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far Me.RibbonPageGroup_Layout.ItemLinks.Add(Me.SwitchMainContainerHorizontal) Me.RibbonPageGroup_Layout.ItemLinks.Add(Me.SwitchDetailContainerHorizontal) - Me.RibbonPageGroup_Layout.ItemLinks.Add(Me.BarButtonResetLayout) Me.RibbonPageGroup_Layout.Name = "RibbonPageGroup_Layout" resources.ApplyResources(Me.RibbonPageGroup_Layout, "RibbonPageGroup_Layout") ' - 'RibbonPageGroup_Export + 'RibbonPageGroup1 ' - Me.RibbonPageGroup_Export.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup_Export.ItemLinks.Add(Me.BarButtonItemExportGrid1) - Me.RibbonPageGroup_Export.Name = "RibbonPageGroup_Export" - resources.ApplyResources(Me.RibbonPageGroup_Export, "RibbonPageGroup_Export") + Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonResetLayout) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem6) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + ' + 'RibbonPageExport + ' + Me.RibbonPageExport.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2}) + Me.RibbonPageExport.Name = "RibbonPageExport" + resources.ApplyResources(Me.RibbonPageExport, "RibbonPageExport") + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItemExportGrid1) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") ' 'RepositoryItemTextEdit1 ' @@ -428,23 +564,6 @@ Partial Class frmDocumentResultList Me.GridBand3.OptionsBand.AllowSize = False Me.GridBand3.VisibleIndex = 0 ' - 'SplitContainerControl3 - ' - Me.SplitContainerControl3.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.[Default] - resources.ApplyResources(Me.SplitContainerControl3, "SplitContainerControl3") - Me.SplitContainerControl3.Name = "SplitContainerControl3" - ' - 'SplitContainerControl3.Panel1 - ' - Me.SplitContainerControl3.Panel1.Controls.Add(Me.SplitContainerControl1) - resources.ApplyResources(Me.SplitContainerControl3.Panel1, "SplitContainerControl3.Panel1") - ' - 'SplitContainerControl3.Panel2 - ' - Me.SplitContainerControl3.Panel2.Controls.Add(Me.DocumentViewer1) - resources.ApplyResources(Me.SplitContainerControl3.Panel2, "SplitContainerControl3.Panel2") - Me.SplitContainerControl3.SplitterPosition = 762 - ' 'DocumentViewer1 ' resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") @@ -455,45 +574,212 @@ Partial Class frmDocumentResultList ' Me.XtraSaveFileDialog.FileName = "XtraSaveFileDialog1" ' - 'MenuFullAccess_IDB + 'RibbonPageGroup6 ' - Me.MenuFullAccess_IDB.ItemLinks.Add(Me.MenuItemFileOpen) - Me.MenuFullAccess_IDB.ItemLinks.Add(Me.MenuItemFolderOpen) - Me.MenuFullAccess_IDB.ItemLinks.Add(Me.MenuItemFilepathCopy) - Me.MenuFullAccess_IDB.ItemLinks.Add(Me.MenuItemFolderpathCopy) - Me.MenuFullAccess_IDB.ItemLinks.Add(Me.MenuItemPropertiesIDB) - Me.MenuFullAccess_IDB.Name = "MenuFullAccess_IDB" - Me.MenuFullAccess_IDB.Ribbon = Me.RibbonControl + Me.RibbonPageGroup6.Name = "RibbonPageGroup6" + resources.ApplyResources(Me.RibbonPageGroup6, "RibbonPageGroup6") ' - 'MenuViewAccess_IDB + 'DockManager1 ' - Me.MenuViewAccess_IDB.ItemLinks.Add(Me.MenuItemPropertiesIDB) - Me.MenuViewAccess_IDB.Name = "MenuViewAccess_IDB" - Me.MenuViewAccess_IDB.Ribbon = Me.RibbonControl + Me.DockManager1.Form = Me + Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanelFileList, Me.DockPanelMetadata, Me.DockPanelDocViewer}) + Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"}) ' - 'MenuFullAccess_EDM + 'DockPanelFileList ' - Me.MenuFullAccess_EDM.ItemLinks.Add(Me.MenuItemFileOpen) - Me.MenuFullAccess_EDM.ItemLinks.Add(Me.MenuItemFolderOpen) - Me.MenuFullAccess_EDM.ItemLinks.Add(Me.MenuItemFilepathCopy) - Me.MenuFullAccess_EDM.ItemLinks.Add(Me.MenuItemFolderpathCopy) - Me.MenuFullAccess_EDM.ItemLinks.Add(Me.MenuItemPropertiesECM) - Me.MenuFullAccess_EDM.Name = "MenuFullAccess_EDM" - Me.MenuFullAccess_EDM.Ribbon = Me.RibbonControl + Me.DockPanelFileList.Controls.Add(Me.DockPanel2_Container) + Me.DockPanelFileList.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left + Me.DockPanelFileList.ID = New System.Guid("1839997d-1d60-4497-acbb-0a49e64d6376") + resources.ApplyResources(Me.DockPanelFileList, "DockPanelFileList") + Me.DockPanelFileList.Name = "DockPanelFileList" + Me.DockPanelFileList.Options.ShowCloseButton = False + Me.DockPanelFileList.OriginalSize = New System.Drawing.Size(585, 200) ' - 'MenuFullAccess_ZOOFLOW + 'DockPanel2_Container ' - Me.MenuFullAccess_ZOOFLOW.ItemLinks.Add(Me.MenuItemsOpenFileZooFlow) - Me.MenuFullAccess_ZOOFLOW.ItemLinks.Add(Me.MenuItemPropertiesZooFlow) - Me.MenuFullAccess_ZOOFLOW.Name = "MenuFullAccess_ZOOFLOW" - Me.MenuFullAccess_ZOOFLOW.Ribbon = Me.RibbonControl + Me.DockPanel2_Container.Controls.Add(Me.SplitContainerControl1) + resources.ApplyResources(Me.DockPanel2_Container, "DockPanel2_Container") + Me.DockPanel2_Container.Name = "DockPanel2_Container" + ' + 'DockPanelMetadata + ' + Me.DockPanelMetadata.Controls.Add(Me.DockPanel3_Container) + Me.DockPanelMetadata.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right + Me.DockPanelMetadata.ID = New System.Guid("a7688cec-f13e-448b-82cf-a6bb020fb3f7") + resources.ApplyResources(Me.DockPanelMetadata, "DockPanelMetadata") + Me.DockPanelMetadata.Name = "DockPanelMetadata" + Me.DockPanelMetadata.Options.ShowCloseButton = False + Me.DockPanelMetadata.OriginalSize = New System.Drawing.Size(280, 200) + ' + 'DockPanel3_Container + ' + Me.DockPanel3_Container.Controls.Add(Me.XtraTabControl1) + resources.ApplyResources(Me.DockPanel3_Container, "DockPanel3_Container") + Me.DockPanel3_Container.Name = "DockPanel3_Container" + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.TextEdit1) + Me.LayoutControl1.Controls.Add(Me.ProgressBarControl1) + Me.LayoutControl1.Controls.Add(Me.TextEdit3) + resources.ApplyResources(Me.LayoutControl1, "LayoutControl1") + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1068, 351, 650, 400) + Me.LayoutControl1.Root = Me.RootMetadata + ' + 'RootMetadata + ' + Me.RootMetadata.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.RootMetadata.GroupBordersVisible = False + Me.RootMetadata.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.LayoutControlGroup2, Me.LayoutControlGroup3}) + Me.RootMetadata.Name = "Root" + Me.RootMetadata.Size = New System.Drawing.Size(276, 487) + Me.RootMetadata.TextVisible = False + ' + 'DockPanelDocViewer + ' + Me.DockPanelDocViewer.Controls.Add(Me.DockPanel1_Container) + Me.DockPanelDocViewer.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill + Me.DockPanelDocViewer.ID = New System.Guid("6e5335e5-ba54-49c1-81b3-f174ea4e59ca") + resources.ApplyResources(Me.DockPanelDocViewer, "DockPanelDocViewer") + Me.DockPanelDocViewer.Name = "DockPanelDocViewer" + Me.DockPanelDocViewer.Options.ShowCloseButton = False + Me.DockPanelDocViewer.OriginalSize = New System.Drawing.Size(324, 200) + ' + 'DockPanel1_Container + ' + Me.DockPanel1_Container.Controls.Add(Me.DocumentViewer1) + resources.ApplyResources(Me.DockPanel1_Container, "DockPanel1_Container") + Me.DockPanel1_Container.Name = "DockPanel1_Container" + ' + 'XtraTabControl1 + ' + resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1") + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageAttributes + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageAttributes, Me.XtraTabPageObject, Me.XtraTabPageAttributeHistory}) + ' + 'XtraTabPageAttributes + ' + Me.XtraTabPageAttributes.Controls.Add(Me.LayoutControl1) + Me.XtraTabPageAttributes.Name = "XtraTabPageAttributes" + resources.ApplyResources(Me.XtraTabPageAttributes, "XtraTabPageAttributes") + ' + 'XtraTabPageObject + ' + Me.XtraTabPageObject.Name = "XtraTabPageObject" + resources.ApplyResources(Me.XtraTabPageObject, "XtraTabPageObject") + ' + 'XtraTabPageAttributeHistory + ' + Me.XtraTabPageAttributeHistory.Name = "XtraTabPageAttributeHistory" + resources.ApplyResources(Me.XtraTabPageAttributeHistory, "XtraTabPageAttributeHistory") + ' + 'TextEdit1 + ' + resources.ApplyResources(Me.TextEdit1, "TextEdit1") + Me.TextEdit1.MenuManager = Me.RibbonControl + Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.StyleController = Me.LayoutControl1 + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.TextEdit1 + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Size = New System.Drawing.Size(232, 24) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(96, 13) + ' + 'LayoutControlGroup1 + ' + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem3}) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 69) + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(256, 69) + ' + 'LayoutControlGroup2 + ' + Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1}) + Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlGroup2.Name = "LayoutControlGroup2" + Me.LayoutControlGroup2.Size = New System.Drawing.Size(256, 69) + ' + 'LayoutControlGroup3 + ' + Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.lbLifecycleStart, Me.lbLifecycleEnd, Me.EmptySpaceItem1}) + Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 138) + Me.LayoutControlGroup3.Name = "LayoutControlGroup3" + Me.LayoutControlGroup3.Size = New System.Drawing.Size(256, 329) + ' + 'ProgressBarControl1 + ' + resources.ApplyResources(Me.ProgressBarControl1, "ProgressBarControl1") + Me.ProgressBarControl1.MenuManager = Me.RibbonControl + Me.ProgressBarControl1.Name = "ProgressBarControl1" + Me.ProgressBarControl1.StyleController = Me.LayoutControl1 + ' + 'LayoutControlItem4 + ' + Me.LayoutControlItem4.Control = Me.ProgressBarControl1 + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 262) + Me.LayoutControlItem4.Name = "LayoutControlItem4" + Me.LayoutControlItem4.Size = New System.Drawing.Size(232, 22) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem4.TextVisible = False + ' + 'lbLifecycleEnd + ' + Me.lbLifecycleEnd.AllowHotTrack = False + Me.lbLifecycleEnd.AppearanceItemCaption.Options.UseTextOptions = True + Me.lbLifecycleEnd.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far + Me.lbLifecycleEnd.Location = New System.Drawing.Point(116, 229) + Me.lbLifecycleEnd.Name = "lbLifecycleEnd" + Me.lbLifecycleEnd.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.lbLifecycleEnd.Size = New System.Drawing.Size(116, 33) + resources.ApplyResources(Me.lbLifecycleEnd, "lbLifecycleEnd") + Me.lbLifecycleEnd.TextSize = New System.Drawing.Size(96, 13) + ' + 'lbLifecycleStart + ' + Me.lbLifecycleStart.AllowHotTrack = False + Me.lbLifecycleStart.Location = New System.Drawing.Point(0, 229) + Me.lbLifecycleStart.Name = "lbLifecycleStart" + Me.lbLifecycleStart.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.lbLifecycleStart.Size = New System.Drawing.Size(116, 33) + resources.ApplyResources(Me.lbLifecycleStart, "lbLifecycleStart") + Me.lbLifecycleStart.TextSize = New System.Drawing.Size(96, 13) + ' + 'EmptySpaceItem1 + ' + Me.EmptySpaceItem1.AllowHotTrack = False + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 0) + Me.EmptySpaceItem1.Name = "EmptySpaceItem1" + Me.EmptySpaceItem1.Size = New System.Drawing.Size(232, 229) + Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) + ' + 'TextEdit3 + ' + resources.ApplyResources(Me.TextEdit3, "TextEdit3") + Me.TextEdit3.MenuManager = Me.RibbonControl + Me.TextEdit3.Name = "TextEdit3" + Me.TextEdit3.StyleController = Me.LayoutControl1 + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.TextEdit3 + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Size = New System.Drawing.Size(232, 24) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(96, 13) ' 'frmDocumentResultList ' Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.SplitContainerControl3) + Me.Controls.Add(Me.DockPanelDocViewer) + Me.Controls.Add(Me.DockPanelMetadata) + Me.Controls.Add(Me.DockPanelFileList) Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonControl) Me.IconOptions.Icon = CType(resources.GetObject("frmDocumentResultList.IconOptions.Icon"), System.Drawing.Icon) @@ -522,16 +808,31 @@ Partial Class frmDocumentResultList CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SplitContainerControl3.Panel1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControl3.Panel1.ResumeLayout(False) - CType(Me.SplitContainerControl3.Panel2, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControl3.Panel2.ResumeLayout(False) - CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControl3.ResumeLayout(False) - CType(Me.MenuFullAccess_IDB, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.MenuViewAccess_IDB, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.MenuFullAccess_EDM, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.MenuFullAccess_ZOOFLOW, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanelFileList.ResumeLayout(False) + Me.DockPanel2_Container.ResumeLayout(False) + Me.DockPanelMetadata.ResumeLayout(False) + Me.DockPanel3_Container.ResumeLayout(False) + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanelDocViewer.ResumeLayout(False) + Me.DockPanel1_Container.ResumeLayout(False) + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.XtraTabPageAttributes.ResumeLayout(False) + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lbLifecycleEnd, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -553,8 +854,6 @@ Partial Class frmDocumentResultList Friend WithEvents GridView3 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridView Friend WithEvents GridBand3 As DevExpress.XtraGrid.Views.BandedGrid.GridBand Friend WithEvents BarButtonItemExportGrid1 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup_Export As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem Friend WithEvents labelResultCount As DevExpress.XtraBars.BarStaticItem @@ -568,17 +867,54 @@ Partial Class frmDocumentResultList Friend WithEvents labelWarning As DevExpress.XtraBars.BarStaticItem Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridView Friend WithEvents GridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand - Friend WithEvents MenuFullAccess_IDB As DevExpress.XtraBars.PopupMenu Friend WithEvents MenuItemFileOpen As DevExpress.XtraBars.BarButtonItem Friend WithEvents MenuItemPropertiesIDB As DevExpress.XtraBars.BarButtonItem Friend WithEvents MenuItemFolderOpen As DevExpress.XtraBars.BarButtonItem Friend WithEvents MenuItemFilepathCopy As DevExpress.XtraBars.BarButtonItem Friend WithEvents MenuItemFolderpathCopy As DevExpress.XtraBars.BarButtonItem - Friend WithEvents MenuViewAccess_IDB As DevExpress.XtraBars.PopupMenu - Friend WithEvents MenuFullAccess_EDM As DevExpress.XtraBars.PopupMenu Friend WithEvents MenuItemPropertiesECM As DevExpress.XtraBars.BarButtonItem - Friend WithEvents MenuFullAccess_ZOOFLOW As DevExpress.XtraBars.PopupMenu Friend WithEvents MenuItemsOpenFileZooFlow As DevExpress.XtraBars.BarButtonItem Friend WithEvents MenuItemPropertiesZooFlow As DevExpress.XtraBars.BarButtonItem Friend WithEvents ButtonRefresh As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageExport As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPage4 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupFilesystem As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup7 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager + Friend WithEvents DockPanelDocViewer As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents DockPanelMetadata As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel3_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents DockPanelFileList As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents RootMetadata As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents XtraTabPageAttributes As DevExpress.XtraTab.XtraTabPage + Friend WithEvents XtraTabPageObject As DevExpress.XtraTab.XtraTabPage + Friend WithEvents XtraTabPageAttributeHistory As DevExpress.XtraTab.XtraTabPage + Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents ProgressBarControl1 As DevExpress.XtraEditors.ProgressBarControl + Friend WithEvents LayoutControlGroup3 As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents lbLifecycleStart As DevExpress.XtraLayout.SimpleLabelItem + Friend WithEvents lbLifecycleEnd As DevExpress.XtraLayout.SimpleLabelItem + Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem + Friend WithEvents TextEdit3 As DevExpress.XtraEditors.TextEdit + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem End Class diff --git a/GUIs.Common/frmDocumentResultList.resx b/GUIs.Common/frmDocumentResultList.resx index 4d9932fc..07fe96f2 100644 --- a/GUIs.Common/frmDocumentResultList.resx +++ b/GUIs.Common/frmDocumentResultList.resx @@ -253,7 +253,7 @@ - Layout zurücksetzen + Aktives Tabellen Layout zurücksetzen @@ -383,10 +383,10 @@ - Dateipfad kopeieren + Dateipfad kopieren - Ordnerpfad in Zwischenablage + Ordnerpfad kopieren Eigenschaften @@ -429,21 +429,39 @@ Ergebnisse aktualisieren + + BarButtonItem1 + + + BarButtonItem2 + + + BarButtonItem3 + + + BarButtonItem4 + + + BarButtonItem5 + + + Fenster Layout zurücksetzen + 0, 0 - - Navigation + + Start - + + Bearbeiten + + Layout - + Export - - Ergebnisse - False @@ -452,13 +470,13 @@ False - 1189, 132 + 1189, 89 - 0, 649 + 0, 647 - 1189, 22 + 1189, 24 RibbonStatusBar @@ -470,7 +488,7 @@ $this - 1 + 3 RibbonControl @@ -482,10 +500,10 @@ $this - 2 + 4 - 389, 513 + 325, 529 0 @@ -539,7 +557,7 @@ GridBand2 - 363, 223 + 243, 223 0 @@ -587,7 +605,7 @@ GridBand3 - 363, 280 + 243, 296 0 @@ -620,7 +638,7 @@ 1 - 363, 513 + 243, 529 0 @@ -656,7 +674,7 @@ 1 - 762, 513 + 578, 529 2 @@ -671,31 +689,34 @@ DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - SplitContainerControl3.Panel1 + DockPanel2_Container 0 - - Fill + + Navigation - - 0, 132 + + RibbonPageGroup5 - - Panel1 + + RibbonPageGroup3 - - SplitContainerControl3.Panel1 + + RibbonPageGroup7 - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageGroup4 - - SplitContainerControl3 + + Layout - - 0 + + RibbonPageGroup1 + + + RibbonPageGroup2 Fill @@ -704,7 +725,7 @@ 0, 0 - 413, 513 + 318, 528 0 @@ -713,64 +734,22 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.5.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.6.7.0, Culture=neutral, PublicKeyToken=null - SplitContainerControl3.Panel2 + DockPanel1_Container 0 - - Panel2 - - - SplitContainerControl3.Panel2 - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl3 - - - 1 - - - 1189, 517 - - - 5 - - - SplitContainerControl3 - - - SplitContainerControl3 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - $this - - - 0 - 14, 16 - - 167, 16 - - - 353, 18 - - - 522, 21 - - - 692, 21 + + RibbonPageGroup6 + + + 155, 22 True @@ -781,6 +760,292 @@ 1189, 671 + + DockPanel1_Container + + + DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanelDocViewer + + + 0 + + + 585, 89 + + + 324, 558 + + + Vorschau + + + DockPanelDocViewer + + + DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + + + Fill + + + + Bottom + + + 0, 0 + + + 132, 45 + + + 120, 20 + + + 4 + + + TextEdit1 + + + DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControl1 + + + 4 + + + 24, 445 + + + 228, 18 + + + 7 + + + ProgressBarControl1 + + + DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControl1 + + + 5 + + + 132, 114 + + + 120, 20 + + + 8 + + + TextEdit3 + + + DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControl1 + + + 6 + + + Fill + + + 0, 0 + + + 00.00.0000 + + + 99.99.9999 + + + 271, 504 + + + 0 + + + LayoutControl1 + + + LayoutControl1 + + + DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabPageAttributes + + + 0 + + + 271, 504 + + + Attribute + + + XtraTabPageAttributes + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 0 + + + 273, 529 + + + 1 + + + 271, 504 + + + XtraTabPage2 + + + XtraTabPageObject + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 1 + + + 271, 504 + + + XtraTabPage3 + + + XtraTabPageAttributeHistory + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 2 + + + XtraTabControl1 + + + DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanel3_Container + + + 0 + + + 4, 26 + + + 273, 529 + + + 0 + + + DockPanel3_Container + + + DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanelMetadata + + + 0 + + + 909, 89 + + + 280, 558 + + + Mehr + + + DockPanelMetadata + + + DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 1 + + + DockPanel2_Container + + + DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanelFileList + + + 0 + + + 0, 89 + + + 585, 558 + + + Ergebnisse + + + DockPanelFileList + + + DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 2 + AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA @@ -984,6 +1249,42 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem2 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem3 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem4 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem5 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem6 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -996,16 +1297,64 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageGroup5 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage4 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup3 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup7 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroupFilesystem + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage2 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPageGroup_Layout DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup_Export + + RibbonPageGroup1 - + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageExport + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup2 + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -1050,29 +1399,77 @@ DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - MenuFullAccess_IDB + + RibbonPageGroup6 - - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - MenuViewAccess_IDB + + DockManager1 - - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - MenuFullAccess_EDM + + RootMetadata - - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - MenuFullAccess_ZOOFLOW + + LayoutControlItem1 - - DevExpress.XtraBars.PopupMenu, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControlGroup1 + + + DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControlGroup2 + + + DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControlGroup3 + + + DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControlItem4 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + lbLifecycleEnd + + + DevExpress.XtraLayout.SimpleLabelItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + lbLifecycleStart + + + DevExpress.XtraLayout.SimpleLabelItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + EmptySpaceItem1 + + + DevExpress.XtraLayout.EmptySpaceItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + LayoutControlItem3 + + + DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmDocumentResultList @@ -1080,4 +1477,46 @@ DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 3, 26 + + + 578, 529 + + + 0 + + + DockPanel2_Container + + + DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanelFileList + + + 0 + + + 3, 26 + + + 318, 528 + + + 0 + + + DockPanel1_Container + + + DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DockPanelDocViewer + + + 0 + \ No newline at end of file diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb index 2aad87a8..a30f1604 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -10,7 +10,6 @@ Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Views.BandedGrid Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraGrid.Views.Grid -Imports DevExpress.XtraGrid.Views.Grid.ViewInfo Imports DevExpress.XtraPrinting Imports DigitalData.Modules.Config Imports DigitalData.Modules.EDMI.API @@ -21,9 +20,10 @@ Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow.Constants Imports DigitalData.Modules.Base.IDB.FileStore Imports DigitalData.Controls.MessageBoxEx +Imports DigitalData.GUIs.Common.Base Public Class frmDocumentResultList - Implements IResultForm + Implements IResultForm, IBaseForm ' These are NOT constants, only defaults ' Can be changed when calling frmDocumentResultList @@ -41,10 +41,12 @@ Public Class frmDocumentResultList Private Const FILE_OPEN_TIMER_INTERVAL As Integer = 500 + Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig + Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger + Public ReadOnly Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler + ' Helper Classes Private _IDBClient As Client - Private ReadOnly LogConfig As LogConfig - Private ReadOnly Logger As Logger Private ReadOnly Config As ConfigManager(Of DocumentResultList.Config) Private ReadOnly Environment As Environment Private ReadOnly Filesystem As Modules.Filesystem.File @@ -53,12 +55,14 @@ Public Class frmDocumentResultList Private ReadOnly Helpers As DocumentResultList.Helpers Private ReadOnly Params As DocumentResultList.Params + Private ReadOnly LayoutManager As DocumentResultList.Layout Private WithEvents Watcher As DocumentResultList.Watcher + Private ControlManager As AttributeControls Private Documentloader As DocumentResultList.Loader ' Runtime variables - Private Property _ResultLists As List(Of DocumentResultList.DocumentResult) + Private Property ResultLists As List(Of DocumentResultList.DocumentResult) Private _IsLoading As Boolean = True Private _ActiveGrid As GridControl = Nothing @@ -73,6 +77,8 @@ Public Class frmDocumentResultList Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm + + Public Event NeedsRefresh As EventHandler(Of Integer) Implements IResultForm.NeedsRefresh Public Event ResultsRefreshed As EventHandler(Of List(Of DocumentResultList.DocumentResult)) @@ -93,6 +99,11 @@ Public Class frmDocumentResultList LogConfig = pLogConfig Logger = pLogConfig.GetLogger() + ErrorHandler = New BaseErrorHandler(pLogConfig, Me) + + Environment = pEnvironment + Params = pParams + ResultLists = pParams.Results Config = New ConfigManager(Of DocumentResultList.Config)(pLogConfig, oConfigPath, oConfigPath) Helpers = New DocumentResultList.Helpers(pLogConfig) @@ -100,10 +111,7 @@ Public Class frmDocumentResultList GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3}) FileEx = New Modules.Windows.File(pLogConfig) Watcher = New DocumentResultList.Watcher(pLogConfig) - - Environment = pEnvironment - Params = pParams - _ResultLists = pParams.Results + LayoutManager = New DocumentResultList.Layout(pLogConfig, Config) _Language = Utils.NotNull(Me.Environment.User.Language, State.UserState.LANG_EN_US) End Sub @@ -134,8 +142,6 @@ Public Class frmDocumentResultList End If - - Documentloader = New DocumentResultList.Loader(LogConfig, OperationMode, _IDBClient, Environment.User) If Params.WindowTitle <> "" Then @@ -154,6 +160,17 @@ Public Class frmDocumentResultList SplitContainerControl2.SplitterPosition = Config.Config.SplitContainer2Distance SwitchDetailContainerHorizontal.Checked = Config.Config.SplitContainer2Horizontal + ' Hide options relating to a filepath for zooflow + If OperationMode = OperationMode.ZooFlow Then + RibbonPageGroupFilesystem.Visible = False + Else + RibbonPageGroupFilesystem.Visible = False + End If + + If OperationMode = OperationMode.NoAppServer Then + DockPanelMetadata.Visibility = Docking.DockVisibility.Hidden + End If + If OperationMode <> OperationMode.NoAppServer Then ' Location and size will be managed by the ZooFlow Search Window If Utils.IsVisibleOnAnyScreen(Config.Config.WindowLocation) Then @@ -179,17 +196,22 @@ Public Class frmDocumentResultList UpdateTotalResults() UpdateGridData() + + LayoutManager.DockManager_RestoreLayout(DockManager1) + Catch ex As Exception - Logger.Error(ex) - MessageBox.Show("Error while loading results:" & vbNewLine & vbNewLine & ex.Message, Text) + ErrorHandler.ShowErrorMessage(ex, "Error while loading results", "Form Load") + Finally _IsLoading = False + End Try End Sub Private Sub frmDocumentResultList_Closing(sender As Object, e As CancelEventArgs) Handles Me.FormClosing Try - GridViewSave_Layout(_ActiveGrid.MainView) + LayoutManager.GridView_SaveLayout(_ActiveGrid.MainView) + LayoutManager.DockManager_SaveLayout(DockManager1) Config.Config.WindowLocation = Location Config.Config.WindowSize = Size @@ -201,11 +223,10 @@ Public Class frmDocumentResultList End Try End Sub - Private Sub GridView_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) + Private Async Sub GridView_FocusedRowChanged(sender As GridView, e As FocusedRowChangedEventArgs) Helpers.SetRowHandle(e) Try - Reset_Errors() Cursor = Cursors.WaitCursor If e.FocusedRowHandle >= 0 Then @@ -220,7 +241,7 @@ Public Class frmDocumentResultList ' Check DocumentInfo If IsNothing(oDocumentInfo) Then - Show_Warning("File could not be loaded!") + ErrorHandler.ShowErrorMessage("File could not be loaded!") Exit Sub End If @@ -231,17 +252,30 @@ Public Class frmDocumentResultList ' Save reference to current _CurrentDocument = oDocumentInfo + ' Hide Export and filesystem options for view only right If oDocumentInfo.AccessRight = Rights.AccessRight.VIEW_ONLY Then DocumentViewer1.SetViewOnly(True) - RibbonPageGroup_Export.Visible = False + RibbonPageExport.Visible = False + RibbonPageGroupFilesystem.Visible = False Else DocumentViewer1.SetViewOnly(False) - RibbonPageGroup_Export.Visible = True + RibbonPageExport.Visible = True + RibbonPageGroupFilesystem.Visible = True + End If + + If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then + Dim oEntityId = 1 + Dim oAttributes = Await ControlManager.GetAttributesForBusinessEntity(oEntityId) + + If oAttributes.Count = 0 Then + MsgBox($"Es konnten keine Attribute für das Objekt '{oObjectId}' geladen werden!", MsgBoxStyle.Critical, Text) + End If + + Await ControlManager.LoadControlsForAttributes(oObjectId, oAttributes, RootMetadata) End If End If Catch ex As Exception - Logger.Error(ex) - Show_CriticalError(ex) + ErrorHandler.ShowErrorMessage(ex, "GridView_FocusedRowChanged") Finally Cursor = Cursors.Default End Try @@ -287,8 +321,7 @@ Public Class frmDocumentResultList End If Catch ex As Exception - Logger.Error(ex) - Show_CriticalError(ex) + ErrorHandler.ShowErrorMessage(ex, "Watcher_FileChanged") Finally ' Signal to the watcher that the file is no longer in use @@ -360,8 +393,7 @@ Public Class frmDocumentResultList Dim oPort As Integer = oSplit.Item(1) _IDBClient = New Client(LogConfig, oAddress, oPort) - ' TODO: INitialize databasewithfallback - '_Database + ControlManager = New AttributeControls(LogConfig, Environment, _IDBClient) If Not _IDBClient.Connect() Then Logger.Warn("Client could not connect to Service at [{0}]", Environment.Service.Address) @@ -382,7 +414,7 @@ Public Class frmDocumentResultList _IsLoading = True Try ' Save the new results - _ResultLists = pResults + ResultLists = pResults ' Remove the current document from Documentloader.ClearCache() @@ -434,31 +466,31 @@ Public Class frmDocumentResultList Private Sub UpdateGridData() ' Load Grids - For oIndex = 0 To _ResultLists.Count - 1 + For oIndex = 0 To ResultLists.Count - 1 Select Case oIndex Case 0 - Dim oResult As DocumentResultList.DocumentResult = _ResultLists.Item(0) + Dim oResult As DocumentResultList.DocumentResult = ResultLists.Item(0) LoadGridData(GridView1, oResult) CreateDocumentGrid(GridView1, oResult) - RestoreLayout(GridView1) - UpdateGridHeader(_ResultLists, oIndex, oResult.Datatable.Rows.Count) + LayoutManager.GridView_RestoreLayout(GridView1) + UpdateGridHeader(ResultLists, oIndex, oResult.Datatable.Rows.Count) Case 1 - Dim oResult As DocumentResultList.DocumentResult = _ResultLists.Item(1) + Dim oResult As DocumentResultList.DocumentResult = ResultLists.Item(1) LoadGridData(GridView2, oResult) CreateDocumentGrid(GridView2, oResult) - RestoreLayout(GridView2) - UpdateGridHeader(_ResultLists, oIndex, oResult.Datatable.Rows.Count) + LayoutManager.GridView_RestoreLayout(GridView2) + UpdateGridHeader(ResultLists, oIndex, oResult.Datatable.Rows.Count) Case 2 - Dim oResult As DocumentResultList.DocumentResult = _ResultLists.Item(2) + Dim oResult As DocumentResultList.DocumentResult = ResultLists.Item(2) LoadGridData(GridView3, oResult) CreateDocumentGrid(GridView3, oResult) - RestoreLayout(GridView3) - UpdateGridHeader(_ResultLists, oIndex, oResult.Datatable.Rows.Count) + LayoutManager.GridView_RestoreLayout(GridView3) + UpdateGridHeader(ResultLists, oIndex, oResult.Datatable.Rows.Count) Case Else MessageBox.Show(Constants.MESSAGE_TOO_MANY_SEARCHES, Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) @@ -467,7 +499,7 @@ Public Class frmDocumentResultList Next ' Hide Grids depending on Result count - Select Case _ResultLists.Count + Select Case ResultLists.Count Case 0 SplitContainerControl1.SetPanelCollapsed(True) @@ -499,7 +531,7 @@ Public Class frmDocumentResultList Private Sub UpdateTotalResults() Dim oTotalResults = 0 - For Each oList In _ResultLists + For Each oList In ResultLists oTotalResults += oList.Datatable.Rows.Count Next @@ -686,17 +718,17 @@ Public Class frmDocumentResultList Private Sub GridView1_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView1.ColumnFilterChanged Dim oRowCount = sender.RowCount - UpdateGridHeader(_ResultLists, 0, oRowCount) + UpdateGridHeader(ResultLists, 0, oRowCount) End Sub Private Sub GridView2_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView2.ColumnFilterChanged Dim oRowCount = sender.RowCount - UpdateGridHeader(_ResultLists, 1, oRowCount) + UpdateGridHeader(ResultLists, 1, oRowCount) End Sub Private Sub GridView3_ColumnFilterChanged(sender As GridView, e As EventArgs) Handles GridView3.ColumnFilterChanged Dim oRowCount = sender.RowCount - UpdateGridHeader(_ResultLists, 2, oRowCount) + UpdateGridHeader(ResultLists, 2, oRowCount) End Sub Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonBack.ItemClick @@ -706,37 +738,14 @@ Public Class frmDocumentResultList Private Async Sub GridControl_DoubleClick(sender As Object, e As EventArgs) Handles GridControl1.DoubleClick, GridControl2.DoubleClick, GridControl3.DoubleClick If _CurrentDocument IsNot Nothing AndAlso _CurrentDocument.AccessRight > Rights.AccessRight.VIEW_ONLY Then - 'Process.Start(New ProcessStartInfo With { - ' .FileName = _CurrentDocument.FullPath - '}) Await Watcher.OpenDocument(_CurrentDocument) End If End Sub - Public Sub Show_CriticalError(Message As String) - labelCriticalError.Visibility = BarItemVisibility.Always - labelCriticalError.Caption = Message - End Sub - - Public Sub Show_CriticalError(pException As Exception) - labelCriticalError.Visibility = BarItemVisibility.Always - labelCriticalError.Caption = pException.Message - End Sub - - Public Sub Show_Warning(Message As String) - labelWarning.Visibility = BarItemVisibility.Always - labelWarning.Caption = Message - End Sub - - Public Sub Reset_Errors() - labelCriticalError.Visibility = BarItemVisibility.Never - labelWarning.Visibility = BarItemVisibility.Never - End Sub - Private Sub BarButtonResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonResetLayout.ItemClick If Not IsNothing(_ActiveGrid) Then Try - Dim oFile = GetDevexpressGrid_LayoutName(_ActiveGrid.MainView) + Dim oFile = LayoutManager.GetGrid_LayoutName(_ActiveGrid.MainView) If IO.File.Exists(oFile) Then IO.File.Delete(oFile) End If @@ -747,8 +756,12 @@ Public Class frmDocumentResultList End If End Sub - Private Function TestPathExists(pTitle As String) As Boolean - If IO.File.Exists(_CurrentDocument.FullPath) = False Then + Private Function TestFileExists(pTitle As String) As Boolean + If _CurrentDocument Is Nothing Then + Return False + End If + + If File.Exists(_CurrentDocument.FullPath) = False Then MessageBox.Show($"Datei {_CurrentDocument.FullPath} existiert nicht oder wurde verschoben!", pTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) Return False Else @@ -756,6 +769,19 @@ Public Class frmDocumentResultList End If End Function + Private Function TestDirectoryExists(pDirectory As String, pTitle As String) As Boolean + If _CurrentDocument Is Nothing Then + Return False + End If + + If Directory.Exists(pDirectory) = False Then + MessageBox.Show($"Ordner {pDirectory} existiert nicht oder wurde verschoben!", pTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) + Return False + Else + Return True + End If + End Function + Private Function TestObjectIdExists(pObjectId As Long, pTitle As String) As Boolean If pObjectId = 0 Then MessageBox.Show($"Objekt {pObjectId} existiert nicht oder wurde verschoben!", pTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) @@ -768,67 +794,47 @@ Public Class frmDocumentResultList -#Region "Context Menu" +#Region "File Actions" + Private Sub MenuItem_OpenProperties_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemPropertiesECM.ItemClick + If _CurrentDocument Is Nothing Then + Exit Sub + End If - Private Sub GridView_PopupMenuShowing(sender As Object, e As PopupMenuShowingEventArgs) Handles GridView2.PopupMenuShowing, GridView3.PopupMenuShowing, GridView1.PopupMenuShowing - Try - Dim oView As GridView = sender + Select Case OperationMode + Case OperationMode.NoAppServer + FileEx.OpenFileProperties(_CurrentDocument.FullPath) - If e.MenuType = GridMenuType.Row Then - Dim oRowHandle = e.HitInfo.RowHandle - Dim oRow As DataRow = oView.GetDataRow(oRowHandle) - Dim oObjectId As Long = oRow.Item(COLUMN_DOCID) - Dim oPoint As Point = oView.GridControl.PointToScreen(e.HitInfo.HitPoint) - Dim oRight As Rights.AccessRight = _CurrentDocument.AccessRight - - '_CurrentDocumentId = oObjectId - _CurrentDocument.Id = oObjectId - - If OperationMode = OperationMode.WithAppServer Then - If oRight = Rights.AccessRight.FULL Or oRight = Rights.AccessRight.VIEW_EXPORT Then - MenuFullAccess_IDB.ShowPopup(oPoint) - Else - MenuViewAccess_IDB.ShowPopup(oPoint) - End If - ElseIf OperationMode = OperationMode.ZooFlow Then - MenuFullAccess_ZOOFLOW.ShowPopup(oPoint) - - Else - MenuFullAccess_EDM.ShowPopup(oPoint) - End If - Else - '_CurrentDocumentId = Nothing - _CurrentDocument.Id = Nothing - End If - Catch ex As Exception - Logger.Error(ex) - MsgBox("Unexpected Error while preparing context menu", MsgBoxStyle.Critical, Text) - End Try + Case Else + Dim oPropertyDialog As New frmObjectPropertyDialog(LogConfig, Environment, _IDBClient, _CurrentDocument.Id) + oPropertyDialog.Show() + End Select End Sub - Private Sub MenuItemFolderpathCopyECM_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFolderpathCopy.ItemClick - Dim oFolderPath = IO.Path.GetDirectoryName(_CurrentDocument.FullPath) + Private Sub MenuItem_CopyFolderpath_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFolderpathCopy.ItemClick + Dim oFolderPath = Path.GetDirectoryName(_CurrentDocument.FullPath) Clipboard.SetText(oFolderPath) End Sub - Private Sub MenuItemPropertiesECM_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemPropertiesECM.ItemClick - If TestPathExists(OPEN_PROPERTIES) = False Then - Exit Sub - End If - - FileEx.OpenFileProperties(_CurrentDocument.FullPath) - End Sub - - Private Sub MenuItemFilepathCopyIDB_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFilepathCopy.ItemClick + Private Sub MenuItem_CopyFilepath_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFilepathCopy.ItemClick Clipboard.SetText(_CurrentDocument.FullPath) End Sub - Private Sub MenuItemFolderOpen_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFolderOpen.ItemClick - If TestPathExists(OPEN_DIRECTORY) = False Then + Private Async Sub MenuItem_OpenFile_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFileOpen.ItemClick + Try + Await Watcher.OpenDocument(_CurrentDocument) + Catch ex As Exception + Logger.Error(ex) + End Try + End Sub + + Private Sub MenuItem_FolderOpen_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFolderOpen.ItemClick + Dim oFolderPath = Path.GetDirectoryName(_CurrentDocument.FullPath) + + If TestDirectoryExists(oFolderPath, OPEN_DIRECTORY) = False Then Exit Sub End If - Dim oArgs As String = $"/e, /select, ""{_CurrentDocument.FullPath}""" + Dim oArgs As String = $"/e, /select, ""{oFolderPath}""" Dim oInfo As New ProcessStartInfo() With { .Arguments = oArgs, .FileName = "explorer" @@ -837,44 +843,6 @@ Public Class frmDocumentResultList Process.Start(oInfo) End Sub - Private Sub MenuItemPropertiesIDB_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemPropertiesIDB.ItemClick - If TestObjectIdExists(_CurrentDocument.Id, OPEN_PROPERTIES) = False Then - Exit Sub - End If - - Dim oPropertyDialog As New frmObjectPropertyDialog(LogConfig, Environment, _IDBClient, _CurrentDocument.Id) - oPropertyDialog.Show() - End Sub - - Private Async Sub MenuItemFileOpen_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemFileOpen.ItemClick - If TestPathExists(OPEN_FILE) = False Then - Exit Sub - End If - - Try - Await Watcher.OpenDocument(_CurrentDocument) - - 'Process.Start(New ProcessStartInfo With { - ' .FileName = _CurrentDocument.FullPath - '}) - Catch ex As Exception - Logger.Error(ex) - End Try - End Sub - - Private Sub MenuItemPropertiesZooFlow_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemPropertiesZooFlow.ItemClick - If TestObjectIdExists(_CurrentDocument.Id, OPEN_PROPERTIES) = False Then - Exit Sub - End If - - Dim oPropertyDialog As New frmObjectPropertyDialog(LogConfig, Environment, _IDBClient, _CurrentDocument.Id) - oPropertyDialog.Show() - End Sub - - Private Async Sub MenuItemsOpenFileZooFlow_ItemClick(sender As Object, e As ItemClickEventArgs) Handles MenuItemsOpenFileZooFlow.ItemClick - Await Watcher.OpenDocument(_CurrentDocument) - End Sub - #End Region #Region "Drag to Export" @@ -942,38 +910,19 @@ Public Class frmDocumentResultList Config.Config.SplitContainer2Horizontal = SwitchDetailContainerHorizontal.Checked End If End Sub - - Private Function GetDevexpressGrid_LayoutName(pGridView As GridView) - Dim Filename As String = $"DevExpressGridViewDocResult_{pGridView.Name}UserLayout.xml" - Return Path.Combine(Config.UserConfigPath.Replace("UserConfig.xml", ""), Filename) - End Function - - - Private Sub GridViewSave_Layout(pGridView As GridView) - Try - Dim oXml As String = GetDevexpressGrid_LayoutName(pGridView) - pGridView.SaveLayoutToXml(oXml, OptionsLayoutBase.FullLayout) - Catch ex As Exception - Logger.Error(ex) - Logger.Info("Error while saving GridLayout: " & ex.Message) - End Try - End Sub - Private Sub RestoreLayout(pGridView As GridView) - Try - Dim oLayoutFile As String = GetDevexpressGrid_LayoutName(pGridView) - If IO.File.Exists(oLayoutFile) Then - pGridView.RestoreLayoutFromXml(oLayoutFile, OptionsLayoutBase.FullLayout) - End If - Catch ex As Exception - Logger.Error(ex) - Logger.Info("Error while restoring layout: " & ex.Message) - End Try - End Sub - +#End Region Private Sub ButtonRefresh_ItemClick(sender As Object, e As ItemClickEventArgs) Handles ButtonRefresh.ItemClick RaiseEvent NeedsRefresh(Me, Params.ProfileGuid) End Sub -#End Region - + Private Sub BarButtonItem6_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonItem6.ItemClick + Try + Dim oFile = LayoutManager.GetDockmanager_LayoutName() + If File.Exists(oFile) Then + File.Delete(oFile) + End If + Catch ex As Exception + Logger.Error(ex) + End Try + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/ClassDetailForm.vb b/GUIs.ZooFlow/Administration/ClassDetailForm.vb index 2c2ea18b..5b139f67 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailForm.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailForm.vb @@ -49,12 +49,14 @@ Public Class ClassDetailForm {PAGE_IDB_ATTRIBUTE_REL, New DetailSettings With { .GridTitle = "Attribute-Relations", .[Module] = MODULE_IDB, - .Entity = PAGE_IDB_ATTRIBUTES + .Entity = PAGE_IDB_ATTRIBUTES, + .IsRelationPage = True }}, {PAGE_GI_RELATIONS, New DetailSettings With { .GridTitle = "Globix profile-relations", .[Module] = MODULE_GI, - .Entity = PAGE_GI_RELATIONS + .Entity = PAGE_GI_RELATIONS, + .IsRelationPage = True }}, {PAGE_IDB_DOCTYPE_CONFIG, New DetailSettings With { .GridTitle = "Detail Doctype Configuration", @@ -70,7 +72,8 @@ Public Class ClassDetailForm {PAGE_IDB_DOCTYPE_BE, New DetailSettings With { .GridTitle = "Doctype BE Relations", .[Module] = MODULE_IDB, - .Entity = PAGE_IDB_DOCTYPE_BE + .Entity = PAGE_IDB_DOCTYPE_BE, + .IsRelationPage = True }}, {PAGE_USERS_USERLIST, New DetailSettings With { .GridTitle = "User Overview", @@ -87,7 +90,8 @@ Public Class ClassDetailForm {PAGE_USERS_USER_GROUP_RELATIONS, New DetailSettings With { .GridTitle = "User Group Relations", .[Module] = MODULE_USERS, - .Entity = PAGE_USERS_USER_GROUP_RELATIONS + .Entity = PAGE_USERS_USER_GROUP_RELATIONS, + .IsRelationPage = True }} } @@ -194,11 +198,21 @@ Public Class ClassDetailForm End Try End Function + Public Function TestPageIsRelation(pPageName As String) As Boolean + Return DetailSettingsList.Any(Function(page) page.Key = pPageName And page.Value.IsRelationPage = True) + End Function + Public Class DetailSettings Public Property GridTitle As String Public Property [Module] As String Public Property Entity As String + ''' + ''' This makes sure that the page can be opened even if there are no entries + ''' + ''' + Public Property IsRelationPage As Boolean = False + ''' ''' If this is empty, the button "New Record will be hidden" ''' diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb index c64eecce..d37f553e 100644 --- a/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb +++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_User.Designer.vb @@ -457,11 +457,12 @@ Partial Class frmAdmin_User Me.Controls.Add(Me.LayoutControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_user Me.KeyPreview = True Me.Name = "frmAdmin_User" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "Benutzer bearbeiten" + Me.Text = "Benutzer bearbeiten - Zooflow" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DSDD_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.Designer.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.Designer.vb similarity index 98% rename from GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.Designer.vb rename to GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.Designer.vb index 7acbc68e..9b5e5912 100644 --- a/GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.Designer.vb +++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.Designer.vb @@ -1,5 +1,5 @@  -Partial Class frmAdmin_ImportUser +Partial Class frmAdmin_UserImport Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -247,7 +247,7 @@ Partial Class frmAdmin_ImportUser ' Me.SplashScreenManager1.ClosingDelay = 500 ' - 'frmAdmin_ImportUser + 'frmAdmin_UserImport ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -256,10 +256,10 @@ Partial Class frmAdmin_ImportUser Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.text - Me.Name = "frmAdmin_ImportUser" + Me.Name = "frmAdmin_UserImport" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "Active Directory Import" + Me.Text = "Active Directory Import - Zooflow" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.Panel1.ResumeLayout(False) diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.resx.bak b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.resx similarity index 68% rename from GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.resx.bak rename to GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.resx index 0dc5f691..1af7de15 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.resx.bak +++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.resx @@ -117,34 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACcFAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3 - RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm - aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRWRpdENvbG9ycyI+DQogICAgPHBhdGggZD0i - TTI5LDBIMUMwLjUsMCwwLDAuNSwwLDF2MjhjMCwwLjUsMC41LDEsMSwxaDI4YzAuNSwwLDEtMC41LDEt - MVYxQzMwLDAuNSwyOS41LDAsMjksMHogTTI4LDI4SDJWMmgyNlYyOHoiIGNsYXNzPSJCbGFjayIgLz4N - CiAgICA8cGF0aCBkPSJNMTAsMTBINFY0aDZWMTB6IE0xOCw0aC02djZoNlY0eiBNMTAsMTJINHY2aDZW - MTJ6IiBjbGFzcz0iWWVsbG93IiAvPg0KICAgIDxwYXRoIGQ9Ik0xMCwyNkg0di02aDZWMjZ6IE0xOCwx - MmgtNnY2aDZWMTJ6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTI2LDEwaC02VjRoNlYx - MHogTTI2LDEyaC02djZoNlYxMnoiIGNsYXNzPSJSZWQiIC8+DQogICAgPHBhdGggZD0iTTI2LDI2aC02 - di02aDZWMjZ6IE0xOCwyMGgtNnY2aDZWMjB6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgICA8ZyBjbGFzcz0i - c3QxIj4NCiAgICAgIDxyZWN0IHg9IjQiIHk9IjEyIiB3aWR0aD0iNiIgaGVpZ2h0PSI2IiByeD0iMCIg - cnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgICAgIDxwYXRoIGQ9Ik0xOCwxMGgtNlY0aDZWMTB6IE0y - NiwyMGgtNnY2aDZWMjB6IiBjbGFzcz0iUmVkIiAvPg0KICAgICAgPHBhdGggZD0iTTI2LDE4aC02di02 - aDZWMTh6IE0xOCwxMmgtNnY2aDZWMTJ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgICA8L2c+DQogICAgPGcg - Y2xhc3M9InN0MSI+DQogICAgICA8cmVjdCB4PSIyMCIgeT0iMjAiIHdpZHRoPSI2IiBoZWlnaHQ9IjYi - IHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsdWUiIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L - - \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.vb similarity index 99% rename from GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.vb rename to GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.vb index 2aba2ce5..55cfcf97 100644 --- a/GUIs.ZooFlow/Administration/Users/frmAdmin_ImportUser.vb +++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserImport.vb @@ -4,7 +4,7 @@ Imports DigitalData.Modules.Logging Imports DigitalData.GUIs.Common Imports DevExpress.XtraGrid.Views.Grid -Public Class frmAdmin_ImportUser +Public Class frmAdmin_UserImport Private ReadOnly Logger As Logger = My.LogConfig.GetLogger Private ActiveDirectory As ActiveDirectoryInterface @@ -56,7 +56,7 @@ Public Class frmAdmin_ImportUser End Sub Private Sub btnImportUsers_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnImportUsers.ItemClick - Dim oForm As New frmAdmin_ImportUser() + Dim oForm As New frmAdmin_UserImport() oForm.ShowDialog() End Sub diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 44862208..8f7e6116 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -424,22 +424,21 @@ Partial Class frmAdmin_Start Me.TreeListMenu.AppendNode(New Object() {"Attribute"}, 0, 2, 2, -1, "IDB_ATTRIBUTES") Me.TreeListMenu.AppendNode(New Object() {"Relation Business Entity"}, 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() {Nothing}, 3) Me.TreeListMenu.AppendNode(New Object() {"Doctypes"}, 0, 10, 10, -1, "DOCTYPE_DEF") - Me.TreeListMenu.AppendNode(New Object() {"Configurations"}, 5, 10, 10, -1, "IDB_DOCTYPE_CONFIG") - Me.TreeListMenu.AppendNode(New Object() {"Relation Business Entity"}, 5, 9, 9, -1, "DOCTYPE_BE") + Me.TreeListMenu.AppendNode(New Object() {"Configurations"}, 4, 10, 10, -1, "IDB_DOCTYPE_CONFIG") + Me.TreeListMenu.AppendNode(New Object() {"Relation Business Entity"}, 4, 9, 9, -1, "DOCTYPE_BE") 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"}, 9, 4, 4, -1, "GI_PROFILES") - Me.TreeListMenu.AppendNode(New Object() {"Profile Relations"}, 10, 9, 9, -1, "GI_RELATIONS") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 8, 4, 4, -1, "GI_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profile Relations"}, 9, 9, 9, -1, "GI_RELATIONS") Me.TreeListMenu.AppendNode(New Object() {"Clipboard Watcher"}, -1, 7, 7, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 12, 4, 4, -1, "CW_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 11, 4, 4, -1, "CW_PROFILES") Me.TreeListMenu.AppendNode(New Object() {"Administration"}, -1) - Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 14, 3, 3, -1, "META_SOURCE_SQL") + Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 13, 3, 3, -1, "META_SOURCE_SQL") Me.TreeListMenu.AppendNode(New Object() {"User Management"}, -1, 11, 11, -1) - Me.TreeListMenu.AppendNode(New Object() {"User List"}, 16, 5, 5, -1, "USERS_USERLIST") - Me.TreeListMenu.AppendNode(New Object() {"Group List"}, 16, 12, 12, -1, "USERS_GROUPLIST") - Me.TreeListMenu.AppendNode(New Object() {"User To Group Relations"}, 16, "USERS_USER_GROUP_RELATIONS") + Me.TreeListMenu.AppendNode(New Object() {"User List"}, 15, 5, 5, -1, "USERS_USERLIST") + Me.TreeListMenu.AppendNode(New Object() {"Group List"}, 15, 12, 12, -1, "USERS_GROUPLIST") + Me.TreeListMenu.AppendNode(New Object() {"User Relations"}, 17, 9, 9, -1, "USERS_USER_GROUP_RELATIONS") Me.TreeListMenu.EndUnboundLoad() Me.TreeListMenu.OptionsBehavior.Editable = False Me.TreeListMenu.OptionsView.ShowColumns = False diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index abe6e38f..75f1592e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -8,6 +8,7 @@ Imports DigitalData.Modules.Language.Utils Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants Imports DevExpress.XtraGrid Imports DevExpress.XtraBars +Imports DigitalData.Modules.Language Public Class frmAdmin_Start Private CurrentModule As String @@ -222,8 +223,13 @@ Public Class frmAdmin_Start Try Dim oView As GridView = ViewMain Dim oRowView As DataRowView = oView.GetRow(RowHandle) + + If oRowView Is Nothing Then + Return Nothing + End If + Dim oItem As ClassDetailForm.DetailData = CurrentItem - Dim oGuid = oRowView.Row.Item(oItem.PrimaryKey) + Dim oGuid = oRowView.Row.ItemEx(oItem.PrimaryKey, -1) Return oGuid Catch ex As Exception @@ -256,13 +262,15 @@ Public Class frmAdmin_Start Private Sub btnEditRecord_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnEditRecord.ItemClick Try - If ViewMain.FocusedRowHandle = GridControl.InvalidRowHandle Then + Dim oIsRelationPage = DetailForm.TestPageIsRelation(CurrentPage) + + If ViewMain.FocusedRowHandle = GridControl.InvalidRowHandle And Not oIsRelationPage Then Exit Sub End If Dim oPrimaryKey = Get_PrimaryKey(ViewMain.FocusedRowHandle) - If oPrimaryKey IsNot Nothing Or CurrentPage = PAGE_GI_RELATIONS Then + If oPrimaryKey IsNot Nothing Or oIsRelationPage Then DetailForm.Handle_OpenDetail(oPrimaryKey, CurrentPage, False) End If Catch ex As Exception @@ -271,7 +279,7 @@ Public Class frmAdmin_Start End Sub Private Sub BarButtonItem27_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem27.ItemClick - Dim oForm As New frmAdmin_ImportUser() + Dim oForm As New frmAdmin_UserImport() oForm.ShowDialog() End Sub diff --git a/GUIs.ZooFlow/ClassDragDrop.vb b/GUIs.ZooFlow/ClassDragDrop.vb index 721759a3..adcb3908 100644 --- a/GUIs.ZooFlow/ClassDragDrop.vb +++ b/GUIs.ZooFlow/ClassDragDrop.vb @@ -7,9 +7,22 @@ Imports DigitalData.Modules.Base Public Class ClassDragDrop Inherits BaseClass + Public Enum ResultType + PrimaryKey + RowHandle + End Enum + Private downHitInfo As GridHitInfo = Nothing + Private SelectedResultType As ResultType + Public Sub New(LogConfig As LogConfig) MyBase.New(LogConfig) + SelectedResultType = ResultType.PrimaryKey + End Sub + + Public Sub New(LogConfig As LogConfig, pResultType As ResultType) + MyBase.New(LogConfig) + SelectedResultType = pResultType End Sub Public Sub AddGridView(view As GridView) @@ -62,7 +75,16 @@ Public Class ClassDragDrop If Not IsNothing(row) Then Try - dragDropData = row.Item("GUID") & "|" & source + Dim oKey As String + + Select Case SelectedResultType + Case ResultType.RowHandle + oKey = downHitInfo.RowHandle + Case Else + oKey = row.Item("GUID") + End Select + + dragDropData = $"{oKey}|{source}" view.GridControl.DoDragDrop(dragDropData, DragDropEffects.Move) downHitInfo = Nothing diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index ee7d2f58..46219dd1 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -540,6 +540,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_user() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_user", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -550,6 +560,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property allowuserstoeditranges() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("allowuserstoeditranges", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 29559b2d..4537a70d 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -121,6 +121,12 @@ ..\Resources\save8.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -142,8 +148,11 @@ ..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\Hamburger_icon.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -151,8 +160,11 @@ ..\Resources\servermode.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -190,8 +202,8 @@ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -208,9 +220,6 @@ ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -313,14 +322,17 @@ ..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\allowuserstoeditranges.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -331,8 +343,8 @@ ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -340,14 +352,11 @@ ..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_send2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -397,14 +406,14 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\previousview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_check6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Hamburger_icon.svg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -412,8 +421,8 @@ ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -433,17 +442,14 @@ ..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\deletetable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -481,8 +487,8 @@ ..\Resources\managedatasource2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -511,8 +517,8 @@ ..\Resources\windows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -520,13 +526,13 @@ ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_validation1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\previousview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_user.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/actions_user.svg b/GUIs.ZooFlow/Resources/actions_user.svg new file mode 100644 index 00000000..8c183040 --- /dev/null +++ b/GUIs.ZooFlow/Resources/actions_user.svg @@ -0,0 +1,16 @@ + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/allowuserstoeditranges.svg b/GUIs.ZooFlow/Resources/allowuserstoeditranges.svg new file mode 100644 index 00000000..6497af97 --- /dev/null +++ b/GUIs.ZooFlow/Resources/allowuserstoeditranges.svg @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb index 845550d5..d61978dc 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb @@ -60,6 +60,7 @@ Partial Class frmFlowSearch1 Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() Me.txtSearchInput = New System.Windows.Forms.TextBox() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() + Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel1.SuspendLayout() @@ -81,6 +82,7 @@ Partial Class frmFlowSearch1 CType(Me.ToggleSwitchYear_Last.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 @@ -261,7 +263,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth_Last.Name = "ToggleSwitchMonth_Last" Me.ToggleSwitchMonth_Last.Properties.OffText = "Letzter Monat" Me.ToggleSwitchMonth_Last.Properties.OnText = "Letzter Monat" - Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(195, 19) + Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(195, 18) Me.ToggleSwitchMonth_Last.TabIndex = 9 ' 'ToggleSwitchDateto @@ -271,14 +273,14 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchDateto.Name = "ToggleSwitchDateto" Me.ToggleSwitchDateto.Properties.OffText = "Datum bis" Me.ToggleSwitchDateto.Properties.OnText = "Datum bis" - Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 19) + Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 18) Me.ToggleSwitchDateto.TabIndex = 0 ' 'lblDatefrom ' Me.lblDatefrom.Location = New System.Drawing.Point(3, 211) Me.lblDatefrom.Name = "lblDatefrom" - Me.lblDatefrom.Size = New System.Drawing.Size(34, 13) + Me.lblDatefrom.Size = New System.Drawing.Size(31, 13) Me.lblDatefrom.TabIndex = 3 Me.lblDatefrom.Text = "Datum" ' @@ -302,7 +304,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth.Name = "ToggleSwitchMonth" Me.ToggleSwitchMonth.Properties.OffText = "Dieser Monat" Me.ToggleSwitchMonth.Properties.OnText = "Dieser Monat" - Me.ToggleSwitchMonth.Size = New System.Drawing.Size(195, 19) + Me.ToggleSwitchMonth.Size = New System.Drawing.Size(195, 18) Me.ToggleSwitchMonth.TabIndex = 8 ' 'ToggleSwitchTomorrow @@ -312,7 +314,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchTomorrow.Name = "ToggleSwitchTomorrow" Me.ToggleSwitchTomorrow.Properties.OffText = "Morgen" Me.ToggleSwitchTomorrow.Properties.OnText = "Morgen" - Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 19) + Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 18) Me.ToggleSwitchTomorrow.TabIndex = 7 Me.ToggleSwitchTomorrow.Visible = False ' @@ -323,7 +325,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchToday.Name = "ToggleSwitchToday" Me.ToggleSwitchToday.Properties.OffText = "Heute" Me.ToggleSwitchToday.Properties.OnText = "Heute" - Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 19) + Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 18) Me.ToggleSwitchToday.TabIndex = 2 ' 'ToggleSwitchLastWeek @@ -333,7 +335,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchLastWeek.Name = "ToggleSwitchLastWeek" Me.ToggleSwitchLastWeek.Properties.OffText = "Letzten 7 Tage" Me.ToggleSwitchLastWeek.Properties.OnText = "Letzten 7 Tage" - Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(195, 19) + Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(195, 18) Me.ToggleSwitchLastWeek.TabIndex = 6 ' 'ToggleSwitchYesterday @@ -343,7 +345,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYesterday.Name = "ToggleSwitchYesterday" Me.ToggleSwitchYesterday.Properties.OffText = "Gestern" Me.ToggleSwitchYesterday.Properties.OnText = "Gestern" - Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 19) + Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 18) Me.ToggleSwitchYesterday.TabIndex = 3 ' 'ToggleSwitchYear_Last @@ -353,7 +355,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear_Last.Name = "ToggleSwitchYear_Last" Me.ToggleSwitchYear_Last.Properties.OffText = "Letztes Jahr" Me.ToggleSwitchYear_Last.Properties.OnText = "Letztes Jahr" - Me.ToggleSwitchYear_Last.Size = New System.Drawing.Size(195, 19) + Me.ToggleSwitchYear_Last.Size = New System.Drawing.Size(195, 18) Me.ToggleSwitchYear_Last.TabIndex = 5 ' 'ToggleSwitchYear @@ -363,13 +365,13 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear.Name = "ToggleSwitchYear" Me.ToggleSwitchYear.Properties.OffText = "Dieses Jahr" Me.ToggleSwitchYear.Properties.OnText = "Dieses Jahr" - Me.ToggleSwitchYear.Size = New System.Drawing.Size(195, 19) + Me.ToggleSwitchYear.Size = New System.Drawing.Size(195, 18) Me.ToggleSwitchYear.TabIndex = 4 ' 'XtraTabPage2 ' Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(201, 450) + Me.XtraTabPage2.Size = New System.Drawing.Size(201, 458) Me.XtraTabPage2.Text = "...tbd" ' 'Label1 @@ -377,7 +379,7 @@ Partial Class frmFlowSearch1 Me.Label1.AutoSize = True Me.Label1.Location = New System.Drawing.Point(4, 8) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(47, 13) + Me.Label1.Size = New System.Drawing.Size(44, 13) Me.Label1.TabIndex = 0 Me.Label1.Text = "Attribut" ' @@ -427,6 +429,15 @@ Partial Class frmFlowSearch1 Me.PictureEdit1.Size = New System.Drawing.Size(208, 200) Me.PictureEdit1.TabIndex = 8 ' + 'TextEdit1 + ' + Me.TextEdit1.Location = New System.Drawing.Point(231, 220) + Me.TextEdit1.MenuManager = Me.RibbonControl1 + Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.Properties.Padding = New System.Windows.Forms.Padding(10) + Me.TextEdit1.Size = New System.Drawing.Size(528, 40) + Me.TextEdit1.TabIndex = 12 + ' 'frmFlowSearch1 ' Me.Appearance.BackColor = System.Drawing.Color.Lavender @@ -434,6 +445,7 @@ Partial Class frmFlowSearch1 Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(936, 769) + Me.Controls.Add(Me.TextEdit1) Me.Controls.Add(Me.PictureEdit1) Me.Controls.Add(Me.txtSearchInput) Me.Controls.Add(Me.LabelControl1) @@ -468,6 +480,7 @@ Partial Class frmFlowSearch1 CType(Me.ToggleSwitchYear_Last.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -509,4 +522,5 @@ Partial Class frmFlowSearch1 Friend WithEvents DateEditTill As DevExpress.XtraEditors.DateEdit Friend WithEvents DateEditFrom As DevExpress.XtraEditors.DateEdit Friend WithEvents ToggleSwitchDateto As DevExpress.XtraEditors.ToggleSwitch + Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index fb0ac1bb..79a643b6 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -40,11 +40,20 @@ Public Class frmFlowSearch1 TOGGLE_Change = False End Sub - Private Sub ToggleSwitchToday_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchToday.Toggled, ToggleSwitchYesterday.Toggled, ToggleSwitchYear.Toggled, ToggleSwitchYear_Last.Toggled, - ToggleSwitchMonth_Last.Toggled, ToggleSwitchMonth.Toggled, ToggleSwitchLastWeek.Toggled, ToggleSwitchTomorrow.Toggled + Private Sub ToggleSwitchToday_Toggled(sender As Object, e As EventArgs) Handles _ + ToggleSwitchToday.Toggled, + ToggleSwitchYesterday.Toggled, + ToggleSwitchYear.Toggled, + ToggleSwitchYear_Last.Toggled, + ToggleSwitchMonth_Last.Toggled, + ToggleSwitchMonth.Toggled, + ToggleSwitchLastWeek.Toggled, + ToggleSwitchTomorrow.Toggled + If TOGGLE_Change = True Then Exit Sub End If + Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) If oToggle.IsOn Then @@ -268,6 +277,9 @@ Public Class frmFlowSearch1 .Datatable = oDTDocResult }) Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams) + + AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh + oForm.Show() Else bsiStatus.Caption = "No Results" @@ -277,6 +289,10 @@ Public Class frmFlowSearch1 End If End Function + Private Sub Form_NeedsRefresh(sender As Object, e As Integer) + + End Sub + Private Async Function txtSearchInput_KeyUp(sender As Object, e As KeyEventArgs) As Threading.Tasks.Task Handles txtSearchInput.KeyUp If e.KeyCode = Keys.Return Then If txtSearchInput.Text = String.Empty Then @@ -347,8 +363,4 @@ Public Class frmFlowSearch1 End If End Sub - - Private Sub DockPanel1_Click(sender As Object, e As EventArgs) Handles DockPanel1.Click - - End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb new file mode 100644 index 00000000..d965c20d --- /dev/null +++ b/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb @@ -0,0 +1,201 @@ + _ +Partial Class frmFlowSearch2 + 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.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() + Me.PanelControl2 = New DevExpress.XtraEditors.PanelControl() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.RadioGroup1 = New DevExpress.XtraEditors.RadioGroup() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.PanelControl1.SuspendLayout() + CType(Me.PanelControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.PanelControl2.SuspendLayout() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, 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.MaxItemId = 1 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.Size = New System.Drawing.Size(1011, 158) + 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 = "RibbonPage1" + ' + '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, 645) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1011, 24) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'TextEdit1 + ' + Me.TextEdit1.Dock = System.Windows.Forms.DockStyle.Top + Me.TextEdit1.Location = New System.Drawing.Point(32, 32) + Me.TextEdit1.MenuManager = Me.RibbonControl1 + Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.Properties.NullText = "Suchbegriff eingeben.." + Me.TextEdit1.Properties.Padding = New System.Windows.Forms.Padding(10) + Me.TextEdit1.Size = New System.Drawing.Size(947, 40) + Me.TextEdit1.TabIndex = 2 + ' + 'PanelControl1 + ' + Me.PanelControl1.Controls.Add(Me.PanelControl2) + Me.PanelControl1.Controls.Add(Me.TextEdit1) + Me.PanelControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.PanelControl1.Location = New System.Drawing.Point(0, 158) + Me.PanelControl1.Name = "PanelControl1" + Me.PanelControl1.Padding = New System.Windows.Forms.Padding(30) + Me.PanelControl1.Size = New System.Drawing.Size(1011, 487) + Me.PanelControl1.TabIndex = 3 + ' + 'PanelControl2 + ' + Me.PanelControl2.Controls.Add(Me.LayoutControl1) + Me.PanelControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.PanelControl2.Location = New System.Drawing.Point(32, 72) + Me.PanelControl2.Name = "PanelControl2" + Me.PanelControl2.Padding = New System.Windows.Forms.Padding(0, 30, 0, 30) + Me.PanelControl2.Size = New System.Drawing.Size(947, 383) + Me.PanelControl2.TabIndex = 3 + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.RadioGroup1) + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Top + Me.LayoutControl1.Location = New System.Drawing.Point(2, 32) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(943, 120) + Me.LayoutControl1.TabIndex = 0 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(943, 120) + Me.Root.TextVisible = False + ' + 'RadioGroup1 + ' + Me.RadioGroup1.Location = New System.Drawing.Point(120, 12) + Me.RadioGroup1.MenuManager = Me.RibbonControl1 + Me.RadioGroup1.Name = "RadioGroup1" + Me.RadioGroup1.Properties.Items.AddRange(New DevExpress.XtraEditors.Controls.RadioGroupItem() {New DevExpress.XtraEditors.Controls.RadioGroupItem("Gestern", "Yesterday", True, "YESTERDAY"), New DevExpress.XtraEditors.Controls.RadioGroupItem("Heute", "Today", True, "TODAY", "")}) + Me.RadioGroup1.Size = New System.Drawing.Size(811, 96) + Me.RadioGroup1.StyleController = Me.LayoutControl1 + Me.RadioGroup1.TabIndex = 4 + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.RadioGroup1 + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Size = New System.Drawing.Size(923, 100) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(96, 13) + ' + 'frmFlowSearch2 + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1011, 669) + Me.Controls.Add(Me.PanelControl1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.Name = "frmFlowSearch2" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "frmFlowSearch2" + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.PanelControl1.ResumeLayout(False) + CType(Me.PanelControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.PanelControl2.ResumeLayout(False) + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, 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 RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit + Friend WithEvents PanelControl1 As DevExpress.XtraEditors.PanelControl + Friend WithEvents PanelControl2 As DevExpress.XtraEditors.PanelControl + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents RadioGroup1 As DevExpress.XtraEditors.RadioGroup + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem +End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.resx b/GUIs.ZooFlow/Search/frmFlowSearch2.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/GUIs.ZooFlow/Search/frmFlowSearch2.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch2.vb b/GUIs.ZooFlow/Search/frmFlowSearch2.vb new file mode 100644 index 00000000..802f66d9 --- /dev/null +++ b/GUIs.ZooFlow/Search/frmFlowSearch2.vb @@ -0,0 +1,3 @@ +Public Class frmFlowSearch2 + +End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 4019d3b4..64631e18 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -229,10 +229,10 @@ Form - - frmAdmin_ImportUser.vb + + frmAdmin_UserImport.vb - + Form @@ -382,6 +382,12 @@ Form + + frmFlowSearch2.vb + + + Form + frmSearchNeu.vb @@ -479,8 +485,8 @@ frmSQLDesigner.vb - - frmAdmin_ImportUser.vb + + frmAdmin_UserImport.vb frmAdmin_User.vb @@ -528,6 +534,9 @@ frmFlowSearch1.vb + + frmFlowSearch2.vb + frmSearchNeu.vb @@ -1068,6 +1077,8 @@ + + diff --git a/Modules.Database/Adapters/MSSQLServer.vb b/Modules.Database/Adapters/MSSQLServer.vb index e8bd14d5..85c89657 100644 --- a/Modules.Database/Adapters/MSSQLServer.vb +++ b/Modules.Database/Adapters/MSSQLServer.vb @@ -382,6 +382,8 @@ Public Class MSSQLServer Dim oTransaction As SqlTransaction = MaybeGetTransaction(SqlConnection, TransactionMode, Transaction) Try + _Logger.Debug("ExecuteNonQueryWithConnectionObject: Running Command [{0}]", SqlCommand) + Using oSQLCOmmand = SqlConnection.CreateCommand() oSQLCOmmand.CommandText = SqlCommand oSQLCOmmand.CommandTimeout = Timeout diff --git a/Modules.EDMIAPI/Client.vb b/Modules.EDMIAPI/Client.vb index 6ece987d..0b597322 100644 --- a/Modules.EDMIAPI/Client.vb +++ b/Modules.EDMIAPI/Client.vb @@ -224,6 +224,18 @@ Public Class Client End Try End Function + Public Async Function SetAttributeValueAsync(pObjectId As Long, pName As String, pValue As Object, Optional pOptions As Options.SetAttributeValueOptions = Nothing) As Task(Of Boolean) + Try + Dim oSetAttributeValue As New Modules.IDB.SetAttributeValue(LogConfig, Channel) + Return Await oSetAttributeValue.RunAsync(pObjectId, pName, pValue, pOptions) + + Catch ex As Exception + Logger.Error(ex) + Return False + + End Try + End Function + Public Async Function Globix_ImportFileAsync( pFilePath As String, pProfileId As Integer, @@ -273,115 +285,115 @@ Public Class Client ''' ''' ''' - Public Function SetVariableValue(pObjectId As Long, pAttributeName As String, pValue As Object, Optional pOptions As Options.SetVariableValueOptions = Nothing) As Boolean - Try - ' Set default options - If pOptions Is Nothing Then - pOptions = New Options.SetVariableValueOptions() - End If + 'Public Function SetVariableValue(pObjectId As Long, pAttributeName As String, pValue As Object, Optional pOptions As Options.SetVariableValueOptions = Nothing) As Boolean + ' Try + ' ' Set default options + ' If pOptions Is Nothing Then + ' pOptions = New Options.SetVariableValueOptions() + ' End If - Dim oOptions As New Options.GetVariableValueOptions With { - .Language = pOptions.Language, - .Username = pOptions.Username - } + ' Dim oOptions As New Options.GetVariableValueOptions With { + ' .Language = pOptions.Language, + ' .Username = pOptions.Username + ' } - Try - Dim oResponse = Channel.TestObjectIdExists(New TestObjectIdExistsRequest With {.ObjectId = pObjectId}) - If oResponse.Exists = False Then - Return False - End If + ' Try + ' Dim oResponse = Channel.TestObjectIdExists(New TestObjectIdExistsRequest With {.ObjectId = pObjectId}) + ' If oResponse.Exists = False Then + ' Return False + ' End If - Catch ex As Exception - Logger.Error(ex) - Return False - End Try + ' Catch ex As Exception + ' Logger.Error(ex) + ' Return False + ' End Try - Dim oType = pValue.GetType.Name + ' Dim oType = pValue.GetType.Name - If oType = GetType(DataTable).Name Then - Dim oValueTable As DataTable = pValue - Dim oCurrentValue As VariableValue + ' If oType = GetType(DataTable).Name Then + ' Dim oValueTable As DataTable = pValue + ' Dim oCurrentValue As VariableValue - ' Get current value - oCurrentValue = GetVariableValue(pObjectId, pAttributeName, oOptions) + ' ' Get current value + ' oCurrentValue = GetVariableValue(pObjectId, pAttributeName, oOptions) - ' If current value is datatable - If oCurrentValue.Type = GetType(DataTable) Then + ' ' If current value is datatable + ' If oCurrentValue.Type = GetType(DataTable) Then - ' Convert value to Datatable - Dim oTable As DataTable = oCurrentValue.Value + ' ' Convert value to Datatable + ' Dim oTable As DataTable = oCurrentValue.Value - If oTable.Rows.Count > 1 Then + ' If oTable.Rows.Count > 1 Then - 'now Checking whether the old row still remains in Vector? If not it will be deleted as it cannot be replaced in multivalues - For Each oRow As DataRow In oTable.Rows - Dim oExists As Boolean = False - For Each oNewValueRow As DataRow In oValueTable.Rows - Logger.Debug($"Checking oldValue[{oCurrentValue}] vs NewValue [{oNewValueRow.Item(1)}]") + ' 'now Checking whether the old row still remains in Vector? If not it will be deleted as it cannot be replaced in multivalues + ' For Each oRow As DataRow In oTable.Rows + ' Dim oExists As Boolean = False + ' For Each oNewValueRow As DataRow In oValueTable.Rows + ' Logger.Debug($"Checking oldValue[{oCurrentValue}] vs NewValue [{oNewValueRow.Item(1)}]") - If oNewValueRow.Item(1).ToString.ToUpper = oRow.Item(0).ToString.ToUpper Then - oExists = True - Exit For - End If - Next + ' If oNewValueRow.Item(1).ToString.ToUpper = oRow.Item(0).ToString.ToUpper Then + ' oExists = True + ' Exit For + ' End If + ' Next - If oExists = False Then - Logger.Debug($"Value [{oRow.Item(0)}] no longer existing in Vector-Attribute [{pAttributeName}] - will be deleted!") - DeleteTermObjectFromMetadata(pObjectId, pAttributeName, oRow.Item(0)) - End If + ' If oExists = False Then + ' Logger.Debug($"Value [{oRow.Item(0)}] no longer existing in Vector-Attribute [{pAttributeName}] - will be deleted!") + ' DeleteTermObjectFromMetadata(pObjectId, pAttributeName, oRow.Item(0)) + ' End If - Next - End If - Else - If oValueTable.Rows.Count > 1 Then + ' Next + ' End If + ' Else + ' If oValueTable.Rows.Count > 1 Then - 'now Checking whether the old row still remains in Vector? If not it will be deleted as it cannot be replaced in multivalues - Dim oExists As Boolean = False - For Each oNewValueRow As DataRow In oValueTable.Rows - Logger.Debug($"Checking oldValue[{oCurrentValue}] vs NewValue [{oNewValueRow.Item(1)}]") + ' 'now Checking whether the old row still remains in Vector? If not it will be deleted as it cannot be replaced in multivalues + ' Dim oExists As Boolean = False + ' For Each oNewValueRow As DataRow In oValueTable.Rows + ' Logger.Debug($"Checking oldValue[{oCurrentValue}] vs NewValue [{oNewValueRow.Item(1)}]") - If oNewValueRow.Item(1).ToString.ToUpper = oCurrentValue.ToString.ToUpper Then - oExists = True - Exit For - End If + ' If oNewValueRow.Item(1).ToString.ToUpper = oCurrentValue.ToString.ToUpper Then + ' oExists = True + ' Exit For + ' End If - Next - If oExists = False Then - Logger.Debug($"Value [{oCurrentValue}] no longer existing in Vector-Attribute [{pAttributeName}] - will be deleted!") - DeleteTermObjectFromMetadata(pObjectId, pAttributeName, oCurrentValue.Value) - End If + ' Next + ' If oExists = False Then + ' Logger.Debug($"Value [{oCurrentValue}] no longer existing in Vector-Attribute [{pAttributeName}] - will be deleted!") + ' DeleteTermObjectFromMetadata(pObjectId, pAttributeName, oCurrentValue.Value) + ' End If - Else - Logger.Debug($"Value [{oCurrentValue}] of Attribute [{pAttributeName}] obviously was updated during runtime - will be deleted!") - DeleteTermObjectFromMetadata(pObjectId, pAttributeName, oCurrentValue.Value) + ' Else + ' Logger.Debug($"Value [{oCurrentValue}] of Attribute [{pAttributeName}] obviously was updated during runtime - will be deleted!") + ' DeleteTermObjectFromMetadata(pObjectId, pAttributeName, oCurrentValue.Value) - End If + ' End If - End If + ' End If - For Each oNewValueRow As DataRow In oValueTable.Rows - Dim oResult As Boolean = NewObjectData(pObjectId, pAttributeName, pValue, New Options.NewObjectOptions With { - .Language = pOptions.Language, - .Username = pOptions.Username - }) + ' For Each oNewValueRow As DataRow In oValueTable.Rows + ' Dim oResult As Boolean = NewObjectData(pObjectId, pAttributeName, pValue, New Options.NewObjectOptions With { + ' .Language = pOptions.Language, + ' .Username = pOptions.Username + ' }) - If oResult = False Then - Return False - End If - Next - Return True - Else - Return NewObjectData(pObjectId, pAttributeName, pValue, New Options.NewObjectOptions With { - .Language = pOptions.Language, - .Username = pOptions.Username - }) - End If + ' If oResult = False Then + ' Return False + ' End If + ' Next + ' Return True + ' Else + ' Return NewObjectData(pObjectId, pAttributeName, pValue, New Options.NewObjectOptions With { + ' .Language = pOptions.Language, + ' .Username = pOptions.Username + ' }) + ' End If - Catch ex As Exception - Logger.Error(ex) - Return False - End Try - End Function + ' Catch ex As Exception + ' Logger.Error(ex) + ' Return False + ' End Try + 'End Function ''' ''' diff --git a/Modules.EDMIAPI/Client/Options.vb b/Modules.EDMIAPI/Client/Options.vb index c16fdaed..f894a8cc 100644 --- a/Modules.EDMIAPI/Client/Options.vb +++ b/Modules.EDMIAPI/Client/Options.vb @@ -52,6 +52,10 @@ Public Property DateImported As Date = Date.Now End Class + Public Class SetAttributeValueOptions + Inherits BaseOptions + End Class + Public Class GetVariableValueOptions Inherits BaseOptions diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentInfoResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentInfoResponse1.datasource new file mode 100644 index 00000000..0f899425 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentInfoResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentInfoResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse1.datasource new file mode 100644 index 00000000..ba63f700 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentListResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse1.datasource new file mode 100644 index 00000000..9c6b26fa --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ExecuteNonQueryResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ExecuteNonQueryResponse1.datasource new file mode 100644 index 00000000..8bb4d79f --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ExecuteNonQueryResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.ExecuteNonQueryResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetAttributeValueResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetAttributeValueResponse1.datasource new file mode 100644 index 00000000..396f87b7 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetAttributeValueResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.GetAttributeValueResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetClientConfigResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetClientConfigResponse1.datasource new file mode 100644 index 00000000..8d9e62a6 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetClientConfigResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.GetClientConfigResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetDatatableResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetDatatableResponse1.datasource new file mode 100644 index 00000000..47b7add3 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetDatatableResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.GetDatatableResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetFileObjectResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetFileObjectResponse1.datasource new file mode 100644 index 00000000..df13dd7d --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetFileObjectResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.GetFileObjectResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetScalarValueResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetScalarValueResponse1.datasource new file mode 100644 index 00000000..4df80cb8 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.GetScalarValueResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.GetScalarValueResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileResponse1.datasource new file mode 100644 index 00000000..d3e7710e --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse1.datasource new file mode 100644 index 00000000..bebd9f37 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult1.datasource new file mode 100644 index 00000000..08cbd66d --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.RightsAccessRight1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.RightsAccessRight1.datasource new file mode 100644 index 00000000..b7dc0d4c --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.RightsAccessRight1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.RightsAccessRight, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult1.datasource new file mode 100644 index 00000000..b025563c --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.ScalarResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.SetAttributeValueResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.SetAttributeValueResponse1.datasource new file mode 100644 index 00000000..f00b50c6 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.SetAttributeValueResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.SetAttributeValueResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult1.datasource new file mode 100644 index 00000000..ec10938e --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.TableResult, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TestObjectIdExistsResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TestObjectIdExistsResponse1.datasource new file mode 100644 index 00000000..d646db66 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.TestObjectIdExistsResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.TestObjectIdExistsResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.UpdateFileResponse1.datasource b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.UpdateFileResponse1.datasource new file mode 100644 index 00000000..e22df5f3 --- /dev/null +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.UpdateFileResponse1.datasource @@ -0,0 +1,10 @@ + + + + DigitalData.Modules.EDMI.API.EDMIServiceReference.UpdateFileResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + \ No newline at end of file diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.Methods.IDB.SetAttributeValue.xsd b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.Methods.IDB.SetAttributeValue.xsd index e8b79472..1e183ac1 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.Methods.IDB.SetAttributeValue.xsd +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/DigitalData.Services.EDMIService.Methods.IDB.SetAttributeValue.xsd @@ -7,7 +7,7 @@ - + diff --git a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb index eaaa60f0..6161b094 100644 --- a/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb +++ b/Modules.EDMIAPI/Connected Services/EDMIServiceReference/Reference.vb @@ -1810,7 +1810,7 @@ Namespace EDMIServiceReference Private ObjectIdField As Long _ - Private WhoField As Long + Private WhoField As String _ Public Property ExtensionData() As System.Runtime.Serialization.ExtensionDataObject Implements System.Runtime.Serialization.IExtensibleDataObject.ExtensionData @@ -1875,12 +1875,12 @@ Namespace EDMIServiceReference End Property _ - Public Property Who() As Long + Public Property Who() As String Get Return Me.WhoField End Get Set - If (Me.WhoField.Equals(value) <> true) Then + If (Object.ReferenceEquals(Me.WhoField, value) <> true) Then Me.WhoField = value Me.RaisePropertyChanged("Who") End If diff --git a/Modules.EDMIAPI/EDMI.API.vbproj b/Modules.EDMIAPI/EDMI.API.vbproj index 5cca3097..2724259e 100644 --- a/Modules.EDMIAPI/EDMI.API.vbproj +++ b/Modules.EDMIAPI/EDMI.API.vbproj @@ -80,6 +80,7 @@ + @@ -120,58 +121,58 @@ Designer - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap - + Reference.svcmap diff --git a/Modules.EDMIAPI/Modules/IDB/SetAttributeValue.vb b/Modules.EDMIAPI/Modules/IDB/SetAttributeValue.vb new file mode 100644 index 00000000..2504720e --- /dev/null +++ b/Modules.EDMIAPI/Modules/IDB/SetAttributeValue.vb @@ -0,0 +1,38 @@ +Imports DigitalData.Modules.EDMI.API.EDMIServiceReference +Imports DigitalData.Modules.EDMI.API.Options +Imports DigitalData.Modules.Logging + +Namespace Modules.IDB + Public Class SetAttributeValue + Inherits BaseMethod + + Public Sub New(pLogConfig As LogConfig, pChannel As IEDMIServiceChannel) + MyBase.New(pLogConfig, pChannel) + End Sub + + Public Async Function RunAsync(pObjectId As String, pAttributeName As String, pAttributeValue As Object, Optional pOptions As SetAttributeValueOptions = Nothing) As Task(Of Boolean) + Try + Dim oParams As New SetAttributeValueRequest With { + .ObjectId = pObjectId, + .Language = pOptions.Language, + .Who = pOptions.Username, + .AttributeName = pAttributeName, + .AttributeValue = pAttributeValue + } + Dim oResponse As SetAttributeValueResponse = Await Channel.SetAttributeValueAsync(oParams) + + If oResponse.OK Then + Return True + End If + + Logger.Warn("Error while setting Attribute Value: [{0}]", oResponse.ErrorMessage) + Return False + + Catch ex As Exception + Logger.Error(ex) + Return False + + End Try + End Function + End Class +End Namespace \ No newline at end of file diff --git a/Modules.Windream/Windream.vb b/Modules.Windream/Windream.vb index ef123f5e..3c122f95 100644 --- a/Modules.Windream/Windream.vb +++ b/Modules.Windream/Windream.vb @@ -1173,12 +1173,8 @@ Public Class Windream Try Dim oType As Integer = GetIndexType(IndexName) - Dim oConvertedValue As Object - If oType < 3000 Then - oConvertedValue = Helpers.ConvertIndexValue(oType, Value) - Else - oConvertedValue = Helpers.ConvertVectorType(oType, Value) - End If + Dim oConvertedValue As Object = Helpers.ConvertIndexValue(oType, Value) + oWMObject.SetVariableValue(IndexName, oConvertedValue) oWMObject.Save() diff --git a/Modules.ZooFlow/Params/Attribute.vb b/Modules.ZooFlow/Params/Attribute.vb index b9e11ed7..3fc9052d 100644 --- a/Modules.ZooFlow/Params/Attribute.vb +++ b/Modules.ZooFlow/Params/Attribute.vb @@ -10,4 +10,5 @@ Public Property Title As String Public Property TypeID As Long Public Property TypeName As String + Public Property IsSystem As Boolean End Class diff --git a/Service.EDMIService/IDB/Helpers.vb b/Service.EDMIService/IDB/Helpers.vb index a40b0fb2..4b7622d4 100644 --- a/Service.EDMIService/IDB/Helpers.vb +++ b/Service.EDMIService/IDB/Helpers.vb @@ -198,6 +198,7 @@ Namespace IDB 'End Function Public Function SetAttributeValue(pConnection As SqlConnection, pTransaction As SqlTransaction, pObjectId As Long, pAttributeName As String, pValue As String, pLanguage As String, pWho As String) As Boolean + Logger.Info("Setting value of Attribute [{0}]", pAttributeName) Dim oSql = $" DECLARE @NEW_OBJ_MD_ID BIGINT EXEC PRIDB_NEW_OBJ_DATA {pObjectId}, '{pAttributeName}', '{pWho}', '{pValue}', '{pLanguage}', 0, @OMD_ID = @NEW_OBJ_MD_ID OUTPUT" diff --git a/Service.EDMIService/Methods/IDB/SetAttributeValue/SetAttributeValueMethod.vb b/Service.EDMIService/Methods/IDB/SetAttributeValue/SetAttributeValueMethod.vb index f6185daf..7e372a22 100644 --- a/Service.EDMIService/Methods/IDB/SetAttributeValue/SetAttributeValueMethod.vb +++ b/Service.EDMIService/Methods/IDB/SetAttributeValue/SetAttributeValueMethod.vb @@ -23,6 +23,8 @@ Namespace Methods.IDB.SetAttributeValue LogAndThrow("ObjectId does not exist!") End If + Logger.Debug("Setting value of Attribute [{0}]", pData.AttributeName) + Dim oResult = Helpers.SetAttributeValue(Connection, Transaction, pData.ObjectId, pData.AttributeName, pData.AttributeValue, pData.Language, pData.Who) @@ -30,9 +32,19 @@ Namespace Methods.IDB.SetAttributeValue LogAndThrow("Attribute value could not be set!") End If + Logger.Debug("Attribute value set!") + + ' Finally, commit the transaction + Transaction?.Commit() + Return New SetAttributeValueResponse(pData.ObjectId) Catch ex As Exception Logger.Warn("Error occurred while setting attribute value!") + Logger.Error(ex) + + Logger.Info("Rolling back transaction.") + Transaction?.Rollback() + Return New SetAttributeValueResponse(ex) End Try End Function diff --git a/Service.EDMIService/Methods/IDB/SetAttributeValue/SetAttributeValueRequest.vb b/Service.EDMIService/Methods/IDB/SetAttributeValue/SetAttributeValueRequest.vb index 04085ee9..1d1c58f1 100644 --- a/Service.EDMIService/Methods/IDB/SetAttributeValue/SetAttributeValueRequest.vb +++ b/Service.EDMIService/Methods/IDB/SetAttributeValue/SetAttributeValueRequest.vb @@ -14,7 +14,7 @@ Namespace Methods.IDB.SetAttributeValue Public Property AttributeValue As String - Public Property Who As Long + Public Property Who As String Public Property Language As String End Class