diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index d7153d26..c388b6a1 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -105,7 +105,8 @@ Public Class ClassInit oDataRow.Item("PASSWORD").ToString ) - My.DatabaseIDB = New MSSQLServer(My.LogConfig, oConString) + Dim oDecryptedConnectionString = MSSQLServer.DecryptConnectionString(oConString) + My.DatabaseIDB = New MSSQLServer(My.LogConfig, oDecryptedConnectionString) End If If My.DatabaseIDB.DBInitialized = False Then diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index 9a16001b..4b26483b 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,23 +1,24 @@ -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, 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.DateEdit, 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.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.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.ProgressBarControl, 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.LookUpEdit, 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.XtraBars.Navigation.TileNavPane, DevExpress.XtraBars.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.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TileControl, 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.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraSpreadsheet.SpreadsheetFormulaBar, DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.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.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.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.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TileControl, 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.ProgressBarControl, 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.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.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.Navigation.TileNavPane, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking2010.DocumentManager, 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.ComboBoxEdit, 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.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraSpreadsheet.SpreadsheetFormulaBar, DevExpress.XtraSpreadsheet.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 diff --git a/GUIs.ZooFlow/Search/frmSearchNeu.Designer.vb b/GUIs.ZooFlow/Search/frmSearchNeu.Designer.vb new file mode 100644 index 00000000..c5e53027 --- /dev/null +++ b/GUIs.ZooFlow/Search/frmSearchNeu.Designer.vb @@ -0,0 +1,477 @@ +Imports DevExpress.XtraEditors +Imports DevExpress.XtraGrid +Imports DevExpress.XtraGrid.Views.Grid + + +Partial Class frmSearchNeu + 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.cmbOperator = New DevExpress.XtraEditors.ComboBoxEdit() + Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() + Me.cmbMandator = New DevExpress.XtraEditors.ComboBoxEdit() + Me.lookupAttribute = New DevExpress.XtraEditors.SearchLookUpEdit() + Me.SearchLookUpEdit2View = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.lookupValue = New DevExpress.XtraEditors.SearchLookUpEdit() + Me.SearchLookUpEdit1View = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() + Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() + Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + Me.NavBarControl1 = New DevExpress.XtraNavBar.NavBarControl() + Me.NavBarGroup1 = New DevExpress.XtraNavBar.NavBarGroup() + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() + Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.colParenLeft = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colAttribute = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colOperator = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colValue = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colParenRight = New DevExpress.XtraGrid.Columns.GridColumn() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + CType(Me.cmbOperator.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.LayoutControl1.SuspendLayout() + CType(Me.cmbMandator.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lookupAttribute.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SearchLookUpEdit2View, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lookupValue.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SearchLookUpEdit1View, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.NavBarControl1, 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.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl3.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'cmbOperator + ' + Me.cmbOperator.Location = New System.Drawing.Point(410, 12) + Me.cmbOperator.Name = "cmbOperator" + Me.cmbOperator.Properties.Appearance.Font = New System.Drawing.Font("Tahoma", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbOperator.Properties.Appearance.Options.UseFont = True + Me.cmbOperator.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.cmbOperator.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor + Me.cmbOperator.Size = New System.Drawing.Size(234, 24) + Me.cmbOperator.StyleController = Me.LayoutControl1 + Me.cmbOperator.TabIndex = 1 + ' + 'LayoutControl1 + ' + Me.LayoutControl1.Controls.Add(Me.cmbMandator) + Me.LayoutControl1.Controls.Add(Me.lookupAttribute) + Me.LayoutControl1.Controls.Add(Me.lookupValue) + Me.LayoutControl1.Controls.Add(Me.cmbOperator) + Me.LayoutControl1.Controls.Add(Me.SimpleButton1) + Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.LayoutControl1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.Root = Me.Root + Me.LayoutControl1.Size = New System.Drawing.Size(984, 55) + Me.LayoutControl1.TabIndex = 8 + Me.LayoutControl1.Text = "LayoutControl1" + ' + 'cmbMandator + ' + Me.cmbMandator.EditValue = "Mandant" + Me.cmbMandator.Location = New System.Drawing.Point(12, 12) + Me.cmbMandator.Name = "cmbMandator" + Me.cmbMandator.Properties.Appearance.Font = New System.Drawing.Font("Tahoma", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.cmbMandator.Properties.Appearance.Options.UseFont = True + Me.cmbMandator.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.cmbMandator.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor + Me.cmbMandator.Size = New System.Drawing.Size(105, 24) + Me.cmbMandator.StyleController = Me.LayoutControl1 + Me.cmbMandator.TabIndex = 6 + ' + 'lookupAttribute + ' + Me.lookupAttribute.Location = New System.Drawing.Point(121, 12) + Me.lookupAttribute.Name = "lookupAttribute" + Me.lookupAttribute.Properties.Appearance.Font = New System.Drawing.Font("Tahoma", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lookupAttribute.Properties.Appearance.Options.UseFont = True + Me.lookupAttribute.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.lookupAttribute.Properties.NullText = "" + Me.lookupAttribute.Properties.PopupView = Me.SearchLookUpEdit2View + Me.lookupAttribute.Size = New System.Drawing.Size(285, 24) + Me.lookupAttribute.StyleController = Me.LayoutControl1 + Me.lookupAttribute.TabIndex = 5 + ' + 'SearchLookUpEdit2View + ' + Me.SearchLookUpEdit2View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.SearchLookUpEdit2View.Name = "SearchLookUpEdit2View" + Me.SearchLookUpEdit2View.OptionsSelection.EnableAppearanceFocusedCell = False + Me.SearchLookUpEdit2View.OptionsView.ShowGroupPanel = False + ' + 'lookupValue + ' + Me.lookupValue.EditValue = "" + Me.lookupValue.Location = New System.Drawing.Point(648, 12) + Me.lookupValue.Name = "lookupValue" + Me.lookupValue.Properties.Appearance.Font = New System.Drawing.Font("Tahoma", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lookupValue.Properties.Appearance.Options.UseFont = True + Me.lookupValue.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.lookupValue.Properties.CloseUpKey = New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.F5) + Me.lookupValue.Properties.NullText = "" + Me.lookupValue.Properties.PopupView = Me.SearchLookUpEdit1View + Me.lookupValue.Properties.ShowClearButton = False + Me.lookupValue.Properties.ShowFooter = False + Me.lookupValue.Size = New System.Drawing.Size(188, 24) + Me.lookupValue.StyleController = Me.LayoutControl1 + Me.lookupValue.TabIndex = 2 + ' + 'SearchLookUpEdit1View + ' + Me.SearchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.SearchLookUpEdit1View.Name = "SearchLookUpEdit1View" + Me.SearchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = False + Me.SearchLookUpEdit1View.OptionsView.ShowGroupPanel = False + ' + 'SimpleButton1 + ' + Me.SimpleButton1.Appearance.Font = New System.Drawing.Font("Tahoma", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.SimpleButton1.Appearance.Options.UseFont = True + Me.SimpleButton1.Location = New System.Drawing.Point(840, 12) + Me.SimpleButton1.Name = "SimpleButton1" + Me.SimpleButton1.Size = New System.Drawing.Size(115, 24) + Me.SimpleButton1.StyleController = Me.LayoutControl1 + Me.SimpleButton1.TabIndex = 7 + Me.SimpleButton1.Text = "SimpleButton1" + ' + 'Root + ' + Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.Root.GroupBordersVisible = False + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.EmptySpaceItem1, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem3}) + Me.Root.Name = "Root" + Me.Root.Size = New System.Drawing.Size(967, 58) + Me.Root.TextVisible = False + ' + 'LayoutControlItem1 + ' + Me.LayoutControlItem1.Control = Me.cmbMandator + Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem1.Name = "LayoutControlItem1" + Me.LayoutControlItem1.Size = New System.Drawing.Size(109, 28) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem1.TextVisible = False + ' + 'EmptySpaceItem1 + ' + Me.EmptySpaceItem1.AllowHotTrack = False + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 28) + Me.EmptySpaceItem1.Name = "EmptySpaceItem1" + Me.EmptySpaceItem1.Size = New System.Drawing.Size(828, 10) + Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) + ' + 'LayoutControlItem2 + ' + Me.LayoutControlItem2.Control = Me.lookupValue + Me.LayoutControlItem2.Location = New System.Drawing.Point(636, 0) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Size = New System.Drawing.Size(192, 28) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem2.TextVisible = False + ' + 'LayoutControlItem4 + ' + Me.LayoutControlItem4.Control = Me.lookupAttribute + Me.LayoutControlItem4.Location = New System.Drawing.Point(109, 0) + Me.LayoutControlItem4.Name = "LayoutControlItem4" + Me.LayoutControlItem4.Size = New System.Drawing.Size(289, 28) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem4.TextVisible = False + ' + 'LayoutControlItem3 + ' + Me.LayoutControlItem3.Control = Me.cmbOperator + Me.LayoutControlItem3.Location = New System.Drawing.Point(398, 0) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Size = New System.Drawing.Size(238, 28) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem3.TextVisible = False + ' + 'LayoutControlItem5 + ' + Me.LayoutControlItem5.Control = Me.SimpleButton1 + Me.LayoutControlItem5.Location = New System.Drawing.Point(828, 0) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Size = New System.Drawing.Size(119, 38) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem5.TextVisible = False + ' + 'NavBarControl1 + ' + Me.NavBarControl1.ActiveGroup = Me.NavBarGroup1 + Me.NavBarControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.NavBarControl1.Groups.AddRange(New DevExpress.XtraNavBar.NavBarGroup() {Me.NavBarGroup1}) + Me.NavBarControl1.Location = New System.Drawing.Point(0, 0) + Me.NavBarControl1.Name = "NavBarControl1" + Me.NavBarControl1.OptionsNavPane.ExpandedWidth = 163 + Me.NavBarControl1.Size = New System.Drawing.Size(163, 196) + Me.NavBarControl1.TabIndex = 4 + Me.NavBarControl1.Text = "NavBarControl1" + ' + 'NavBarGroup1 + ' + Me.NavBarGroup1.Caption = "NavBarGroup1" + Me.NavBarGroup1.Expanded = True + Me.NavBarGroup1.Name = "NavBarGroup1" + ' + 'SplitContainerControl1 + ' + Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerControl1.Name = "SplitContainerControl1" + Me.SplitContainerControl1.Panel1.Controls.Add(Me.NavBarControl1) + Me.SplitContainerControl1.Panel1.Text = "Panel1" + Me.SplitContainerControl1.Panel2.Text = "Panel2" + Me.SplitContainerControl1.Size = New System.Drawing.Size(984, 196) + Me.SplitContainerControl1.SplitterPosition = 163 + Me.SplitContainerControl1.TabIndex = 7 + ' + 'SplitContainerControl2 + ' + Me.SplitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl2.Horizontal = False + Me.SplitContainerControl2.Location = New System.Drawing.Point(0, 89) + Me.SplitContainerControl2.Name = "SplitContainerControl2" + Me.SplitContainerControl2.Panel1.Controls.Add(Me.SplitContainerControl3) + Me.SplitContainerControl2.Panel1.Text = "Panel1" + Me.SplitContainerControl2.Panel2.Controls.Add(Me.SplitContainerControl1) + Me.SplitContainerControl2.Panel2.Text = "Panel2" + Me.SplitContainerControl2.Size = New System.Drawing.Size(984, 496) + Me.SplitContainerControl2.SplitterPosition = 290 + Me.SplitContainerControl2.TabIndex = 8 + ' + 'SplitContainerControl3 + ' + Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl3.Horizontal = False + Me.SplitContainerControl3.IsSplitterFixed = True + Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 0) + Me.SplitContainerControl3.Name = "SplitContainerControl3" + Me.SplitContainerControl3.Panel1.Controls.Add(Me.LayoutControl1) + Me.SplitContainerControl3.Panel1.Text = "Panel1" + Me.SplitContainerControl3.Panel2.Controls.Add(Me.GridControl1) + Me.SplitContainerControl3.Panel2.Text = "Panel2" + Me.SplitContainerControl3.Size = New System.Drawing.Size(984, 290) + Me.SplitContainerControl3.SplitterPosition = 55 + Me.SplitContainerControl3.TabIndex = 9 + ' + '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.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(984, 225) + Me.GridControl1.TabIndex = 8 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colParenLeft, Me.colAttribute, Me.colOperator, Me.colValue, Me.colParenRight}) + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'colParenLeft + ' + Me.colParenLeft.Caption = "(" + Me.colParenLeft.Name = "colParenLeft" + Me.colParenLeft.Visible = True + Me.colParenLeft.VisibleIndex = 0 + ' + 'colAttribute + ' + Me.colAttribute.Caption = "Attribut" + Me.colAttribute.Name = "colAttribute" + Me.colAttribute.Visible = True + Me.colAttribute.VisibleIndex = 1 + ' + 'colOperator + ' + Me.colOperator.Caption = "Operand" + Me.colOperator.Name = "colOperator" + Me.colOperator.Visible = True + Me.colOperator.VisibleIndex = 2 + ' + 'colValue + ' + Me.colValue.Caption = "Wert" + Me.colValue.Name = "colValue" + Me.colValue.Visible = True + Me.colValue.VisibleIndex = 3 + ' + 'colParenRight + ' + Me.colParenRight.Caption = ")" + Me.colParenRight.Name = "colParenRight" + Me.colParenRight.Visible = True + Me.colParenRight.VisibleIndex = 4 + ' + 'RibbonControl1 + ' + Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 2 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.Size = New System.Drawing.Size(984, 89) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "BarButtonItem1" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 585) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(984, 24) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'frmSearchNeu + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(984, 609) + Me.Controls.Add(Me.SplitContainerControl2) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.Name = "frmSearchNeu" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "frmSearchNeu" + CType(Me.cmbOperator.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.LayoutControl1.ResumeLayout(False) + CType(Me.cmbMandator.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lookupAttribute.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SearchLookUpEdit2View, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lookupValue.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SearchLookUpEdit1View, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.NavBarControl1, 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.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl3.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents cmbOperator As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents lookupValue As DevExpress.XtraEditors.SearchLookUpEdit + Friend WithEvents SearchLookUpEdit1View As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents NavBarControl1 As DevExpress.XtraNavBar.NavBarControl + Friend WithEvents NavBarGroup1 As DevExpress.XtraNavBar.NavBarGroup + Friend WithEvents lookupAttribute As SearchLookUpEdit + Friend WithEvents SearchLookUpEdit2View As GridView + Friend WithEvents cmbMandator As ComboBoxEdit + Friend WithEvents SplitContainerControl1 As SplitContainerControl + Friend WithEvents SplitContainerControl2 As SplitContainerControl + Friend WithEvents SplitContainerControl3 As SplitContainerControl + Friend WithEvents GridControl1 As GridControl + Friend WithEvents GridView1 As GridView + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl + Friend WithEvents SimpleButton1 As SimpleButton + Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem + Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents colParenLeft As Columns.GridColumn + Friend WithEvents colAttribute As Columns.GridColumn + Friend WithEvents colOperator As Columns.GridColumn + Friend WithEvents colValue As Columns.GridColumn + Friend WithEvents colParenRight As Columns.GridColumn +End Class diff --git a/GUIs.ZooFlow/Search/frmSearchNeu.resx b/GUIs.ZooFlow/Search/frmSearchNeu.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/GUIs.ZooFlow/Search/frmSearchNeu.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmSearchNeu.vb b/GUIs.ZooFlow/Search/frmSearchNeu.vb new file mode 100644 index 00000000..741ebcb6 --- /dev/null +++ b/GUIs.ZooFlow/Search/frmSearchNeu.vb @@ -0,0 +1,32 @@ +Imports DevExpress.XtraEditors + +Public Class frmSearchNeu + Public Class Attribute + Public Name As String + + Public Overrides Function ToString() As String + Return Name + End Function + End Class + + Private Sub frmSearchNeu_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim oSQL As String = "SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE DEFAULT_SEARCH_ATTRIBUTE = 1 AND LANG_CODE = 'de-DE'" + Dim oAttributeList As DataTable = My.DatabaseIDB.GetDatatable(oSQL) + + Dim oAttributes As New List(Of Attribute) + For Each oRow As DataRow In oAttributeList.Rows + Dim oAttr = New Attribute With {.Name = oRow.Item("ATTR_TITLE")} + oAttributes.Add(oAttr) + + cmbOperator.Properties.Items.Add(oAttr) + cmbOperator.Properties.Items.Add(oAttr) + Next + + lookupValue.Properties.DataSource = oAttributes + lookupValue.Properties.DisplayMember = "TITLE" + + + lookupValue.Properties.DataSource = oAttributes + lookupValue.Properties.DisplayMember = "TITLE" + End Sub +End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 3cbc7293..16e3edcf 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -285,6 +285,12 @@ Form + + frmSearchNeu.vb + + + Form + frmSearchPredefined.vb @@ -335,6 +341,7 @@ True Application.myapp + True @@ -392,6 +399,9 @@ frmGlobix_Index.vb + + frmSearchNeu.vb + frmSearchPredefined.vb diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 5f044837..8f18b43f 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -206,9 +206,8 @@ Public Class frmFlowForm AddHandler Watcher.ClipboardChanged, AddressOf Watcher_ClipboardChanged Dim oSQL = My.Queries.Common.FNIDB_GET_SEARCH_PROFILES(My.Application.User.UserId, My.Application.User.Language) - Dim oDatatable As DataTable = My.DatabaseIDB.GetDatatable(oSQL) + Dim oDatatable As DataTable = My.DatabaseIDB.GetDatatable(oSql) PictureBoxSearch1.Visible = False - If Not IsNothing(oDatatable) OrElse oDatatable.Rows.Count > 0 Then IDBSearchActive = True DTIDB_SEARCHES = oDatatable @@ -256,8 +255,6 @@ Public Class frmFlowForm Logger.Info("Clipboard Watcher Module is not active. Hotkey Monitoring will be disabled!") End If - - If My.Application.ModulesActive.Contains(MODULE_GLOBAL_INDEXER) Then FileDrop = New ClassFileDrop(My.LogConfig) FileHandle = New ClassFilehandle() @@ -403,7 +400,7 @@ Public Class frmFlowForm Logger.Debug("OnEvent called!") End Sub Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click - frmSearch2021.Show() + frmSearchNeu.Show() 'Open_FlowSearch() End Sub diff --git a/Modules.Database/Adapters/MSSQLServer.vb b/Modules.Database/Adapters/MSSQLServer.vb index 910ee5b2..5f8daebe 100644 --- a/Modules.Database/Adapters/MSSQLServer.vb +++ b/Modules.Database/Adapters/MSSQLServer.vb @@ -225,7 +225,7 @@ Public Class MSSQLServer ''' ''' ''' - + ' Private Function OpenSQLConnection(Connection As SqlConnection) As SqlConnection If Connection.State = ConnectionState.Closed Then Connection.Open() @@ -234,12 +234,12 @@ Public Class MSSQLServer Return Connection End Function - + ' Private Function GetSQLConnection() As SqlConnection Return GetConnection(CurrentSQLConnectionString) End Function - + ' Private Function GetConnection(ConnectionString As String) As SqlConnection Try Dim oConnection As New SqlConnection(ConnectionString) @@ -272,7 +272,7 @@ Public Class MSSQLServer End Try End Function - + ' Public Function GetDatatable(SqlCommand As String) As DataTable Implements IDatabase.GetDatatable Return GetDatatable(SqlCommand, _Timeout) End Function @@ -282,33 +282,33 @@ Public Class MSSQLServer ''' ''' sqlcommand for datatable (select XYZ from TableORView) ''' Returns a datatable - + ' Public Function GetDatatable(SqlCommand As String, Timeout As Integer) As DataTable Implements IDatabase.GetDatatable Using oSqlConnection = GetSQLConnection() Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.WithTransaction, Nothing, Timeout) End Using End Function - + ' Public Function GetDatatable(SqlCommand As String, Transaction As SqlTransaction, Optional Timeout As Integer = 120) As DataTable Using oSqlConnection = GetSQLConnection() Return GetDatatableWithConnectionObject(SqlCommand, oSqlConnection, TransactionMode.ExternalTransaction, Transaction, Timeout) End Using End Function - + ' Public Async Function GetDatatableAsync(SqlCommand As String, Optional Timeout As Integer = 120) As Task(Of DataTable) Return Await Task.Run(Function() GetDatatable(SqlCommand, Timeout)) End Function - + ' Public Function GetDatatableWithConnection(SqlCommand As String, ConnectionString As String, Optional Timeout As Integer = 120) As DataTable Using oConnection = GetConnection(ConnectionString) Return GetDatatableWithConnectionObject(SqlCommand, oConnection, Timeout:=Timeout) End Using End Function - + ' Public Function GetDatatableWithConnectionObject(SqlCommand As String, SqlConnection As SqlConnection, Optional TransactionMode As TransactionMode = TransactionMode.WithTransaction, Optional Transaction As SqlTransaction = Nothing, diff --git a/Modules.Patterns/Modules/BaseModule.vb b/Modules.Patterns/Modules/BaseModule.vb index 39ca4da4..172bc770 100644 --- a/Modules.Patterns/Modules/BaseModule.vb +++ b/Modules.Patterns/Modules/BaseModule.vb @@ -3,7 +3,7 @@ Imports System.Text.RegularExpressions Namespace [PatternModule] Public Class BaseModule - Private ReadOnly Logger As Logger + Friend ReadOnly Logger As Logger Private ReadOnly MyRegex As Regex = New Regex("{#(\w+)#([\:\.\w\s_-]+)}+") Private ReadOnly SqlPhrases As New List(Of String) From { "SELECT ", "UPDATE ", "DELETE ", "EXEC "