diff --git a/GUIs.ZooFlow/ClassConstants.vb b/GUIs.ZooFlow/ClassConstants.vb index 2a55126c..d97c2fa6 100644 --- a/GUIs.ZooFlow/ClassConstants.vb +++ b/GUIs.ZooFlow/ClassConstants.vb @@ -27,7 +27,8 @@ Public Const NOTIFICATION_DELAY = 2500 - Public Const SQLCMD_FLOW_SEARCH1 = "FLOW_SEARCH1" + Public Const SQLCMD_FLOW_SEARCH_LOWER_LIMIT = "FLOW_SEARCH_LOWER_LIMIT" + Public Const SQLCMD_FLOW_SEARCH_TILE = "FLOW_SEARCH_PER_TILE" Public Const RESULTLIST_COL_ADDED_WHEN_DE = "Erstellt wann" Public Const RESULTLIST_COL_CHANGED_WHEN_DE = "Geändert wann" diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index 55ecb5ad..7d173bb1 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -313,22 +313,22 @@ Public Class ClassInit For Each oLine In oLines _Logger.Debug(oLine.Trim) If oLine = "NO_BASICCONF" Then - My.Application.User.HideBasicConfig = True + MyApplication.User.HideBasicConfig = True ElseIf oLine.StartsWith("SEARCH_STRING_ATTRID") Then Try Dim oResult = oLine.Replace("SEARCH_STRING_ATTRID=", "") - My.Application.Search.StringAttributeId = Long.Parse(oResult) + MyApplication.Search.SelectInStringAttributeIds = oResult Catch ex As Exception - My.Application.Search.StringAttributeId = -1 + MyApplication.Search.SelectInStringAttributeIds = "" End Try ElseIf oLine.StartsWith("SEARCH_INT_ATTRID") Then Try Dim oResult = oLine.Replace("SEARCH_INT_ATTRID=", "") - My.Application.Search.IntegerAttributeId = Long.Parse(oResult) + MyApplication.Search.SelectInIntegerAttributeIds = oResult Catch ex As Exception - My.Application.Search.IntegerAttributeId = -1 + MyApplication.Search.SelectInIntegerAttributeIds = "" End Try Else _Logger.Info($"Wrong WorkingMode: {oLine}") diff --git a/GUIs.ZooFlow/Search/State.vb b/GUIs.ZooFlow/Search/State.vb index 65ae87a6..d3c669a8 100644 --- a/GUIs.ZooFlow/Search/State.vb +++ b/GUIs.ZooFlow/Search/State.vb @@ -1,6 +1,6 @@ Namespace Search Public Class State - Public Property StringAttributeId As Long = -1 - Public Property IntegerAttributeId As Long = -1 + Public Property SelectInStringAttributeIds As String = "" + Public Property SelectInIntegerAttributeIds As String = "" End Class End Namespace diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb index 144714be..248f1ce0 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb @@ -22,54 +22,25 @@ Partial Class frmFlowSearch 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Dim TileItemElement19 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement20 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement21 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement22 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement23 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemFrame3 As DevExpress.XtraEditors.TileItemFrame = New DevExpress.XtraEditors.TileItemFrame() - Dim TileItemElement24 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() + Dim TileItemElement1 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() + Dim TileItemElement2 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch)) - Dim TileItemFrame4 As DevExpress.XtraEditors.TileItemFrame = New DevExpress.XtraEditors.TileItemFrame() - Dim TileItemElement25 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement26 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement27 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement28 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement29 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement30 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement31 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement32 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement33 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement34 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement35 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement36 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() Me.Panel1 = New System.Windows.Forms.Panel() Me.txtSearch = New System.Windows.Forms.TextBox() Me.lblFoundResult = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() + Me.Panel2 = New System.Windows.Forms.Panel() Me.TileControlMatch = New DevExpress.XtraEditors.TileControl() - Me.TileGroupDocumentsData = New DevExpress.XtraEditors.TileGroup() - Me.TileGroupDocuments = New DevExpress.XtraEditors.TileGroup() + Me.TileGroup2 = New DevExpress.XtraEditors.TileGroup() + Me.TileGroup3 = New DevExpress.XtraEditors.TileGroup() Me.TileItem1 = New DevExpress.XtraEditors.TileItem() Me.TileItem2 = New DevExpress.XtraEditors.TileItem() - Me.TileItem3 = New DevExpress.XtraEditors.TileItem() - Me.TileGroupData = New DevExpress.XtraEditors.TileGroup() - Me.TileGroup2 = New DevExpress.XtraEditors.TileGroup() - Me.TileItem5 = New DevExpress.XtraEditors.TileItem() - Me.TileItem4 = New DevExpress.XtraEditors.TileItem() - Me.TileGroup3 = New DevExpress.XtraEditors.TileGroup() - Me.TileItem6 = New DevExpress.XtraEditors.TileItem() - Me.TileItem7 = New DevExpress.XtraEditors.TileItem() - Me.TileItem8 = New DevExpress.XtraEditors.TileItem() - Me.TileGroup4 = New DevExpress.XtraEditors.TileGroup() - Me.TileItem9 = New DevExpress.XtraEditors.TileItem() - Me.TileItem10 = New DevExpress.XtraEditors.TileItem() - Me.TileGroup5 = New DevExpress.XtraEditors.TileGroup() Me.Panel1.SuspendLayout() Me.SuspendLayout() ' 'Panel1 ' + Me.Panel1.BackColor = System.Drawing.Color.DimGray Me.Panel1.Controls.Add(Me.txtSearch) Me.Panel1.Controls.Add(Me.lblFoundResult) Me.Panel1.Controls.Add(Me.Label1) @@ -81,19 +52,19 @@ Partial Class frmFlowSearch ' 'txtSearch ' - Me.txtSearch.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(47, Byte), Integer)) + Me.txtSearch.BackColor = System.Drawing.Color.White Me.txtSearch.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.txtSearch.Location = New System.Drawing.Point(16, 12) Me.txtSearch.Name = "txtSearch" Me.txtSearch.Size = New System.Drawing.Size(167, 23) - Me.txtSearch.TabIndex = 1 + Me.txtSearch.TabIndex = 0 ' 'lblFoundResult ' Me.lblFoundResult.AutoSize = True - Me.lblFoundResult.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.lblFoundResult.BackColor = System.Drawing.Color.Transparent Me.lblFoundResult.Font = New System.Drawing.Font("Tahoma", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblFoundResult.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(47, Byte), Integer)) + Me.lblFoundResult.ForeColor = System.Drawing.Color.White Me.lblFoundResult.Location = New System.Drawing.Point(12, 38) Me.lblFoundResult.Name = "lblFoundResult" Me.lblFoundResult.Size = New System.Drawing.Size(53, 19) @@ -105,342 +76,66 @@ Partial Class frmFlowSearch ' Me.Label1.AutoSize = True Me.Label1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Label1.ForeColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(47, Byte), Integer)) + Me.Label1.ForeColor = System.Drawing.Color.White Me.Label1.Location = New System.Drawing.Point(185, 15) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(43, 16) Me.Label1.TabIndex = 0 Me.Label1.Text = "finden" ' + 'Panel2 + ' + Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom + Me.Panel2.Location = New System.Drawing.Point(0, 474) + Me.Panel2.Name = "Panel2" + Me.Panel2.Size = New System.Drawing.Size(1245, 18) + Me.Panel2.TabIndex = 1 + ' 'TileControlMatch ' - Me.TileControlMatch.AllowDragTilesBetweenGroups = False - Me.TileControlMatch.AllowGlyphSkinning = True - Me.TileControlMatch.AppearanceGroupText.BackColor = System.Drawing.Color.Transparent - Me.TileControlMatch.AppearanceGroupText.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TileControlMatch.AppearanceGroupText.ForeColor = System.Drawing.Color.White - Me.TileControlMatch.AppearanceGroupText.Options.UseBackColor = True - Me.TileControlMatch.AppearanceGroupText.Options.UseFont = True - Me.TileControlMatch.AppearanceGroupText.Options.UseForeColor = True - Me.TileControlMatch.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) - Me.TileControlMatch.ColumnCount = 6 + Me.TileControlMatch.BackColor = System.Drawing.Color.DimGray Me.TileControlMatch.Dock = System.Windows.Forms.DockStyle.Fill - Me.TileControlMatch.Groups.Add(Me.TileGroupDocumentsData) - Me.TileControlMatch.Groups.Add(Me.TileGroupDocuments) - Me.TileControlMatch.Groups.Add(Me.TileGroupData) Me.TileControlMatch.Groups.Add(Me.TileGroup2) Me.TileControlMatch.Groups.Add(Me.TileGroup3) - Me.TileControlMatch.Groups.Add(Me.TileGroup4) - Me.TileControlMatch.Groups.Add(Me.TileGroup5) - Me.TileControlMatch.IndentBetweenGroups = 25 Me.TileControlMatch.Location = New System.Drawing.Point(0, 61) - Me.TileControlMatch.MaxId = 14 + Me.TileControlMatch.MaxId = 2 Me.TileControlMatch.Name = "TileControlMatch" Me.TileControlMatch.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollBar - Me.TileControlMatch.ShowGroupText = True - Me.TileControlMatch.Size = New System.Drawing.Size(1245, 431) + Me.TileControlMatch.Size = New System.Drawing.Size(1245, 413) Me.TileControlMatch.TabIndex = 2 Me.TileControlMatch.Text = "TileControl1" ' - 'TileGroupDocumentsData + 'TileGroup2 ' - Me.TileGroupDocumentsData.Name = "TileGroupDocumentsData" - Me.TileGroupDocumentsData.Text = "Kombiniert" - Me.TileGroupDocumentsData.Visible = False + Me.TileGroup2.Items.Add(Me.TileItem1) + Me.TileGroup2.Items.Add(Me.TileItem2) + Me.TileGroup2.Name = "TileGroup2" + Me.TileGroup2.Text = "Attribut1" ' - 'TileGroupDocuments + 'TileGroup3 ' - Me.TileGroupDocuments.Items.Add(Me.TileItem1) - Me.TileGroupDocuments.Items.Add(Me.TileItem2) - Me.TileGroupDocuments.Items.Add(Me.TileItem3) - Me.TileGroupDocuments.Name = "TileGroupDocuments" - Me.TileGroupDocuments.Text = "Dokumente" + Me.TileGroup3.Name = "TileGroup3" ' 'TileItem1 ' - Me.TileItem1.AppearanceItem.Normal.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.TileItem1.AppearanceItem.Normal.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.TileItem1.AppearanceItem.Normal.Options.UseBackColor = True - TileItemElement19.Appearance.Normal.ForeColor = System.Drawing.Color.Black - TileItemElement19.Appearance.Normal.Options.UseForeColor = True - TileItemElement19.Text = "TileItem1" - Me.TileItem1.Elements.Add(TileItemElement19) + TileItemElement1.Text = "TileItem1" + Me.TileItem1.Elements.Add(TileItemElement1) Me.TileItem1.Id = 0 Me.TileItem1.ItemSize = DevExpress.XtraEditors.TileItemSize.Wide Me.TileItem1.Name = "TileItem1" ' 'TileItem2 ' - Me.TileItem2.AppearanceItem.Normal.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) + Me.TileItem2.AppearanceItem.Normal.BackColor = System.Drawing.Color.White Me.TileItem2.AppearanceItem.Normal.Options.UseBackColor = True - Me.TileItem2.CurrentFrameIndex = 1 - TileItemElement20.Appearance.Hovered.Font = New System.Drawing.Font("Segoe UI Light", 17.0!) - TileItemElement20.Appearance.Hovered.Options.UseFont = True - TileItemElement20.Appearance.Hovered.Options.UseTextOptions = True - TileItemElement20.Appearance.Hovered.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement20.Appearance.Hovered.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement20.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI Light", 17.0!) - TileItemElement20.Appearance.Normal.Options.UseFont = True - TileItemElement20.Appearance.Normal.Options.UseTextOptions = True - TileItemElement20.Appearance.Normal.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement20.Appearance.Normal.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement20.Appearance.Selected.Font = New System.Drawing.Font("Segoe UI Light", 17.0!) - TileItemElement20.Appearance.Selected.Options.UseFont = True - TileItemElement20.Appearance.Selected.Options.UseTextOptions = True - TileItemElement20.Appearance.Selected.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement20.Appearance.Selected.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement20.Text = "Header" - TileItemElement20.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileItemElement20.TextLocation = New System.Drawing.Point(4, 0) - TileItemElement21.Appearance.Hovered.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement21.Appearance.Hovered.Options.UseFont = True - TileItemElement21.Appearance.Hovered.Options.UseTextOptions = True - TileItemElement21.Appearance.Hovered.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement21.Appearance.Hovered.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement21.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement21.Appearance.Normal.Options.UseFont = True - TileItemElement21.Appearance.Normal.Options.UseTextOptions = True - TileItemElement21.Appearance.Normal.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement21.Appearance.Normal.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement21.Appearance.Selected.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement21.Appearance.Selected.Options.UseFont = True - TileItemElement21.Appearance.Selected.Options.UseTextOptions = True - TileItemElement21.Appearance.Selected.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement21.Appearance.Selected.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement21.Text = "Text2" - TileItemElement21.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileItemElement21.TextLocation = New System.Drawing.Point(4, 27) - TileItemElement22.Appearance.Hovered.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement22.Appearance.Hovered.Options.UseFont = True - TileItemElement22.Appearance.Hovered.Options.UseTextOptions = True - TileItemElement22.Appearance.Hovered.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement22.Appearance.Hovered.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement22.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement22.Appearance.Normal.Options.UseFont = True - TileItemElement22.Appearance.Normal.Options.UseTextOptions = True - TileItemElement22.Appearance.Normal.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement22.Appearance.Normal.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement22.Appearance.Selected.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement22.Appearance.Selected.Options.UseFont = True - TileItemElement22.Appearance.Selected.Options.UseTextOptions = True - TileItemElement22.Appearance.Selected.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement22.Appearance.Selected.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement22.Text = "Text3" - TileItemElement22.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileItemElement22.TextLocation = New System.Drawing.Point(4, 43) - TileItemElement23.Appearance.Hovered.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement23.Appearance.Hovered.Options.UseFont = True - TileItemElement23.Appearance.Hovered.Options.UseTextOptions = True - TileItemElement23.Appearance.Hovered.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement23.Appearance.Hovered.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement23.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement23.Appearance.Normal.Options.UseFont = True - TileItemElement23.Appearance.Normal.Options.UseTextOptions = True - TileItemElement23.Appearance.Normal.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement23.Appearance.Normal.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement23.Appearance.Selected.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement23.Appearance.Selected.Options.UseFont = True - TileItemElement23.Appearance.Selected.Options.UseTextOptions = True - TileItemElement23.Appearance.Selected.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement23.Appearance.Selected.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement23.Text = "Text4" - TileItemElement23.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileItemElement23.TextLocation = New System.Drawing.Point(4, 59) - Me.TileItem2.Elements.Add(TileItemElement20) - Me.TileItem2.Elements.Add(TileItemElement21) - Me.TileItem2.Elements.Add(TileItemElement22) - Me.TileItem2.Elements.Add(TileItemElement23) - TileItemFrame3.Animation = DevExpress.XtraEditors.TileItemContentAnimationType.ScrollDown - TileItemElement24.ImageOptions.Image = CType(resources.GetObject("resource.Image"), System.Drawing.Image) - TileItemElement24.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileItemElement24.ImageOptions.ImageLocation = New System.Drawing.Point(-12, -8) - TileItemElement24.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.ZoomOutside - TileItemElement24.ImageOptions.ImageSize = New System.Drawing.Size(120, 120) - TileItemFrame3.Elements.Add(TileItemElement24) - TileItemFrame3.Image = CType(resources.GetObject("TileItemFrame3.Image"), System.Drawing.Image) - TileItemFrame4.Animation = DevExpress.XtraEditors.TileItemContentAnimationType.ScrollTop - TileItemElement25.Appearance.Hovered.Font = New System.Drawing.Font("Segoe UI Light", 17.0!) - TileItemElement25.Appearance.Hovered.Options.UseFont = True - TileItemElement25.Appearance.Hovered.Options.UseTextOptions = True - TileItemElement25.Appearance.Hovered.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement25.Appearance.Hovered.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement25.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI Light", 17.0!) - TileItemElement25.Appearance.Normal.Options.UseFont = True - TileItemElement25.Appearance.Normal.Options.UseTextOptions = True - TileItemElement25.Appearance.Normal.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement25.Appearance.Normal.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement25.Appearance.Selected.Font = New System.Drawing.Font("Segoe UI Light", 17.0!) - TileItemElement25.Appearance.Selected.Options.UseFont = True - TileItemElement25.Appearance.Selected.Options.UseTextOptions = True - TileItemElement25.Appearance.Selected.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement25.Appearance.Selected.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement25.Text = "Header" - TileItemElement25.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileItemElement25.TextLocation = New System.Drawing.Point(4, 0) - TileItemElement26.Appearance.Hovered.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement26.Appearance.Hovered.Options.UseFont = True - TileItemElement26.Appearance.Hovered.Options.UseTextOptions = True - TileItemElement26.Appearance.Hovered.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement26.Appearance.Hovered.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement26.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement26.Appearance.Normal.Options.UseFont = True - TileItemElement26.Appearance.Normal.Options.UseTextOptions = True - TileItemElement26.Appearance.Normal.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement26.Appearance.Normal.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement26.Appearance.Selected.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement26.Appearance.Selected.Options.UseFont = True - TileItemElement26.Appearance.Selected.Options.UseTextOptions = True - TileItemElement26.Appearance.Selected.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement26.Appearance.Selected.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement26.Text = "Text2" - TileItemElement26.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileItemElement26.TextLocation = New System.Drawing.Point(4, 27) - TileItemElement27.Appearance.Hovered.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement27.Appearance.Hovered.Options.UseFont = True - TileItemElement27.Appearance.Hovered.Options.UseTextOptions = True - TileItemElement27.Appearance.Hovered.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement27.Appearance.Hovered.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement27.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement27.Appearance.Normal.Options.UseFont = True - TileItemElement27.Appearance.Normal.Options.UseTextOptions = True - TileItemElement27.Appearance.Normal.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement27.Appearance.Normal.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement27.Appearance.Selected.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement27.Appearance.Selected.Options.UseFont = True - TileItemElement27.Appearance.Selected.Options.UseTextOptions = True - TileItemElement27.Appearance.Selected.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement27.Appearance.Selected.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement27.Text = "Text3" - TileItemElement27.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileItemElement27.TextLocation = New System.Drawing.Point(4, 43) - TileItemElement28.Appearance.Hovered.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement28.Appearance.Hovered.Options.UseFont = True - TileItemElement28.Appearance.Hovered.Options.UseTextOptions = True - TileItemElement28.Appearance.Hovered.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement28.Appearance.Hovered.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement28.Appearance.Normal.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement28.Appearance.Normal.Options.UseFont = True - TileItemElement28.Appearance.Normal.Options.UseTextOptions = True - TileItemElement28.Appearance.Normal.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement28.Appearance.Normal.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement28.Appearance.Selected.Font = New System.Drawing.Font("Segoe UI", 9.0!) - TileItemElement28.Appearance.Selected.Options.UseFont = True - TileItemElement28.Appearance.Selected.Options.UseTextOptions = True - TileItemElement28.Appearance.Selected.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter - TileItemElement28.Appearance.Selected.TextOptions.WordWrap = DevExpress.Utils.WordWrap.NoWrap - TileItemElement28.Text = "Text4" - TileItemElement28.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.Manual - TileItemElement28.TextLocation = New System.Drawing.Point(4, 59) - TileItemFrame4.Elements.Add(TileItemElement25) - TileItemFrame4.Elements.Add(TileItemElement26) - TileItemFrame4.Elements.Add(TileItemElement27) - TileItemFrame4.Elements.Add(TileItemElement28) - Me.TileItem2.Frames.Add(TileItemFrame3) - Me.TileItem2.Frames.Add(TileItemFrame4) + TileItemElement2.Text = "TileItem2" + Me.TileItem2.Elements.Add(TileItemElement2) Me.TileItem2.Id = 1 Me.TileItem2.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium Me.TileItem2.Name = "TileItem2" ' - 'TileItem3 - ' - Me.TileItem3.AppearanceItem.Normal.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer)) - Me.TileItem3.AppearanceItem.Normal.Options.UseBackColor = True - TileItemElement29.Text = "TileItem3" - Me.TileItem3.Elements.Add(TileItemElement29) - Me.TileItem3.Id = 2 - Me.TileItem3.ItemSize = DevExpress.XtraEditors.TileItemSize.Small - Me.TileItem3.Name = "TileItem3" - ' - 'TileGroupData - ' - Me.TileGroupData.Name = "TileGroupData" - Me.TileGroupData.Text = "Daten" - ' - 'TileGroup2 - ' - Me.TileGroup2.Items.Add(Me.TileItem5) - Me.TileGroup2.Items.Add(Me.TileItem4) - Me.TileGroup2.Name = "TileGroup2" - Me.TileGroup2.Text = "Group3" - ' - 'TileItem5 - ' - TileItemElement30.Text = "TileItem5" - Me.TileItem5.Elements.Add(TileItemElement30) - Me.TileItem5.Id = 11 - Me.TileItem5.ItemSize = DevExpress.XtraEditors.TileItemSize.Wide - Me.TileItem5.Name = "TileItem5" - ' - 'TileItem4 - ' - TileItemElement31.Text = "TileItem4dadadasdasdasdasdasd" - TileItemElement31.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.TopLeft - Me.TileItem4.Elements.Add(TileItemElement31) - Me.TileItem4.Id = 3 - Me.TileItem4.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium - Me.TileItem4.Name = "TileItem4" - Me.TileItem4.RowCount = 3 - Me.TileItem4.TextShowMode = DevExpress.XtraEditors.TileItemContentShowMode.Hover - ' - 'TileGroup3 - ' - Me.TileGroup3.Items.Add(Me.TileItem6) - Me.TileGroup3.Items.Add(Me.TileItem7) - Me.TileGroup3.Items.Add(Me.TileItem8) - Me.TileGroup3.Name = "TileGroup3" - Me.TileGroup3.Text = "Group4" - ' - 'TileItem6 - ' - TileItemElement32.Text = "TileItem6" - Me.TileItem6.Elements.Add(TileItemElement32) - Me.TileItem6.Id = 6 - Me.TileItem6.ItemSize = DevExpress.XtraEditors.TileItemSize.Wide - Me.TileItem6.Name = "TileItem6" - ' - 'TileItem7 - ' - TileItemElement33.Text = "TileItem7" - Me.TileItem7.Elements.Add(TileItemElement33) - Me.TileItem7.Id = 7 - Me.TileItem7.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium - Me.TileItem7.Name = "TileItem7" - ' - 'TileItem8 - ' - TileItemElement34.Text = "TileItem8" - Me.TileItem8.Elements.Add(TileItemElement34) - Me.TileItem8.Id = 8 - Me.TileItem8.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium - Me.TileItem8.Name = "TileItem8" - ' - 'TileGroup4 - ' - Me.TileGroup4.Items.Add(Me.TileItem9) - Me.TileGroup4.Items.Add(Me.TileItem10) - Me.TileGroup4.Name = "TileGroup4" - Me.TileGroup4.Text = "Group5" - ' - 'TileItem9 - ' - TileItemElement35.Text = "TileItem9" - Me.TileItem9.Elements.Add(TileItemElement35) - Me.TileItem9.Id = 12 - Me.TileItem9.ItemSize = DevExpress.XtraEditors.TileItemSize.Wide - Me.TileItem9.Name = "TileItem9" - ' - 'TileItem10 - ' - TileItemElement36.Text = "TileItem10" - Me.TileItem10.Elements.Add(TileItemElement36) - Me.TileItem10.Id = 13 - Me.TileItem10.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium - Me.TileItem10.Name = "TileItem10" - ' - 'TileGroup5 - ' - Me.TileGroup5.Name = "TileGroup5" - Me.TileGroup5.Text = "Group 6" - ' 'frmFlowSearch ' Me.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) @@ -449,6 +144,7 @@ Partial Class frmFlowSearch Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1245, 492) Me.Controls.Add(Me.TileControlMatch) + Me.Controls.Add(Me.Panel2) Me.Controls.Add(Me.Panel1) Me.IconOptions.SvgImage = CType(resources.GetObject("frmFlowSearch.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Name = "frmFlowSearch" @@ -462,23 +158,11 @@ Partial Class frmFlowSearch Friend WithEvents Panel1 As Panel Friend WithEvents txtSearch As TextBox Friend WithEvents Label1 As Label + Friend WithEvents lblFoundResult As Label + Friend WithEvents Panel2 As Panel Friend WithEvents TileControlMatch As DevExpress.XtraEditors.TileControl - Friend WithEvents TileGroupDocumentsData As DevExpress.XtraEditors.TileGroup - Friend WithEvents TileGroupDocuments As DevExpress.XtraEditors.TileGroup + Friend WithEvents TileGroup2 As DevExpress.XtraEditors.TileGroup Friend WithEvents TileItem1 As DevExpress.XtraEditors.TileItem Friend WithEvents TileItem2 As DevExpress.XtraEditors.TileItem - Friend WithEvents TileItem3 As DevExpress.XtraEditors.TileItem - Friend WithEvents TileGroupData As DevExpress.XtraEditors.TileGroup - Friend WithEvents TileGroup2 As DevExpress.XtraEditors.TileGroup - Friend WithEvents TileItem5 As DevExpress.XtraEditors.TileItem - Friend WithEvents TileItem4 As DevExpress.XtraEditors.TileItem Friend WithEvents TileGroup3 As DevExpress.XtraEditors.TileGroup - Friend WithEvents TileItem6 As DevExpress.XtraEditors.TileItem - Friend WithEvents TileItem7 As DevExpress.XtraEditors.TileItem - Friend WithEvents TileItem8 As DevExpress.XtraEditors.TileItem - Friend WithEvents TileGroup4 As DevExpress.XtraEditors.TileGroup - Friend WithEvents TileItem9 As DevExpress.XtraEditors.TileItem - Friend WithEvents TileItem10 As DevExpress.XtraEditors.TileItem - Friend WithEvents TileGroup5 As DevExpress.XtraEditors.TileGroup - Friend WithEvents lblFoundResult As Label End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.resx b/GUIs.ZooFlow/Search/frmFlowSearch.resx index ab91c5d5..f3af65ef 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.resx +++ b/GUIs.ZooFlow/Search/frmFlowSearch.resx @@ -117,89 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 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 - - diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.vb b/GUIs.ZooFlow/Search/frmFlowSearch.vb index 246509a5..276a6cde 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb @@ -11,14 +11,14 @@ Public Class frmFlowSearch Private SecondaryFont As New Font("Segoe UI", 8) Dim oLastAttribute As String = "" Dim oAttributeCount As Integer = 1 - Dim BASE_SSEARCHCommand As String + Dim BASE_SEARCHCommand As String Private LastSearchForm As frmDocumentResultList Public Sub New(pBaseSearchSql As String) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() - BASE_SSEARCHCommand = pBaseSearchSql + BASE_SEARCHCommand = pBaseSearchSql ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. Logger = My.LogConfig.GetLogger() End Sub @@ -27,6 +27,7 @@ Public Class frmFlowSearch Try If txtSearch.Text = String.Empty Then + Reset_Form() Exit Sub End If lblFoundResult.Visible = False @@ -38,101 +39,92 @@ Public Class frmFlowSearch Logger.Error(ex) End Try End Sub - Sub SearchContent(oSearchValue As String) - oLastAttribute = "" - Dim oSQL = BASE_SSEARCHCommand.Replace("@SEARCH_STRING", oSearchValue) - Dim oResultCount As Integer = 0 + Sub Reset_Form() TileControlMatch.Groups.Clear() + lblFoundResult.Visible = False + End Sub + Sub SearchContent(oSearchValue As String) + Try + oLastAttribute = "" + Dim oSQL = BASE_SEARCHCommand.Replace("@SEARCH_STRING", oSearchValue) + Dim oResultCountAttributes As Integer = 0 + TileControlMatch.Groups.Clear() - Dim ODT As DataTable = My.DatabaseIDB.GetDatatable(oSQL) - If Not IsNothing(ODT) Then + Dim oResultsfromSearchDT As DataTable = My.DatabaseIDB.GetDatatable(oSQL) + If Not IsNothing(oResultsfromSearchDT) Then - Dim oView As DataView = New DataView(ODT) - Dim oDTDistinctValues As DataTable = oView.ToTable(True, "ATTRIBUTE", "ATTR_ID") - Dim oGroups = ODT.AsEnumerable().GroupBy(Function(row) row.Field(Of String)("ATTRIBUTE")) - Dim oNewTable As New DataTable - oNewTable.Columns.Add("ATTRIBUTE") - oNewTable.Columns.Add("COUNT", Type.GetType("System.Int32")) - For Each oGroup In oGroups - oNewTable.Rows.Add(oGroup.Key, oGroup.Sum(Function(row) row.Field(Of Int32)("COUNT_OBJ"))) - Next - If Not IsNothing(oNewTable) Then - Dim oAttrCount As Integer = 0 - - For Each orow As DataRow In oNewTable.Rows - oAttrCount += 1 - oResultCount += orow.Item(1) + Dim oView As DataView = New DataView(oResultsfromSearchDT) + Dim oDTDistinctValues As DataTable = oView.ToTable(True, "ATTRIBUTE", "ATTR_ID") + Dim oGroups = oResultsfromSearchDT.AsEnumerable().GroupBy(Function(row) row.Field(Of String)("ATTRIBUTE")) + Dim oNewTable As New DataTable + oNewTable.Columns.Add("ATTRIBUTE") + oNewTable.Columns.Add("COUNT", Type.GetType("System.Int32")) + For Each oGroup In oGroups + oNewTable.Rows.Add(oGroup.Key, oGroup.Sum(Function(row) row.Field(Of Int32)("COUNT_OBJ"))) Next - lblFoundResult.Text = GetResultString(oResultCount, oAttrCount, oSearchValue) - lblFoundResult.Visible = True + If Not IsNothing(oNewTable) Then + Dim oAttrCount As Integer = 0 - End If - oNewTable.DefaultView.Sort = "COUNT ASC" - oNewTable = oNewTable.DefaultView.ToTable + For Each orow As DataRow In oNewTable.Rows + oAttrCount += 1 + oResultCountAttributes += orow.Item(1) + Next + lblFoundResult.Text = GetResultString(oResultCountAttributes, oAttrCount, oSearchValue) + lblFoundResult.Visible = True + + End If + oNewTable.DefaultView.Sort = "COUNT ASC" + oNewTable = oNewTable.DefaultView.ToTable + + For Each oGroupRow As DataRow In oNewTable.Rows + Dim oGroup As New TileGroup + oGroup.Text = $"{oGroupRow.Item(0).ToString} [{oGroupRow.Item(1).ToString}]" + oGroup.Visible = True + For Each oitemRow As DataRow In oResultsfromSearchDT.Rows + If oitemRow.Item("ATTRIBUTE") = oGroupRow.Item(0) Then + Dim oItem = CreateTile(oitemRow.Item("TERM_VALUE"), oitemRow.Item("COUNT_OBJ"), oGroupRow.Item(0).ToString, oitemRow.Item("ATTR_ID"), oitemRow.Item("TERM_GUID")) + If Not IsNothing(oItem) Then + oGroup.Items.Add(oItem) + End If + + End If + Next + TileControlMatch.Groups.Add(oGroup) + Next + + 'Wenn weniger als 45 Belege gefunden wurden wird direkt die Suche ausgeführt + If oResultCountAttributes > 0 And oResultCountAttributes <= 45 Then + StartSearch_Full(oSearchValue) + Else + If oResultsfromSearchDT.Rows.Count = 0 Then + Reset_Form() - For Each oGroupRow As DataRow In oNewTable.Rows - Dim oGroup As New TileGroup - oGroup.Text = $"{oGroupRow.Item(0).ToString} [{oGroupRow.Item(1).ToString}]" - oGroup.Visible = True - For Each oitemRow As DataRow In ODT.Rows - If oitemRow.Item("ATTRIBUTE") = oGroupRow.Item(0) Then - Dim oItem = CreateTile(oitemRow.Item("TERM_VALUE"), oitemRow.Item("COUNT_OBJ"), oGroupRow.Item(0).ToString, oitemRow.Item("ATTR_ID"), oitemRow.Item("TERM_GUID")) - oGroup.Items.Add(oItem) End If - Next - TileControlMatch.Groups.Add(oGroup) - Next + End If - 'Wenn weniger als 45 Belege gefunden wurden wird direkt die Suche ausgeführt - If oResultCount > 0 And oResultCount <= 45 Then - StartSearch_Full(oSearchValue) + Else + lblFoundResult.Text = "Result from DB Is Nothing..Check SQL" + lblFoundResult.Visible = True End If + Catch ex As Exception + Logger.Error(ex) + End Try - Else - lblFoundResult.Text = "Result from DB Is Nothing..Check SQL" - lblFoundResult.Visible = True - End If End Sub Private Function StartSearch_Full(pSearchValue As String) As Boolean Dim oHandle As IOverlaySplashScreenHandle = Nothing Dim oItemsFound As Boolean = False - Dim oState = My.Application.Search + Dim oSearchData = My.Application.Search Try oHandle = SplashScreenManager.ShowOverlayForm(Me) - Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}',{My.Application.User.UserId},'{oState.StringAttributeId}','{oState.IntegerAttributeId}'" + Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}',{My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}'" Dim oDTOBJECT_RESULT As DataTable = My.DatabaseIDB.GetDatatable(oEXECSQL) If Not IsNothing(oDTOBJECT_RESULT) Then - Dim oEnvironment As New Modules.ZooFlow.Environment() With { - .User = My.Application.User, - .Modules = My.Application.Modules, - .Database = My.Database, - .DatabaseIDB = My.DatabaseIDB, - .Settings = My.Application.Settings, - .Service = My.Application.Service - } - Dim oShortGuid = Guid.NewGuid() - Dim oWindowGuid = $"FLOWSEARCH-{My.User.Name}" - Dim oParams = New DocumentResultParams() With { - .WindowGuid = oWindowGuid, - .Results = New List(Of DocumentResult) From { - New DocumentResult() With { - .Title = "FlowSearchResult", - .Datatable = oDTOBJECT_RESULT - } - } - } - Dim oForm As New frmDocumentResultList(My.LogConfig, oEnvironment, oParams) - oForm.Show() - - LastSearchForm = oForm - - ' Position Result Window below this window - LastSearchForm.Location = GetResultFormLocation() - LastSearchForm.Size = GetResultFormSize() oItemsFound = True + OpenResultForm(oDTOBJECT_RESULT) End If @@ -144,6 +136,40 @@ Public Class frmFlowSearch End Try Return oItemsFound End Function + Private Sub OpenResultForm(pDTRESULT As DataTable) + Try + Dim oEnvironment As New Modules.ZooFlow.Environment() With { + .User = My.Application.User, + .Modules = My.Application.Modules, + .Database = My.Database, + .DatabaseIDB = My.DatabaseIDB, + .Settings = My.Application.Settings, + .Service = My.Application.Service + } + Dim oShortGuid = Guid.NewGuid() + Dim oWindowGuid = $"FLOWSEARCH-{My.User.Name}" + Dim oParams = New DocumentResultParams() With { + .WindowGuid = oWindowGuid, + .Results = New List(Of DocumentResult) From { + New DocumentResult() With { + .Title = "FlowSearchResult", + .Datatable = pDTRESULT + } + } + } + Dim oForm As New frmDocumentResultList(My.LogConfig, oEnvironment, oParams) + oForm.Show() + + LastSearchForm = oForm + + ' Position Result Window below this window + LastSearchForm.Location = GetResultFormLocation() + LastSearchForm.Size = GetResultFormSize() + + Catch ex As Exception + Logger.Error(ex) + End Try + End Sub Private Function GetResultFormLocation() As Point Return Location @@ -160,64 +186,73 @@ Public Class frmFlowSearch Return String.Format(oBase, oResultString, oProfileString, SearchContent) End Function Private Function CreateTile(pTermValue As String, pCount_Obj As String, pAttribute As String, pAttributeID As String, pTermGuid As Long) As TileItem - Dim oItem As New TileItem() With {.Tag = $"{pTermGuid}#{pAttributeID}"} + Try + Dim oItem As New TileItem() With {.Tag = $"{pTermGuid}|{pAttributeID}"} - oItem.AppearanceItem.Normal.BackColor = Color.FromArgb(255, 214, 47) - If oLastAttribute <> pAttribute Then - oAttributeCount = 1 - oLastAttribute = pAttribute - oItem.ItemSize = TileItemSize.Wide - ElseIf oAttributeCount = 2 Then - oItem.ItemSize = TileItemSize.Medium - End If - oAttributeCount += 1 + If oLastAttribute <> pAttribute Then + oAttributeCount = 1 + oLastAttribute = pAttribute + oItem.ItemSize = TileItemSize.Wide + oItem.AppearanceItem.Normal.BackColor = Color.FromArgb(165, 36, 49) ' GELB 255, 214, 47) + Else + oItem.ItemSize = TileItemSize.Medium + oItem.AppearanceItem.Normal.BackColor = Color.White + End If + oAttributeCount += 1 - oItem.Elements.Clear() + oItem.Elements.Clear() - Dim oNameElement = New TileItemElement With { - .Text = pTermValue, - .TextAlignment = TileItemContentAlignment.TopLeft - } - Select Case oItem.ItemSize - Case TileItemSize.Wide - oNameElement.Appearance.Normal.Font = FontLargeBold - Case Else - oNameElement.Appearance.Normal.Font = SecondaryFontBold - End Select + Dim oNameElement = New TileItemElement With { + .Text = pTermValue, + .TextAlignment = TileItemContentAlignment.TopLeft + } + Select Case oItem.ItemSize + Case TileItemSize.Wide + oNameElement.Appearance.Normal.Font = FontLargeBold + oNameElement.Appearance.Normal.ForeColor = Color.White + Case Else + oNameElement.Appearance.Normal.Font = SecondaryFontBold + oNameElement.Appearance.Normal.ForeColor = Color.FromArgb(165, 36, 49) + End Select - oNameElement.Appearance.Normal.ForeColor = Color.Black - oItem.Elements.Add(oNameElement) + 'oNameElement.Appearance.Normal.ForeColor = Color.Black + oItem.Elements.Add(oNameElement) - 'Dim oCommentElement = New TileItemElement With { - ' .Text = "Anzahl Objekte: " & pCount_Obj, - ' .TextAlignment = TileItemContentAlignment.MiddleLeft - '} + 'Dim oCommentElement = New TileItemElement With { + ' .Text = "Anzahl Objekte: " & pCount_Obj, + ' .TextAlignment = TileItemContentAlignment.MiddleLeft + '} - 'Select Case oItem.ItemSize - ' Case TileItemSize.Wide - ' oCommentElement.Appearance.Normal.Font = FontLargeNormal - ' Case Else - ' oCommentElement.Appearance.Normal.Font = SecondaryFont - 'End Select + 'Select Case oItem.ItemSize + ' Case TileItemSize.Wide + ' oCommentElement.Appearance.Normal.Font = FontLargeNormal + ' Case Else + ' oCommentElement.Appearance.Normal.Font = SecondaryFont + 'End Select - 'oCommentElement.Appearance.Normal.ForeColor = Color.Black - 'oItem.Elements.Add(oCommentElement) + 'oCommentElement.Appearance.Normal.ForeColor = Color.Black + 'oItem.Elements.Add(oCommentElement) - Dim oCountElement = New TileItemElement With { - .Text = "Anzahl Objekte: " & pCount_Obj, - .TextAlignment = TileItemContentAlignment.BottomRight - } - Select Case oItem.ItemSize - Case TileItemSize.Wide - oCountElement.Appearance.Normal.Font = FontLargeNormal - Case Else - oCountElement.Appearance.Normal.Font = SecondaryFont - End Select - oCountElement.Appearance.Normal.ForeColor = Color.Black + Dim oCountElement = New TileItemElement With { + .Text = "Anzahl Objekte: " & pCount_Obj, + .TextAlignment = TileItemContentAlignment.BottomRight + } + Select Case oItem.ItemSize + Case TileItemSize.Wide + oCountElement.Appearance.Normal.Font = FontLargeNormal + oCountElement.Appearance.Normal.ForeColor = Color.White + Case Else + oCountElement.Appearance.Normal.Font = SecondaryFont + oCountElement.Appearance.Normal.ForeColor = Color.FromArgb(165, 36, 49) + End Select + oItem.Elements.Add(oCountElement) - oItem.Elements.Add(oCountElement) + Return oItem + Catch ex As Exception + Logger.Error(ex) + Return Nothing + End Try - Return oItem End Function Private Sub txtSearch_Enter(sender As Object, e As EventArgs) Handles txtSearch.GotFocus @@ -227,4 +262,38 @@ Public Class frmFlowSearch Private Sub frmFlowSearch_Load(sender As Object, e As EventArgs) Handles Me.Load TileControlMatch.Groups.Clear() End Sub + + Private Sub TileControlMatch_ItemClick(sender As Object, e As TileItemEventArgs) Handles TileControlMatch.ItemClick + Try + Dim oItem As TileItem = e.Item + Dim oItemTag = oItem.Tag + Dim oHandle As IOverlaySplashScreenHandle = Nothing + Dim oItemsFound As Boolean = False + Dim oSearchData = My.Application.Search + Dim oSplit = oItem.Tag.ToString.Split("|") + Try + oHandle = SplashScreenManager.ShowOverlayForm(Me) + + Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT_PER_TILE '{oSplit(0)}',{My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}'" + Dim oDTOBJECT_RESULT As DataTable = My.DatabaseIDB.GetDatatable(oEXECSQL) + If Not IsNothing(oDTOBJECT_RESULT) Then + oItemsFound = True + OpenResultForm(oDTOBJECT_RESULT) + End If + + + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical, Text) + Finally + SplashScreenManager.CloseOverlayForm(oHandle) + + End Try + Return oItemsFound + + + Catch ex As Exception + MsgBox($"Error while loading Searches: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, Text) + Logger.Error(ex) + End Try + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 3a53f9ea..9a5eac1d 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -400,14 +400,15 @@ Public Class frmFlowForm Cursor = Cursors.Default Exit Sub End If - Dim oSQL As String = "" + Dim oSQLFlowSearch As String = "" For Each oRow As DataRow In My.DTCOMMON_SQL.Rows - If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH1 Then - oSQL = oRow.Item("SQL_COMMAND") + If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_LOWER_LIMIT Then + oSQLFlowSearch = oRow.Item("SQL_COMMAND") End If Next - If oSQL <> String.Empty Then - Dim oForm As New frmFlowSearch(oSQL) + If oSQLFlowSearch <> String.Empty Then + oSQLFlowSearch = oSQLFlowSearch.Replace("@USER_ID", My.Application.User.UserId) + Dim oForm As New frmFlowSearch(oSQLFlowSearch) oForm.Show() oForm.BringToFront() End If