diff --git a/GUIs.ZooFlow/ClassConstants.vb b/GUIs.ZooFlow/ClassConstants.vb index 6fc422d1..079d49c8 100644 --- a/GUIs.ZooFlow/ClassConstants.vb +++ b/GUIs.ZooFlow/ClassConstants.vb @@ -29,6 +29,8 @@ Public Const SQLCMD_FLOW_SEARCH_CATEGORIES = "FLOW_SEARCH_CATEGORIES" Public Const SQLCMD_FLOW_SEARCH_TILE = "FLOW_SEARCH_PER_TILE" + Public Const SQLCMD_FLOW_SEARCH_BASE = "FLOW_SEARCH_SQL_BASE" + Public Const RESULTLIST_COL_ADDED_WHEN_DE = "Erstellt wann" Public Const RESULTLIST_COL_CHANGED_WHEN_DE = "Geändert wann" Public Const RESULTLIST_COL_ADDED_WHEN_EN = "Created when" diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index ff9e5ac2..82e3c58e 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -10,6 +10,7 @@ Imports DigitalData.GUIs.ZooFlow.ClassConstants Imports DigitalData.GUIs.ZooFlow.ClassInitLoader Imports DigitalData.Controls.SQLConfig Imports System.Data.SqlClient +Imports DigitalData.Modules Public Class ClassInit Inherits Base.BaseClass @@ -208,10 +209,13 @@ Public Class ClassInit End Sub Private Sub InitBasicConfig(MyApplication As My.MyApplication) Try - My.Tables.DTIDB_COMMON_SQL = My.Database.GetDatatableIDB("SELECT * FROM TBIDB_COMMON_SQL WHERE ACTIVE = 1") - + Dim oSQL = "Select * FROM TBIDB_COMMON_SQL WHERE ACTIVE = 1" + My.Tables.DTIDB_COMMON_SQL = My.Database.GetDatatable("TBIDB_COMMON_SQL", oSQL, EDMI.API.Constants.DatabaseType.IDB) + oSQL = "Select * From VWIDB_BE_ATTRIBUTE Where LANG_CODE = '" + MyApplication.User.Language + "'" + My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatable("VWIDB_BE_ATTRIBUTE", oSQL, EDMI.API.Constants.DatabaseType.IDB, "LANG_CODE = '" + MyApplication.User.Language + "'") + ' My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatableIDB("SELECT * From VWIDB_BE_ATTRIBUTE Where LANG_CODE = '" + MyApplication.User.Language + "'") Catch ex As Exception Logger.Error(ex) Throw New InitException("Error in InitBasicData", ex) diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index 651cfe22..323a0dcf 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,14 +1,16 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb index 815516b7..f3f06353 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb @@ -25,8 +25,12 @@ Partial Class frmFlowSearch1 Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch1)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.bsiStatus = New DevExpress.XtraBars.BarStaticItem() + Me.BarSubItem1 = New DevExpress.XtraBars.BarSubItem() + Me.BarListItem1 = New DevExpress.XtraBars.BarListItem() 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() @@ -43,6 +47,19 @@ Partial Class frmFlowSearch1 Me.ToggleSwitchToday = New DevExpress.XtraEditors.ToggleSwitch() Me.cmbLimitationDateAttr = New System.Windows.Forms.ComboBox() Me.Label1 = New System.Windows.Forms.Label() + Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() + Me.txtSearchInput = New System.Windows.Forms.TextBox() + Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarToggleSwitchItemTerm = New DevExpress.XtraBars.BarToggleSwitchItem() + Me.BarToggleSwitchItemFulltext = New DevExpress.XtraBars.BarToggleSwitchItem() + Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() + Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() + Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() + Me.ToggleSwitch1 = New DevExpress.XtraEditors.ToggleSwitch() + Me.DateEdit1 = New DevExpress.XtraEditors.DateEdit() + Me.DateEditBis = New DevExpress.XtraEditors.DateEdit() + Me.lblDatefrom = New DevExpress.XtraEditors.LabelControl() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanel1.SuspendLayout() @@ -55,41 +72,82 @@ Partial Class frmFlowSearch1 CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToggleSwitchYesterday.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToggleSwitchToday.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabControl1.SuspendLayout() + Me.XtraTabPage1.SuspendLayout() + CType(Me.ToggleSwitch1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEdit1.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEditBis.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DateEditBis.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.bsiStatus, Me.BarSubItem1, Me.BarListItem1, Me.BarToggleSwitchItemTerm, Me.BarToggleSwitchItemFulltext}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 1 + Me.RibbonControl1.MaxItemId = 8 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.Size = New System.Drawing.Size(864, 160) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.Size = New System.Drawing.Size(936, 160) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Suche starten" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Suche zurücksetzen" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'bsiStatus + ' + Me.bsiStatus.Id = 3 + Me.bsiStatus.ImageOptions.SvgImage = CType(resources.GetObject("bsiStatus.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bsiStatus.Name = "bsiStatus" + Me.bsiStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph + ' + 'BarSubItem1 + ' + Me.BarSubItem1.Caption = "BarSubItem1" + Me.BarSubItem1.Id = 4 + Me.BarSubItem1.Name = "BarSubItem1" + ' + 'BarListItem1 + ' + Me.BarListItem1.Caption = "Vorlagen" + Me.BarListItem1.Id = 5 + Me.BarListItem1.Name = "BarListItem1" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" - ' - 'RibbonPageGroup1 - ' - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + Me.RibbonPage1.Text = "Suche" ' 'RibbonPageGroup2 ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "Suchfunktionen" ' 'RibbonStatusBar1 ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 567) + Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiStatus) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 747) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(864, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(936, 22) ' 'RibbonPage2 ' @@ -112,30 +170,23 @@ Partial Class frmFlowSearch1 Me.DockPanel1.ImageOptions.SvgImage = CType(resources.GetObject("DockPanel1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.DockPanel1.Location = New System.Drawing.Point(0, 160) Me.DockPanel1.Name = "DockPanel1" - Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.Size = New System.Drawing.Size(200, 407) + Me.DockPanel1.OriginalSize = New System.Drawing.Size(225, 200) + Me.DockPanel1.Size = New System.Drawing.Size(225, 587) Me.DockPanel1.Text = "Datum" ' 'DockPanel1_Container ' - Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchMonth_Last) - Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchMonth) - Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchTomorrow) - Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchLastWeek) - Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchYear_Last) - Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchYear) - Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchYesterday) - Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchToday) - Me.DockPanel1_Container.Controls.Add(Me.cmbLimitationDateAttr) + Me.DockPanel1_Container.Controls.Add(Me.XtraTabControl1) Me.DockPanel1_Container.Controls.Add(Me.Label1) + Me.DockPanel1_Container.Controls.Add(Me.cmbLimitationDateAttr) Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 48) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 356) + Me.DockPanel1_Container.Size = New System.Drawing.Size(218, 536) Me.DockPanel1_Container.TabIndex = 0 ' 'ToggleSwitchMonth_Last ' - Me.ToggleSwitchMonth_Last.Location = New System.Drawing.Point(12, 220) + Me.ToggleSwitchMonth_Last.Location = New System.Drawing.Point(3, 155) Me.ToggleSwitchMonth_Last.MenuManager = Me.RibbonControl1 Me.ToggleSwitchMonth_Last.Name = "ToggleSwitchMonth_Last" Me.ToggleSwitchMonth_Last.Properties.OffText = "Letzter Monat" @@ -145,7 +196,7 @@ Partial Class frmFlowSearch1 ' 'ToggleSwitchMonth ' - Me.ToggleSwitchMonth.Location = New System.Drawing.Point(12, 195) + Me.ToggleSwitchMonth.Location = New System.Drawing.Point(3, 130) Me.ToggleSwitchMonth.MenuManager = Me.RibbonControl1 Me.ToggleSwitchMonth.Name = "ToggleSwitchMonth" Me.ToggleSwitchMonth.Properties.OffText = "Dieser Monat" @@ -155,17 +206,18 @@ Partial Class frmFlowSearch1 ' 'ToggleSwitchTomorrow ' - Me.ToggleSwitchTomorrow.Location = New System.Drawing.Point(12, 93) + Me.ToggleSwitchTomorrow.Location = New System.Drawing.Point(104, 28) Me.ToggleSwitchTomorrow.MenuManager = Me.RibbonControl1 Me.ToggleSwitchTomorrow.Name = "ToggleSwitchTomorrow" Me.ToggleSwitchTomorrow.Properties.OffText = "Morgen" Me.ToggleSwitchTomorrow.Properties.OnText = "Morgen" Me.ToggleSwitchTomorrow.Size = New System.Drawing.Size(95, 19) Me.ToggleSwitchTomorrow.TabIndex = 7 + Me.ToggleSwitchTomorrow.Visible = False ' 'ToggleSwitchLastWeek ' - Me.ToggleSwitchLastWeek.Location = New System.Drawing.Point(12, 118) + Me.ToggleSwitchLastWeek.Location = New System.Drawing.Point(3, 53) Me.ToggleSwitchLastWeek.MenuManager = Me.RibbonControl1 Me.ToggleSwitchLastWeek.Name = "ToggleSwitchLastWeek" Me.ToggleSwitchLastWeek.Properties.OffText = "Letzten 7 Tage" @@ -175,7 +227,7 @@ Partial Class frmFlowSearch1 ' 'ToggleSwitchYear_Last ' - Me.ToggleSwitchYear_Last.Location = New System.Drawing.Point(12, 170) + Me.ToggleSwitchYear_Last.Location = New System.Drawing.Point(3, 105) Me.ToggleSwitchYear_Last.MenuManager = Me.RibbonControl1 Me.ToggleSwitchYear_Last.Name = "ToggleSwitchYear_Last" Me.ToggleSwitchYear_Last.Properties.OffText = "Letztes Jahr" @@ -185,17 +237,17 @@ Partial Class frmFlowSearch1 ' 'ToggleSwitchYear ' - Me.ToggleSwitchYear.Location = New System.Drawing.Point(12, 145) + Me.ToggleSwitchYear.Location = New System.Drawing.Point(3, 80) Me.ToggleSwitchYear.MenuManager = Me.RibbonControl1 Me.ToggleSwitchYear.Name = "ToggleSwitchYear" Me.ToggleSwitchYear.Properties.OffText = "Dieses Jahr" - Me.ToggleSwitchYear.Properties.OnText = "Letztes Jahr" + Me.ToggleSwitchYear.Properties.OnText = "Dieses Jahr" Me.ToggleSwitchYear.Size = New System.Drawing.Size(132, 19) Me.ToggleSwitchYear.TabIndex = 4 ' 'ToggleSwitchYesterday ' - Me.ToggleSwitchYesterday.Location = New System.Drawing.Point(12, 68) + Me.ToggleSwitchYesterday.Location = New System.Drawing.Point(3, 28) Me.ToggleSwitchYesterday.MenuManager = Me.RibbonControl1 Me.ToggleSwitchYesterday.Name = "ToggleSwitchYesterday" Me.ToggleSwitchYesterday.Properties.OffText = "Gestern" @@ -205,7 +257,7 @@ Partial Class frmFlowSearch1 ' 'ToggleSwitchToday ' - Me.ToggleSwitchToday.Location = New System.Drawing.Point(12, 43) + Me.ToggleSwitchToday.Location = New System.Drawing.Point(3, 3) Me.ToggleSwitchToday.MenuManager = Me.RibbonControl1 Me.ToggleSwitchToday.Name = "ToggleSwitchToday" Me.ToggleSwitchToday.Properties.OffText = "Heute" @@ -216,7 +268,7 @@ Partial Class frmFlowSearch1 'cmbLimitationDateAttr ' Me.cmbLimitationDateAttr.FormattingEnabled = True - Me.cmbLimitationDateAttr.Location = New System.Drawing.Point(12, 16) + Me.cmbLimitationDateAttr.Location = New System.Drawing.Point(6, 16) Me.cmbLimitationDateAttr.Name = "cmbLimitationDateAttr" Me.cmbLimitationDateAttr.Size = New System.Drawing.Size(178, 21) Me.cmbLimitationDateAttr.TabIndex = 1 @@ -224,24 +276,164 @@ Partial Class frmFlowSearch1 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(9, 0) + Me.Label1.Location = New System.Drawing.Point(3, 0) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(47, 13) Me.Label1.TabIndex = 0 Me.Label1.Text = "Attribut" ' + '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(116, 17) + Me.LabelControl1.TabIndex = 3 + Me.LabelControl1.Text = "Suche nach Dateien:" + ' + 'txtSearchInput + ' + Me.txtSearchInput.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtSearchInput.Location = New System.Drawing.Point(231, 189) + Me.txtSearchInput.Name = "txtSearchInput" + Me.txtSearchInput.Size = New System.Drawing.Size(341, 25) + Me.txtSearchInput.TabIndex = 4 + ' + '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(231, 224) + Me.PictureEdit1.MenuManager = Me.RibbonControl1 + Me.PictureEdit1.Name = "PictureEdit1" + 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(693, 517) + Me.PictureEdit1.TabIndex = 8 + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.AllowTextClipping = False + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemTerm) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarToggleSwitchItemFulltext) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Suchvarianten" + ' + 'BarToggleSwitchItemTerm + ' + Me.BarToggleSwitchItemTerm.BindableChecked = True + Me.BarToggleSwitchItemTerm.Caption = "Suche nach Term" + Me.BarToggleSwitchItemTerm.Checked = True + Me.BarToggleSwitchItemTerm.Id = 6 + Me.BarToggleSwitchItemTerm.Name = "BarToggleSwitchItemTerm" + ' + 'BarToggleSwitchItemFulltext + ' + Me.BarToggleSwitchItemFulltext.Caption = "Volltext" + Me.BarToggleSwitchItemFulltext.Id = 7 + Me.BarToggleSwitchItemFulltext.Name = "BarToggleSwitchItemFulltext" + ' + 'XtraTabControl1 + ' + Me.XtraTabControl1.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.XtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom + Me.XtraTabControl1.Location = New System.Drawing.Point(6, 43) + Me.XtraTabControl1.Name = "XtraTabControl1" + Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 + Me.XtraTabControl1.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] + Me.XtraTabControl1.Size = New System.Drawing.Size(203, 490) + Me.XtraTabControl1.TabIndex = 10 + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) + ' + 'XtraTabPage1 + ' + Me.XtraTabPage1.Controls.Add(Me.DateEditBis) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchMonth_Last) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitch1) + Me.XtraTabPage1.Controls.Add(Me.lblDatefrom) + Me.XtraTabPage1.Controls.Add(Me.DateEdit1) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchMonth) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchTomorrow) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchToday) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchLastWeek) + Me.XtraTabPage1.Controls.Add(Me.ToggleSwitchYesterday) + 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, 467) + Me.XtraTabPage1.Text = "Standard" + ' + 'XtraTabPage2 + ' + Me.XtraTabPage2.Name = "XtraTabPage2" + Me.XtraTabPage2.Size = New System.Drawing.Size(201, 467) + Me.XtraTabPage2.Text = "Explizit" + ' + 'ToggleSwitch1 + ' + Me.ToggleSwitch1.Location = New System.Drawing.Point(3, 256) + Me.ToggleSwitch1.MenuManager = Me.RibbonControl1 + Me.ToggleSwitch1.Name = "ToggleSwitch1" + Me.ToggleSwitch1.Properties.OffText = "Datum bis" + Me.ToggleSwitch1.Properties.OnText = "Datum bis" + Me.ToggleSwitch1.Size = New System.Drawing.Size(122, 19) + Me.ToggleSwitch1.TabIndex = 0 + ' + 'DateEdit1 + ' + Me.DateEdit1.EditValue = Nothing + Me.DateEdit1.Location = New System.Drawing.Point(3, 230) + Me.DateEdit1.MenuManager = Me.RibbonControl1 + Me.DateEdit1.Name = "DateEdit1" + Me.DateEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEdit1.Properties.CalendarView = DevExpress.XtraEditors.Repository.CalendarView.ClassicNew + Me.DateEdit1.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.Standard + Me.DateEdit1.Properties.VistaDisplayMode = DevExpress.Utils.DefaultBoolean.[False] + Me.DateEdit1.Size = New System.Drawing.Size(117, 20) + Me.DateEdit1.TabIndex = 1 + ' + 'DateEditBis + ' + Me.DateEditBis.EditValue = Nothing + Me.DateEditBis.Location = New System.Drawing.Point(3, 281) + Me.DateEditBis.MenuManager = Me.RibbonControl1 + Me.DateEditBis.Name = "DateEditBis" + Me.DateEditBis.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEditBis.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.DateEditBis.Size = New System.Drawing.Size(117, 20) + Me.DateEditBis.TabIndex = 2 + ' + 'lblDatefrom + ' + Me.lblDatefrom.Location = New System.Drawing.Point(3, 211) + Me.lblDatefrom.Name = "lblDatefrom" + Me.lblDatefrom.Size = New System.Drawing.Size(34, 13) + Me.lblDatefrom.TabIndex = 3 + Me.lblDatefrom.Text = "Datum" + ' 'frmFlowSearch1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(864, 589) + Me.ClientSize = New System.Drawing.Size(936, 769) + Me.Controls.Add(Me.PictureEdit1) + Me.Controls.Add(Me.txtSearchInput) + Me.Controls.Add(Me.LabelControl1) Me.Controls.Add(Me.DockPanel1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) + Me.IconOptions.SvgImage = CType(resources.GetObject("frmFlowSearch1.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Name = "frmFlowSearch1" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "frmFlowSearch1" + Me.Text = "Flowsearch" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit() Me.DockPanel1.ResumeLayout(False) @@ -255,6 +447,16 @@ Partial Class frmFlowSearch1 CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToggleSwitchYesterday.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToggleSwitchToday.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabControl1.ResumeLayout(False) + Me.XtraTabPage1.ResumeLayout(False) + Me.XtraTabPage1.PerformLayout() + CType(Me.ToggleSwitch1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEdit1.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEditBis.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DateEditBis.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -262,7 +464,6 @@ Partial Class frmFlowSearch1 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 @@ -273,10 +474,28 @@ Partial Class frmFlowSearch1 Friend WithEvents Label1 As Label Friend WithEvents ToggleSwitchToday As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents ToggleSwitchYear_Last As DevExpress.XtraEditors.ToggleSwitch - Friend WithEvents ToggleSwitchYear As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents ToggleSwitchYesterday As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents ToggleSwitchLastWeek As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents ToggleSwitchTomorrow As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents ToggleSwitchMonth_Last As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents ToggleSwitchMonth As DevExpress.XtraEditors.ToggleSwitch + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents txtSearchInput As TextBox + 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 + Friend WithEvents BarListItem1 As DevExpress.XtraBars.BarListItem + Friend WithEvents PictureEdit1 As DevExpress.XtraEditors.PictureEdit + Friend WithEvents BarToggleSwitchItemTerm As DevExpress.XtraBars.BarToggleSwitchItem + Friend WithEvents BarToggleSwitchItemFulltext As DevExpress.XtraBars.BarToggleSwitchItem + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl + Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents lblDatefrom As DevExpress.XtraEditors.LabelControl + Friend WithEvents DateEditBis As DevExpress.XtraEditors.DateEdit + Friend WithEvents DateEdit1 As DevExpress.XtraEditors.DateEdit + Friend WithEvents ToggleSwitch1 As DevExpress.XtraEditors.ToggleSwitch End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.resx b/GUIs.ZooFlow/Search/frmFlowSearch1.resx index 2a496df5..3531dccb 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.resx +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.resx @@ -117,10 +117,61 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALoBAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9z + dHlsZT4NCiAgPHBhdGggZD0iTTguOSw0LjFDOC40LDMuOCw4LDQuMSw4LDQuN3YyMi42YzAsMC43LDAu + NCwwLjksMC45LDAuNWwxNi43LTExLjNjMC41LTAuMywwLjUtMC45LDAtMS4yTDguOSw0LjF6IiBjbGFz + cz0iQmx1ZSIgLz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAL4BAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9z + dHlsZT4NCiAgPHBhdGggZD0iTTIxLDEwSDEwbDYtNmgtNmwtOCw4bDgsOGg2bC02LTZoMTFjMi44LDAs + NSwyLjIsNSw1cy0yLjIsNS01LDVoLTV2NGg1YzUsMCw5LTQsOS05QzMwLDE0LDI2LDEwLDIxLDEweiIg + Y2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQWJvdXQiPg0KICAgIDxwYXRoIGQ9 + Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs + MnogTTE2LDZjMS4xLDAsMiwwLjksMiwycy0wLjksMi0yLDJzLTItMC45LTItMiAgIFMxNC45LDYsMTYs + NnogTTIwLDI0aC04di0yaDJ2LThoLTJ2LTJoMmg0djEwaDJWMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg + PC9nPg0KPC9zdmc+Cw== + + 17, 17 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -143,6 +194,32 @@ dGg9IjQiIGhlaWdodD0iNCIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHJlY3Qg eD0iMjAiIHk9IjE4IiB3aWR0aD0iNCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJCbGFj ayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku + QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC + MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh + cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz + LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu + NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt + MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs + MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks + MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi + IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu + NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01 + ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj + LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i + QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb index a28f58cb..3bf4ee45 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch1.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -1,13 +1,34 @@ Imports DevExpress.XtraEditors +Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.ZooFlow.ClassConstants +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.ZooFlow + Public Class frmFlowSearch1 + Private _Params As ClipboardWatcherParams + Private _Environment As Environment + Private Logger As Logger + Private TOGGLE_Change As Boolean = False Private LIMITATION_DATE As Boolean = False Private SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Private SEARCH_FACT_DATE As String = "MONTH(OBJ.ADDED_WHEN) <> 13" + Private CONST_CR_TODAY As String = "CREATED_TODAY" + Private CONST_CR_YDAY As String = "CREATED_YESTERDAY" + Private CONST_CR_L7DAYS As String = "CREATED_LAST7DAYS" + Private CONST_CR_Y_CURR As String = "CREATED_YEAR_CURRENT" + Private CONST_CR_Y_LAST As String = "CREATED_YEAR_LAST" + Private CONST_CR_M_CURR As String = "CREATED_MONTH_CURRENT" + Private CONST_CR_M_LAST As String = "CREATED_MONTH_LAST" + + Private CONST_DATE_TOMORROW As String = "TOMORROW" + Private SEARCH_PARAM3 + + Dim oBASESEARCH As String + Private Sub ToggleSwitchToday_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchToday.Toggled, ToggleSwitchYesterday.Toggled, ToggleSwitchYear.Toggled, ToggleSwitchYear_Last.Toggled, - ToggleSwitchMonth_Last.Toggled, ToggleSwitchMonth.Toggled + ToggleSwitchMonth_Last.Toggled, ToggleSwitchMonth.Toggled, ToggleSwitchLastWeek.Toggled, ToggleSwitchTomorrow.Toggled If TOGGLE_Change = True Then Exit Sub End If @@ -17,6 +38,16 @@ Public Class frmFlowSearch1 TOGGLE_Change = 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())", CONST_DATE_TOMORROW) Case "ToggleSwitchYear" ToggleSwitchToday.IsOn = False ToggleSwitchYesterday.IsOn = False @@ -25,8 +56,8 @@ Public Class frmFlowSearch1 ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())") - Case "ToggleSwitchLastYear" + oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CONST_CR_Y_CURR) + Case "ToggleSwitchYear_Last" ToggleSwitchToday.IsOn = False ToggleSwitchYesterday.IsOn = False ToggleSwitchTomorrow.IsOn = False @@ -34,7 +65,8 @@ Public Class frmFlowSearch1 ToggleSwitchYear.IsOn = False ToggleSwitchMonth.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)") + oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())", CONST_CR_TODAY) + Case "ToggleSwitchMonth" ToggleSwitchToday.IsOn = False ToggleSwitchYesterday.IsOn = False @@ -43,7 +75,7 @@ Public Class frmFlowSearch1 ToggleSwitchYear.IsOn = False ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())") + oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = MONTH(GETDATE())", CONST_CR_M_CURR) Case "ToggleSwitchMonth_Last" ToggleSwitchToday.IsOn = False ToggleSwitchYesterday.IsOn = False @@ -54,9 +86,9 @@ Public Class frmFlowSearch1 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)") + oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = 12 " & vbNewLine & "AND YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)", CONST_CR_M_LAST) Else - oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)") + oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)", CONST_CR_M_LAST) End If Case "ToggleSwitchToday" ToggleSwitchYesterday.IsOn = False @@ -66,7 +98,7 @@ Public Class frmFlowSearch1 ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())") + oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())", CONST_CR_TODAY) Case "ToggleSwitchYesterday" ToggleSwitchToday.IsOn = False ToggleSwitchTomorrow.IsOn = False @@ -75,28 +107,41 @@ Public Class frmFlowSearch1 ToggleSwitchYear_Last.IsOn = False ToggleSwitchMonth.IsOn = False ToggleSwitchMonth_Last.IsOn = False - oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)") + oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)", CONST_CR_YDAY) + Case "ToggleSwitchLastWeek" + ToggleSwitchToday.IsOn = False + ToggleSwitchTomorrow.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)", CONST_CR_L7DAYS) End Select SEARCH_FACT_DATE = oWHENDATE TOGGLE_Change = 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 Then + 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 + SEARCH_PARAM3 = "" End If End If End Sub - Private Function GET_DATE_LIMITATION(pInput As String) As String + Private Function GET_DATE_LIMITATION(pInput As String, pVariant As String) As String Try If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then + SEARCH_PARAM3 = "ECM_" & 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) + Logger.Error(ex) End Try End Function @@ -114,22 +159,28 @@ Public Class frmFlowSearch1 End If 'SearchContent() Catch ex As Exception - LOGGER.Error(ex) + Logger.Error(ex) End Try End If End Sub Private Sub frmFlowSearch1_Load(sender As Object, e As EventArgs) Handles Me.Load + Logger = My.LogConfig.GetLogger() + If My.Application.User.Language = "de-DE" Then cmbLimitationDateAttr.Items.Add(IDB_ADDED_WHEN_String_German) Else cmbLimitationDateAttr.Items.Add(IDB_ADDED_WHEN_String_Englisch) End If - Dim oDT As DataTable = My.DatabaseIDB.GetDatatable($"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE TYPE_ID IN (5,6) AND LANG_ID = {My.Application.User.LanguageId}") + 'Dim oDT As DataTable = My.DatabaseIDB.GetDatatable($"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE TYPE_ID IN (5,6) AND LANG_ID = {My.Application.User.LanguageId}") + + For Each oRow As DataRow In My.Tables.DTIDB_ATTRIBUTE.Rows + If CBool(oRow.Item("SYS_ATTRIBUTE")) = False And (oRow.Item("TYP_ID") = 5 Or oRow.Item("TYP_ID") = 6) Then + cmbLimitationDateAttr.Items.Add(oRow.Item("TITLE")) + End If - For Each oRow As DataRow In oDT.Rows - cmbLimitationDateAttr.Items.Add(oRow.Item("ATTR_TITLE")) Next + _Environment = My.Application.GetEnvironment 'Dim editor As BarEditItem = BarEditItemDate ' editor = TryCast(BarEditItemDate, ComboBoxEdit) If My.Application.User.Language = "de-DE" Then @@ -137,7 +188,110 @@ Public Class frmFlowSearch1 ' BarEditItemDate.EditValue = "Erstellt Wann" Else cmbLimitationDateAttr.SelectedIndex = 1 - ' BarEditItemDate.EditValue = "Added when" + ' BarEditItemDate.EditValue = "Added When" + End If + + For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows + If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then + oBASESEARCH = oRow.Item("SQL_COMMAND") + oBASESEARCH = oBASESEARCH.Replace("@USER_ID", My.Application.User.UserId) + oBASESEARCH = oBASESEARCH.Replace("@LANG_CODE", My.Application.User.Language) + End If + Next + + + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Search_GO() + End Sub + Private Sub Search_GO() + Dim owTITLE + Dim oSearchTerm = txtSearchInput.Text + If My.Application.User.Language = "de-DE" Then + owTITLE = $"Suche nach ""{oSearchTerm}""" + End If + _Params = New ClipboardWatcherParams() + _Params.ClipboardContents = oSearchTerm + + Dim oParams = New DocumentResultList.Params() With { + .WindowGuid = "FlowSearch", + .WindowTitle = GetResultWindowString(oSearchTerm), + .OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow, + .ProfileGuid = 123456789 + } + + Dim oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~{SEARCH_PARAM3}" + Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'" + + If My.DatabaseIDB.ExecuteNonQuery(oSQL) = True Then + Dim oDTDocResult = My.DatabaseIDB.GetDatatable(oBASESEARCH) + If oDTDocResult.Rows.Count > 0 Then + oParams.Results.Add(New DocumentResultList.DocumentResult() With { + .Title = "MySearchTitle", + .Datatable = oDTDocResult}) + Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams) + 'AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed + 'AddHandler oForm.NeedsRefresh, AddressOf ProfileResultForm_NeedsRefresh + + 'OpenForms.Add(oForm) + oForm.Show() + Else + bsiStatus.Caption = "No Results" + End If + + + + End If + ' + + End Sub + + Private Sub txtSearchInput_KeyUp(sender As Object, e As KeyEventArgs) Handles txtSearchInput.KeyUp + If e.KeyCode = Keys.Return Then + If txtSearchInput.Text = String.Empty Then + Exit Sub + End If + Search_GO() 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 Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Me.txtSearchInput.Text = "" + ToggleSwitchToday.IsOn = False + End Sub + + Private Sub ToggleSwitch1_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitch1.Toggled + Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) + + If oToggle.IsOn Then + DateEditBis.Enabled = True + lblDatefrom.Text = "Datum von" + Else + DateEditBis.Enabled = False + lblDatefrom.Text = "Datum" + End If + End Sub + + Private Sub DateEdit1_DateTimeChanged(sender As Object, e As EventArgs) Handles DateEdit1.DateTimeChanged + ToggleSwitchToday.IsOn = False + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index deaf2f27..05e95c11 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -40,6 +40,7 @@ Partial Class frmFlowForm Me.VerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.SucheTestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.TestFlowSearchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() @@ -55,8 +56,10 @@ Partial Class frmFlowForm Me.BehaviorManager1 = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components) Me.PictureBoxGlobix1 = New DevExpress.XtraEditors.SvgImageBox() Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox() - Me.AccordionControl1 = New DevExpress.XtraBars.Navigation.AccordionControl() - Me.TestFlowSearchToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.lblQuicksearch1 = New DevExpress.XtraEditors.LabelControl() + Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() + Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() Me.ContextMenuSystray.SuspendLayout() CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit() @@ -65,7 +68,9 @@ Partial Class frmFlowForm CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.AccordionControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplashScreenManager @@ -83,14 +88,14 @@ Partial Class frmFlowForm ' Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GlobixToolStripMenuItem, Me.UserKonfigurationToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.SucheTestToolStripMenuItem, Me.TestFlowSearchToolStripMenuItem, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem}) Me.ContextMenuSystray.Name = "ContextMenuSystray" - Me.ContextMenuSystray.Size = New System.Drawing.Size(181, 198) + Me.ContextMenuSystray.Size = New System.Drawing.Size(174, 176) ' 'GlobixToolStripMenuItem ' Me.GlobixToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TsiGlobixConfig}) Me.GlobixToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.GLOBIX_short Me.GlobixToolStripMenuItem.Name = "GlobixToolStripMenuItem" - Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(173, 22) Me.GlobixToolStripMenuItem.Text = "Globix" Me.GlobixToolStripMenuItem.Visible = False ' @@ -104,7 +109,7 @@ Partial Class frmFlowForm ' Me.UserKonfigurationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DatenbankverbindungToolStripMenuItem, Me.BasisKonfigurationToolStripMenuItem}) Me.UserKonfigurationToolStripMenuItem.Name = "UserKonfigurationToolStripMenuItem" - Me.UserKonfigurationToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.UserKonfigurationToolStripMenuItem.Size = New System.Drawing.Size(173, 22) Me.UserKonfigurationToolStripMenuItem.Text = "User Konfiguration" ' 'DatenbankverbindungToolStripMenuItem @@ -122,41 +127,47 @@ Partial Class frmFlowForm 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(170, 6) ' 'VerwaltungToolStripMenuItem ' Me.VerwaltungToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.gear_32xLG Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem" - Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(173, 22) Me.VerwaltungToolStripMenuItem.Text = "Verwaltung" ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(170, 6) ' 'SucheTestToolStripMenuItem ' Me.SucheTestToolStripMenuItem.Name = "SucheTestToolStripMenuItem" - Me.SucheTestToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.SucheTestToolStripMenuItem.Size = New System.Drawing.Size(173, 22) Me.SucheTestToolStripMenuItem.Text = "Suche (Test)" ' + 'TestFlowSearchToolStripMenuItem + ' + Me.TestFlowSearchToolStripMenuItem.Name = "TestFlowSearchToolStripMenuItem" + Me.TestFlowSearchToolStripMenuItem.Size = New System.Drawing.Size(173, 22) + Me.TestFlowSearchToolStripMenuItem.Text = "Test_FlowSearch" + ' 'TestToolStripMenuItem ' Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem" - Me.TestToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.TestToolStripMenuItem.Size = New System.Drawing.Size(173, 22) Me.TestToolStripMenuItem.Text = "Test" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(170, 6) ' 'ZooFlowBeendenToolStripMenuItem ' Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem" - Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22) + Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(173, 22) Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden" ' 'PictureBoxPM1 @@ -165,7 +176,7 @@ Partial Class frmFlowForm Me.PictureBoxPM1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.PictureBoxPM1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark Me.PictureBoxPM1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxPM1.Location = New System.Drawing.Point(49, 361) + Me.PictureBoxPM1.Location = New System.Drawing.Point(38, 377) Me.PictureBoxPM1.Name = "PictureBoxPM1" Me.PictureBoxPM1.Size = New System.Drawing.Size(90, 90) Me.PictureBoxPM1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom @@ -178,7 +189,7 @@ Partial Class frmFlowForm ' Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand Me.PictureBoxAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo - Me.PictureBoxAbo.Location = New System.Drawing.Point(99, 216) + Me.PictureBoxAbo.Location = New System.Drawing.Point(88, 224) Me.PictureBoxAbo.Name = "PictureBoxAbo" Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36) Me.PictureBoxAbo.TabIndex = 11 @@ -192,7 +203,7 @@ Partial Class frmFlowForm Me.PictureBoxDragDrop.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW Me.PictureBoxDragDrop.Location = New System.Drawing.Point(0, 0) Me.PictureBoxDragDrop.Name = "PictureBoxDragDrop" - Me.PictureBoxDragDrop.Size = New System.Drawing.Size(200, 150) + Me.PictureBoxDragDrop.Size = New System.Drawing.Size(202, 150) Me.PictureBoxDragDrop.TabIndex = 10 Me.PictureBoxDragDrop.TabStop = False Me.ToolTip1.SetToolTip(Me.PictureBoxDragDrop, "Drag and Drop files here") @@ -222,7 +233,7 @@ Partial Class frmFlowForm Me.PictureBoxGlobix1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.PictureBoxGlobix1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark Me.PictureBoxGlobix1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxGlobix1.Location = New System.Drawing.Point(49, 469) + Me.PictureBoxGlobix1.Location = New System.Drawing.Point(38, 485) Me.PictureBoxGlobix1.Name = "PictureBoxGlobix1" Me.PictureBoxGlobix1.Size = New System.Drawing.Size(90, 90) Me.PictureBoxGlobix1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom @@ -236,7 +247,7 @@ Partial Class frmFlowForm Me.PictureBoxSearch1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.PictureBoxSearch1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark Me.PictureBoxSearch1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox - Me.PictureBoxSearch1.Location = New System.Drawing.Point(49, 250) + Me.PictureBoxSearch1.Location = New System.Drawing.Point(38, 266) Me.PictureBoxSearch1.Name = "PictureBoxSearch1" Me.PictureBoxSearch1.Size = New System.Drawing.Size(90, 90) Me.PictureBoxSearch1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch @@ -244,21 +255,48 @@ Partial Class frmFlowForm Me.PictureBoxSearch1.TabIndex = 13 Me.PictureBoxSearch1.Text = "SvgImageBox1" ' - 'AccordionControl1 + 'Panel1 ' - Me.AccordionControl1.Dock = System.Windows.Forms.DockStyle.Top - Me.AccordionControl1.Location = New System.Drawing.Point(0, 150) - Me.AccordionControl1.Name = "AccordionControl1" - Me.AccordionControl1.OptionsHamburgerMenu.DisplayMode = DevExpress.XtraBars.Navigation.AccordionControlDisplayMode.Overlay - Me.AccordionControl1.Size = New System.Drawing.Size(200, 39) - Me.AccordionControl1.TabIndex = 16 - Me.AccordionControl1.ViewType = DevExpress.XtraBars.Navigation.AccordionControlViewType.HamburgerMenu + Me.Panel1.Controls.Add(Me.PictureEdit1) + Me.Panel1.Controls.Add(Me.TextEdit1) + Me.Panel1.Controls.Add(Me.lblQuicksearch1) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top + Me.Panel1.Location = New System.Drawing.Point(0, 150) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(202, 60) + Me.Panel1.TabIndex = 16 ' - 'TestFlowSearchToolStripMenuItem + 'lblQuicksearch1 ' - Me.TestFlowSearchToolStripMenuItem.Name = "TestFlowSearchToolStripMenuItem" - Me.TestFlowSearchToolStripMenuItem.Size = New System.Drawing.Size(180, 22) - Me.TestFlowSearchToolStripMenuItem.Text = "Test_FlowSearch" + Me.lblQuicksearch1.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.lblQuicksearch1.Appearance.Options.UseFont = True + Me.lblQuicksearch1.Location = New System.Drawing.Point(3, 3) + Me.lblQuicksearch1.Name = "lblQuicksearch1" + Me.lblQuicksearch1.Size = New System.Drawing.Size(91, 21) + Me.lblQuicksearch1.TabIndex = 0 + Me.lblQuicksearch1.Text = "Alle Attribute" + ' + 'TextEdit1 + ' + Me.TextEdit1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.TextEdit1.Location = New System.Drawing.Point(3, 29) + Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.TextEdit1.Properties.Appearance.Options.UseFont = True + Me.TextEdit1.Size = New System.Drawing.Size(196, 28) + Me.TextEdit1.TabIndex = 1 + ' + 'PictureEdit1 + ' + Me.PictureEdit1.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.PictureEdit1.EditValue = CType(resources.GetObject("PictureEdit1.EditValue"), Object) + Me.PictureEdit1.Location = New System.Drawing.Point(170, 29) + Me.PictureEdit1.Name = "PictureEdit1" + Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] + Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom + Me.PictureEdit1.Size = New System.Drawing.Size(29, 28) + Me.PictureEdit1.TabIndex = 17 ' 'frmFlowForm ' @@ -271,11 +309,11 @@ Partial Class frmFlowForm Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.BehaviorManager1.SetBehaviors(Me, New DevExpress.Utils.Behaviors.Behavior() {CType(DevExpress.Utils.Behaviors.Common.SnapWindowBehavior.Create(GetType(DevExpress.Utils.BehaviorSource.SnapWindowBehaviorSourceForForm), SnapOptions1), DevExpress.Utils.Behaviors.Behavior)}) - Me.ClientSize = New System.Drawing.Size(200, 638) - Me.Controls.Add(Me.AccordionControl1) + Me.ClientSize = New System.Drawing.Size(202, 638) + Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.PictureBoxAbo) Me.Controls.Add(Me.PictureBoxGlobix1) Me.Controls.Add(Me.PictureBoxPM1) - Me.Controls.Add(Me.PictureBoxAbo) Me.Controls.Add(Me.PictureBoxSearch1) Me.Controls.Add(Me.PictureBoxDragDrop) Me.DoubleBuffered = True @@ -292,7 +330,10 @@ Partial Class frmFlowForm CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.AccordionControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -322,6 +363,9 @@ Partial Class frmFlowForm Friend WithEvents SucheTestToolStripMenuItem As ToolStripMenuItem Friend WithEvents BehaviorManager1 As DevExpress.Utils.Behaviors.BehaviorManager Friend WithEvents BasisKonfigurationToolStripMenuItem As ToolStripMenuItem - Friend WithEvents AccordionControl1 As DevExpress.XtraBars.Navigation.AccordionControl Friend WithEvents TestFlowSearchToolStripMenuItem As ToolStripMenuItem + Friend WithEvents Panel1 As Panel + Friend WithEvents PictureEdit1 As PictureEdit + Friend WithEvents TextEdit1 As TextEdit + Friend WithEvents lblQuicksearch1 As LabelControl End Class diff --git a/GUIs.ZooFlow/frmFlowForm.resx b/GUIs.ZooFlow/frmFlowForm.resx index 7329206b..5fcd91c8 100644 --- a/GUIs.ZooFlow/frmFlowForm.resx +++ b/GUIs.ZooFlow/frmFlowForm.resx @@ -1977,4 +1977,31 @@ 222, 56 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku + QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC + MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh + cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz + LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu + NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt + MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs + MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks + MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi + IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu + NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01 + ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj + LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i + QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + \ No newline at end of file diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 99c4b0be..44228dad 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -224,17 +224,22 @@ Public Class frmFlowForm AddHandler Watcher.ClipboardChanged, AddressOf Watcher_ClipboardChanged PictureBoxSearch1.Visible = False - Dim oSQL = My.Queries.Common.FNIDB_GET_SEARCH_PROFILES(My.Application.User.UserId, My.Application.User.Language) - Dim oDatatable As DataTable = My.Database.GetDatatableIDB(oSQL) - - If Not IsNothing(oDatatable) Then - If oDatatable.Rows.Count > 0 Then + 'Dim oSQL = My.Queries.Common.FNIDB_GET_SEARCH_PROFILES(My.Application.User.UserId, My.Application.User.Language) + 'Dim oDatatable As DataTable = My.Database.GetDatatableIDB(oSQL) + For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows + If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then IDBSearchActive = True - DTIDB_SEARCHES = oDatatable PictureBoxSearch1.Visible = True End If + Next + 'If Not IsNothing(oDatatable) Then + ' If oDatatable.Rows.Count > 0 Then + ' IDBSearchActive = True + ' DTIDB_SEARCHES = oDatatable + ' PictureBoxSearch1.Visible = True + ' End If - End If + 'End If If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then Try @@ -298,7 +303,7 @@ Public Class frmFlowForm End If - oSQL = "SELECT * FROM TBIDB_ATTRIBUTE" + 'oSQL = "SELECT * FROM TBIDB_ATTRIBUTE" My.Tables.DTIDB_ATTRIBUTE = My.Database.GetDatatable("TBIDB_ATTRIBUTE", "SELECT * FROM TBIDB_ATTRIBUTE", EDMI.API.Constants.DatabaseType.IDB) Me.Cursor = Cursors.Default @@ -438,21 +443,22 @@ Public Class frmFlowForm Cursor = Cursors.Default Exit Sub End If - Dim oSQLFlowSearch As String = "" - For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows - If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_LOWER_LIMIT Then - oSQLFlowSearch = oRow.Item("SQL_COMMAND") + 'Dim oSQLFlowSearch As String = "" + 'For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows + ' If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_LOWER_LIMIT Then + ' oSQLFlowSearch = oRow.Item("SQL_COMMAND") - End If - Next - If oSQLFlowSearch <> String.Empty Then - oSQLFlowSearch = oSQLFlowSearch.Replace("@USER_ID", My.Application.User.UserId) - oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE_ID", My.Application.User.LanguageId) - oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE", My.Application.User.Language) - Dim oForm As New frmFlowSearch1() - oForm.Show() - oForm.BringToFront() - End If + ' End If + 'Next + 'If oSQLFlowSearch <> String.Empty Then + 'oSQLFlowSearch = oSQLFlowSearch.Replace("@USER_ID", My.Application.User.UserId) + 'oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE_ID", My.Application.User.LanguageId) + 'oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE", My.Application.User.Language) + + 'End If + Dim oForm As New frmFlowSearch1() + oForm.Show() + oForm.BringToFront() Cursor = Cursors.Default End Sub