From d3ca8282d8ef78825baab91e128ee3a331f482e0 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 10 Nov 2020 16:23:28 +0100 Subject: [PATCH 1/3] DocumentResultList: Use IsIDBResult param to adjust ui, truly hide unused grid panels --- .../frmDocumentResultList.Designer.vb | 131 ++++++++---------- .../frmDocumentResultList.vb | 17 +++ 2 files changed, 78 insertions(+), 70 deletions(-) diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb index e88466a3..4ebf1260 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb @@ -33,22 +33,21 @@ Partial Class frmDocumentResultList Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupNavigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() + Me.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() + Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() + Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.ContextMenuGrid = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.DateiÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.OrdnerÖffnenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.PfadInZwischenablageKopierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.EigenschaftenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.GridView1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() - Me.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() - Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() - Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.GridView2 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() Me.GridBand2 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() Me.GridControl3 = New DevExpress.XtraGrid.GridControl() @@ -61,11 +60,11 @@ Partial Class frmDocumentResultList CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.SuspendLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.ContextMenuGrid.SuspendLayout() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl2.SuspendLayout() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ContextMenuGrid.SuspendLayout() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -82,7 +81,7 @@ Partial Class frmDocumentResultList Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl.Size = New System.Drawing.Size(1189, 158) + Me.RibbonControl.Size = New System.Drawing.Size(1189, 159) Me.RibbonControl.StatusBar = Me.RibbonStatusBar ' 'SwitchMainContainerHorizontal @@ -160,24 +159,16 @@ Partial Class frmDocumentResultList ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4, Me.RibbonPageGroup3, Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroupNavigation, Me.RibbonPageGroup1, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Ergebnisse" ' - 'RibbonPageGroup4 + 'RibbonPageGroupNavigation ' - Me.RibbonPageGroup4.AllowTextClipping = False - Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem4) - Me.RibbonPageGroup4.Name = "RibbonPageGroup4" - Me.RibbonPageGroup4.Text = "Navigation" - ' - 'RibbonPageGroup3 - ' - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2) - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem3) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - Me.RibbonPageGroup3.Text = "Dateiaktionen" + Me.RibbonPageGroupNavigation.AllowTextClipping = False + Me.RibbonPageGroupNavigation.ItemLinks.Add(Me.BarButtonItem4) + Me.RibbonPageGroupNavigation.Name = "RibbonPageGroupNavigation" + Me.RibbonPageGroupNavigation.Text = "Navigation" ' 'RibbonPageGroup1 ' @@ -196,10 +187,10 @@ Partial Class frmDocumentResultList 'RibbonStatusBar ' Me.RibbonStatusBar.ItemLinks.Add(Me.labelResultCount) - Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 647) + Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 649) Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl - Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 24) + Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 22) ' 'SplitContainerControl1 ' @@ -211,7 +202,7 @@ Partial Class frmDocumentResultList Me.SplitContainerControl1.Panel1.Text = "Panel1" Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 489) + Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 490) Me.SplitContainerControl1.SplitterPosition = 382 Me.SplitContainerControl1.TabIndex = 2 Me.SplitContainerControl1.Text = "SplitContainerControl1" @@ -223,43 +214,10 @@ Partial Class frmDocumentResultList Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(382, 489) + Me.GridControl1.Size = New System.Drawing.Size(382, 490) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' - 'ContextMenuGrid - ' - Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.OrdnerÖffnenToolStripMenuItem, Me.PfadInZwischenablageKopierenToolStripMenuItem, Me.EigenschaftenToolStripMenuItem}) - Me.ContextMenuGrid.Name = "ContextMenuGrid" - Me.ContextMenuGrid.Size = New System.Drawing.Size(200, 92) - ' - 'DateiÖffnenToolStripMenuItem - ' - Me.DateiÖffnenToolStripMenuItem.Image = Global.DigitalData.GUIs.Common.My.Resources.Resources.Article_32x32 - Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem" - Me.DateiÖffnenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) - Me.DateiÖffnenToolStripMenuItem.Text = "Datei öffnen" - ' - 'OrdnerÖffnenToolStripMenuItem - ' - Me.OrdnerÖffnenToolStripMenuItem.Image = Global.DigitalData.GUIs.Common.My.Resources.Resources.Open_32x32 - Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem" - Me.OrdnerÖffnenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) - Me.OrdnerÖffnenToolStripMenuItem.Text = "Ordner öffnen" - ' - 'PfadInZwischenablageKopierenToolStripMenuItem - ' - Me.PfadInZwischenablageKopierenToolStripMenuItem.Image = Global.DigitalData.GUIs.Common.My.Resources.Resources.Copy_32x32 - Me.PfadInZwischenablageKopierenToolStripMenuItem.Name = "PfadInZwischenablageKopierenToolStripMenuItem" - Me.PfadInZwischenablageKopierenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) - Me.PfadInZwischenablageKopierenToolStripMenuItem.Text = "Pfad in Zwischenablage" - ' - 'EigenschaftenToolStripMenuItem - ' - Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem" - Me.EigenschaftenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) - Me.EigenschaftenToolStripMenuItem.Text = "Eigenschaften" - ' 'GridView1 ' Me.GridView1.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1}) @@ -269,7 +227,7 @@ Partial Class frmDocumentResultList ' 'GridBand1 ' - Me.GridBand1.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GridBand1.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold) Me.GridBand1.AppearanceHeader.Options.UseFont = True Me.GridBand1.Caption = "GridBand1" Me.GridBand1.Name = "GridBand1" @@ -291,7 +249,7 @@ Partial Class frmDocumentResultList Me.SplitContainerControl2.Panel1.Text = "Panel1" Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3) Me.SplitContainerControl2.Panel2.Text = "Panel2" - Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 489) + Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 490) Me.SplitContainerControl2.SplitterPosition = 223 Me.SplitContainerControl2.TabIndex = 0 Me.SplitContainerControl2.Text = "SplitContainerControl2" @@ -308,6 +266,39 @@ Partial Class frmDocumentResultList Me.GridControl2.TabIndex = 0 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' + 'ContextMenuGrid + ' + Me.ContextMenuGrid.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DateiÖffnenToolStripMenuItem, Me.OrdnerÖffnenToolStripMenuItem, Me.PfadInZwischenablageKopierenToolStripMenuItem, Me.EigenschaftenToolStripMenuItem}) + Me.ContextMenuGrid.Name = "ContextMenuGrid" + Me.ContextMenuGrid.Size = New System.Drawing.Size(200, 92) + ' + 'DateiÖffnenToolStripMenuItem + ' + Me.DateiÖffnenToolStripMenuItem.Image = Global.DigitalData.GUIs.Common.My.Resources.Resources.Article_32x32 + Me.DateiÖffnenToolStripMenuItem.Name = "DateiÖffnenToolStripMenuItem" + Me.DateiÖffnenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) + Me.DateiÖffnenToolStripMenuItem.Text = "Datei öffnen" + ' + 'OrdnerÖffnenToolStripMenuItem + ' + Me.OrdnerÖffnenToolStripMenuItem.Image = Global.DigitalData.GUIs.Common.My.Resources.Resources.Open_32x32 + Me.OrdnerÖffnenToolStripMenuItem.Name = "OrdnerÖffnenToolStripMenuItem" + Me.OrdnerÖffnenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) + Me.OrdnerÖffnenToolStripMenuItem.Text = "Ordner öffnen" + ' + 'PfadInZwischenablageKopierenToolStripMenuItem + ' + Me.PfadInZwischenablageKopierenToolStripMenuItem.Image = Global.DigitalData.GUIs.Common.My.Resources.Resources.Copy_32x32 + Me.PfadInZwischenablageKopierenToolStripMenuItem.Name = "PfadInZwischenablageKopierenToolStripMenuItem" + Me.PfadInZwischenablageKopierenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) + Me.PfadInZwischenablageKopierenToolStripMenuItem.Text = "Pfad in Zwischenablage" + ' + 'EigenschaftenToolStripMenuItem + ' + Me.EigenschaftenToolStripMenuItem.Name = "EigenschaftenToolStripMenuItem" + Me.EigenschaftenToolStripMenuItem.Size = New System.Drawing.Size(199, 22) + Me.EigenschaftenToolStripMenuItem.Text = "Eigenschaften" + ' 'GridView2 ' Me.GridView2.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand2}) @@ -317,7 +308,7 @@ Partial Class frmDocumentResultList ' 'GridBand2 ' - Me.GridBand2.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GridBand2.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold) Me.GridBand2.AppearanceHeader.Options.UseFont = True Me.GridBand2.Caption = "GridBand2" Me.GridBand2.Name = "GridBand2" @@ -335,7 +326,7 @@ Partial Class frmDocumentResultList Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.MenuManager = Me.RibbonControl Me.GridControl3.Name = "GridControl3" - Me.GridControl3.Size = New System.Drawing.Size(370, 256) + Me.GridControl3.Size = New System.Drawing.Size(370, 257) Me.GridControl3.TabIndex = 0 Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -348,7 +339,7 @@ Partial Class frmDocumentResultList ' 'GridBand3 ' - Me.GridBand3.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GridBand3.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold) Me.GridBand3.AppearanceHeader.Options.UseFont = True Me.GridBand3.Caption = "GridBand3" Me.GridBand3.Name = "GridBand3" @@ -361,13 +352,13 @@ Partial Class frmDocumentResultList 'SplitContainerControl3 ' Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 158) + Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 159) Me.SplitContainerControl3.Name = "SplitContainerControl3" Me.SplitContainerControl3.Panel1.Controls.Add(Me.SplitContainerControl1) Me.SplitContainerControl3.Panel1.Text = "Panel1" Me.SplitContainerControl3.Panel2.Controls.Add(Me.DocumentViewer1) Me.SplitContainerControl3.Panel2.Text = "Panel2" - Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 489) + Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 490) Me.SplitContainerControl3.SplitterPosition = 762 Me.SplitContainerControl3.TabIndex = 5 Me.SplitContainerControl3.Text = "SplitContainerControl3" @@ -377,7 +368,7 @@ Partial Class frmDocumentResultList Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer1.Name = "DocumentViewer1" - Me.DocumentViewer1.Size = New System.Drawing.Size(417, 489) + Me.DocumentViewer1.Size = New System.Drawing.Size(417, 490) Me.DocumentViewer1.TabIndex = 0 ' 'XtraSaveFileDialog @@ -386,6 +377,7 @@ Partial Class frmDocumentResultList ' 'frmDocumentResultList ' + Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1189, 671) @@ -402,11 +394,11 @@ Partial Class frmDocumentResultList CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.ResumeLayout(False) CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.ContextMenuGrid.ResumeLayout(False) CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl2.ResumeLayout(False) CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.ContextMenuGrid.ResumeLayout(False) CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() @@ -440,7 +432,6 @@ Partial Class frmDocumentResultList Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem Friend WithEvents ContextMenuGrid As Windows.Forms.ContextMenuStrip Friend WithEvents DateiÖffnenToolStripMenuItem As Windows.Forms.ToolStripMenuItem @@ -450,7 +441,7 @@ Partial Class frmDocumentResultList Friend WithEvents labelResultCount As DevExpress.XtraBars.BarStaticItem Friend WithEvents XtraSaveFileDialog As DevExpress.XtraEditors.XtraSaveFileDialog Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupNavigation As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem Friend WithEvents EigenschaftenToolStripMenuItem As Windows.Forms.ToolStripMenuItem End Class diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index 159ceebd..aecd81c5 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -34,6 +34,7 @@ Public Class frmDocumentResultList Private Const COLUMN_DOCID = "DocID" Private _IsLoading As Boolean = True + Private _IsLegacy As Boolean = True Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm @@ -44,6 +45,7 @@ Public Class frmDocumentResultList ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. Dim oConfigPath As String = Path.Combine(Application.UserAppDataPath, "ResultList", Params.WindowGuid) + _IsLegacy = Not Params.IsIDBResult _LogConfig = LogConfig _Logger = LogConfig.GetLogger() _Config = New ConfigManager(Of DocumentResultConfig)(LogConfig, oConfigPath, oConfigPath) @@ -69,6 +71,14 @@ Public Class frmDocumentResultList End If End If + If _IsLegacy = True Then + RibbonPageGroupNavigation.Visible = True + Else + RibbonPageGroupNavigation.Visible = False + End If + + RibbonControl.Minimized = True + ' Initialize Viewer with GDPicture.NET License DocumentViewer1.Init(_LogConfig, _Environment.Settings.GdPictureKey) @@ -110,6 +120,7 @@ Public Class frmDocumentResultList ' Hide Grids depending on Result count Select Case _ResultLists.Count Case 0 + SplitContainerControl1.SetPanelCollapsed(True) SplitContainerControl2.SetPanelCollapsed(True) @@ -118,12 +129,18 @@ Public Class frmDocumentResultList MessageBox.Show(Constants.MESSAGE_ERROR_IN_SEARCHES, Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) Case 1 + SplitContainerControl1.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 + SplitContainerControl2.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 + SplitContainerControl1.SetPanelCollapsed(True) SplitContainerControl2.SetPanelCollapsed(True) SwitchMainContainerHorizontal.Enabled = False SwitchDetailContainerHorizontal.Enabled = False Case 2 + SplitContainerControl1.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Both + SplitContainerControl2.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 + SplitContainerControl2.SetPanelCollapsed(True) SwitchDetailContainerHorizontal.Enabled = False From b33a381bb929470d611398834453129400433ae9 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 10 Nov 2020 16:24:19 +0100 Subject: [PATCH 2/3] ObjectPropertyDialog: Add Loading indicator, show basic object properties, show attribute history --- .../frmObjectPropertyDialog.Designer.vb | 493 +++++++++++++++--- .../frmObjectPropertyDialog.vb | 74 ++- 2 files changed, 501 insertions(+), 66 deletions(-) diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb index 36de67cf..68be8152 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb @@ -22,29 +22,82 @@ Partial Class frmObjectPropertyDialog 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, true, true) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmObjectPropertyDialog)) Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.TabFormControl1 = New DevExpress.XtraBars.TabFormControl() Me.cmbBusinessEntity = New DevExpress.XtraBars.BarEditItem() - Me.TabPageProperties = New DevExpress.XtraBars.TabFormPage() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() + Me.TabPageAttributes = New DevExpress.XtraBars.TabFormPage() Me.TabFormContentContainer1 = New DevExpress.XtraBars.TabFormContentContainer() - Me.LayoutControlProperties = New DevExpress.XtraLayout.LayoutControl() - Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.TabPageMetadata = New DevExpress.XtraBars.TabFormPage() + Me.LayoutControlAttributes = New DevExpress.XtraLayout.LayoutControl() + Me.AttributeLayout = New DevExpress.XtraLayout.LayoutControlGroup() + Me.TabPageObject = New DevExpress.XtraBars.TabFormPage() Me.TabFormContentContainer2 = New DevExpress.XtraBars.TabFormContentContainer() + Me.LayoutControlObject = New DevExpress.XtraLayout.LayoutControl() + Me.LayoutObject = New DevExpress.XtraLayout.LayoutControlGroup() Me.TabPageLifecycle = New DevExpress.XtraBars.TabFormPage() Me.TabFormContentContainer3 = New DevExpress.XtraBars.TabFormContentContainer() - Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TabFormControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TabFormContentContainer1.SuspendLayout() - CType(Me.LayoutControlProperties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() + Me.TabPageHistory = New DevExpress.XtraBars.TabFormPage() + Me.TabFormContentContainer4 = New DevExpress.XtraBars.TabFormContentContainer() + Me.GridValueHistory = New DevExpress.XtraGrid.GridControl() + Me.ViewValueHistory = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn2 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn3 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn4 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn() + Me.AttributeRoot = New DevExpress.XtraLayout.LayoutControlGroup() + Me.txtCreatedWhen = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.txtAccessedWhen = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.txtObjectId = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.SimpleSeparator1 = New DevExpress.XtraLayout.SimpleSeparator() + Me.txtCreatedWho = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() + Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.txtAccessedWho = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() + CType(Me.RepositoryItemComboBox1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.TabFormControl1,System.ComponentModel.ISupportInitialize).BeginInit + Me.TabFormContentContainer1.SuspendLayout + CType(Me.LayoutControlAttributes,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.AttributeLayout,System.ComponentModel.ISupportInitialize).BeginInit + Me.TabFormContentContainer2.SuspendLayout + CType(Me.LayoutControlObject,System.ComponentModel.ISupportInitialize).BeginInit + Me.LayoutControlObject.SuspendLayout + CType(Me.LayoutObject,System.ComponentModel.ISupportInitialize).BeginInit + Me.TabFormContentContainer4.SuspendLayout + CType(Me.GridValueHistory,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.ViewValueHistory,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.AttributeRoot,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.txtCreatedWhen.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.txtChangedWhen.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem2,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.txtAccessedWhen.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem3,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.txtObjectId.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem4,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.SimpleSeparator1,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.txtCreatedWho.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem5,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.txtChangedWho.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.LayoutControlItem6,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.TextEdit1.Properties,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.txtAccessedWho,System.ComponentModel.ISupportInitialize).BeginInit + CType(Me.EmptySpaceItem1,System.ComponentModel.ISupportInitialize).BeginInit + Me.SuspendLayout ' 'RepositoryItemComboBox1 ' - Me.RepositoryItemComboBox1.AutoHeight = False + Me.RepositoryItemComboBox1.AutoHeight = false Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" ' @@ -53,18 +106,19 @@ Partial Class frmObjectPropertyDialog Me.TabFormControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.cmbBusinessEntity, Me.BarStaticItem1}) Me.TabFormControl1.Location = New System.Drawing.Point(0, 0) Me.TabFormControl1.Name = "TabFormControl1" - Me.TabFormControl1.Pages.Add(Me.TabPageProperties) - Me.TabFormControl1.Pages.Add(Me.TabPageMetadata) + Me.TabFormControl1.Pages.Add(Me.TabPageAttributes) + Me.TabFormControl1.Pages.Add(Me.TabPageObject) Me.TabFormControl1.Pages.Add(Me.TabPageLifecycle) - Me.TabFormControl1.SelectedPage = Me.TabPageProperties - Me.TabFormControl1.ShowAddPageButton = False - Me.TabFormControl1.ShowTabCloseButtons = False + Me.TabFormControl1.Pages.Add(Me.TabPageHistory) + Me.TabFormControl1.SelectedPage = Me.TabPageAttributes + Me.TabFormControl1.ShowAddPageButton = false + Me.TabFormControl1.ShowTabCloseButtons = false Me.TabFormControl1.Size = New System.Drawing.Size(572, 71) Me.TabFormControl1.TabForm = Me Me.TabFormControl1.TabIndex = 0 Me.TabFormControl1.TabRightItemLinks.Add(Me.BarStaticItem1) Me.TabFormControl1.TabRightItemLinks.Add(Me.cmbBusinessEntity) - Me.TabFormControl1.TabStop = False + Me.TabFormControl1.TabStop = false ' 'cmbBusinessEntity ' @@ -74,53 +128,86 @@ Partial Class frmObjectPropertyDialog Me.cmbBusinessEntity.Id = 6 Me.cmbBusinessEntity.Name = "cmbBusinessEntity" ' - 'TabPageProperties + 'BarStaticItem1 ' - Me.TabPageProperties.ContentContainer = Me.TabFormContentContainer1 - Me.TabPageProperties.Name = "TabPageProperties" - Me.TabPageProperties.Text = "Eigenschaften" + Me.BarStaticItem1.Caption = "Entity:" + Me.BarStaticItem1.Id = 0 + Me.BarStaticItem1.Name = "BarStaticItem1" + ' + 'TabPageAttributes + ' + Me.TabPageAttributes.ContentContainer = Me.TabFormContentContainer1 + Me.TabPageAttributes.Name = "TabPageAttributes" + Me.TabPageAttributes.Text = "Attribute" ' 'TabFormContentContainer1 ' - Me.TabFormContentContainer1.Controls.Add(Me.LayoutControlProperties) + Me.TabFormContentContainer1.Controls.Add(Me.LayoutControlAttributes) Me.TabFormContentContainer1.Dock = System.Windows.Forms.DockStyle.Fill Me.TabFormContentContainer1.Location = New System.Drawing.Point(0, 71) Me.TabFormContentContainer1.Name = "TabFormContentContainer1" Me.TabFormContentContainer1.Size = New System.Drawing.Size(572, 534) Me.TabFormContentContainer1.TabIndex = 1 ' - 'LayoutControlProperties + 'LayoutControlAttributes ' - Me.LayoutControlProperties.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControlProperties.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlProperties.Name = "LayoutControlProperties" - Me.LayoutControlProperties.Root = Me.Root - Me.LayoutControlProperties.Size = New System.Drawing.Size(572, 534) - Me.LayoutControlProperties.TabIndex = 0 - Me.LayoutControlProperties.Text = "LayoutControl1" + Me.LayoutControlAttributes.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControlAttributes.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlAttributes.Name = "LayoutControlAttributes" + Me.LayoutControlAttributes.Root = Me.AttributeLayout + Me.LayoutControlAttributes.Size = New System.Drawing.Size(572, 534) + Me.LayoutControlAttributes.TabIndex = 0 + Me.LayoutControlAttributes.Text = "LayoutControl1" ' - 'Root + 'AttributeLayout ' - Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.Root.GroupBordersVisible = False - Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(572, 534) - Me.Root.TextVisible = False + Me.AttributeLayout.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.AttributeLayout.GroupBordersVisible = false + Me.AttributeLayout.Name = "AttributeRoot" + Me.AttributeLayout.Size = New System.Drawing.Size(572, 534) + Me.AttributeLayout.TextVisible = false ' - 'TabPageMetadata + 'TabPageObject ' - Me.TabPageMetadata.ContentContainer = Me.TabFormContentContainer2 - Me.TabPageMetadata.Name = "TabPageMetadata" - Me.TabPageMetadata.Text = "Metadaten" + Me.TabPageObject.ContentContainer = Me.TabFormContentContainer2 + Me.TabPageObject.Name = "TabPageObject" + Me.TabPageObject.Text = "Objekt" ' 'TabFormContentContainer2 ' + Me.TabFormContentContainer2.Controls.Add(Me.LayoutControlObject) Me.TabFormContentContainer2.Dock = System.Windows.Forms.DockStyle.Fill Me.TabFormContentContainer2.Location = New System.Drawing.Point(0, 71) Me.TabFormContentContainer2.Name = "TabFormContentContainer2" Me.TabFormContentContainer2.Size = New System.Drawing.Size(572, 534) Me.TabFormContentContainer2.TabIndex = 2 ' + 'LayoutControlObject + ' + Me.LayoutControlObject.Controls.Add(Me.txtCreatedWhen) + Me.LayoutControlObject.Controls.Add(Me.txtChangedWhen) + Me.LayoutControlObject.Controls.Add(Me.txtAccessedWhen) + Me.LayoutControlObject.Controls.Add(Me.txtObjectId) + Me.LayoutControlObject.Controls.Add(Me.txtCreatedWho) + Me.LayoutControlObject.Controls.Add(Me.txtChangedWho) + Me.LayoutControlObject.Controls.Add(Me.TextEdit1) + Me.LayoutControlObject.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControlObject.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlObject.Name = "LayoutControlObject" + Me.LayoutControlObject.Root = Me.LayoutObject + Me.LayoutControlObject.Size = New System.Drawing.Size(572, 534) + Me.LayoutControlObject.TabIndex = 0 + Me.LayoutControlObject.Text = "LayoutControl1" + ' + 'LayoutObject + ' + 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.LayoutObject.Name = "LayoutObject" + Me.LayoutObject.Size = New System.Drawing.Size(572, 534) + Me.LayoutObject.TextVisible = false + ' 'TabPageLifecycle ' Me.TabPageLifecycle.ContentContainer = Me.TabFormContentContainer3 @@ -135,42 +222,330 @@ Partial Class frmObjectPropertyDialog Me.TabFormContentContainer3.Size = New System.Drawing.Size(572, 534) Me.TabFormContentContainer3.TabIndex = 3 ' - 'BarStaticItem1 + 'TabPageHistory ' - Me.BarStaticItem1.Caption = "Entity:" - Me.BarStaticItem1.Id = 0 - Me.BarStaticItem1.Name = "BarStaticItem1" + Me.TabPageHistory.ContentContainer = Me.TabFormContentContainer4 + Me.TabPageHistory.Name = "TabPageHistory" + Me.TabPageHistory.Text = "Historie" + ' + 'TabFormContentContainer4 + ' + Me.TabFormContentContainer4.Controls.Add(Me.GridValueHistory) + Me.TabFormContentContainer4.Dock = System.Windows.Forms.DockStyle.Fill + Me.TabFormContentContainer4.Location = New System.Drawing.Point(0, 71) + Me.TabFormContentContainer4.Name = "TabFormContentContainer4" + Me.TabFormContentContainer4.Size = New System.Drawing.Size(572, 534) + Me.TabFormContentContainer4.TabIndex = 3 + ' + 'GridValueHistory + ' + Me.GridValueHistory.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridValueHistory.Location = New System.Drawing.Point(0, 0) + Me.GridValueHistory.MainView = Me.ViewValueHistory + Me.GridValueHistory.Name = "GridValueHistory" + Me.GridValueHistory.Size = New System.Drawing.Size(572, 534) + Me.GridValueHistory.TabIndex = 0 + Me.GridValueHistory.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewValueHistory}) + ' + 'ViewValueHistory + ' + Me.ViewValueHistory.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn1, Me.GridColumn2, Me.GridColumn3, Me.GridColumn4, Me.GridColumn5}) + Me.ViewValueHistory.GridControl = Me.GridValueHistory + Me.ViewValueHistory.Name = "ViewValueHistory" + Me.ViewValueHistory.OptionsBehavior.Editable = false + Me.ViewValueHistory.OptionsBehavior.ReadOnly = true + ' + 'GridColumn1 + ' + Me.GridColumn1.Caption = "Attribut" + Me.GridColumn1.FieldName = "Attribute" + Me.GridColumn1.Name = "GridColumn1" + Me.GridColumn1.Visible = true + Me.GridColumn1.VisibleIndex = 0 + ' + 'GridColumn2 + ' + Me.GridColumn2.Caption = "Alter Wert" + Me.GridColumn2.FieldName = "Old value" + Me.GridColumn2.Name = "GridColumn2" + Me.GridColumn2.Visible = true + Me.GridColumn2.VisibleIndex = 1 + ' + 'GridColumn3 + ' + Me.GridColumn3.Caption = "Neuer Wert" + Me.GridColumn3.FieldName = "New value" + Me.GridColumn3.Name = "GridColumn3" + Me.GridColumn3.Visible = true + Me.GridColumn3.VisibleIndex = 2 + ' + 'GridColumn4 + ' + Me.GridColumn4.Caption = "Geändert Wer" + Me.GridColumn4.FieldName = "Changed who" + Me.GridColumn4.Name = "GridColumn4" + Me.GridColumn4.Visible = true + Me.GridColumn4.VisibleIndex = 3 + ' + 'GridColumn5 + ' + Me.GridColumn5.Caption = "Geändert Wann" + Me.GridColumn5.FieldName = "Changed when" + Me.GridColumn5.Name = "GridColumn5" + Me.GridColumn5.Visible = true + Me.GridColumn5.VisibleIndex = 4 + ' + 'AttributeRoot + ' + Me.AttributeRoot.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.AttributeRoot.GroupBordersVisible = false + Me.AttributeRoot.Location = New System.Drawing.Point(0, 0) + Me.AttributeRoot.Name = "AttributeRoot" + Me.AttributeRoot.Size = New System.Drawing.Size(572, 534) + Me.AttributeRoot.TextVisible = false + ' + 'txtCreatedWhen + ' + Me.txtCreatedWhen.Location = New System.Drawing.Point(87, 37) + 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(197, 20) + Me.txtCreatedWhen.StyleController = Me.LayoutControlObject + Me.txtCreatedWhen.TabIndex = 4 + ' + 'LayoutControlItem1 + ' + 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(72, 13) + ' + 'txtChangedWhen + ' + Me.txtChangedWhen.Location = New System.Drawing.Point(87, 61) + 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(197, 20) + Me.txtChangedWhen.StyleController = Me.LayoutControlObject + Me.txtChangedWhen.TabIndex = 5 + ' + 'LayoutControlItem2 + ' + 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(72, 13) + ' + 'txtAccessedWhen + ' + Me.txtAccessedWhen.Location = New System.Drawing.Point(87, 85) + 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(197, 20) + Me.txtAccessedWhen.StyleController = Me.LayoutControlObject + Me.txtAccessedWhen.TabIndex = 6 + ' + 'LayoutControlItem3 + ' + 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(72, 13) + ' + 'txtObjectId + ' + Me.txtObjectId.Location = New System.Drawing.Point(87, 12) + 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(473, 20) + Me.txtObjectId.StyleController = Me.LayoutControlObject + Me.txtObjectId.TabIndex = 7 + ' + '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.Text = "Objekt Id" + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(72, 13) + ' + 'SimpleSeparator1 + ' + 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) + ' + 'txtCreatedWho + ' + Me.txtCreatedWho.Location = New System.Drawing.Point(363, 37) + 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(197, 20) + Me.txtCreatedWho.StyleController = Me.LayoutControlObject + Me.txtCreatedWho.TabIndex = 8 + ' + 'LayoutControlItem5 + ' + Me.LayoutControlItem5.Control = Me.txtCreatedWho + Me.LayoutControlItem5.Location = New System.Drawing.Point(276, 25) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Size = New System.Drawing.Size(276, 24) + Me.LayoutControlItem5.Text = "von" + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(72, 13) + ' + 'txtChangedWho + ' + Me.txtChangedWho.Location = New System.Drawing.Point(363, 61) + 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(197, 20) + Me.txtChangedWho.StyleController = Me.LayoutControlObject + Me.txtChangedWho.TabIndex = 9 + ' + 'LayoutControlItem6 + ' + Me.LayoutControlItem6.Control = Me.txtChangedWho + Me.LayoutControlItem6.Location = New System.Drawing.Point(276, 49) + Me.LayoutControlItem6.Name = "LayoutControlItem6" + Me.LayoutControlItem6.Size = New System.Drawing.Size(276, 24) + Me.LayoutControlItem6.Text = "von" + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(72, 13) + ' + 'TextEdit1 + ' + Me.TextEdit1.Location = New System.Drawing.Point(363, 85) + 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(197, 20) + Me.TextEdit1.StyleController = Me.LayoutControlObject + Me.TextEdit1.TabIndex = 10 + ' + 'txtAccessedWho + ' + Me.txtAccessedWho.Control = Me.TextEdit1 + Me.txtAccessedWho.CustomizationFormText = "von" + Me.txtAccessedWho.Location = New System.Drawing.Point(276, 73) + Me.txtAccessedWho.Name = "txtAccessedWho" + Me.txtAccessedWho.Size = New System.Drawing.Size(276, 24) + Me.txtAccessedWho.Text = "von" + Me.txtAccessedWho.TextSize = New System.Drawing.Size(72, 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, 417) + Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) + ' + 'SplashScreenManager + ' + SplashScreenManager.ClosingDelay = 500 ' 'frmObjectPropertyDialog ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6!, 13!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(572, 605) Me.Controls.Add(Me.TabFormContentContainer1) Me.Controls.Add(Me.TabFormControl1) - Me.IconOptions.SvgImage = CType(resources.GetObject("frmObjectPropertyDialog.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmObjectPropertyDialog.IconOptions.SvgImage"),DevExpress.Utils.Svg.SvgImage) Me.Name = "frmObjectPropertyDialog" Me.TabFormControl = Me.TabFormControl1 - Me.Text = "Objekt-Eigenschaften" - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TabFormControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.TabFormContentContainer1.ResumeLayout(False) - CType(Me.LayoutControlProperties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) + Me.Text = "Eigenschaften" + CType(Me.RepositoryItemComboBox1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.TabFormControl1,System.ComponentModel.ISupportInitialize).EndInit + Me.TabFormContentContainer1.ResumeLayout(false) + CType(Me.LayoutControlAttributes,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.AttributeLayout,System.ComponentModel.ISupportInitialize).EndInit + Me.TabFormContentContainer2.ResumeLayout(false) + CType(Me.LayoutControlObject,System.ComponentModel.ISupportInitialize).EndInit + Me.LayoutControlObject.ResumeLayout(false) + CType(Me.LayoutObject,System.ComponentModel.ISupportInitialize).EndInit + Me.TabFormContentContainer4.ResumeLayout(false) + CType(Me.GridValueHistory,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.ViewValueHistory,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.AttributeRoot,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.txtCreatedWhen.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.txtChangedWhen.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem2,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.txtAccessedWhen.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem3,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.txtObjectId.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem4,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.SimpleSeparator1,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.txtCreatedWho.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem5,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.txtChangedWho.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.LayoutControlItem6,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.TextEdit1.Properties,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.txtAccessedWho,System.ComponentModel.ISupportInitialize).EndInit + CType(Me.EmptySpaceItem1,System.ComponentModel.ISupportInitialize).EndInit + Me.ResumeLayout(false) - End Sub +End Sub Friend WithEvents TabFormControl1 As DevExpress.XtraBars.TabFormControl - Friend WithEvents TabPageProperties As DevExpress.XtraBars.TabFormPage + Friend WithEvents TabPageAttributes As DevExpress.XtraBars.TabFormPage Friend WithEvents TabFormContentContainer1 As DevExpress.XtraBars.TabFormContentContainer - Friend WithEvents TabPageMetadata As DevExpress.XtraBars.TabFormPage + Friend WithEvents TabPageObject As DevExpress.XtraBars.TabFormPage Friend WithEvents TabFormContentContainer2 As DevExpress.XtraBars.TabFormContentContainer Friend WithEvents TabPageLifecycle As DevExpress.XtraBars.TabFormPage Friend WithEvents TabFormContentContainer3 As DevExpress.XtraBars.TabFormContentContainer - Friend WithEvents LayoutControlProperties As DevExpress.XtraLayout.LayoutControl - Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlAttributes As DevExpress.XtraLayout.LayoutControl + Friend WithEvents AttributeRoot As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents cmbBusinessEntity As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem + Friend WithEvents TabPageHistory As DevExpress.XtraBars.TabFormPage + Friend WithEvents TabFormContentContainer4 As DevExpress.XtraBars.TabFormContentContainer + Friend WithEvents GridValueHistory As DevExpress.XtraGrid.GridControl + Friend WithEvents ViewValueHistory As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn2 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn3 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn4 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents GridColumn5 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents LayoutControlObject As DevExpress.XtraLayout.LayoutControl + Friend WithEvents LayoutObject As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents AttributeLayout As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents txtCreatedWhen As DevExpress.XtraEditors.TextEdit + 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 End Class diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb index 74aaa834..0ace9315 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb @@ -2,6 +2,7 @@ Imports DevExpress.XtraEditors Imports DevExpress.XtraEditors.Repository Imports DevExpress.XtraLayout +Imports DevExpress.XtraSplashScreen Imports DigitalData.Modules.Database Imports DigitalData.Modules.Logging Imports DigitalData.Modules.ZooFlow @@ -28,13 +29,23 @@ Public Class frmObjectPropertyDialog End Sub Private Async Sub frmObjectPropertyDialog_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim oHandle As IOverlaySplashScreenHandle = Nothing + Try - Dim EntityIds = Await GetBusinessEntitiesForObjectId(_ObjectId) + oHandle = SplashScreenManager.ShowOverlayForm(Me) + + Dim oEntityIds = Await GetBusinessEntitiesForObjectId(_ObjectId) + Dim oHistoryDataTable = Await GetValueHistoryForObjectId(_ObjectId) + Dim oObjectProperties = Await GetPropertiesForObjectId(_ObjectId) Dim oCombobox As RepositoryItemComboBox = DirectCast(cmbBusinessEntity.Edit, RepositoryItemComboBox) - oCombobox.Items.AddRange(EntityIds) + oCombobox.Items.AddRange(oEntityIds) + + + ShowAttributeHistory(oHistoryDataTable) + ShowObjectProperties(oObjectProperties) - If EntityIds.Count = 1 Then - cmbBusinessEntity.EditValue = EntityIds.First() + If oEntityIds.Count = 1 Then + cmbBusinessEntity.EditValue = oEntityIds.First() End If Catch ex As ApplicationException _Logger.Error(ex) @@ -42,6 +53,10 @@ Public Class frmObjectPropertyDialog Catch ex As Exception _Logger.Error(ex) MessageBox.Show("Unhandled exception occurred please check the log", Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation) + Finally + If oHandle IsNot Nothing + SplashScreenManager.CloseOverlayForm(oHandle) + End If End Try End Sub @@ -67,7 +82,7 @@ Public Class frmObjectPropertyDialog End If End Function - Private Async Function GetBusinessEntitiesForObjectId(ObjectId) As Task(Of List(Of Long)) + Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long)) Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WHERE IDB_OBJ_ID = {ObjectId}" Dim oDatatable = Await _Db.GetDatatableAsync(oSQL) @@ -84,6 +99,20 @@ Public Class frmObjectPropertyDialog End If 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 oDatatable = Await _Db.GetDatatableAsync(oSQL) + + Return oDatatable + 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 oDatatable = Await _Db.GetDatatableAsync(oSQL) + + Return oDatatable + 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})" @@ -103,16 +132,47 @@ Public Class frmObjectPropertyDialog For Each oAttribute As Attribute In oAttributes Dim oControl = _Controls.GetControlForAttribute(oAttribute) - Dim oItem As LayoutControlItem = Root.AddItem() + Dim oItem As LayoutControlItem = AttributeLayout.AddItem() oItem.Text = oAttribute.Title oItem.Name = oAttribute.Title oItem.Control = oControl Next - For Each oItem As LayoutControlItem In Root.Items + For Each oItem As LayoutControlItem In AttributeLayout.Items Dim oValue = Await GetAttributeValue(oItem.Name, _ObjectId) Dim oEdit = DirectCast(oItem.Control, BaseEdit) oEdit.EditValue = oValue Next 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 + + Return True + Catch ex As Exception + _Logger.Error(ex) + Return False + End Try + End Function + + Private Function ShowObjectProperties(pDatatable As DataTable) As Boolean + Try + Dim oRow As DataRow = pDatatable.Rows.Item(0) + txtObjectId.Text = oRow.Item("IDB_OBJ_ID") + txtCreatedWhen.Text = oRow.Item("ADDED_WHEN") + txtCreatedWho.Text = oRow.Item("ADDED_WHO") + txtChangedWhen.Text = oRow.Item("CHANGED_WHEN") + txtChangedWho.Text = oRow.Item("CHANGED_WHO") + + Return True + Catch ex As Exception + _Logger.Error(ex) + Return False + End Try + End Function End Class \ No newline at end of file From 7fd8af6a1496f829e38830ba1c83e935ad2c6be6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 10 Nov 2020 16:25:29 +0100 Subject: [PATCH 3/3] ZooFlow: Add Time Filter, Loading indicator when running search --- GUIs.Common/My Project/licenses.licx | 5 +- GUIs.ZooFlow/My Project/licenses.licx | 17 +-- GUIs.ZooFlow/frmSearchStart.Designer.vb | 166 +++++++++++++++++++----- GUIs.ZooFlow/frmSearchStart.resx | 44 +++---- GUIs.ZooFlow/frmSearchStart.vb | 161 +++++++++++++++-------- 5 files changed, 276 insertions(+), 117 deletions(-) diff --git a/GUIs.Common/My Project/licenses.licx b/GUIs.Common/My Project/licenses.licx index 1b8e60c5..0916fd88 100644 --- a/GUIs.Common/My Project/licenses.licx +++ b/GUIs.Common/My Project/licenses.licx @@ -1,4 +1,5 @@ -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index dda02e90..f385a333 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,13 +1,14 @@ -DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.FormAssistant, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ZooFlow/frmSearchStart.Designer.vb b/GUIs.ZooFlow/frmSearchStart.Designer.vb index 2f3abc6f..8e225e47 100644 --- a/GUIs.ZooFlow/frmSearchStart.Designer.vb +++ b/GUIs.ZooFlow/frmSearchStart.Designer.vb @@ -23,6 +23,7 @@ Partial Class frmSearchStart Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, true, true) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSearchStart)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItemNewSearch = New DevExpress.XtraBars.BarButtonItem() @@ -36,9 +37,20 @@ Partial Class frmSearchStart Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.BarStaticItemInfo = New DevExpress.XtraBars.BarStaticItem() Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() + Me.txtFilterFrom = New DevExpress.XtraBars.BarEditItem() + Me.RepositoryItemDateEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemDateEdit() + Me.txtFilterTo = New DevExpress.XtraBars.BarEditItem() + Me.RepositoryItemDateEdit2 = New DevExpress.XtraEditors.Repository.RepositoryItemDateEdit() + Me.cmbFilterTimeframe = New DevExpress.XtraBars.BarEditItem() + Me.RepositoryItemComboBox2 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() + Me.SwitchFilter = New DevExpress.XtraBars.BarToggleSwitchItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupFilter = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() + Me.RepositoryItemTimeSpanEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTimeSpanEdit() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.Panel1 = New System.Windows.Forms.Panel() Me.cmbProfile = New System.Windows.Forms.ComboBox() @@ -65,10 +77,16 @@ Partial Class frmSearchStart Me.ContextMenuStripMultiselect = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MehrfachauswahlAktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.MehrfachauswahlInaktivierenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.DateEdit1 = New DevExpress.XtraEditors.DateEdit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemRadioGroup1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemDateEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemDateEdit1.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemDateEdit2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemDateEdit2.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemComboBox2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemTimeSpanEdit1, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() @@ -78,20 +96,22 @@ Partial Class frmSearchStart CType(Me.SplitContainerControlSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControlSearch.SuspendLayout() Me.ContextMenuStripMultiselect.SuspendLayout() - CType(Me.DateEdit1.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.DateEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' + 'SplashScreenManager + ' + SplashScreenManager.ClosingDelay = 500 + ' 'RibbonControl1 ' Me.RibbonControl1.AutoSizeItems = True Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemNewSearch, Me.BarButtonItem2, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarEditItem2, Me.BarStaticItemInfo, Me.BarButtonItem4}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemNewSearch, Me.BarButtonItem2, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarEditItem2, Me.BarStaticItemInfo, Me.BarButtonItem4, Me.BarStaticItem1, Me.txtFilterFrom, Me.txtFilterTo, Me.cmbFilterTimeframe, Me.SwitchFilter}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 11 + Me.RibbonControl1.MaxItemId = 20 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemRadioGroup1, Me.RepositoryItemComboBox1}) + Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemRadioGroup1, Me.RepositoryItemComboBox1, Me.RepositoryItemTextEdit1, Me.RepositoryItemDateEdit1, Me.RepositoryItemDateEdit2, Me.RepositoryItemComboBox2, Me.RepositoryItemTimeSpanEdit1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.Size = New System.Drawing.Size(1070, 159) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 @@ -143,10 +163,9 @@ Partial Class frmSearchStart ' 'BarEditItem2 ' - Me.BarEditItem2.Caption = "Suchen" Me.BarEditItem2.Edit = Me.RepositoryItemComboBox1 + Me.BarEditItem2.EditWidth = 100 Me.BarEditItem2.Id = 7 - Me.BarEditItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarEditItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarEditItem2.Name = "BarEditItem2" ' 'RepositoryItemComboBox1 @@ -167,9 +186,69 @@ Partial Class frmSearchStart Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem4.Name = "BarButtonItem4" ' + 'BarStaticItem1 + ' + Me.BarStaticItem1.Caption = "Suchen" + Me.BarStaticItem1.Id = 12 + Me.BarStaticItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarStaticItem1.Name = "BarStaticItem1" + Me.BarStaticItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' + 'txtFilterFrom + ' + Me.txtFilterFrom.Caption = "Von" + Me.txtFilterFrom.Edit = Me.RepositoryItemDateEdit1 + Me.txtFilterFrom.EditWidth = 100 + Me.txtFilterFrom.Id = 15 + Me.txtFilterFrom.Name = "txtFilterFrom" + ' + 'RepositoryItemDateEdit1 + ' + Me.RepositoryItemDateEdit1.AutoHeight = False + Me.RepositoryItemDateEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemDateEdit1.Name = "RepositoryItemDateEdit1" + Me.RepositoryItemDateEdit1.NullDate = "" + ' + 'txtFilterTo + ' + Me.txtFilterTo.Caption = "Bis" + Me.txtFilterTo.Edit = Me.RepositoryItemDateEdit2 + Me.txtFilterTo.EditWidth = 100 + Me.txtFilterTo.Id = 16 + Me.txtFilterTo.Name = "txtFilterTo" + ' + 'RepositoryItemDateEdit2 + ' + Me.RepositoryItemDateEdit2.AutoHeight = False + Me.RepositoryItemDateEdit2.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemDateEdit2.Name = "RepositoryItemDateEdit2" + Me.RepositoryItemDateEdit2.NullDate = "" + ' + 'cmbFilterTimeframe + ' + Me.cmbFilterTimeframe.Caption = "Zeitraum" + Me.cmbFilterTimeframe.Edit = Me.RepositoryItemComboBox2 + Me.cmbFilterTimeframe.EditWidth = 100 + Me.cmbFilterTimeframe.Id = 17 + Me.cmbFilterTimeframe.Name = "cmbFilterTimeframe" + ' + 'RepositoryItemComboBox2 + ' + Me.RepositoryItemComboBox2.AutoHeight = False + Me.RepositoryItemComboBox2.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemComboBox2.Name = "RepositoryItemComboBox2" + ' + 'SwitchFilter + ' + Me.SwitchFilter.Caption = "Suche Filtern" + Me.SwitchFilter.Id = 18 + Me.SwitchFilter.Name = "SwitchFilter" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroupFilter}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -179,15 +258,37 @@ Partial Class frmSearchStart Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItemNewSearch) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.SwitchFilter) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Suchfunktionen" ' 'RibbonPageGroup2 ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarStaticItem1) Me.RibbonPageGroup2.ItemLinks.Add(Me.BarEditItem2) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Auswahl Suche" ' + 'RibbonPageGroupFilter + ' + Me.RibbonPageGroupFilter.Enabled = False + Me.RibbonPageGroupFilter.ItemLinks.Add(Me.cmbFilterTimeframe) + Me.RibbonPageGroupFilter.ItemLinks.Add(Me.txtFilterFrom) + Me.RibbonPageGroupFilter.ItemLinks.Add(Me.txtFilterTo) + Me.RibbonPageGroupFilter.Name = "RibbonPageGroupFilter" + Me.RibbonPageGroupFilter.Text = "Filter" + ' + 'RepositoryItemTextEdit1 + ' + Me.RepositoryItemTextEdit1.AutoHeight = False + Me.RepositoryItemTextEdit1.Name = "RepositoryItemTextEdit1" + ' + 'RepositoryItemTimeSpanEdit1 + ' + Me.RepositoryItemTimeSpanEdit1.AutoHeight = False + Me.RepositoryItemTimeSpanEdit1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.RepositoryItemTimeSpanEdit1.Name = "RepositoryItemTimeSpanEdit1" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemInfo) @@ -238,14 +339,14 @@ Partial Class frmSearchStart Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.Size = New System.Drawing.Size(750, 310) + Me.XtraTabControl1.Size = New System.Drawing.Size(750, 363) Me.XtraTabControl1.TabIndex = 12 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2, Me.XtraTabPage3, Me.XtraTabPage4, Me.XtraTabPage5, Me.XtraTabPage6, Me.XtraTabPage7, Me.XtraTabPage8, Me.XtraTabPage9, Me.XtraTabPage10}) ' 'XtraTabPage1 ' Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(748, 287) + Me.XtraTabPage1.Size = New System.Drawing.Size(748, 340) Me.XtraTabPage1.Text = "Search#1" ' 'XtraTabPage2 @@ -310,7 +411,7 @@ Partial Class frmSearchStart Me.GridControlSerchTerms.MainView = Me.GridViewSearchTerms Me.GridControlSerchTerms.MenuManager = Me.RibbonControl1 Me.GridControlSerchTerms.Name = "GridControlSerchTerms" - Me.GridControlSerchTerms.Size = New System.Drawing.Size(310, 310) + Me.GridControlSerchTerms.Size = New System.Drawing.Size(310, 363) Me.GridControlSerchTerms.TabIndex = 15 Me.GridControlSerchTerms.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSearchTerms}) ' @@ -360,18 +461,16 @@ Partial Class frmSearchStart ' 'SplitContainerControlSearch ' - Me.SplitContainerControlSearch.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.SplitContainerControlSearch.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 + Me.SplitContainerControlSearch.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainerControlSearch.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2 - Me.SplitContainerControlSearch.Location = New System.Drawing.Point(0, 207) + Me.SplitContainerControlSearch.Location = New System.Drawing.Point(0, 216) Me.SplitContainerControlSearch.Name = "SplitContainerControlSearch" Me.SplitContainerControlSearch.Panel1.Controls.Add(Me.XtraTabControl1) Me.SplitContainerControlSearch.Panel1.Text = "Panel1" Me.SplitContainerControlSearch.Panel2.Controls.Add(Me.GridControlSerchTerms) Me.SplitContainerControlSearch.Panel2.Text = "Panel2" - Me.SplitContainerControlSearch.Size = New System.Drawing.Size(1070, 310) + Me.SplitContainerControlSearch.Size = New System.Drawing.Size(1070, 363) Me.SplitContainerControlSearch.SplitterPosition = 310 Me.SplitContainerControlSearch.TabIndex = 16 ' @@ -395,17 +494,6 @@ Partial Class frmSearchStart Me.MehrfachauswahlInaktivierenToolStripMenuItem.Size = New System.Drawing.Size(232, 22) Me.MehrfachauswahlInaktivierenToolStripMenuItem.Text = "Mehrfachauswahl inaktivieren" ' - 'DateEdit1 - ' - Me.DateEdit1.EditValue = Nothing - Me.DateEdit1.Location = New System.Drawing.Point(173, 543) - Me.DateEdit1.MenuManager = Me.RibbonControl1 - Me.DateEdit1.Name = "DateEdit1" - Me.DateEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.DateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.DateEdit1.Size = New System.Drawing.Size(100, 20) - Me.DateEdit1.TabIndex = 19 - ' 'frmSearchStart ' Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] @@ -413,7 +501,6 @@ Partial Class frmSearchStart Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1070, 601) - Me.Controls.Add(Me.DateEdit1) Me.Controls.Add(Me.SplitContainerControlSearch) Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.RibbonStatusBar1) @@ -429,6 +516,13 @@ Partial Class frmSearchStart CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemRadioGroup1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemDateEdit1.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemDateEdit1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemDateEdit2.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemDateEdit2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemComboBox2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemTimeSpanEdit1, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() @@ -439,8 +533,6 @@ Partial Class frmSearchStart CType(Me.SplitContainerControlSearch, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControlSearch.ResumeLayout(False) Me.ContextMenuStripMultiselect.ResumeLayout(False) - CType(Me.DateEdit1.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.DateEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout @@ -487,5 +579,15 @@ End Sub Friend WithEvents KlammerRechtsToolStripMenuItem As ToolStripMenuItem Friend WithEvents KlammerEntfernenToolStripMenuItem As ToolStripMenuItem Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents DateEdit1 As DevExpress.XtraEditors.DateEdit + Friend WithEvents RibbonPageGroupFilter As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem + Friend WithEvents RepositoryItemTextEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit + Friend WithEvents txtFilterFrom As DevExpress.XtraBars.BarEditItem + Friend WithEvents RepositoryItemDateEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemDateEdit + Friend WithEvents txtFilterTo As DevExpress.XtraBars.BarEditItem + Friend WithEvents RepositoryItemDateEdit2 As DevExpress.XtraEditors.Repository.RepositoryItemDateEdit + Friend WithEvents cmbFilterTimeframe As DevExpress.XtraBars.BarEditItem + Friend WithEvents RepositoryItemComboBox2 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox + Friend WithEvents SwitchFilter As DevExpress.XtraBars.BarToggleSwitchItem + Friend WithEvents RepositoryItemTimeSpanEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemTimeSpanEdit End Class diff --git a/GUIs.ZooFlow/frmSearchStart.resx b/GUIs.ZooFlow/frmSearchStart.resx index 78482693..4cc7d351 100644 --- a/GUIs.ZooFlow/frmSearchStart.resx +++ b/GUIs.ZooFlow/frmSearchStart.resx @@ -167,26 +167,6 @@ Ni4xLDIzLjF6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPHBhdGggZD0iTTI3LjUsMTEuOGwtMTAsMTBsLTku Mi05LjJsMTAtMTBjMC43LTAuNywxLjktMC43LDIuNiwwbDYuNiw2LjZDMjguMiw5LjksMjguMiwxMSwy Ny41LDExLjh6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw== - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iRmluZCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg - MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 - bGU+DQogIDxwYXRoIGQ9Ik0yOS41LDE5LjdMMjkuNSwxOS43TDI5LjUsMTkuN0MyOS41LDE5LjcsMjku - NSwxOS43LDI5LjUsMTkuN0wyMy44LDZsMCwwYy0wLjQtMS4yLTEuNS0yLTIuOC0yICBjLTEuNywwLTMs - MS4zLTMsM3YzaC00VjdjMC0xLjctMS4zLTMtMy0zQzkuNyw0LDguNiw0LjksOC4yLDZsMCwwTDIuNSwx - OS43YzAsMCwwLDAsMCwwbDAsMGgwQzIuMiwyMC40LDIsMjEuMiwyLDIyICBjMCwzLjMsMi43LDYsNiw2 - czYtMi43LDYtNnYtNGg0djRjMCwzLjMsMi43LDYsNiw2czYtMi43LDYtNkMzMCwyMS4yLDI5LjgsMjAu - NCwyOS41LDE5Ljd6IE04LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00ICBzNCwxLjgsNCw0UzEw - LjIsMjYsOCwyNnogTTI0LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNi4y - LDI2LDI0LDI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== @@ -207,13 +187,33 @@ IDxwYXRoIGQ9Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMy My43LDIsMTYsMnogTTEyLDIyVjEwbDEwLDZMMTIsMjJ6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N Cjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPcCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iRmluZCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg + MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5 + bGU+DQogIDxwYXRoIGQ9Ik0yOS41LDE5LjdMMjkuNSwxOS43TDI5LjUsMTkuN0MyOS41LDE5LjcsMjku + NSwxOS43LDI5LjUsMTkuN0wyMy44LDZsMCwwYy0wLjQtMS4yLTEuNS0yLTIuOC0yICBjLTEuNywwLTMs + MS4zLTMsM3YzaC00VjdjMC0xLjctMS4zLTMtMy0zQzkuNyw0LDguNiw0LjksOC4yLDZsMCwwTDIuNSwx + OS43YzAsMCwwLDAsMCwwbDAsMGgwQzIuMiwyMC40LDIsMjEuMiwyLDIyICBjMCwzLjMsMi43LDYsNiw2 + czYtMi43LDYtNnYtNGg0djRjMCwzLjMsMi43LDYsNiw2czYtMi43LDYtNkMzMCwyMS4yLDI5LjgsMjAu + NCwyOS41LDE5Ljd6IE04LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00ICBzNCwxLjgsNCw0UzEw + LjIsMjYsOCwyNnogTTI0LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNi4y + LDI2LDI0LDI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== - 17, 17 + 189, 17 - 237, 17 + 409, 17 174 diff --git a/GUIs.ZooFlow/frmSearchStart.vb b/GUIs.ZooFlow/frmSearchStart.vb index fad90499..bcaa2613 100644 --- a/GUIs.ZooFlow/frmSearchStart.vb +++ b/GUIs.ZooFlow/frmSearchStart.vb @@ -7,6 +7,8 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DevExpress.XtraEditors Imports DigitalData.GUIs.Common Imports System.Random +Imports DevExpress.XtraSplashScreen +Imports DevExpress.XtraEditors.Repository Public Class frmSearchStart Private Logger As Logger @@ -43,9 +45,70 @@ Public Class frmSearchStart oSearchTerms.Columns.Add("BracketRight", GetType(String)) oSearchTerms.Columns.Add("Operator", GetType(String)) DTSearchTerms = oSearchTerms + End Sub + + Private Sub frmSearchStart_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + Me.Panel1.Visible = False + For Each oTab As XtraTabPage In XtraTabControl1.TabPages + oTab.PageVisible = False + Next + + RepositoryItemComboBox2.Items.AddRange(New List(Of FilterTimeframe) From { + New FilterTimeframe() With {.Name = "Alle", .From = Nothing, .[To] = Nothing}, + New FilterTimeframe() With {.Name = "Eigener", .From = Nothing, .[To] = Nothing}, + New FilterTimeframe() With { + .Name = "letzte 7 Tage", + .From = Date.Now.Subtract(TimeSpan.FromDays(7)), + .[To] = Date.Now + }, + New FilterTimeframe() With { + .Name = "letzte 14 Tage", + .From = Date.Now.Subtract(TimeSpan.FromDays(14)), + .[To] = Date.Now + } + }) + + If DTSearchProfiles.Rows.Count > 1 Then + cmbProfile.DataSource = DTSearchProfiles + cmbProfile.ValueMember = DTSearchProfiles.Columns("SEARCH_PROFILE_ID").ColumnName + cmbProfile.DisplayMember = DTSearchProfiles.Columns("TITLE").ColumnName + cmbProfile.AutoCompleteMode = AutoCompleteMode.Suggest + cmbProfile.AutoCompleteSource = AutoCompleteSource.ListItems + cmbProfile.SelectedIndex = -1 + TabSelectedIndex = -1 + + Me.Panel1.Visible = True + For Each orow As DataRow In DTSearchProfiles.Rows + RepositoryItemComboBox1.Items.Add(orow.Item("TITLE")) + Next + + Else + TabSelectedIndex = 0 + TabSelected = XtraTabControl1.TabPages(0) + TabSelected.PageVisible = True + PSEARCH_ID = DTSearchProfiles.Rows(0).Item("SEARCH_PROFILE_ID") + SEARCH_SQL = DTSearchProfiles.Rows(0).Item("RESULT_SQL") + SEARCH_TITLE = DTSearchProfiles.Rows(0).Item("TITLE") + TabSelected.Text = DTSearchProfiles.Rows(0).Item("TITLE") + Load_Search_Attributes() + BarButtonItemNewSearch.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End If + SEARCH_COUNT = DTSearchProfiles.Rows.Count + SplitContainerControlSearch.Collapsed = True + RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Red + If My.UIConfig.SearchForm.Location.X > 0 And My.UIConfig.SearchForm.Location.Y > 0 Then + Me.Location = My.UIConfig.SearchForm.Location + End If + Catch ex As Exception + Logger.Error(ex.Message) + MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error while loading ProfileSearches:") + End Try End Sub + + Public Sub AddSearchAttribute(pAttributeId As String, pAttributeTitle As String, pSearchTerm As String, Optional pCriteria As String = "=") GridControlSerchTerms.DataSource = Nothing Dim oMultiselect As Boolean = False @@ -107,51 +170,6 @@ Public Class frmSearchStart End Sub - - Private Sub frmSearchStart_Load(sender As Object, e As EventArgs) Handles Me.Load - Try - Me.Panel1.Visible = False - For Each oTab As XtraTabPage In XtraTabControl1.TabPages - oTab.PageVisible = False - Next - If DTSearchProfiles.Rows.Count > 1 Then - cmbProfile.DataSource = DTSearchProfiles - cmbProfile.ValueMember = DTSearchProfiles.Columns("SEARCH_PROFILE_ID").ColumnName - cmbProfile.DisplayMember = DTSearchProfiles.Columns("TITLE").ColumnName - cmbProfile.AutoCompleteMode = AutoCompleteMode.Suggest - cmbProfile.AutoCompleteSource = AutoCompleteSource.ListItems - cmbProfile.SelectedIndex = -1 - TabSelectedIndex = -1 - - Me.Panel1.Visible = True - For Each orow As DataRow In DTSearchProfiles.Rows - RepositoryItemComboBox1.Items.Add(orow.Item("TITLE")) - Next - - Else - TabSelectedIndex = 0 - TabSelected = XtraTabControl1.TabPages(0) - TabSelected.PageVisible = True - PSEARCH_ID = DTSearchProfiles.Rows(0).Item("SEARCH_PROFILE_ID") - SEARCH_SQL = DTSearchProfiles.Rows(0).Item("RESULT_SQL") - SEARCH_TITLE = DTSearchProfiles.Rows(0).Item("TITLE") - TabSelected.Text = DTSearchProfiles.Rows(0).Item("TITLE") - Load_Search_Attributes() - BarButtonItemNewSearch.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - End If - SEARCH_COUNT = DTSearchProfiles.Rows.Count - SplitContainerControlSearch.Collapsed = True - RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Red - If My.UIConfig.SearchForm.Location.X > 0 And My.UIConfig.SearchForm.Location.Y > 0 Then - Me.Location = My.UIConfig.SearchForm.Location - End If - - Catch ex As Exception - Logger.Error(ex.Message) - MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error while loading ProfileSearches:") - End Try - - End Sub Sub Load_Search_Attributes() Try DataLoaded = False @@ -754,10 +772,14 @@ Public Class frmSearchStart End Function Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick - Start_Search + Start_Search() End Sub - Private Function Start_Search() + Private Sub Start_Search() + Dim oHandle As IOverlaySplashScreenHandle = Nothing + Try + oHandle = SplashScreenManager.ShowOverlayForm(Me) + Dim oSEARCH_SQL = SEARCH_SQL Dim oOperator As String Dim oCount As Integer = 1 @@ -772,14 +794,18 @@ Public Class frmSearchStart oOperator = oRow.Item("Operator").ToString Dim oSearchTerm = GetSearchTermForType(oRow.Item("AttrID"), oRow.Item("AttrTitle").ToString, oRow.Item("Criteria").ToString, oRow.Item("SearchTerm").ToString) - oSEARCH_SQL &= IIf(oCount = 0, " ", "") + $"{oRow.Item("BracketLeft").ToString}{oSearchTerm}{oRow.Item("BracketLeft").ToString}" + Dim oBracketLeft As String = oRow.Item("BracketLeft").ToString + Dim oBracketRight As String = oRow.Item("BracketLeft").ToString + Dim oSpaceChar = IIf(oCount = 0, " ", "") + + oSEARCH_SQL &= $"{oSpaceChar}{oBracketLeft}{oSearchTerm}{oBracketRight}" If DTSearchTerms.Rows.Count > oCount Then oSEARCH_SQL &= $" {oOperator} {Chr(13)}" End If oCount += 1 Next - Dim oEnvironment As New DigitalData.Modules.ZooFlow.Environment() With { + Dim oEnvironment As New Modules.ZooFlow.Environment() With { .User = My.Application.User, .Modules = My.Application.Modules, .Database = My.Database, @@ -791,6 +817,7 @@ Public Class frmSearchStart Dim oShortGuid = Guid.NewGuid() Dim oWindowGuid = $"{PSEARCH_ID.ToString}-{My.User.Name}" Dim oParams = New DocumentResultParams() With { + .IsIDBResult = True, .WindowGuid = oWindowGuid, .Results = New List(Of DocumentResult) From { New DocumentResult() With { @@ -805,12 +832,11 @@ Public Class frmSearchStart Else Display_InfoItem("No results for this searchcombination!", Color.OrangeRed) End If - - Catch ex As Exception - + Finally + SplashScreenManager.CloseOverlayForm(oHandle) End Try - End Function + End Sub Private Sub frmSearchStart_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp If e.KeyCode = Keys.F2 Then @@ -818,5 +844,34 @@ Public Class frmSearchStart End If End Sub + Private Sub SwitchFilter_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles SwitchFilter.CheckedChanged + If SwitchFilter.Checked Then + RibbonPageGroupFilter.Enabled = True + Else + RibbonPageGroupFilter.Enabled = False + End If + End Sub + + Private Class FilterTimeframe + Public Property Name As String + Public Property From As Date + Public Property [To] As Date + Public Overrides Function ToString() As String + Return Name.ToString + End Function + End Class + + Private Sub cmbFilterTimeframe_EditValueChanged(sender As Object, e As EventArgs) Handles cmbFilterTimeframe.EditValueChanged + Dim oTimeframe As FilterTimeframe = DirectCast(cmbFilterTimeframe.EditValue, FilterTimeframe) + + If IsNothing(oTimeframe.From) And IsNothing(oTimeframe.To) Then + txtFilterFrom.Reset() + txtFilterTo.Reset() + Else + txtFilterFrom.EditValue = oTimeframe.From + txtFilterTo.EditValue = oTimeframe.[To] + End If + + End Sub End Class \ No newline at end of file