From 435c32d5cb3c7dad674d0a46714b6ff987427753 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Apr 2022 16:07:04 +0200 Subject: [PATCH] Zooflow: Improve Search UI --- GUIs.ZooFlow/Search/SearchRunner.vb | 2 +- .../Search/frmFlowSearch1.Designer.vb | 93 +++--- GUIs.ZooFlow/Search/frmFlowSearch1.resx | 4 +- GUIs.ZooFlow/Search/frmFlowSearch1.vb | 264 ++---------------- 4 files changed, 67 insertions(+), 296 deletions(-) diff --git a/GUIs.ZooFlow/Search/SearchRunner.vb b/GUIs.ZooFlow/Search/SearchRunner.vb index a7b353c6..a99914c8 100644 --- a/GUIs.ZooFlow/Search/SearchRunner.vb +++ b/GUIs.ZooFlow/Search/SearchRunner.vb @@ -32,7 +32,7 @@ Public Class SearchRunner Public Event NeedsRefresh As EventHandler(Of Integer) - Private _ActiveDateConstraint As String = CREATED_TODAY + Private _ActiveDateConstraint As String = String.Empty Public ReadOnly Property ActiveDateConstraint As String Get Return _ActiveDateConstraint diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb index 4648961f..236b224d 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmFlowSearch1 Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmFlowSearch1 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch1)) @@ -57,9 +57,9 @@ Partial Class frmFlowSearch1 Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.Label1 = New System.Windows.Forms.Label() Me.cmbLimitationDateAttr = New System.Windows.Forms.ComboBox() - Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() Me.txtSearchInput = New DevExpress.XtraEditors.TextEdit() + Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel1.SuspendLayout() @@ -86,6 +86,7 @@ Partial Class frmFlowSearch1 ' '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.BarButtonStartSearch, Me.BarButtonReset, Me.bsiStatus, Me.BarSubItem1, Me.BarListItem1, Me.BarToggleSwitchItemTerm, Me.BarToggleSwitchItemFulltext}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) @@ -93,21 +94,22 @@ Partial Class frmFlowSearch1 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(936, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(936, 89) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonStartSearch ' Me.BarButtonStartSearch.Caption = "Suche starten" Me.BarButtonStartSearch.Id = 1 - Me.BarButtonStartSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonStartSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonStartSearch.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonStartSearch.Name = "BarButtonStartSearch" + Me.BarButtonStartSearch.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' 'BarButtonReset ' Me.BarButtonReset.Caption = "Suche zurücksetzen" Me.BarButtonReset.Id = 2 - Me.BarButtonReset.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonReset.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonReset.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonReset.Name = "BarButtonReset" ' 'bsiStatus @@ -192,10 +194,10 @@ Partial Class frmFlowSearch1 Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("404a591d-3a18-4984-8b8d-d8ac23bfc3db") Me.DockPanel1.ImageOptions.SvgImage = CType(resources.GetObject("DockPanel1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.DockPanel1.Location = New System.Drawing.Point(0, 158) + Me.DockPanel1.Location = New System.Drawing.Point(0, 89) Me.DockPanel1.Name = "DockPanel1" - Me.DockPanel1.OriginalSize = New System.Drawing.Size(225, 200) - Me.DockPanel1.Size = New System.Drawing.Size(225, 587) + Me.DockPanel1.OriginalSize = New System.Drawing.Size(193, 200) + Me.DockPanel1.Size = New System.Drawing.Size(193, 656) Me.DockPanel1.Text = "Datum" ' 'DockPanel1_Container @@ -205,7 +207,7 @@ Partial Class frmFlowSearch1 Me.DockPanel1_Container.Controls.Add(Me.cmbLimitationDateAttr) Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 40) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(218, 544) + Me.DockPanel1_Container.Size = New System.Drawing.Size(186, 613) Me.DockPanel1_Container.TabIndex = 0 ' 'XtraTabControl1 @@ -218,7 +220,7 @@ Partial Class frmFlowSearch1 Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 Me.XtraTabControl1.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] - Me.XtraTabControl1.Size = New System.Drawing.Size(203, 483) + Me.XtraTabControl1.Size = New System.Drawing.Size(171, 552) Me.XtraTabControl1.TabIndex = 10 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) ' @@ -239,7 +241,7 @@ Partial Class frmFlowSearch1 Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYear_Last) Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYear) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(201, 458) + Me.XtraTabPage1.Size = New System.Drawing.Size(169, 527) Me.XtraTabPage1.Text = "Standard" ' 'DateEditTill @@ -260,7 +262,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth_Last.Name = "ToggleSwitchMonth_Last" Me.ToggleSwitchMonth_Last.Properties.OffText = "Letzter Monat" Me.ToggleSwitchMonth_Last.Properties.OnText = "Letzter Monat" - Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchMonth_Last.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchMonth_Last.TabIndex = 9 ' 'ToggleSwitchDateto @@ -270,14 +272,14 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchDateto.Name = "ToggleSwitchDateto" Me.ToggleSwitchDateto.Properties.OffText = "Datum bis" Me.ToggleSwitchDateto.Properties.OnText = "Datum bis" - Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 18) + Me.ToggleSwitchDateto.Size = New System.Drawing.Size(122, 19) Me.ToggleSwitchDateto.TabIndex = 0 ' 'lblDatefrom ' Me.lblDatefrom.Location = New System.Drawing.Point(3, 211) Me.lblDatefrom.Name = "lblDatefrom" - Me.lblDatefrom.Size = New System.Drawing.Size(31, 13) + Me.lblDatefrom.Size = New System.Drawing.Size(34, 13) Me.lblDatefrom.TabIndex = 3 Me.lblDatefrom.Text = "Datum" ' @@ -301,7 +303,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchMonth.Name = "ToggleSwitchMonth" Me.ToggleSwitchMonth.Properties.OffText = "Dieser Monat" Me.ToggleSwitchMonth.Properties.OnText = "Dieser Monat" - Me.ToggleSwitchMonth.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchMonth.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchMonth.TabIndex = 8 ' 'ToggleSwitchTomorrow @@ -311,7 +313,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchTomorrow.Name = "ToggleSwitchTomorrow" Me.ToggleSwitchTomorrow.Properties.OffText = "Morgen" Me.ToggleSwitchTomorrow.Properties.OnText = "Morgen" - Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 18) + Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 19) Me.ToggleSwitchTomorrow.TabIndex = 7 Me.ToggleSwitchTomorrow.Visible = False ' @@ -322,7 +324,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchToday.Name = "ToggleSwitchToday" Me.ToggleSwitchToday.Properties.OffText = "Heute" Me.ToggleSwitchToday.Properties.OnText = "Heute" - Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 18) + Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 19) Me.ToggleSwitchToday.TabIndex = 2 ' 'ToggleSwitchLastWeek @@ -332,7 +334,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchLastWeek.Name = "ToggleSwitchLastWeek" Me.ToggleSwitchLastWeek.Properties.OffText = "Letzten 7 Tage" Me.ToggleSwitchLastWeek.Properties.OnText = "Letzten 7 Tage" - Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchLastWeek.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchLastWeek.TabIndex = 6 ' 'ToggleSwitchYesterday @@ -342,7 +344,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYesterday.Name = "ToggleSwitchYesterday" Me.ToggleSwitchYesterday.Properties.OffText = "Gestern" Me.ToggleSwitchYesterday.Properties.OnText = "Gestern" - Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 18) + Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 19) Me.ToggleSwitchYesterday.TabIndex = 3 ' 'ToggleSwitchYear_Last @@ -352,7 +354,7 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear_Last.Name = "ToggleSwitchYear_Last" Me.ToggleSwitchYear_Last.Properties.OffText = "Letztes Jahr" Me.ToggleSwitchYear_Last.Properties.OnText = "Letztes Jahr" - Me.ToggleSwitchYear_Last.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchYear_Last.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchYear_Last.TabIndex = 5 ' 'ToggleSwitchYear @@ -362,13 +364,13 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchYear.Name = "ToggleSwitchYear" Me.ToggleSwitchYear.Properties.OffText = "Dieses Jahr" Me.ToggleSwitchYear.Properties.OnText = "Dieses Jahr" - Me.ToggleSwitchYear.Size = New System.Drawing.Size(195, 18) + Me.ToggleSwitchYear.Size = New System.Drawing.Size(195, 19) Me.ToggleSwitchYear.TabIndex = 4 ' 'XtraTabPage2 ' Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(201, 458) + Me.XtraTabPage2.Size = New System.Drawing.Size(169, 527) Me.XtraTabPage2.Text = "...tbd" ' 'Label1 @@ -376,35 +378,25 @@ Partial Class frmFlowSearch1 Me.Label1.AutoSize = True Me.Label1.Location = New System.Drawing.Point(4, 8) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(44, 13) + Me.Label1.Size = New System.Drawing.Size(47, 13) Me.Label1.TabIndex = 0 Me.Label1.Text = "Attribut" ' 'cmbLimitationDateAttr ' Me.cmbLimitationDateAttr.FormattingEnabled = True - Me.cmbLimitationDateAttr.Location = New System.Drawing.Point(7, 24) + Me.cmbLimitationDateAttr.Location = New System.Drawing.Point(6, 24) Me.cmbLimitationDateAttr.Name = "cmbLimitationDateAttr" - Me.cmbLimitationDateAttr.Size = New System.Drawing.Size(178, 21) + Me.cmbLimitationDateAttr.Size = New System.Drawing.Size(171, 21) Me.cmbLimitationDateAttr.TabIndex = 1 ' - 'LabelControl1 - ' - Me.LabelControl1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.LabelControl1.Appearance.Options.UseFont = True - Me.LabelControl1.Location = New System.Drawing.Point(231, 166) - Me.LabelControl1.Name = "LabelControl1" - Me.LabelControl1.Size = New System.Drawing.Size(69, 17) - Me.LabelControl1.TabIndex = 3 - Me.LabelControl1.Text = "Suchbegriff:" - ' 'PictureEdit1 ' Me.PictureEdit1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.PictureEdit1.EditValue = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress - Me.PictureEdit1.Location = New System.Drawing.Point(666, 516) + Me.PictureEdit1.Location = New System.Drawing.Point(709, 537) Me.PictureEdit1.MenuManager = Me.RibbonControl1 Me.PictureEdit1.Name = "PictureEdit1" Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.SystemColors.Control @@ -413,22 +405,33 @@ Partial Class frmFlowSearch1 Me.PictureEdit1.Properties.PictureAlignment = System.Drawing.ContentAlignment.BottomRight Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] Me.PictureEdit1.Properties.ZoomPercent = 300.0R - Me.PictureEdit1.Size = New System.Drawing.Size(258, 223) + Me.PictureEdit1.Size = New System.Drawing.Size(215, 202) Me.PictureEdit1.TabIndex = 8 ' 'txtSearchInput ' - Me.txtSearchInput.Location = New System.Drawing.Point(227, 189) + Me.txtSearchInput.EditValue = "" + Me.txtSearchInput.Location = New System.Drawing.Point(206, 95) Me.txtSearchInput.MenuManager = Me.RibbonControl1 Me.txtSearchInput.Name = "txtSearchInput" - Me.txtSearchInput.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 11.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.txtSearchInput.Properties.Appearance.ForeColor = System.Drawing.Color.Blue + Me.txtSearchInput.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI Semibold", 11.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSearchInput.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(19, Byte), Integer)) Me.txtSearchInput.Properties.Appearance.Options.UseFont = True Me.txtSearchInput.Properties.Appearance.Options.UseForeColor = True + Me.txtSearchInput.Properties.NullText = "Suchbegriff eingeben" Me.txtSearchInput.Properties.Padding = New System.Windows.Forms.Padding(10) - Me.txtSearchInput.Size = New System.Drawing.Size(697, 46) + Me.txtSearchInput.Size = New System.Drawing.Size(673, 46) Me.txtSearchInput.TabIndex = 12 ' + 'SimpleButton1 + ' + Me.SimpleButton1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress + Me.SimpleButton1.ImageOptions.SvgImageSize = New System.Drawing.Size(40, 40) + Me.SimpleButton1.Location = New System.Drawing.Point(878, 95) + Me.SimpleButton1.Name = "SimpleButton1" + Me.SimpleButton1.Size = New System.Drawing.Size(46, 46) + Me.SimpleButton1.TabIndex = 16 + ' 'frmFlowSearch1 ' Me.Appearance.BackColor = System.Drawing.SystemColors.Control @@ -436,9 +439,9 @@ Partial Class frmFlowSearch1 Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(936, 769) + Me.Controls.Add(Me.SimpleButton1) Me.Controls.Add(Me.txtSearchInput) Me.Controls.Add(Me.PictureEdit1) - Me.Controls.Add(Me.LabelControl1) Me.Controls.Add(Me.DockPanel1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) @@ -495,7 +498,6 @@ Partial Class frmFlowSearch1 Friend WithEvents ToggleSwitchMonth As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents BarButtonStartSearch As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonReset As DevExpress.XtraBars.BarButtonItem - Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl Friend WithEvents bsiStatus As DevExpress.XtraBars.BarStaticItem Friend WithEvents ToggleSwitchYear As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents BarSubItem1 As DevExpress.XtraBars.BarSubItem @@ -512,4 +514,5 @@ Partial Class frmFlowSearch1 Friend WithEvents DateEditFrom As DevExpress.XtraEditors.DateEdit Friend WithEvents ToggleSwitchDateto As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents txtSearchInput As DevExpress.XtraEditors.TextEdit + Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.resx b/GUIs.ZooFlow/Search/frmFlowSearch1.resx index 3531dccb..db5b0340 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.resx +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -133,7 +133,7 @@ cz0iQmx1ZSIgLz4NCjwvc3ZnPgs= - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index 338a7913..c8896a0d 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -10,22 +10,6 @@ Public Class frmFlowSearch1 Private Logger As Logger Private SearchRunner As SearchRunner - - 'Private Property AttributeSearch As String = "ADDED_WHEN" - 'Private Property DateConstraint As String = "" - 'Private LIMITATION_DATE As Boolean = False - 'Private SEARCH_FACT_DATE As String = "MONTH(OBJ.ADDED_WHEN) <> 13" - 'Private Const SEARCH_FACT_DATE_DEFAULT As String = "ADDED_WHEN" - 'Private Const CREATED_TOMORROW As String = "TOMORROW" - 'Private Const CREATED_TODAY As String = "ECM_CREATED_TODAY" - 'Private Const CREATED_YESTERDAY As String = "ECM_CREATED_YESTERDAY" - 'Private Const CREATED_LAST_7_DAYS As String = "ECM_CREATED_LAST7DAYS" - 'Private Const CREATED_YEAR_CURRENT As String = "ECM_CREATED_YEAR_CURRENT" - 'Private Const CREATED_YEAR_LAST As String = "ECM_CREATED_YEAR_LAST" - 'Private Const CREATED_MONTH_CURR As String = "ECM_CREATED_MONTH_CURRENT" - 'Private Const CREATED_MONTH_LAST As String = "ECM_CREATED_MONTH_LAST" - 'Private Property ExplizitDate As Boolean = False - Private Property BaseSearchSQL As String Private Property TogglesDate As List(Of ToggleSwitch) Private Property TogglesDateChanging As Boolean = False @@ -46,14 +30,6 @@ Public Class frmFlowSearch1 oToggle.IsOn = False Next - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False TogglesDateChanging = False End Sub @@ -75,136 +51,46 @@ Public Class frmFlowSearch1 If oToggle.IsOn Then TogglesDateChanging = True - 'Dim oWHENDATE As String + Select Case oToggle.Name Case "ToggleSwitchTomorrow" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_TOMORROW) - 'DateConstraint = CREATED_TOMORROW - ResetTogglesDate(ToggleSwitchTomorrow) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Tomorrow) Case "ToggleSwitchYear" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_CURRENT) - 'DateConstraint = CREATED_YEAR_CURRENT - ResetTogglesDate(ToggleSwitchYear) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.CurrentYear) Case "ToggleSwitchYear_Last" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_LAST) - 'DateConstraint = CREATED_TODAY - ResetTogglesDate(ToggleSwitchYear_Last) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Today) Case "ToggleSwitchMonth" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CREATED_MONTH_CURR) - 'DateConstraint = CREATED_MONTH_CURR - ResetTogglesDate(ToggleSwitchMonth) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.CurrentMonth) Case "ToggleSwitchMonth_Last" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'Dim currentDate As DateTime = DateTime.Now - 'If currentDate.Month = 1 Then - ' oWHENDATE = GET_DATE_LIMITATION($"MONTH(@ATTRIBUTE) = 12 {vbNewLine}AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CREATED_MONTH_LAST) - 'Else - ' oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CREATED_MONTH_LAST) - 'End If - 'DateConstraint = CREATED_MONTH_LAST - ResetTogglesDate(ToggleSwitchMonth_Last) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.LastMonth) Case "ToggleSwitchToday" - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CREATED_TODAY) - 'DateConstraint = CREATED_TODAY - ResetTogglesDate(ToggleSwitchToday) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Today) Case "ToggleSwitchYesterday" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchLastWeek.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_YESTERDAY) - 'DateConstraint = CREATED_YESTERDAY - ResetTogglesDate(ToggleSwitchYesterday) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Yesterday) Case "ToggleSwitchLastWeek" - 'ToggleSwitchToday.IsOn = False - 'ToggleSwitchTomorrow.IsOn = False - 'ToggleSwitchYesterday.IsOn = False - 'ToggleSwitchYear.IsOn = False - 'ToggleSwitchYear_Last.IsOn = False - 'ToggleSwitchMonth.IsOn = False - 'ToggleSwitchMonth_Last.IsOn = False - 'oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_LAST_7_DAYS) - 'DateConstraint = CREATED_LAST_7_DAYS - ResetTogglesDate(ToggleSwitchLastWeek) SearchRunner.SetDateConstraint(SearchRunner.DateConstraint.Last7Days) End Select - 'SEARCH_FACT_DATE = oWHENDATE TogglesDateChanging = False - 'LIMITATION_DATE = True + Else If ToggleSwitchToday.IsOn = False And ToggleSwitchYesterday.IsOn = False And ToggleSwitchYear.IsOn = False And ToggleSwitchYear_Last.IsOn = False And ToggleSwitchMonth_Last.IsOn = False And ToggleSwitchMonth.IsOn = False And ToggleSwitchLastWeek.IsOn = False And ToggleSwitchTomorrow.IsOn = False Then - - 'LIMITATION_DATE = False - 'DateConstraint = "" SearchRunner.SetDateConstraint() End If End If @@ -219,14 +105,10 @@ Public Class frmFlowSearch1 Dim oEditValue As String = cmbLimitationDateAttr.SelectedItem.ToString If oEditValue = IDB_ADDED_WHEN_String_German Or oEditValue = IDB_ADDED_WHEN_String_Englisch Then - 'AttributeSearch = SEARCH_FACT_DATE_DEFAULT SearchRunner.SetDateAttribute() Else - 'AttributeSearch = oEditValue SearchRunner.SetDateAttribute(oEditValue) - 'SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13" End If - 'SearchContent() Catch ex As Exception Logger.Error(ex) End Try @@ -281,7 +163,6 @@ Public Class frmFlowSearch1 collection.Add(orow.Item("TERM")) Next - txtSearchInput.MaskBox.AutoCompleteSource = AutoCompleteSource.CustomSource txtSearchInput.MaskBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend txtSearchInput.MaskBox.AutoCompleteCustomSource = collection @@ -309,8 +190,6 @@ Public Class frmFlowSearch1 Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - 'Await ExecuteSearch() - Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue) If oResult.OK = False Then bsiStatus.Caption = oResult.ErrorMessage @@ -336,7 +215,6 @@ Public Class frmFlowSearch1 Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) Try - 'Await ExecuteSearch() Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue) If oResult.OK = False Then bsiStatus.Caption = oResult.ErrorMessage @@ -353,7 +231,6 @@ Public Class frmFlowSearch1 txtSearchInput.Text = "" ResetTogglesDate() ToggleSwitchDateto.IsOn = False - 'ExplizitDate = False SearchRunner.ExplicitDate = False End Sub @@ -373,131 +250,22 @@ Public Class frmFlowSearch1 Dim oDateFrom = DateEditFrom.EditValue If Not IsNothing(oDateFrom) Then ResetTogglesDate() - 'ExplizitDate = True SearchRunner.ExplicitDate = True End If End Sub - 'Private Function GetResultWindowString(SearchContent As String) As String - ' If SearchContent <> String.Empty Then - ' If My.Application.User.Language = State.UserState.LANG_DE_DE Then - - ' Return $"Suche Nach '{txtSearchInput.Text}'" - ' Else - ' Return $"Search For '{txtSearchInput.Text}'" - ' End If - ' Else - ' If My.Application.User.Language = State.UserState.LANG_DE_DE Then - ' Return $"Suche Datumsbegrenzt" - ' Else - ' Return $"Search via date" - ' End If - ' End If - 'End Function - - 'Private Async Function ExecuteSearch() As Threading.Tasks.Task - ' Dim oSearchTerm = txtSearchInput.Text - ' Dim oParams = New DocumentResultList.Params() With { - ' .WindowGuid = "FlowSearch", - ' .WindowTitle = GetResultWindowString(oSearchTerm), - ' .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, - ' .ProfileGuid = 354522, - ' .ColumnNames = New DocumentResultList.ColumnNames With { - ' .ObjectIdColumn = "DocID" - ' } - ' } - - ' Dim oP3 = $"{AttributeSearch}~{DateConstraint}" - ' If ExplizitDate Then - ' Dim oDate2 As Date - ' If Not IsNothing(DateEditTill.EditValue) Then - ' oDate2 = CDate(DateEditTill.EditValue) - ' Else - ' oDate2 = CDate(DateEditFrom.EditValue) - ' End If - ' Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{CDate(DateEditFrom.EditValue)}','{oDate2}'" - ' If Await My.Database.ExecuteNonQueryIDBAsync(oProc) = True Then - ' oP3 = $"{AttributeSearch}~DATEPART" - ' End If - ' End If - - ' Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" - - ' If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then - ' Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(BaseSearchSQL) - ' If oDTDocResult.Rows.Count > 0 Then - ' oParams.Results.Add(New DocumentResultList.DocumentResult() With { - ' .Title = "FlowSearchXYZ", - ' .Datatable = oDTDocResult - ' }) - ' Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams) - - ' AddHandler oForm.NeedsRefresh, AddressOf Form_NeedsRefresh - - ' oForm.Show() - ' Else - ' bsiStatus.Caption = "No Results" - ' End If - ' Else - ' bsiStatus.Caption = "Error in FlowSearch - Check Your log" - ' End If - 'End Function - - 'Private Function GetDateConstraint(pDateConstraint As DateConstraint) As String - ' Select Case pDateConstraint - ' Case DateConstraint.Today - ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CREATED_TODAY) - - ' Case DateConstraint.Yesterday - ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_YESTERDAY) - - ' Case DateConstraint.Last7Days - ' Return GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CREATED_LAST_7_DAYS) - - ' Case DateConstraint.CurrentMonth - ' Return GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CREATED_MONTH_CURR) - - ' Case DateConstraint.LastMonth - ' If Now.Month = 1 Then - ' Return GET_DATE_LIMITATION($"MONTH(@ATTRIBUTE) = 12 {vbNewLine}AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CREATED_MONTH_LAST) - ' Else - ' Return GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CREATED_MONTH_LAST) - ' End If - - ' Case DateConstraint.CurrentYear - ' Return GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_CURRENT) - - ' Case DateConstraint.LastYear - ' Return GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CREATED_YEAR_LAST) - - ' Case Else - ' Return "" - ' End Select - 'End Function - - 'Private Function GET_DATE_LIMITATION(pInput As String, pVariant As String) As String - ' Try - ' If SEARCH_FACT_DATE_ATTRIBUTE = SEARCH_FACT_DATE_DEFAULT Then - ' SEARCH_PARAM3 = pVariant - ' Return pInput.Replace("@ATTRIBUTE", "OBJ.ADDED_WHEN") - - ' Else - ' Dim oSTR = $"GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]" - ' Return pInput.Replace("@ATTRIBUTE", oSTR) - ' End If - ' Catch ex As Exception - ' Return pInput - ' Logger.Error(ex) - ' End Try - 'End Function - - 'Private Enum DateConstraintEnum - ' Today - ' Yesterday - ' Last7Days - ' CurrentYear - ' LastYear - ' CurrentMonth - ' LastMonth - 'End Enum + Private Async Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click + Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) + + Try + Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue) + If oResult.OK = False Then + bsiStatus.Caption = oResult.ErrorMessage + End If + Catch ex As Exception + Logger.Error(ex) + Finally + SplashScreenManager.CloseOverlayForm(oHandle) + End Try + End Sub End Class \ No newline at end of file