Zooflow: Clean up FlowSearch1, work on FlowSearch2

2022-04-08 16:22:42 +02:00
parent fb1aa4f333
commit 347c83cac2
9 changed files with 644 additions and 446 deletions
--- a/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch2.Designer.vb
@@ -33,8 +33,24 @@ Partial Class frmFlowSearch2
        Me.PanelControl2 = New DevExpress.XtraEditors.PanelControl()
        Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
        Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
-        Me.RadioGroup1 = New DevExpress.XtraEditors.RadioGroup()
+        Me.DateEditFrom = New DevExpress.XtraEditors.DateEdit()
+        Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.DateEditTo = New DevExpress.XtraEditors.DateEdit()
        Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.HyperlinkLabelControl1 = New DevExpress.XtraEditors.HyperlinkLabelControl()
+        Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.HyperlinkLabelControl2 = New DevExpress.XtraEditors.HyperlinkLabelControl()
+        Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.HyperlinkLabelControl3 = New DevExpress.XtraEditors.HyperlinkLabelControl()
+        Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.HyperlinkLabelControl4 = New DevExpress.XtraEditors.HyperlinkLabelControl()
+        Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.HyperlinkLabelControl5 = New DevExpress.XtraEditors.HyperlinkLabelControl()
+        Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.HyperlinkLabelControl6 = New DevExpress.XtraEditors.HyperlinkLabelControl()
+        Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.HyperlinkLabelControl7 = New DevExpress.XtraEditors.HyperlinkLabelControl()
+        Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -44,8 +60,19 @@ Partial Class frmFlowSearch2
        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.LayoutControl1.SuspendLayout()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DateEditFrom.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DateEditFrom.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DateEditTo.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.DateEditTo.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'RibbonControl1
@@ -115,15 +142,22 @@ Partial Class frmFlowSearch2
        Me.PanelControl2.Dock = System.Windows.Forms.DockStyle.Fill
        Me.PanelControl2.Location = New System.Drawing.Point(32, 72)
        Me.PanelControl2.Name = "PanelControl2"
-        Me.PanelControl2.Padding = New System.Windows.Forms.Padding(0, 30, 0, 30)
        Me.PanelControl2.Size = New System.Drawing.Size(947, 383)
        Me.PanelControl2.TabIndex = 3
        '
        'LayoutControl1
        '
-        Me.LayoutControl1.Controls.Add(Me.RadioGroup1)
+        Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl7)
+        Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl6)
+        Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl5)
+        Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl4)
+        Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl3)
+        Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl2)
+        Me.LayoutControl1.Controls.Add(Me.HyperlinkLabelControl1)
+        Me.LayoutControl1.Controls.Add(Me.DateEditFrom)
+        Me.LayoutControl1.Controls.Add(Me.DateEditTo)
        Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.LayoutControl1.Location = New System.Drawing.Point(2, 32)
+        Me.LayoutControl1.Location = New System.Drawing.Point(2, 2)
        Me.LayoutControl1.Name = "LayoutControl1"
        Me.LayoutControl1.Root = Me.Root
        Me.LayoutControl1.Size = New System.Drawing.Size(943, 120)
@@ -134,28 +168,179 @@ Partial Class frmFlowSearch2
        '
        Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
        Me.Root.GroupBordersVisible = False
-        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1})
+        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem1, Me.LayoutControlItem7, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem4, Me.LayoutControlItem3, Me.LayoutControlItem8, Me.LayoutControlItem9})
        Me.Root.Name = "Root"
        Me.Root.Size = New System.Drawing.Size(943, 120)
        Me.Root.TextVisible = False
        '
-        'RadioGroup1
+        'DateEditFrom
        '
-        Me.RadioGroup1.Location = New System.Drawing.Point(120, 12)
-        Me.RadioGroup1.MenuManager = Me.RibbonControl1
-        Me.RadioGroup1.Name = "RadioGroup1"
-        Me.RadioGroup1.Properties.Items.AddRange(New DevExpress.XtraEditors.Controls.RadioGroupItem() {New DevExpress.XtraEditors.Controls.RadioGroupItem("Gestern", "Yesterday", True, "YESTERDAY"), New DevExpress.XtraEditors.Controls.RadioGroupItem("Heute", "Today", True, "TODAY", "")})
-        Me.RadioGroup1.Size = New System.Drawing.Size(811, 96)
-        Me.RadioGroup1.StyleController = Me.LayoutControl1
-        Me.RadioGroup1.TabIndex = 4
+        Me.DateEditFrom.EditValue = Nothing
+        Me.DateEditFrom.Location = New System.Drawing.Point(76, 12)
+        Me.DateEditFrom.MenuManager = Me.RibbonControl1
+        Me.DateEditFrom.Name = "DateEditFrom"
+        Me.DateEditFrom.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.DateEditFrom.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.DateEditFrom.Size = New System.Drawing.Size(162, 20)
+        Me.DateEditFrom.StyleController = Me.LayoutControl1
+        Me.DateEditFrom.TabIndex = 5
+        '
+        'LayoutControlItem2
+        '
+        Me.LayoutControlItem2.Control = Me.DateEditFrom
+        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem2.Name = "LayoutControlItem2"
+        Me.LayoutControlItem2.Size = New System.Drawing.Size(230, 24)
+        Me.LayoutControlItem2.Text = "Datum von"
+        Me.LayoutControlItem2.TextSize = New System.Drawing.Size(52, 13)
+        '
+        'DateEditTo
+        '
+        Me.DateEditTo.EditValue = Nothing
+        Me.DateEditTo.Location = New System.Drawing.Point(306, 12)
+        Me.DateEditTo.MenuManager = Me.RibbonControl1
+        Me.DateEditTo.Name = "DateEditTo"
+        Me.DateEditTo.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.DateEditTo.Properties.CalendarTimeProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
+        Me.DateEditTo.Size = New System.Drawing.Size(625, 20)
+        Me.DateEditTo.StyleController = Me.LayoutControl1
+        Me.DateEditTo.TabIndex = 6
        '
        'LayoutControlItem1
        '
