diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index 1962e32a..651cfe22 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,11 +1,14 @@ -DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.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.XtraBars.Docking.DockManager, DevExpress.XtraBars.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.XtraEditors.TextEdit, 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.XtraEditors.CheckEdit, DevExpress.XtraEditors.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.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.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.XtraEditors.CheckEdit, DevExpress.XtraEditors.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/frmFlowSearch.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb index ec1b1507..3dce7ede 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb @@ -24,8 +24,8 @@ Partial Class frmFlowSearch Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch)) - Dim TileItemElement1 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() - Dim TileItemElement2 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() + Dim TileItemElement7 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() + Dim TileItemElement8 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() Me.CheckButton1 = New DevExpress.XtraEditors.CheckButton() Me.txtSearchTerm = New System.Windows.Forms.TextBox() Me.lblFoundResult = New System.Windows.Forms.Label() @@ -49,7 +49,7 @@ Partial Class frmFlowSearch Me.Label3 = New System.Windows.Forms.Label() Me.CheckedListBoxCategories = New DevExpress.XtraEditors.CheckedListBoxControl() Me.ToggleSwitchLastMonth = New DevExpress.XtraEditors.ToggleSwitch() - Me.ToggleSwitchCurrentMonth = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchMonth = New DevExpress.XtraEditors.ToggleSwitch() Me.ToggleSwitchLastYear = New DevExpress.XtraEditors.ToggleSwitch() Me.ToggleSwitchCurrentYear = New DevExpress.XtraEditors.ToggleSwitch() Me.ToggleSwitchYesterday = New DevExpress.XtraEditors.ToggleSwitch() @@ -67,7 +67,7 @@ Partial Class frmFlowSearch Me.DockPanel1_Container.SuspendLayout() CType(Me.CheckedListBoxCategories, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToggleSwitchLastMonth.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ToggleSwitchCurrentMonth.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchMonth.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToggleSwitchLastYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToggleSwitchCurrentYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ToggleSwitchYesterday.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -144,7 +144,7 @@ Partial Class frmFlowSearch Me.TileControlMatch.Name = "TileControlMatch" Me.TileControlMatch.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollBar Me.TileControlMatch.ShowGroupText = True - Me.TileControlMatch.Size = New System.Drawing.Size(1035, 415) + Me.TileControlMatch.Size = New System.Drawing.Size(1035, 413) Me.TileControlMatch.TabIndex = 2 Me.TileControlMatch.TabStop = False Me.TileControlMatch.Text = "TileControl1" @@ -161,8 +161,8 @@ Partial Class frmFlowSearch ' Me.TileItem1.AppearanceItem.Normal.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer)) Me.TileItem1.AppearanceItem.Normal.Options.UseBackColor = True - TileItemElement1.Text = "TileItem1" - Me.TileItem1.Elements.Add(TileItemElement1) + TileItemElement7.Text = "TileItem1" + Me.TileItem1.Elements.Add(TileItemElement7) Me.TileItem1.Id = 0 Me.TileItem1.ItemSize = DevExpress.XtraEditors.TileItemSize.Wide Me.TileItem1.Name = "TileItem1" @@ -171,8 +171,8 @@ Partial Class frmFlowSearch ' Me.TileItem2.AppearanceItem.Normal.BackColor = System.Drawing.Color.White Me.TileItem2.AppearanceItem.Normal.Options.UseBackColor = True - TileItemElement2.Text = "TileItem2" - Me.TileItem2.Elements.Add(TileItemElement2) + TileItemElement8.Text = "TileItem2" + Me.TileItem2.Elements.Add(TileItemElement8) Me.TileItem2.Id = 1 Me.TileItem2.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium Me.TileItem2.Name = "TileItem2" @@ -198,7 +198,7 @@ Partial Class frmFlowSearch Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.MacOffice Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1237, 146) + Me.RibbonControl1.Size = New System.Drawing.Size(1237, 148) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -238,10 +238,10 @@ Partial Class frmFlowSearch Me.panelContainer1.Controls.Add(Me.DockPanel3) Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.panelContainer1.ID = New System.Guid("2c41e5f4-f976-4b22-a22e-afe12cfdaa3d") - Me.panelContainer1.Location = New System.Drawing.Point(0, 146) + Me.panelContainer1.Location = New System.Drawing.Point(0, 148) Me.panelContainer1.Name = "panelContainer1" Me.panelContainer1.OriginalSize = New System.Drawing.Size(202, 200) - Me.panelContainer1.Size = New System.Drawing.Size(202, 499) + Me.panelContainer1.Size = New System.Drawing.Size(202, 497) Me.panelContainer1.Tabbed = True Me.panelContainer1.Text = "panelContainer1" ' @@ -258,8 +258,8 @@ Partial Class frmFlowSearch Me.DockPanel1.Options.AllowFloating = False Me.DockPanel1.Options.ShowCloseButton = False Me.DockPanel1.Options.ShowMaximizeButton = False - Me.DockPanel1.OriginalSize = New System.Drawing.Size(220, 421) - Me.DockPanel1.Size = New System.Drawing.Size(195, 421) + Me.DockPanel1.OriginalSize = New System.Drawing.Size(195, 421) + Me.DockPanel1.Size = New System.Drawing.Size(195, 419) Me.DockPanel1.Text = "Einschränkungen" ' 'DockPanel1_Container @@ -267,7 +267,7 @@ Partial Class frmFlowSearch Me.DockPanel1_Container.Controls.Add(Me.Label3) Me.DockPanel1_Container.Controls.Add(Me.CheckedListBoxCategories) Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchLastMonth) - Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchCurrentMonth) + Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchMonth) Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchLastYear) Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchCurrentYear) Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchYesterday) @@ -276,7 +276,7 @@ Partial Class frmFlowSearch Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchToday) Me.DockPanel1_Container.Location = New System.Drawing.Point(0, 0) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(195, 421) + Me.DockPanel1_Container.Size = New System.Drawing.Size(195, 419) Me.DockPanel1_Container.TabIndex = 0 ' 'Label3 @@ -299,7 +299,7 @@ Partial Class frmFlowSearch Me.CheckedListBoxCategories.CheckOnClick = True Me.CheckedListBoxCategories.Location = New System.Drawing.Point(12, 217) Me.CheckedListBoxCategories.Name = "CheckedListBoxCategories" - Me.CheckedListBoxCategories.Size = New System.Drawing.Size(174, 201) + Me.CheckedListBoxCategories.Size = New System.Drawing.Size(174, 199) Me.CheckedListBoxCategories.TabIndex = 15 ' 'ToggleSwitchLastMonth @@ -316,19 +316,19 @@ Partial Class frmFlowSearch Me.ToggleSwitchLastMonth.Size = New System.Drawing.Size(151, 19) Me.ToggleSwitchLastMonth.TabIndex = 14 ' - 'ToggleSwitchCurrentMonth + 'ToggleSwitchMonth ' - Me.ToggleSwitchCurrentMonth.Location = New System.Drawing.Point(12, 150) - Me.ToggleSwitchCurrentMonth.MenuManager = Me.RibbonControl1 - Me.ToggleSwitchCurrentMonth.Name = "ToggleSwitchCurrentMonth" - Me.ToggleSwitchCurrentMonth.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.ToggleSwitchCurrentMonth.Properties.Appearance.ForeColor = System.Drawing.Color.White - Me.ToggleSwitchCurrentMonth.Properties.Appearance.Options.UseFont = True - Me.ToggleSwitchCurrentMonth.Properties.Appearance.Options.UseForeColor = True - Me.ToggleSwitchCurrentMonth.Properties.OffText = "Aktueller Monat" - Me.ToggleSwitchCurrentMonth.Properties.OnText = "Aktueller Monat" - Me.ToggleSwitchCurrentMonth.Size = New System.Drawing.Size(174, 19) - Me.ToggleSwitchCurrentMonth.TabIndex = 13 + Me.ToggleSwitchMonth.Location = New System.Drawing.Point(12, 150) + Me.ToggleSwitchMonth.MenuManager = Me.RibbonControl1 + Me.ToggleSwitchMonth.Name = "ToggleSwitchMonth" + Me.ToggleSwitchMonth.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.ToggleSwitchMonth.Properties.Appearance.ForeColor = System.Drawing.Color.White + Me.ToggleSwitchMonth.Properties.Appearance.Options.UseFont = True + Me.ToggleSwitchMonth.Properties.Appearance.Options.UseForeColor = True + Me.ToggleSwitchMonth.Properties.OffText = "Aktueller Monat" + Me.ToggleSwitchMonth.Properties.OnText = "Aktueller Monat" + Me.ToggleSwitchMonth.Size = New System.Drawing.Size(174, 19) + Me.ToggleSwitchMonth.TabIndex = 13 ' 'ToggleSwitchLastYear ' @@ -415,15 +415,15 @@ Partial Class frmFlowSearch Me.DockPanel3.Location = New System.Drawing.Point(3, 46) Me.DockPanel3.Name = "DockPanel3" Me.DockPanel3.Options.AllowFloating = False - Me.DockPanel3.OriginalSize = New System.Drawing.Size(220, 421) - Me.DockPanel3.Size = New System.Drawing.Size(195, 421) + Me.DockPanel3.OriginalSize = New System.Drawing.Size(195, 421) + Me.DockPanel3.Size = New System.Drawing.Size(195, 419) Me.DockPanel3.Text = "Attribute" ' 'DockPanel3_Container ' Me.DockPanel3_Container.Location = New System.Drawing.Point(0, 0) Me.DockPanel3_Container.Name = "DockPanel3_Container" - Me.DockPanel3_Container.Size = New System.Drawing.Size(195, 421) + Me.DockPanel3_Container.Size = New System.Drawing.Size(195, 419) Me.DockPanel3_Container.TabIndex = 0 ' 'Panel1 @@ -434,7 +434,7 @@ Partial Class frmFlowSearch Me.Panel1.Controls.Add(Me.lblFoundResult) Me.Panel1.Controls.Add(Me.Label1) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Location = New System.Drawing.Point(202, 146) + Me.Panel1.Location = New System.Drawing.Point(202, 148) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(1035, 66) Me.Panel1.TabIndex = 0 @@ -444,9 +444,9 @@ Partial Class frmFlowSearch Me.Panel3.BackColor = System.Drawing.Color.Transparent Me.Panel3.Controls.Add(Me.TileControlMatch) Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel3.Location = New System.Drawing.Point(202, 212) + Me.Panel3.Location = New System.Drawing.Point(202, 214) Me.Panel3.Name = "Panel3" - Me.Panel3.Size = New System.Drawing.Size(1035, 415) + Me.Panel3.Size = New System.Drawing.Size(1035, 413) Me.Panel3.TabIndex = 9 ' 'frmFlowSearch @@ -476,7 +476,7 @@ Partial Class frmFlowSearch Me.DockPanel1_Container.PerformLayout() CType(Me.CheckedListBoxCategories, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToggleSwitchLastMonth.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ToggleSwitchCurrentMonth.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchMonth.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToggleSwitchLastYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToggleSwitchCurrentYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ToggleSwitchYesterday.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -519,7 +519,7 @@ Partial Class frmFlowSearch Friend WithEvents ToggleSwitchLastYear As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents ToggleSwitchCurrentYear As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents ToggleSwitchLastMonth As DevExpress.XtraEditors.ToggleSwitch - Friend WithEvents ToggleSwitchCurrentMonth As DevExpress.XtraEditors.ToggleSwitch + Friend WithEvents ToggleSwitchMonth As DevExpress.XtraEditors.ToggleSwitch Friend WithEvents CheckedListBoxCategories As DevExpress.XtraEditors.CheckedListBoxControl Friend WithEvents Label3 As Label Friend WithEvents BarStaticInfoItem As DevExpress.XtraBars.BarStaticItem diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.resx b/GUIs.ZooFlow/Search/frmFlowSearch.resx index b6582fe3..832ddf7d 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.resx +++ b/GUIs.ZooFlow/Search/frmFlowSearch.resx @@ -120,7 +120,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPoCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -152,7 +152,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFsEAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi diff --git a/GUIs.ZooFlow/Search/frmFlowSearch.vb b/GUIs.ZooFlow/Search/frmFlowSearch.vb index c92c2449..5eff9c83 100644 --- a/GUIs.ZooFlow/Search/frmFlowSearch.vb +++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb @@ -473,7 +473,7 @@ Public Class frmFlowSearch Private Sub ToggleSwitchDate_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchToday.Toggled, ToggleSwitchYesterday.Toggled, ToggleSwitchCurrentYear.Toggled, ToggleSwitchLastYear.Toggled, - ToggleSwitchLastMonth.Toggled, ToggleSwitchCurrentMonth.Toggled + ToggleSwitchLastMonth.Toggled, ToggleSwitchMonth.Toggled If TOGGLE_Change = True Then Exit Sub End If @@ -486,19 +486,19 @@ Public Class frmFlowSearch Select Case oToggle.Name Case "ToggleSwitchCurrentYear" ToggleSwitchLastYear.IsOn = False - ToggleSwitchCurrentMonth.IsOn = False + ToggleSwitchMonth.IsOn = False ToggleSwitchLastMonth.IsOn = False ToggleSwitchToday.IsOn = False ToggleSwitchYesterday.IsOn = False oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = YEAR(GETDATE())") Case "ToggleSwitchLastYear" ToggleSwitchCurrentYear.IsOn = False - ToggleSwitchCurrentMonth.IsOn = False + ToggleSwitchMonth.IsOn = False ToggleSwitchLastMonth.IsOn = False ToggleSwitchToday.IsOn = False ToggleSwitchYesterday.IsOn = False oWHENDATE = GET_DATE_LIMITATION("YEAR(@ATTRIBUTE) = (YEAR(GETDATE()) -1)") - Case "ToggleSwitchCurrentMonth" + Case "ToggleSwitchMonth" ToggleSwitchCurrentYear.IsOn = False ToggleSwitchLastYear.IsOn = False ToggleSwitchToday.IsOn = False @@ -508,7 +508,7 @@ Public Class frmFlowSearch Case "ToggleSwitchLastMonth" ToggleSwitchCurrentYear.IsOn = False ToggleSwitchLastYear.IsOn = False - ToggleSwitchCurrentMonth.IsOn = False + ToggleSwitchMonth.IsOn = False ToggleSwitchToday.IsOn = False ToggleSwitchYesterday.IsOn = False Dim currentDate As DateTime = DateTime.Now @@ -520,20 +520,20 @@ Public Class frmFlowSearch Case "ToggleSwitchToday" ToggleSwitchCurrentYear.IsOn = False ToggleSwitchLastYear.IsOn = False - ToggleSwitchCurrentMonth.IsOn = False + ToggleSwitchMonth.IsOn = False ToggleSwitchYesterday.IsOn = False oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE())") Case "ToggleSwitchYesterday" ToggleSwitchCurrentYear.IsOn = False ToggleSwitchLastYear.IsOn = False - ToggleSwitchCurrentMonth.IsOn = False + ToggleSwitchMonth.IsOn = False ToggleSwitchToday.IsOn = False oWHENDATE = GET_DATE_LIMITATION("convert(DATE,@ATTRIBUTE) = convert(DATE,GETDATE()-1)") End Select SEARCH_FACT_DATE = oWHENDATE TOGGLE_Change = False Else - If ToggleSwitchToday.IsOn = False And ToggleSwitchYesterday.IsOn = False And ToggleSwitchCurrentYear.IsOn = False And ToggleSwitchLastYear.IsOn = False And ToggleSwitchLastMonth.IsOn = False And ToggleSwitchCurrentMonth.IsOn = False Then + If ToggleSwitchToday.IsOn = False And ToggleSwitchYesterday.IsOn = False And ToggleSwitchCurrentYear.IsOn = False And ToggleSwitchLastYear.IsOn = False And ToggleSwitchLastMonth.IsOn = False And ToggleSwitchMonth.IsOn = False Then LIMITATION_DATE = False End If diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb new file mode 100644 index 00000000..815516b7 --- /dev/null +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.Designer.vb @@ -0,0 +1,282 @@ + _ +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 + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + '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)) + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + 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() + Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components) + Me.DockPanel1 = New DevExpress.XtraBars.Docking.DockPanel() + Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() + Me.ToggleSwitchMonth_Last = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchMonth = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchTomorrow = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchLastWeek = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchYear_Last = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchYear = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchYesterday = New DevExpress.XtraEditors.ToggleSwitch() + Me.ToggleSwitchToday = New DevExpress.XtraEditors.ToggleSwitch() + Me.cmbLimitationDateAttr = New System.Windows.Forms.ComboBox() + Me.Label1 = New System.Windows.Forms.Label() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.DockPanel1.SuspendLayout() + Me.DockPanel1_Container.SuspendLayout() + CType(Me.ToggleSwitchMonth_Last.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchMonth.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchTomorrow.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchLastWeek.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchYear_Last.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchYesterday.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ToggleSwitchToday.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.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 1 + 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.StatusBar = Me.RibbonStatusBar1 + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 567) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(864, 22) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' + 'DockManager1 + ' + Me.DockManager1.DockingOptions.ShowCaptionImage = True + Me.DockManager1.Form = Me + Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanel1}) + Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"}) + ' + 'DockPanel1 + ' + Me.DockPanel1.Appearance.Options.UseImage = True + Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) + 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, 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.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.Label1) + 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.TabIndex = 0 + ' + 'ToggleSwitchMonth_Last + ' + Me.ToggleSwitchMonth_Last.Location = New System.Drawing.Point(12, 220) + Me.ToggleSwitchMonth_Last.MenuManager = Me.RibbonControl1 + 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(132, 19) + Me.ToggleSwitchMonth_Last.TabIndex = 9 + ' + 'ToggleSwitchMonth + ' + Me.ToggleSwitchMonth.Location = New System.Drawing.Point(12, 195) + Me.ToggleSwitchMonth.MenuManager = Me.RibbonControl1 + Me.ToggleSwitchMonth.Name = "ToggleSwitchMonth" + Me.ToggleSwitchMonth.Properties.OffText = "Dieser Monat" + Me.ToggleSwitchMonth.Properties.OnText = "Dieser Monat" + Me.ToggleSwitchMonth.Size = New System.Drawing.Size(132, 19) + Me.ToggleSwitchMonth.TabIndex = 8 + ' + 'ToggleSwitchTomorrow + ' + Me.ToggleSwitchTomorrow.Location = New System.Drawing.Point(12, 93) + 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 + ' + 'ToggleSwitchLastWeek + ' + Me.ToggleSwitchLastWeek.Location = New System.Drawing.Point(12, 118) + Me.ToggleSwitchLastWeek.MenuManager = Me.RibbonControl1 + 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(132, 19) + Me.ToggleSwitchLastWeek.TabIndex = 6 + ' + 'ToggleSwitchYear_Last + ' + Me.ToggleSwitchYear_Last.Location = New System.Drawing.Point(12, 170) + Me.ToggleSwitchYear_Last.MenuManager = Me.RibbonControl1 + 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(178, 19) + Me.ToggleSwitchYear_Last.TabIndex = 5 + ' + 'ToggleSwitchYear + ' + Me.ToggleSwitchYear.Location = New System.Drawing.Point(12, 145) + Me.ToggleSwitchYear.MenuManager = Me.RibbonControl1 + Me.ToggleSwitchYear.Name = "ToggleSwitchYear" + Me.ToggleSwitchYear.Properties.OffText = "Dieses Jahr" + Me.ToggleSwitchYear.Properties.OnText = "Letztes 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.MenuManager = Me.RibbonControl1 + Me.ToggleSwitchYesterday.Name = "ToggleSwitchYesterday" + Me.ToggleSwitchYesterday.Properties.OffText = "Gestern" + Me.ToggleSwitchYesterday.Properties.OnText = "Gestern" + Me.ToggleSwitchYesterday.Size = New System.Drawing.Size(95, 19) + Me.ToggleSwitchYesterday.TabIndex = 3 + ' + 'ToggleSwitchToday + ' + Me.ToggleSwitchToday.Location = New System.Drawing.Point(12, 43) + Me.ToggleSwitchToday.MenuManager = Me.RibbonControl1 + Me.ToggleSwitchToday.Name = "ToggleSwitchToday" + Me.ToggleSwitchToday.Properties.OffText = "Heute" + Me.ToggleSwitchToday.Properties.OnText = "On" + Me.ToggleSwitchToday.Size = New System.Drawing.Size(95, 19) + Me.ToggleSwitchToday.TabIndex = 2 + ' + 'cmbLimitationDateAttr + ' + Me.cmbLimitationDateAttr.FormattingEnabled = True + Me.cmbLimitationDateAttr.Location = New System.Drawing.Point(12, 16) + Me.cmbLimitationDateAttr.Name = "cmbLimitationDateAttr" + Me.cmbLimitationDateAttr.Size = New System.Drawing.Size(178, 21) + Me.cmbLimitationDateAttr.TabIndex = 1 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(9, 0) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(47, 13) + Me.Label1.TabIndex = 0 + Me.Label1.Text = "Attribut" + ' + '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.Controls.Add(Me.DockPanel1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) + Me.Name = "frmFlowSearch1" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.Text = "frmFlowSearch1" + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.DockManager1, System.ComponentModel.ISupportInitialize).EndInit() + Me.DockPanel1.ResumeLayout(False) + Me.DockPanel1_Container.ResumeLayout(False) + Me.DockPanel1_Container.PerformLayout() + CType(Me.ToggleSwitchMonth_Last.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchMonth.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchTomorrow.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchLastWeek.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchYear_Last.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchYear.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchYesterday.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ToggleSwitchToday.Properties, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager + Friend WithEvents DockPanel1 As DevExpress.XtraBars.Docking.DockPanel + Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer + Friend WithEvents cmbLimitationDateAttr As ComboBox + 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 +End Class diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.resx b/GUIs.ZooFlow/Search/frmFlowSearch1.resx new file mode 100644 index 00000000..2a496df5 --- /dev/null +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.resx @@ -0,0 +1,148 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANgDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iQV9EYXRlX09jY3VyaW5nIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6 + bmV3IDAgMCAzMiAzMiI+DQogIDxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+CgkuQmxhY2t7ZmlsbDojNzI3 + MjcyO30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPHBhdGggZD0iTTI4LDh2MThINFY4SDJ2MTljMCwwLjYsMC40LDEs + MSwxaDI2YzAuNiwwLDEtMC40LDEtMVY4SDI4eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8cGF0aCBkPSJN + MzAsM3Y1SDJWM2MwLTAuNiwwLjQtMSwxLTFoMjZDMjkuNiwyLDMwLDIuNCwzMCwzeiBNMTIsMThIOHY0 + aDRWMTh6IiBjbGFzcz0iUmVkIiAvPg0KICA8ZyBjbGFzcz0ic3QwIj4NCiAgICA8cmVjdCB4PSI4IiB5 + PSIxMiIgd2lkdGg9IjQiIGhlaWdodD0iNCIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iQmxhY2siIC8+DQog + ICAgPHJlY3QgeD0iMTQiIHk9IjEyIiB3aWR0aD0iNCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNs + YXNzPSJCbGFjayIgLz4NCiAgICA8cmVjdCB4PSIyMCIgeT0iMTIiIHdpZHRoPSI0IiBoZWlnaHQ9IjQi + IHJ4PSIwIiByeT0iMCIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxyZWN0IHg9IjE0IiB5PSIxOCIgd2lk + dGg9IjQiIGhlaWdodD0iNCIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iQmxhY2siIC8+DQogICAgPHJlY3Qg + eD0iMjAiIHk9IjE4IiB3aWR0aD0iNCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJCbGFj + ayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Search/frmFlowSearch1.vb b/GUIs.ZooFlow/Search/frmFlowSearch1.vb new file mode 100644 index 00000000..a28f58cb --- /dev/null +++ b/GUIs.ZooFlow/Search/frmFlowSearch1.vb @@ -0,0 +1,143 @@ +Imports DevExpress.XtraEditors +Imports DigitalData.GUIs.ZooFlow.ClassConstants +Public Class frmFlowSearch1 + 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 Sub ToggleSwitchToday_Toggled(sender As Object, e As EventArgs) Handles ToggleSwitchToday.Toggled, ToggleSwitchYesterday.Toggled, ToggleSwitchYear.Toggled, ToggleSwitchYear_Last.Toggled, + ToggleSwitchMonth_Last.Toggled, ToggleSwitchMonth.Toggled + If TOGGLE_Change = True Then + Exit Sub + End If + Dim oToggle As ToggleSwitch = TryCast(sender, ToggleSwitch) + + If oToggle.IsOn Then + TOGGLE_Change = True + Dim oWHENDATE As String + Select Case oToggle.Name + 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())") + Case "ToggleSwitchLastYear" + 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()) -1)") + 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())") + 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)") + Else + oWHENDATE = GET_DATE_LIMITATION("MONTH(@ATTRIBUTE) = (MONTH(GETDATE()) -1)") + End If + 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())") + 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)") + 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 + LIMITATION_DATE = False + End If + End If + End Sub + Private Function GET_DATE_LIMITATION(pInput As String) As String + Try + If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then + 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 Sub cmbLimitationDateAttr_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbLimitationDateAttr.SelectedValueChanged + If cmbLimitationDateAttr.SelectedIndex <> -1 Then + Try + + Dim oEditValue As String = cmbLimitationDateAttr.SelectedItem.ToString + + If oEditValue = IDB_ADDED_WHEN_String_German Or oEditValue = IDB_ADDED_WHEN_String_Englisch Then + SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" + Else + SEARCH_FACT_DATE_ATTRIBUTE = oEditValue + SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13" + End If + 'SearchContent() + Catch ex As Exception + LOGGER.Error(ex) + End Try + End If + End Sub + + Private Sub frmFlowSearch1_Load(sender As Object, e As EventArgs) Handles Me.Load + 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}") + + For Each oRow As DataRow In oDT.Rows + cmbLimitationDateAttr.Items.Add(oRow.Item("ATTR_TITLE")) + Next + 'Dim editor As BarEditItem = BarEditItemDate + ' editor = TryCast(BarEditItemDate, ComboBoxEdit) + If My.Application.User.Language = "de-DE" Then + cmbLimitationDateAttr.SelectedIndex = 0 + ' BarEditItemDate.EditValue = "Erstellt Wann" + Else + cmbLimitationDateAttr.SelectedIndex = 1 + ' BarEditItemDate.EditValue = "Added when" + End If + End Sub +End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 60f58fe9..35e68ff5 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -77,6 +77,7 @@ False + @@ -347,6 +348,12 @@ Form + + frmFlowSearch1.vb + + + Form + frmSearchNeu.vb @@ -482,6 +489,9 @@ frmGlobix_Index.vb + + frmFlowSearch1.vb + frmSearchNeu.vb diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 11cd33ed..99c4b0be 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -434,7 +434,7 @@ Public Class frmFlowForm End Sub Sub Open_FlowSearch() Cursor = Cursors.WaitCursor - If TheFormIsAlreadyLoaded("frmFlowSearch") Then + If TheFormIsAlreadyLoaded("frmFlowSearch1") Then Cursor = Cursors.Default Exit Sub End If @@ -449,7 +449,7 @@ Public Class frmFlowForm 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 frmFlowSearch(oSQLFlowSearch) + Dim oForm As New frmFlowSearch1() oForm.Show() oForm.BringToFront() End If