diff --git a/GUIs.ZooFlow/frmSearchStart.Designer.vb b/GUIs.ZooFlow/frmSearchStart.Designer.vb index 2fa42d67..41bc0a95 100644 --- a/GUIs.ZooFlow/frmSearchStart.Designer.vb +++ b/GUIs.ZooFlow/frmSearchStart.Designer.vb @@ -47,12 +47,12 @@ Partial Class frmSearchStart Me.SwitchFilter = New DevExpress.XtraBars.BarToggleSwitchItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroupProfiles = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupFilter = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.RepositoryItemTimeSpanEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTimeSpanEdit() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.Panel1 = New System.Windows.Forms.Panel() + Me.pnlProfileChoose = New System.Windows.Forms.Panel() Me.cmbProfile = New System.Windows.Forms.ComboBox() Me.Label1 = New System.Windows.Forms.Label() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() @@ -66,13 +66,11 @@ Partial Class frmSearchStart Me.XtraTabPage8 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage9 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage10 = New DevExpress.XtraTab.XtraTabPage() - Me.GridControlSerchTerms = New DevExpress.XtraGrid.GridControl() Me.ContextMenuStripSearchTerms = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.tsmOperator = New System.Windows.Forms.ToolStripMenuItem() Me.BracketLeftToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.KlammerRechtsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.KlammerEntfernenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() - Me.GridViewSearchTerms = New DevExpress.XtraGrid.Views.Grid.GridView() Me.SplitContainerControlSearch = New DevExpress.XtraEditors.SplitContainerControl() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemRadioGroup1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -84,12 +82,10 @@ Partial Class frmSearchStart CType(Me.RepositoryItemComboBox2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTimeSpanEdit1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.Panel1.SuspendLayout() + Me.pnlProfileChoose.SuspendLayout() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() - CType(Me.GridControlSerchTerms, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStripSearchTerms.SuspendLayout() - CType(Me.GridViewSearchTerms, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControlSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControlSearch.SuspendLayout() Me.SuspendLayout() @@ -244,7 +240,7 @@ Partial Class frmSearchStart ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroupFilter}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupProfiles, Me.RibbonPageGroupFilter}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -258,12 +254,12 @@ Partial Class frmSearchStart Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Suchfunktionen" ' - 'RibbonPageGroup2 + 'RibbonPageGroupProfiles ' - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarStaticItem1) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarEditItem2) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "Auswahl Suche" + Me.RibbonPageGroupProfiles.ItemLinks.Add(Me.BarStaticItem1) + Me.RibbonPageGroupProfiles.ItemLinks.Add(Me.BarEditItem2) + Me.RibbonPageGroupProfiles.Name = "RibbonPageGroupProfiles" + Me.RibbonPageGroupProfiles.Text = "Auswahl Suche" ' 'RibbonPageGroupFilter ' @@ -293,18 +289,18 @@ Partial Class frmSearchStart Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 Me.RibbonStatusBar1.Size = New System.Drawing.Size(1070, 22) ' - 'Panel1 + 'pnlProfileChoose ' - Me.Panel1.BackColor = System.Drawing.Color.Transparent - Me.Panel1.Controls.Add(Me.cmbProfile) - Me.Panel1.Controls.Add(Me.Label1) - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Panel1.Location = New System.Drawing.Point(0, 159) - Me.Panel1.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1070, 57) - Me.Panel1.TabIndex = 5 + Me.pnlProfileChoose.BackColor = System.Drawing.Color.Transparent + Me.pnlProfileChoose.Controls.Add(Me.cmbProfile) + Me.pnlProfileChoose.Controls.Add(Me.Label1) + Me.pnlProfileChoose.Dock = System.Windows.Forms.DockStyle.Top + Me.pnlProfileChoose.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.pnlProfileChoose.Location = New System.Drawing.Point(0, 159) + Me.pnlProfileChoose.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.pnlProfileChoose.Name = "pnlProfileChoose" + Me.pnlProfileChoose.Size = New System.Drawing.Size(1070, 57) + Me.pnlProfileChoose.TabIndex = 5 ' 'cmbProfile ' @@ -335,20 +331,20 @@ Partial Class frmSearchStart Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.Size = New System.Drawing.Size(750, 363) + Me.XtraTabControl1.Size = New System.Drawing.Size(1070, 363) Me.XtraTabControl1.TabIndex = 12 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2, Me.XtraTabPage3, Me.XtraTabPage4, Me.XtraTabPage5, Me.XtraTabPage6, Me.XtraTabPage7, Me.XtraTabPage8, Me.XtraTabPage9, Me.XtraTabPage10}) ' 'XtraTabPage1 ' Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(748, 340) + Me.XtraTabPage1.Size = New System.Drawing.Size(1068, 340) Me.XtraTabPage1.Text = "Search#1" ' 'XtraTabPage2 ' Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(748, 340) + Me.XtraTabPage2.Size = New System.Drawing.Size(1068, 340) Me.XtraTabPage2.Text = "Search#2" ' 'XtraTabPage3 @@ -399,18 +395,6 @@ Partial Class frmSearchStart Me.XtraTabPage10.Size = New System.Drawing.Size(748, 340) Me.XtraTabPage10.Text = "Search#10" ' - 'GridControlSerchTerms - ' - Me.GridControlSerchTerms.ContextMenuStrip = Me.ContextMenuStripSearchTerms - Me.GridControlSerchTerms.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControlSerchTerms.Location = New System.Drawing.Point(0, 0) - Me.GridControlSerchTerms.MainView = Me.GridViewSearchTerms - Me.GridControlSerchTerms.MenuManager = Me.RibbonControl1 - Me.GridControlSerchTerms.Name = "GridControlSerchTerms" - Me.GridControlSerchTerms.Size = New System.Drawing.Size(310, 363) - Me.GridControlSerchTerms.TabIndex = 15 - Me.GridControlSerchTerms.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSearchTerms}) - ' 'ContextMenuStripSearchTerms ' Me.ContextMenuStripSearchTerms.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmOperator, Me.BracketLeftToolStripMenuItem, Me.KlammerRechtsToolStripMenuItem, Me.KlammerEntfernenToolStripMenuItem}) @@ -441,22 +425,9 @@ Partial Class frmSearchStart Me.KlammerEntfernenToolStripMenuItem.Size = New System.Drawing.Size(176, 22) Me.KlammerEntfernenToolStripMenuItem.Text = "Klammer entfernen" ' - 'GridViewSearchTerms - ' - Me.GridViewSearchTerms.Appearance.EvenRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(236, Byte), Integer), CType(CType(233, Byte), Integer), CType(CType(125, Byte), Integer)) - Me.GridViewSearchTerms.Appearance.EvenRow.Options.UseBackColor = True - Me.GridViewSearchTerms.GridControl = Me.GridControlSerchTerms - Me.GridViewSearchTerms.Name = "GridViewSearchTerms" - Me.GridViewSearchTerms.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[True] - Me.GridViewSearchTerms.OptionsBehavior.Editable = False - Me.GridViewSearchTerms.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridViewSearchTerms.OptionsView.EnableAppearanceEvenRow = True - Me.GridViewSearchTerms.OptionsView.ShowGroupPanel = False - Me.GridViewSearchTerms.OptionsView.ShowViewCaption = True - Me.GridViewSearchTerms.ViewCaption = "Such-Kriterium" - ' 'SplitContainerControlSearch ' + Me.SplitContainerControlSearch.Collapsed = True Me.SplitContainerControlSearch.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 Me.SplitContainerControlSearch.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainerControlSearch.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2 @@ -464,8 +435,8 @@ Partial Class frmSearchStart Me.SplitContainerControlSearch.Name = "SplitContainerControlSearch" Me.SplitContainerControlSearch.Panel1.Controls.Add(Me.XtraTabControl1) Me.SplitContainerControlSearch.Panel1.Text = "Panel1" - Me.SplitContainerControlSearch.Panel2.Controls.Add(Me.GridControlSerchTerms) Me.SplitContainerControlSearch.Panel2.Text = "Panel2" + Me.SplitContainerControlSearch.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel1 Me.SplitContainerControlSearch.Size = New System.Drawing.Size(1070, 363) Me.SplitContainerControlSearch.SplitterPosition = 310 Me.SplitContainerControlSearch.TabIndex = 16 @@ -478,7 +449,7 @@ Partial Class frmSearchStart Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1070, 601) Me.Controls.Add(Me.SplitContainerControlSearch) - Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.pnlProfileChoose) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.Font = New System.Drawing.Font("Tahoma", 8.25!) @@ -499,13 +470,11 @@ Partial Class frmSearchStart CType(Me.RepositoryItemComboBox2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemTimeSpanEdit1, System.ComponentModel.ISupportInitialize).EndInit() - Me.Panel1.ResumeLayout(False) - Me.Panel1.PerformLayout() + Me.pnlProfileChoose.ResumeLayout(False) + Me.pnlProfileChoose.PerformLayout() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl1.ResumeLayout(False) - CType(Me.GridControlSerchTerms, System.ComponentModel.ISupportInitialize).EndInit() Me.ContextMenuStripSearchTerms.ResumeLayout(False) - CType(Me.GridViewSearchTerms, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControlSearch, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControlSearch.ResumeLayout(False) Me.ResumeLayout(False) @@ -517,7 +486,7 @@ End Sub Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar - Friend WithEvents Panel1 As Panel + Friend WithEvents pnlProfileChoose As Panel Friend WithEvents cmbProfile As ComboBox Friend WithEvents Label1 As Label Friend WithEvents BarButtonItemNewSearch As DevExpress.XtraBars.BarButtonItem @@ -538,12 +507,10 @@ End Sub Friend WithEvents RepositoryItemRadioGroup1 As DevExpress.XtraEditors.Repository.RepositoryItemRadioGroup Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents GridControlSerchTerms As DevExpress.XtraGrid.GridControl - Friend WithEvents GridViewSearchTerms As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents SplitContainerControlSearch As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents BarEditItem2 As DevExpress.XtraBars.BarEditItem Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupProfiles As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarStaticItemInfo As DevExpress.XtraBars.BarStaticItem Friend WithEvents ContextMenuStripSearchTerms As ContextMenuStrip Friend WithEvents tsmOperator As ToolStripMenuItem diff --git a/GUIs.ZooFlow/frmSearchStart.vb b/GUIs.ZooFlow/frmSearchStart.vb index e9eeeb05..1413bd4d 100644 --- a/GUIs.ZooFlow/frmSearchStart.vb +++ b/GUIs.ZooFlow/frmSearchStart.vb @@ -22,7 +22,7 @@ Public Class frmSearchStart Public DataLoaded As Boolean = False Private Const DEFAULT_X As Integer = 10 Private Const DEFAULT_Y As Integer = 10 - Private DTSearchTerms As DataTable + 'Private DTSearchTerms As DataTable Private oDTAttributes As DataTable Private SEARCH_COUNT As Integer = 0 Private _Environment As Environment @@ -47,12 +47,12 @@ Public Class frmSearchStart oSearchTerms.Columns.Add("SearchTerm", GetType(String)) oSearchTerms.Columns.Add("BracketRight", GetType(String)) oSearchTerms.Columns.Add("Operator", GetType(String)) - DTSearchTerms = oSearchTerms + 'DTSearchTerms = oSearchTerms End Sub Private Sub frmSearchStart_Load(sender As Object, e As EventArgs) Handles Me.Load Try - Me.Panel1.Visible = False + Me.pnlProfileChoose.Visible = False For Each oTab As XtraTabPage In XtraTabControl1.TabPages oTab.PageVisible = False Next @@ -81,12 +81,14 @@ Public Class frmSearchStart cmbProfile.SelectedIndex = -1 TabSelectedIndex = -1 - Me.Panel1.Visible = True + Me.pnlProfileChoose.Visible = True For Each orow As DataRow In DTSearchProfiles.Rows RepositoryItemComboBox1.Items.Add(orow.Item("TITLE")) Next - + Me.pnlProfileChoose.Visible = True Else + Me.pnlProfileChoose.Visible = False + RibbonPageGroupProfiles.Visible = False TabSelectedIndex = 0 TabSelected = XtraTabControl1.TabPages(0) TabSelected.PageVisible = True @@ -112,66 +114,60 @@ Public Class frmSearchStart End Sub - Public Sub AddSearchAttribute(pAttributeId As String, pAttributeTitle As String, pSearchTerm As String, Optional pCriteria As String = "=") - GridControlSerchTerms.DataSource = Nothing - Dim oMultiselect As Boolean = False - For Each oRow As DataRow In oDTAttributes.Rows - If oRow.Item("ATTRIBUTE_ID") = pAttributeId Then - oMultiselect = CBool(oRow.Item("MULTISELECT")) - Exit For - End If - Next - If oMultiselect = False Then - For Each oSearchTerm As DataRow In DTSearchTerms.Rows - If oSearchTerm.Item("AttrID") = pAttributeId Then 'And oSearchTerm.Item("Criteria") = pCriteria And oSearchTerm.Item("SearchTerm") = pSearchTerm - oSearchTerm.Delete() - End If - Next - End If + 'Public Sub AddSearchAttribute(pAttributeId As String, pAttributeTitle As String, pSearchTerm As String, Optional pCriteria As String = "=") + ' GridControlSerchTerms.DataSource = Nothing + ' Dim oMultiselect As Boolean = False + ' For Each oRow As DataRow In oDTAttributes.Rows + ' If oRow.Item("ATTRIBUTE_ID") = pAttributeId Then + ' oMultiselect = CBool(oRow.Item("MULTISELECT")) + ' Exit For + ' End If + ' Next + ' If oMultiselect = False Then + ' For Each oSearchTerm As DataRow In DTSearchTerms.Rows + ' If oSearchTerm.Item("AttrID") = pAttributeId Then 'And oSearchTerm.Item("Criteria") = pCriteria And oSearchTerm.Item("SearchTerm") = pSearchTerm + ' oSearchTerm.Delete() + ' End If + ' Next + ' End If - DTSearchTerms.Rows.Add("", pAttributeId, pAttributeTitle, pCriteria, pSearchTerm, "", "and") - RenewBinding_DTSearchTerms() + ' DTSearchTerms.Rows.Add("", pAttributeId, pAttributeTitle, pCriteria, pSearchTerm, "", "and") + ' RenewBinding_DTSearchTerms() - If SplitContainerControlSearch.Collapsed = True Then - SplitContainerControlSearch.Collapsed = False - End If + ' If SplitContainerControlSearch.Collapsed = True Then + ' SplitContainerControlSearch.Collapsed = False + ' End If - End Sub - Sub RenewBinding_DTSearchTerms() - DTSearchTerms.AcceptChanges() - GridControlSerchTerms.DataSource = Nothing - GridControlSerchTerms.DataSource = DTSearchTerms - '"BracketLeft" - '"AttrID", GetType(Integer)) - '"AttrTitle" - '"Criteria" - '"SearchTerm" - '"BracketRight" - '"Operator" - GridViewSearchTerms.Columns("BracketLeft").Caption = "(" - GridViewSearchTerms.Columns("BracketRight").Caption = ")" - If My.Application.User.Language <> "de-DE" Then - GridViewSearchTerms.Columns("AttrTitle").Caption = "Attribute" - GridViewSearchTerms.Columns("Criteria").Caption = "Criteria" - Else - GridViewSearchTerms.Columns("AttrTitle").Caption = "Attribut" - GridViewSearchTerms.Columns("Criteria").Caption = "Bedingung" - End If + 'End Sub + 'Sub RenewBinding_DTSearchTerms() + ' DTSearchTerms.AcceptChanges() + ' GridControlSerchTerms.DataSource = Nothing + ' GridControlSerchTerms.DataSource = DTSearchTerms - End Sub + ' GridViewSearchTerms.Columns("BracketLeft").Caption = "(" + ' GridViewSearchTerms.Columns("BracketRight").Caption = ")" + ' If My.Application.User.Language <> "de-DE" Then + ' GridViewSearchTerms.Columns("AttrTitle").Caption = "Attribute" + ' GridViewSearchTerms.Columns("Criteria").Caption = "Criteria" + ' Else + ' GridViewSearchTerms.Columns("AttrTitle").Caption = "Attribut" + ' GridViewSearchTerms.Columns("Criteria").Caption = "Bedingung" + ' End If - Public Sub SearchAttribute(pAttrID As String, pAttrTitle As String, pSearchTerm As String, Optional pCriteria As String = "=") - '"BracketLeft" - '"AttrID", GetType(Integer)) - '"AttrTitle" - '"Criteria" - '"SearchTerm" - '"BracketRight" - '"Operator" - DTSearchTerms.Rows.Add("", pAttrID, pAttrTitle, pCriteria, pSearchTerm, "", "And") - DTSearchTerms.AcceptChanges() + 'End Sub - End Sub + 'Public Sub SearchAttribute(pAttrID As String, pAttrTitle As String, pSearchTerm As String, Optional pCriteria As String = "=") + ' '"BracketLeft" + ' '"AttrID", GetType(Integer)) + ' '"AttrTitle" + ' '"Criteria" + ' '"SearchTerm" + ' '"BracketRight" + ' '"Operator" + ' DTSearchTerms.Rows.Add("", pAttrID, pAttrTitle, pCriteria, pSearchTerm, "", "And") + ' DTSearchTerms.AcceptChanges() + + 'End Sub Sub Load_Search_Attributes() Try @@ -265,7 +261,7 @@ Public Class frmSearchStart If Not IsNothing(omyDTSource) Then If omyDTSource.Rows.Count = 1 Then oSingleResult = True - AddSearchAttribute(oAttriID, oAttriTitle, omyDTSource.Rows(0).Item(oAttriTitle).ToString) + ' AddSearchAttribute(oAttriID, oAttriTitle, omyDTSource.Rows(0).Item(oAttriTitle).ToString) End If End If @@ -318,22 +314,8 @@ Public Class frmSearchStart TabSelected.Controls.Add(lbl) End Sub - Private Sub WindowsUIButtonPanel1_ButtonClick(sender As Object, e As DevExpress.XtraBars.Docking2010.ButtonEventArgs) - Select Case e.Button.Properties.Tag.ToString - Case "Run" - RunSearch() - End Select - End Sub - Private Sub RunSearch() - Try - For Each oSearchTerm As DataRow In DTSearchTerms.Rows - Next - Catch ex As Exception - MsgBox("Unexpected Error in Clearing Search Items: " & ex.Message, MsgBoxStyle.Critical) - Logger.Error(ex) - End Try - End Sub + Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged TabSelected = XtraTabControl1.SelectedTabPage End Sub @@ -435,7 +417,7 @@ Public Class frmSearchStart Dim oAttrID = DirectCast(oCurrentControl.Tag, ClassControlCreator.ControlMetadata).AttrID Dim oAttrTitle = DirectCast(oCurrentControl.Tag, ClassControlCreator.ControlMetadata).AttrTitle RenewSearchAttributes() - AddSearchAttribute(oAttrID, oAttrTitle, oResult) + ' AddSearchAttribute(oAttrID, oAttrTitle, oResult) End If @@ -447,7 +429,7 @@ Public Class frmSearchStart Dim oAttrID = DirectCast(oCurrentCB.Tag, ClassControlCreator.ControlMetadata).AttrID Dim oAttrTitle = DirectCast(oCurrentCB.Tag, ClassControlCreator.ControlMetadata).AttrTitle RenewSearchAttributes() - AddSearchAttribute(oAttrID, oAttrTitle, oChecked.ToString) + ' AddSearchAttribute(oAttrID, oAttrTitle, oChecked.ToString) End Sub Private Sub frmSearchStart_Shown(sender As Object, e As EventArgs) Handles Me.Shown DataLoaded = True @@ -549,7 +531,7 @@ Public Class frmSearchStart Try 'Clear_token() ClearSearchCriteria() - DTSearchTerms.Clear() + 'DTSearchTerms.Clear() ClearSelectedControls() Catch ex As Exception MsgBox("Unexpected Error in Clearing Search Items: " & ex.Message, MsgBoxStyle.Critical) @@ -655,7 +637,7 @@ Public Class frmSearchStart BarStaticItemInfo.ItemAppearance.Normal.BackColor = pColor End Sub - Private Sub MehrfachauswahlAktivierenToolStripMenuItem_Click(sender As Object, e As EventArgs) + Private Sub MehrfachauswahlAktivierenToolStripMenuItem_Click(sender As Object, e As EventArgs) If DataLoaded = False Then Exit Sub Dim oCurrentControl As GridControl = DirectCast(CURR_CTRL_OBJ, GridControl) Dim oAttrID = DirectCast(oCurrentControl.Tag, ClassControlCreator.ControlMetadata).AttrID @@ -671,7 +653,7 @@ Public Class frmSearchStart - Private Sub MehrfachauswahlInaktivierenToolStripMenuItem_Click(sender As Object, e As EventArgs) + Private Sub MehrfachauswahlInaktivierenToolStripMenuItem_Click(sender As Object, e As EventArgs) If DataLoaded = False Then Exit Sub Dim oCurrentControl As GridControl = DirectCast(CURR_CTRL_OBJ, GridControl) Dim oAttrID = DirectCast(oCurrentControl.Tag, ClassControlCreator.ControlMetadata).AttrID @@ -685,7 +667,7 @@ Public Class frmSearchStart Next End Sub - Private Sub GridViewSearchTerms_RowDeleted(sender As Object, e As DevExpress.Data.RowDeletedEventArgs) Handles GridViewSearchTerms.RowDeleted + Private Sub GridViewSearchTerms_RowDeleted(sender As Object, e As DevExpress.Data.RowDeletedEventArgs) If DataLoaded = False Then Exit Sub Dim oCurrentView As GridView = DirectCast(sender, GridView) Dim oCurrentControl As GridControl = oCurrentView.GridControl @@ -700,116 +682,116 @@ Public Class frmSearchStart End If End Sub - Private Sub GridViewSearchTerms_KeyUp(sender As Object, e As KeyEventArgs) Handles GridViewSearchTerms.KeyUp - If e.KeyValue = Keys.Delete Then - Dim oSelectedRows As Integer() = GridViewSearchTerms.GetSelectedRows() - Dim oAttrID = GridViewSearchTerms.GetRowCellValue(oSelectedRows.Last(), GridViewSearchTerms.Columns("AttrID")) - Dim oSearchTerm = GridViewSearchTerms.GetRowCellValue(oSelectedRows.Last(), GridViewSearchTerms.Columns("SearchTerm")) - For Each dr As DataRow In DTSearchTerms.Rows - If dr.Item("AttrID") = oAttrID And dr.Item("SearchTerm") = oSearchTerm Then - dr.Delete() - Exit For - End If - Next - RenewBinding_DTSearchTerms() - End If - End Sub + 'Private Sub GridViewSearchTerms_KeyUp(sender As Object, e As KeyEventArgs) + ' If e.KeyValue = Keys.Delete Then + ' Dim oSelectedRows As Integer() = GridViewSearchTerms.GetSelectedRows() + ' Dim oAttrID = GridViewSearchTerms.GetRowCellValue(oSelectedRows.Last(), GridViewSearchTerms.Columns("AttrID")) + ' Dim oSearchTerm = GridViewSearchTerms.GetRowCellValue(oSelectedRows.Last(), GridViewSearchTerms.Columns("SearchTerm")) + ' For Each dr As DataRow In DTSearchTerms.Rows + ' If dr.Item("AttrID") = oAttrID And dr.Item("SearchTerm") = oSearchTerm Then + ' dr.Delete() + ' Exit For + ' End If + ' Next + ' RenewBinding_DTSearchTerms() + ' End If + 'End Sub - Private Sub ContextMenuStripSearchTerms_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStripSearchTerms.Opening - Dim rowView As DataRowView = GridViewSearchTerms.GetFocusedRow() - '"BracketLeft" - '"AttrID", GetType(Integer)) - '"AttrTitle" - '"Criteria" - '"SearchTerm" - '"BracketRight" - '"Operator" - If IsNothing(rowView) = False Then - Dim oOperator As String = rowView.Item("Operator") - If oOperator = "and" Then - If My.Application.User.Language = "de-De" Then - tsmOperator.Text = "Operator = oder" - Else - tsmOperator.Text = "Operator = or" - End If - Else - If My.Application.User.Language = "de-De" Then - tsmOperator.Text = "Operator = und" - Else - tsmOperator.Text = "Operator = and" - End If - End If - End If - End Sub + 'Private Sub ContextMenuStripSearchTerms_Opening(sender As Object, e As System.ComponentModel.CancelEventArgs) Handles ContextMenuStripSearchTerms.Opening + ' Dim rowView As DataRowView = GridViewSearchTerms.GetFocusedRow() + ' '"BracketLeft" + ' '"AttrID", GetType(Integer)) + ' '"AttrTitle" + ' '"Criteria" + ' '"SearchTerm" + ' '"BracketRight" + ' '"Operator" + ' If IsNothing(rowView) = False Then + ' Dim oOperator As String = rowView.Item("Operator") + ' If oOperator = "and" Then + ' If My.Application.User.Language = "de-De" Then + ' tsmOperator.Text = "Operator = oder" + ' Else + ' tsmOperator.Text = "Operator = or" + ' End If + ' Else + ' If My.Application.User.Language = "de-De" Then + ' tsmOperator.Text = "Operator = und" + ' Else + ' tsmOperator.Text = "Operator = and" + ' End If + ' End If + ' End If + 'End Sub - Private Sub tsmOperator_Click(sender As Object, e As EventArgs) Handles tsmOperator.Click - Dim rowView As DataRowView = GridViewSearchTerms.GetFocusedRow() - If IsNothing(rowView) = False Then - Dim oAttrID As String = rowView.Item("AttrID") - Dim oSearchTerm As String = rowView.Item("SearchTerm") - Dim oREPLACEOperator As String - If tsmOperator.Text.EndsWith("und") Or tsmOperator.Text.EndsWith("and") Then - oREPLACEOperator = "and" - Else - oREPLACEOperator = "or" - End If - For Each oRow As DataRow In DTSearchTerms.Rows - If oRow.Item("AttrID") = oAttrID And oRow.Item("SearchTerm") = oSearchTerm Then - oRow.Item("Operator") = oREPLACEOperator - DTSearchTerms.AcceptChanges() - Exit For - End If + 'Private Sub tsmOperator_Click(sender As Object, e As EventArgs) Handles tsmOperator.Click + ' Dim rowView As DataRowView = GridViewSearchTerms.GetFocusedRow() + ' If IsNothing(rowView) = False Then + ' Dim oAttrID As String = rowView.Item("AttrID") + ' Dim oSearchTerm As String = rowView.Item("SearchTerm") + ' Dim oREPLACEOperator As String + ' If tsmOperator.Text.EndsWith("und") Or tsmOperator.Text.EndsWith("and") Then + ' oREPLACEOperator = "and" + ' Else + ' oREPLACEOperator = "or" + ' End If + ' For Each oRow As DataRow In DTSearchTerms.Rows + ' If oRow.Item("AttrID") = oAttrID And oRow.Item("SearchTerm") = oSearchTerm Then + ' oRow.Item("Operator") = oREPLACEOperator + ' DTSearchTerms.AcceptChanges() + ' Exit For + ' End If - Next - End If - End Sub - Private Sub BracketLeftToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BracketLeftToolStripMenuItem.Click - Dim rowView As DataRowView = GridViewSearchTerms.GetFocusedRow() - If IsNothing(rowView) = False Then - Dim oAttrID As String = rowView.Item("AttrID") - Dim oSearchTerm As String = rowView.Item("SearchTerm") - For Each oRow As DataRow In DTSearchTerms.Rows - If oRow.Item("AttrID") = oAttrID And oRow.Item("SearchTerm") = oSearchTerm Then - oRow.Item("BracketLeft") = "(" - DTSearchTerms.AcceptChanges() - Exit For - End If + ' Next + ' End If + 'End Sub + 'Private Sub BracketLeftToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BracketLeftToolStripMenuItem.Click + ' Dim rowView As DataRowView = GridViewSearchTerms.GetFocusedRow() + ' If IsNothing(rowView) = False Then + ' Dim oAttrID As String = rowView.Item("AttrID") + ' Dim oSearchTerm As String = rowView.Item("SearchTerm") + ' For Each oRow As DataRow In DTSearchTerms.Rows + ' If oRow.Item("AttrID") = oAttrID And oRow.Item("SearchTerm") = oSearchTerm Then + ' oRow.Item("BracketLeft") = "(" + ' DTSearchTerms.AcceptChanges() + ' Exit For + ' End If - Next - End If - End Sub + ' Next + ' End If + 'End Sub - Private Sub KlammerRechtsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KlammerRechtsToolStripMenuItem.Click - Dim rowView As DataRowView = CType(GridViewSearchTerms.GetFocusedRow(), DataRowView) - If IsNothing(rowView) = False Then - Dim oAttrID As String = rowView.Item("AttrID") - Dim oSearchTerm As String = rowView.Item("SearchTerm") - For Each oRow As DataRow In DTSearchTerms.Rows - If oRow.Item("AttrID") = oAttrID And oRow.Item("SearchTerm") = oSearchTerm Then - oRow.Item("BracketRight") = ")" - DTSearchTerms.AcceptChanges() - Exit For - End If + 'Private Sub KlammerRechtsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KlammerRechtsToolStripMenuItem.Click + ' Dim rowView As DataRowView = CType(GridViewSearchTerms.GetFocusedRow(), DataRowView) + ' If IsNothing(rowView) = False Then + ' Dim oAttrID As String = rowView.Item("AttrID") + ' Dim oSearchTerm As String = rowView.Item("SearchTerm") + ' For Each oRow As DataRow In DTSearchTerms.Rows + ' If oRow.Item("AttrID") = oAttrID And oRow.Item("SearchTerm") = oSearchTerm Then + ' oRow.Item("BracketRight") = ")" + ' DTSearchTerms.AcceptChanges() + ' Exit For + ' End If - Next - End If - End Sub - Private Sub KlammerEntfernenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KlammerEntfernenToolStripMenuItem.Click - Dim rowView As DataRowView = GridViewSearchTerms.GetFocusedRow() - If IsNothing(rowView) = False Then - Dim oAttrID As String = rowView.Item("AttrID") - Dim oSearchTerm As String = rowView.Item("SearchTerm") - For Each oRow As DataRow In DTSearchTerms.Rows - If oRow.Item("AttrID") = oAttrID And oRow.Item("SearchTerm") = oSearchTerm Then - oRow.Item("BracketRight") = "" - oRow.Item("BracketLeft") = "" - DTSearchTerms.AcceptChanges() - Exit For - End If + ' Next + ' End If + 'End Sub + 'Private Sub KlammerEntfernenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles KlammerEntfernenToolStripMenuItem.Click + ' Dim rowView As DataRowView = GridViewSearchTerms.GetFocusedRow() + ' If IsNothing(rowView) = False Then + ' Dim oAttrID As String = rowView.Item("AttrID") + ' Dim oSearchTerm As String = rowView.Item("SearchTerm") + ' For Each oRow As DataRow In DTSearchTerms.Rows + ' If oRow.Item("AttrID") = oAttrID And oRow.Item("SearchTerm") = oSearchTerm Then + ' oRow.Item("BracketRight") = "" + ' oRow.Item("BracketLeft") = "" + ' DTSearchTerms.AcceptChanges() + ' Exit For + ' End If - Next - End If - End Sub + ' Next + ' End If + 'End Sub Private Sub frmSearchStart_FormClosed(sender As Object, e As FormClosedEventArgs) Handles MyBase.FormClosed My.UIConfig.SearchForm.Location = Me.Location My.UIConfigManager.Save() @@ -860,28 +842,31 @@ Public Class frmSearchStart Dim oSEARCH_SQL = SEARCH_SQL Dim oOperator As String Dim oCount As Integer = 1 - For Each oRow As DataRow In DTSearchTerms.Rows - '"BracketLeft" - '"AttrID", GetType(Integer)) - '"AttrTitle" - '"Criteria" - '"SearchTerm" - '"BracketRight" - '"Operator" - oOperator = oRow.Item("Operator").ToString - Dim oSearchTerm = GetSearchTermForType(oRow.Item("AttrID"), oRow.Item("AttrTitle").ToString, oRow.Item("Criteria").ToString, oRow.Item("SearchTerm").ToString) + 'For Each oRow As DataRow In DTSearchTerms.Rows + ' '"BracketLeft" + ' '"AttrID", GetType(Integer)) + ' '"AttrTitle" + ' '"Criteria" + ' '"SearchTerm" + ' '"BracketRight" + ' '"Operator" + ' oOperator = oRow.Item("Operator").ToString + ' Dim oSearchTerm = GetSearchTermForType(oRow.Item("AttrID"), oRow.Item("AttrTitle").ToString, oRow.Item("Criteria").ToString, oRow.Item("SearchTerm").ToString) - Dim oBracketLeft As String = oRow.Item("BracketLeft").ToString - Dim oBracketRight As String = oRow.Item("BracketLeft").ToString - Dim oSpaceChar = IIf(oCount = 0, " ", "") - - oSEARCH_SQL &= $"{oSpaceChar}{oBracketLeft}{oSearchTerm}{oBracketRight}" - If DTSearchTerms.Rows.Count > oCount Then - oSEARCH_SQL &= $" {oOperator} {Chr(13)}" - End If - oCount += 1 - Next + ' Dim oBracketLeft As String = oRow.Item("BracketLeft").ToString + ' Dim oBracketRight As String = oRow.Item("BracketLeft").ToString + ' Dim oSpaceChar = IIf(oCount = 0, " ", "") + ' oSEARCH_SQL &= $"{oSpaceChar}{oBracketLeft}{oSearchTerm}{oBracketRight}" + ' If DTSearchTerms.Rows.Count > oCount Then + ' oSEARCH_SQL &= $" {oOperator} {Chr(13)}" + ' End If + ' oCount += 1 + 'Next + oSEARCH_SQL = oSEARCH_SQL.Replace("@UserID", My.Application.User.UserId) + oSEARCH_SQL = oSEARCH_SQL.Replace("@User_ID", My.Application.User.UserId) + oSEARCH_SQL = oSEARCH_SQL.Replace("@UserName", My.Application.User.UserName) + oSEARCH_SQL = oSEARCH_SQL.Replace("@SearchID", PSEARCH_ID) Dim oEnvironment As New Modules.ZooFlow.Environment() With { .User = My.Application.User, .Modules = My.Application.Modules,