-        Me.LayoutControlItem1.Control = Me.RadioGroup1
-        Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem1.Control = Me.DateEditTo
+        Me.LayoutControlItem1.Location = New System.Drawing.Point(230, 0)
        Me.LayoutControlItem1.Name = "LayoutControlItem1"
-        Me.LayoutControlItem1.Size = New System.Drawing.Size(923, 100)
-        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(96, 13)
+        Me.LayoutControlItem1.Size = New System.Drawing.Size(693, 24)
+        Me.LayoutControlItem1.Text = "Datum bis"
+        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(52, 13)
+        '
+        'HyperlinkLabelControl1
+        '
+        Me.HyperlinkLabelControl1.Location = New System.Drawing.Point(224, 36)
+        Me.HyperlinkLabelControl1.Name = "HyperlinkLabelControl1"
+        Me.HyperlinkLabelControl1.Size = New System.Drawing.Size(67, 13)
+        Me.HyperlinkLabelControl1.StyleController = Me.LayoutControl1
+        Me.HyperlinkLabelControl1.TabIndex = 7
+        Me.HyperlinkLabelControl1.Text = "Letzter Monat"
+        '
+        'LayoutControlItem3
+        '
+        Me.LayoutControlItem3.Control = Me.HyperlinkLabelControl1
+        Me.LayoutControlItem3.Location = New System.Drawing.Point(212, 24)
+        Me.LayoutControlItem3.Name = "LayoutControlItem3"
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(71, 76)
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem3.TextVisible = False
+        '
+        'HyperlinkLabelControl2
+        '
+        Me.HyperlinkLabelControl2.Location = New System.Drawing.Point(157, 36)
+        Me.HyperlinkLabelControl2.Name = "HyperlinkLabelControl2"
+        Me.HyperlinkLabelControl2.Size = New System.Drawing.Size(63, 13)
+        Me.HyperlinkLabelControl2.StyleController = Me.LayoutControl1
+        Me.HyperlinkLabelControl2.TabIndex = 8
+        Me.HyperlinkLabelControl2.Text = "Dieser Monat"
+        '
+        'LayoutControlItem4
+        '
+        Me.LayoutControlItem4.Control = Me.HyperlinkLabelControl2
+        Me.LayoutControlItem4.Location = New System.Drawing.Point(145, 24)
+        Me.LayoutControlItem4.Name = "LayoutControlItem4"
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(67, 76)
+        Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem4.TextVisible = False
+        '
+        'HyperlinkLabelControl3
+        '
+        Me.HyperlinkLabelControl3.Location = New System.Drawing.Point(87, 36)
+        Me.HyperlinkLabelControl3.Name = "HyperlinkLabelControl3"
+        Me.HyperlinkLabelControl3.Size = New System.Drawing.Size(66, 13)
+        Me.HyperlinkLabelControl3.StyleController = Me.LayoutControl1
+        Me.HyperlinkLabelControl3.TabIndex = 9
+        Me.HyperlinkLabelControl3.Text = "Letzte 7 Tage"
+        '
+        'LayoutControlItem5
+        '
+        Me.LayoutControlItem5.Control = Me.HyperlinkLabelControl3
+        Me.LayoutControlItem5.Location = New System.Drawing.Point(75, 24)
+        Me.LayoutControlItem5.Name = "LayoutControlItem5"
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(70, 76)
+        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem5.TextVisible = False
+        '
+        'HyperlinkLabelControl4
+        '
+        Me.HyperlinkLabelControl4.Location = New System.Drawing.Point(45, 36)
+        Me.HyperlinkLabelControl4.Name = "HyperlinkLabelControl4"
+        Me.HyperlinkLabelControl4.Size = New System.Drawing.Size(38, 13)
+        Me.HyperlinkLabelControl4.StyleController = Me.LayoutControl1
+        Me.HyperlinkLabelControl4.TabIndex = 10
+        Me.HyperlinkLabelControl4.Text = "Gestern"
+        '
+        'LayoutControlItem6
+        '
+        Me.LayoutControlItem6.Control = Me.HyperlinkLabelControl4
+        Me.LayoutControlItem6.Location = New System.Drawing.Point(33, 24)
+        Me.LayoutControlItem6.Name = "LayoutControlItem6"
+        Me.LayoutControlItem6.Size = New System.Drawing.Size(42, 76)
+        Me.LayoutControlItem6.Text = "LayoutControlItem6"
+        Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem6.TextVisible = False
+        '
+        'HyperlinkLabelControl5
+        '
+        Me.HyperlinkLabelControl5.Location = New System.Drawing.Point(12, 36)
+        Me.HyperlinkLabelControl5.Name = "HyperlinkLabelControl5"
+        Me.HyperlinkLabelControl5.Size = New System.Drawing.Size(29, 13)
+        Me.HyperlinkLabelControl5.StyleController = Me.LayoutControl1
+        Me.HyperlinkLabelControl5.TabIndex = 11
+        Me.HyperlinkLabelControl5.Text = "Heute"
+        '
+        'LayoutControlItem7
+        '
+        Me.LayoutControlItem7.Control = Me.HyperlinkLabelControl5
+        Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 24)
+        Me.LayoutControlItem7.Name = "LayoutControlItem7"
+        Me.LayoutControlItem7.Size = New System.Drawing.Size(33, 76)
+        Me.LayoutControlItem7.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem7.TextVisible = False
+        '
+        'HyperlinkLabelControl6
+        '
+        Me.HyperlinkLabelControl6.Location = New System.Drawing.Point(295, 36)
+        Me.HyperlinkLabelControl6.Name = "HyperlinkLabelControl6"
+        Me.HyperlinkLabelControl6.Size = New System.Drawing.Size(55, 13)
+        Me.HyperlinkLabelControl6.StyleController = Me.LayoutControl1
+        Me.HyperlinkLabelControl6.TabIndex = 12
+        Me.HyperlinkLabelControl6.Text = "Dieses Jahr"
+        '
+        'LayoutControlItem8
+        '
+        Me.LayoutControlItem8.Control = Me.HyperlinkLabelControl6
+        Me.LayoutControlItem8.Location = New System.Drawing.Point(283, 24)
+        Me.LayoutControlItem8.Name = "LayoutControlItem8"
+        Me.LayoutControlItem8.Size = New System.Drawing.Size(59, 76)
+        Me.LayoutControlItem8.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem8.TextVisible = False
+        '
+        'HyperlinkLabelControl7
+        '
+        Me.HyperlinkLabelControl7.Location = New System.Drawing.Point(354, 36)
+        Me.HyperlinkLabelControl7.Name = "HyperlinkLabelControl7"
+        Me.HyperlinkLabelControl7.Size = New System.Drawing.Size(59, 13)
+        Me.HyperlinkLabelControl7.StyleController = Me.LayoutControl1
+        Me.HyperlinkLabelControl7.TabIndex = 13
+        Me.HyperlinkLabelControl7.Text = "Letztes Jahr"
+        '
+        'LayoutControlItem9
+        '
+        Me.LayoutControlItem9.Control = Me.HyperlinkLabelControl7
+        Me.LayoutControlItem9.Location = New System.Drawing.Point(342, 24)
+        Me.LayoutControlItem9.Name = "LayoutControlItem9"
+        Me.LayoutControlItem9.Size = New System.Drawing.Size(581, 76)
+        Me.LayoutControlItem9.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem9.TextVisible = False
        '
        'frmFlowSearch2
        '
