From 4cf70e1c4e18c9d63731f4ea668840881d9947bd Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 26 Sep 2019 14:45:34 +0200 Subject: [PATCH] add documentresultlist form --- Common/Common.vbproj | 9 + Common/My Project/licenses.licx | 3 +- Common/frmDocumentResultList.Designer.vb | 212 +++++++++++++++++++++++ Common/frmDocumentResultList.resx | 120 +++++++++++++ Common/frmDocumentResultList.vb | 13 ++ Common/frmResult.vb | 8 +- ZooFlow/frmAdmin.vb | 10 -- 7 files changed, 361 insertions(+), 14 deletions(-) create mode 100644 Common/frmDocumentResultList.Designer.vb create mode 100644 Common/frmDocumentResultList.resx create mode 100644 Common/frmDocumentResultList.vb diff --git a/Common/Common.vbproj b/Common/Common.vbproj index 7aae032a..e4d04fb0 100644 --- a/Common/Common.vbproj +++ b/Common/Common.vbproj @@ -82,6 +82,12 @@ + + frmDocumentResultList.vb + + + Form + frmResult.vb @@ -106,6 +112,9 @@ + + frmDocumentResultList.vb + frmResult.vb diff --git a/Common/My Project/licenses.licx b/Common/My Project/licenses.licx index 2658b273..b98ddda4 100644 --- a/Common/My Project/licenses.licx +++ b/Common/My Project/licenses.licx @@ -1,2 +1,3 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/Common/frmDocumentResultList.Designer.vb b/Common/frmDocumentResultList.Designer.vb new file mode 100644 index 00000000..044f131a --- /dev/null +++ b/Common/frmDocumentResultList.Designer.vb @@ -0,0 +1,212 @@ + _ +Partial Class frmDocumentResultList + Inherits DevExpress.XtraBars.Ribbon.RibbonForm + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridControl2 = New DevExpress.XtraGrid.GridControl() + Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridControl3 = New DevExpress.XtraGrid.GridControl() + Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.BarToggleSwitchItem1 = New DevExpress.XtraBars.BarToggleSwitchItem() + Me.BarToggleSwitchItem2 = New DevExpress.XtraBars.BarToggleSwitchItem() + CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.SuspendLayout() + CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl2.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'RibbonControl + ' + Me.RibbonControl.ExpandCollapseItem.Id = 0 + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarToggleSwitchItem1, Me.BarToggleSwitchItem2}) + Me.RibbonControl.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl.MaxItemId = 3 + Me.RibbonControl.Name = "RibbonControl" + Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl.Size = New System.Drawing.Size(1189, 143) + Me.RibbonControl.StatusBar = Me.RibbonStatusBar + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItem2) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Layout" + ' + 'RibbonStatusBar + ' + Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 640) + Me.RibbonStatusBar.Name = "RibbonStatusBar" + Me.RibbonStatusBar.Ribbon = Me.RibbonControl + Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 31) + ' + 'SplitContainerControl1 + ' + Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 143) + Me.SplitContainerControl1.Name = "SplitContainerControl1" + Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControl1) + Me.SplitContainerControl1.Panel1.Text = "Panel1" + Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2) + Me.SplitContainerControl1.Panel2.Text = "Panel2" + Me.SplitContainerControl1.Size = New System.Drawing.Size(1189, 497) + Me.SplitContainerControl1.SplitterPosition = 531 + Me.SplitContainerControl1.TabIndex = 2 + Me.SplitContainerControl1.Text = "SplitContainerControl1" + ' + 'SplitContainerControl2 + ' + Me.SplitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl2.Horizontal = False + Me.SplitContainerControl2.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerControl2.Name = "SplitContainerControl2" + Me.SplitContainerControl2.Panel1.Controls.Add(Me.GridControl2) + Me.SplitContainerControl2.Panel1.Text = "Panel1" + Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3) + Me.SplitContainerControl2.Panel2.Text = "Panel2" + Me.SplitContainerControl2.Size = New System.Drawing.Size(653, 497) + Me.SplitContainerControl2.SplitterPosition = 223 + Me.SplitContainerControl2.TabIndex = 0 + Me.SplitContainerControl2.Text = "SplitContainerControl2" + ' + 'GridControl1 + ' + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl1.Location = New System.Drawing.Point(0, 0) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.MenuManager = Me.RibbonControl + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(531, 497) + Me.GridControl1.TabIndex = 0 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'GridControl2 + ' + Me.GridControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl2.Location = New System.Drawing.Point(0, 0) + Me.GridControl2.MainView = Me.GridView2 + Me.GridControl2.MenuManager = Me.RibbonControl + Me.GridControl2.Name = "GridControl2" + Me.GridControl2.Size = New System.Drawing.Size(653, 223) + Me.GridControl2.TabIndex = 0 + Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) + ' + 'GridView2 + ' + Me.GridView2.GridControl = Me.GridControl2 + Me.GridView2.Name = "GridView2" + ' + 'GridControl3 + ' + Me.GridControl3.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl3.Location = New System.Drawing.Point(0, 0) + Me.GridControl3.MainView = Me.GridView3 + Me.GridControl3.MenuManager = Me.RibbonControl + Me.GridControl3.Name = "GridControl3" + Me.GridControl3.Size = New System.Drawing.Size(653, 269) + Me.GridControl3.TabIndex = 0 + Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) + ' + 'GridView3 + ' + Me.GridView3.GridControl = Me.GridControl3 + Me.GridView3.Name = "GridView3" + ' + 'BarToggleSwitchItem1 + ' + Me.BarToggleSwitchItem1.Caption = "BarToggleSwitchItem1" + Me.BarToggleSwitchItem1.Id = 1 + Me.BarToggleSwitchItem1.Name = "BarToggleSwitchItem1" + ' + 'BarToggleSwitchItem2 + ' + Me.BarToggleSwitchItem2.Caption = "BarToggleSwitchItem2" + Me.BarToggleSwitchItem2.Id = 2 + Me.BarToggleSwitchItem2.Name = "BarToggleSwitchItem2" + ' + 'frmDocumentResultList + ' + 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) + Me.Controls.Add(Me.SplitContainerControl1) + Me.Controls.Add(Me.RibbonStatusBar) + Me.Controls.Add(Me.RibbonControl) + Me.Name = "frmDocumentResultList" + Me.Ribbon = Me.RibbonControl + Me.StatusBar = Me.RibbonStatusBar + Me.Text = "frmDocumentResultList" + CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.ResumeLayout(False) + CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl2.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents BarToggleSwitchItem1 As DevExpress.XtraBars.BarToggleSwitchItem + Friend WithEvents BarToggleSwitchItem2 As DevExpress.XtraBars.BarToggleSwitchItem + Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents SplitContainerControl2 As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents GridControl3 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView3 As DevExpress.XtraGrid.Views.Grid.GridView + +End Class diff --git a/Common/frmDocumentResultList.resx b/Common/frmDocumentResultList.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/Common/frmDocumentResultList.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Common/frmDocumentResultList.vb b/Common/frmDocumentResultList.vb new file mode 100644 index 00000000..cb9c535e --- /dev/null +++ b/Common/frmDocumentResultList.vb @@ -0,0 +1,13 @@ +Public Class frmDocumentResultList + Private Sub frmDocumentResultList_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub + + Private Sub BarToggleSwitchItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarToggleSwitchItem1.CheckedChanged + SplitContainerControl1.Horizontal = BarToggleSwitchItem1.Checked + End Sub + + Private Sub BarToggleSwitchItem2_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarToggleSwitchItem2.CheckedChanged + SplitContainerControl2.Horizontal = BarToggleSwitchItem2.Checked + End Sub +End Class \ No newline at end of file diff --git a/Common/frmResult.vb b/Common/frmResult.vb index d2741ca3..be8bc841 100644 --- a/Common/frmResult.vb +++ b/Common/frmResult.vb @@ -73,9 +73,7 @@ Public Class frmResult Return Await Task.Run(AddressOf DoLoadDocumentSearches) End Function - Private Async Function LoadDataSearchesAsync() As Task(Of List(Of Search)) - Return Await Task.Run(AddressOf DoLoadDataSearches) - End Function + Private Function DoLoadDocumentSearches() As List(Of Search) Dim oMatchingIds = String.Join(",", _MatchingProfiles.Select(Function(p) p.Guid).ToArray()) @@ -111,6 +109,10 @@ Public Class frmResult Return oDocSearches End Function + Private Async Function LoadDataSearchesAsync() As Task(Of List(Of Search)) + Return Await Task.Run(AddressOf DoLoadDataSearches) + End Function + Private Function DoLoadDataSearches() As List(Of Search) Dim oMatchingIds = String.Join(",", _MatchingProfiles.Select(Function(p) p.Guid).ToArray()) Dim oSQL As String = $"SELECT * FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({oMatchingIds}) ORDER BY TAB_INDEX" diff --git a/ZooFlow/frmAdmin.vb b/ZooFlow/frmAdmin.vb index 7fede0f5..930d9a88 100644 --- a/ZooFlow/frmAdmin.vb +++ b/ZooFlow/frmAdmin.vb @@ -71,16 +71,6 @@ Partial Public Class frmAdmin FlowForm = New frmFlowForm(My.Application.ModulesActive) FlowForm.Show() - Dim oModuleItemsIndex = 0 - ' === Setup Notification Icon - For Each oItem As ToolStripItem In ContextMenuStripMain.Items - If oItem.Tag IsNot Nothing AndAlso oItem.Tag.ToString = "MODULE_ITEM_START" Then - oModuleItemsIndex = ContextMenuStripMain.Items.IndexOf(oItem) - Exit For - End If - Next - ContextMenuStripMain.Items.Insert(oModuleItemsIndex + 1, New ToolStripMenuItem("Test")) - ' === Load Data === RefreshData() End Sub