@@ -177,9 +362,21 @@ Partial Class frmFlowSearch2
        Me.PanelControl2.ResumeLayout(False)
        CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.LayoutControl1.ResumeLayout(False)
+        Me.LayoutControl1.PerformLayout()
        CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DateEditFrom.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DateEditFrom.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DateEditTo.Properties.CalendarTimeProperties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.DateEditTo.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -196,6 +393,22 @@ Partial Class frmFlowSearch2
    Friend WithEvents PanelControl2 As DevExpress.XtraEditors.PanelControl
    Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl
    Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup
-    Friend WithEvents RadioGroup1 As DevExpress.XtraEditors.RadioGroup
+    Friend WithEvents DateEditFrom As DevExpress.XtraEditors.DateEdit
+    Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents HyperlinkLabelControl5 As DevExpress.XtraEditors.HyperlinkLabelControl
+    Friend WithEvents HyperlinkLabelControl4 As DevExpress.XtraEditors.HyperlinkLabelControl
+    Friend WithEvents HyperlinkLabelControl3 As DevExpress.XtraEditors.HyperlinkLabelControl
+    Friend WithEvents HyperlinkLabelControl2 As DevExpress.XtraEditors.HyperlinkLabelControl
+    Friend WithEvents HyperlinkLabelControl1 As DevExpress.XtraEditors.HyperlinkLabelControl
+    Friend WithEvents DateEditTo As DevExpress.XtraEditors.DateEdit
    Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents HyperlinkLabelControl7 As DevExpress.XtraEditors.HyperlinkLabelControl
+    Friend WithEvents HyperlinkLabelControl6 As DevExpress.XtraEditors.HyperlinkLabelControl
+    Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem
 End Class