From 10f660460ff2661d2dde7b7ef0bb271ecdfa975b Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Thu, 5 Nov 2020 10:37:14 +0100 Subject: [PATCH] MS --- GUIs.ZooFlow/ClassControlCreator.vb | 1 + GUIs.ZooFlow/My Project/Resources.Designer.vb | 30 +++ GUIs.ZooFlow/My Project/Resources.resx | 23 ++- GUIs.ZooFlow/Resources/1_LOGO_ZOO_FLOW1.png | Bin 0 -> 4740 bytes .../Resources/1_LOGO_ZOO_FLOW_DROP2.png | Bin 0 -> 12739 bytes .../Resources/1_LOGO_ZOO_FLOW_DROP3.png | Bin 0 -> 12739 bytes GUIs.ZooFlow/ZooFlow.vbproj | 18 ++ GUIs.ZooFlow/frmFlowForm.Designer.vb | 15 +- GUIs.ZooFlow/frmFlowForm.resx | 188 +++++++----------- GUIs.ZooFlow/frmFlowForm.vb | 8 + GUIs.ZooFlow/frmPreSearch.Designer.vb | 133 +++++++++++++ GUIs.ZooFlow/frmPreSearch.resx | 147 ++++++++++++++ GUIs.ZooFlow/frmPreSearch.vb | 21 ++ GUIs.ZooFlow/frmSearchStart.Designer.vb | 19 +- GUIs.ZooFlow/frmSearchStart.resx | 20 ++ GUIs.ZooFlow/frmSearchStart.vb | 125 ++++++++---- 16 files changed, 570 insertions(+), 178 deletions(-) create mode 100644 GUIs.ZooFlow/Resources/1_LOGO_ZOO_FLOW1.png create mode 100644 GUIs.ZooFlow/Resources/1_LOGO_ZOO_FLOW_DROP2.png create mode 100644 GUIs.ZooFlow/Resources/1_LOGO_ZOO_FLOW_DROP3.png create mode 100644 GUIs.ZooFlow/frmPreSearch.Designer.vb create mode 100644 GUIs.ZooFlow/frmPreSearch.resx create mode 100644 GUIs.ZooFlow/frmPreSearch.vb diff --git a/GUIs.ZooFlow/ClassControlCreator.vb b/GUIs.ZooFlow/ClassControlCreator.vb index c86e4be0..efd5b9aa 100644 --- a/GUIs.ZooFlow/ClassControlCreator.vb +++ b/GUIs.ZooFlow/ClassControlCreator.vb @@ -201,6 +201,7 @@ Public Class ClassControlCreator If CType(pAttributeRow.Item("MULTISELECT"), Boolean) Then oView.OptionsSelection.MultiSelect = True oView.OptionsSelection.MultiSelectMode = GridMultiSelectMode.CheckBoxRowSelect + oView.OptionsSelection.CheckBoxSelectorColumnWidth = 20 oMyNewGridControl.Size = New Size(CInt(pAttributeRow.Item("WIDTH") + 50), CInt(pAttributeRow.Item("HEIGHT"))) End If diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 3f7f2b78..0d0791c7 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -70,6 +70,36 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property _1_LOGO_ZOO_FLOW_DROP2() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("1_LOGO_ZOO_FLOW_DROP2", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property _1_LOGO_ZOO_FLOW_DROP3() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("1_LOGO_ZOO_FLOW_DROP3", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property _1_LOGO_ZOO_FLOW1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("1_LOGO_ZOO_FLOW1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 76645957..4d558ff2 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -130,6 +130,9 @@ ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -142,31 +145,37 @@ ..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Editdatasetwithdesigner_8449.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\CW_GEFUNDEN_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/1_LOGO_ZOO_FLOW1.png b/GUIs.ZooFlow/Resources/1_LOGO_ZOO_FLOW1.png new file mode 100644 index 0000000000000000000000000000000000000000..b5852fe7c5a20ab3a6ff65db26e97fc9eaed2458 GIT binary patch literal 4740 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�-9ZRgLe)@h8!4a&- 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 C7UeGh literal 0 HcmV?d00001 diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 4395261c..70c60251 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -112,6 +112,12 @@ Form + + frmPreSearch.vb + + + Form + frmSearchStart.vb @@ -164,6 +170,9 @@ frmFlowForm.vb + + frmPreSearch.vb + frmSearchStart.vb @@ -283,6 +292,15 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + 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/frmPreSearch.vb b/GUIs.ZooFlow/frmPreSearch.vb new file mode 100644 index 00000000..756d7730 --- /dev/null +++ b/GUIs.ZooFlow/frmPreSearch.vb @@ -0,0 +1,21 @@ +Imports DigitalData.Modules.Logging +Public Class frmPreSearch + Private Logger As Logger + Public Sub New() + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Logger = My.LogConfig.GetLogger() + + End Sub + Private Sub frmPreSearch_Load(sender As Object, e As EventArgs) Handles Me.Load + RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Red + Dim oSQL = $"SELECT * FROM VWIDB_SEARCH_LANDING" + Dim oDTLanding As DataTable = My.DatabaseIDB.GetDatatable(oSQL) + GridControl1.DataSource = oDTLanding + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + + End Sub +End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/frmSearchStart.Designer.vb b/GUIs.ZooFlow/frmSearchStart.Designer.vb index f1c2f04a..fed0e389 100644 --- a/GUIs.ZooFlow/frmSearchStart.Designer.vb +++ b/GUIs.ZooFlow/frmSearchStart.Designer.vb @@ -35,6 +35,7 @@ Partial Class frmSearchStart Me.BarEditItem2 = New DevExpress.XtraBars.BarEditItem() Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.BarStaticItemInfo = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -83,9 +84,9 @@ Partial Class frmSearchStart ' Me.RibbonControl1.AutoSizeItems = True Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemNewSearch, Me.BarButtonItem2, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarEditItem2, Me.BarStaticItemInfo}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemNewSearch, Me.BarButtonItem2, Me.BarHeaderItem1, Me.BarEditItem1, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarEditItem2, Me.BarStaticItemInfo, Me.BarButtonItem4}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 9 + Me.RibbonControl1.MaxItemId = 10 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemRadioGroup1, Me.RepositoryItemComboBox1}) @@ -102,10 +103,11 @@ Partial Class frmSearchStart ' 'BarButtonItem2 ' - Me.BarButtonItem2.Caption = "Suche speichern" + Me.BarButtonItem2.Caption = "Suchprofil speichern" Me.BarButtonItem2.Id = 2 Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem2.Name = "BarButtonItem2" + Me.BarButtonItem2.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText ' 'BarHeaderItem1 ' @@ -156,6 +158,13 @@ Partial Class frmSearchStart Me.BarStaticItemInfo.Id = 8 Me.BarStaticItemInfo.Name = "BarStaticItemInfo" ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "Suche starten" + Me.BarButtonItem4.Id = 9 + Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem4.Name = "BarButtonItem4" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -164,11 +173,12 @@ Partial Class frmSearchStart ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem4) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItemNewSearch) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "Such-Aktionen" + Me.RibbonPageGroup1.Text = "Suchfunktionen" ' 'RibbonPageGroup2 ' @@ -471,4 +481,5 @@ Partial Class frmSearchStart Friend WithEvents BracketLeftToolStripMenuItem As ToolStripMenuItem Friend WithEvents KlammerRechtsToolStripMenuItem As ToolStripMenuItem Friend WithEvents KlammerEntfernenToolStripMenuItem As ToolStripMenuItem + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/frmSearchStart.resx b/GUIs.ZooFlow/frmSearchStart.resx index 9ecf8de5..4b3137c7 100644 --- a/GUIs.ZooFlow/frmSearchStart.resx +++ b/GUIs.ZooFlow/frmSearchStart.resx @@ -187,6 +187,26 @@ NCwyOS41LDE5Ljd6IE04LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00ICBzNCwxLjgsNCw0UzEw LjIsMjYsOCwyNnogTTI0LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNi4y LDI2LDI0LDI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iR2V0dGluZ1N0YXJ0ZWQiPg0KICAg + IDxwYXRoIGQ9Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMy + My43LDIsMTYsMnogTTEyLDIyVjEwbDEwLDZMMTIsMjJ6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N + Cjwvc3ZnPgs= diff --git a/GUIs.ZooFlow/frmSearchStart.vb b/GUIs.ZooFlow/frmSearchStart.vb index 1afa9897..29169d06 100644 --- a/GUIs.ZooFlow/frmSearchStart.vb +++ b/GUIs.ZooFlow/frmSearchStart.vb @@ -182,7 +182,7 @@ Public Class frmSearchStart Dim oXPosition As Integer Dim oYPositionControl As Integer Dim oYPositionLabel As Integer - + Dim oMyLastGridView As DevExpress.XtraGrid.Views.Grid.GridView Dim oSingleResult As Boolean = False Dim oAttriTitle As String = oAttributeRow.Item("ATTRIBUTE_TITLE").ToString Dim oAttriID As Integer = CInt(oAttributeRow.Item("ATTRIBUTE_ID")) @@ -235,9 +235,6 @@ Public Class frmSearchStart If oCalcHeight > YActControlHeight Then YActControlHeight = oCalcHeight End If - - - Dim oMyControl As Control If oAttriTYPE = "VARCHAR" Or oAttriTYPE = "BIG INTEGER" Then oMyControl = oControls.CreateExistingGridControl(oAttributeRow, oXPosition, oYPositionControl) @@ -253,7 +250,14 @@ Public Class frmSearchStart Dim oView As DevExpress.XtraGrid.Views.Grid.GridView oView = CType(myDGV.MainView, GridView) - AddHandler oView.FocusedRowChanged, AddressOf FocusedRowChanged + oMyLastGridView = oView + If CBool(oAttributeRow.Item("MULTISELECT")) = True Then + AddHandler oView.SelectionChanged, AddressOf RenewSearchAttributes + Else + AddHandler oView.FocusedRowChanged, AddressOf FocusedRowChanged + + End If + oView.FocusInvalidRow() ElseIf oAttriTYPE = "DATE" Then oMyControl = oControls.CreateExistingDatepicker(oAttributeRow, oXPosition, oYPositionControl) @@ -267,6 +271,10 @@ Public Class frmSearchStart oControlCount += 1 TabSelected.Controls.Add(oMyControl) + If oAttriTYPE = "VARCHAR" Or oAttriTYPE = "BIG INTEGER" Then + oMyLastGridView.FocusInvalidRow() + + End If oXPosition += oControlWidth + 20 Next @@ -307,6 +315,40 @@ Public Class frmSearchStart Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged TabSelected = XtraTabControl1.SelectedTabPage End Sub + Private Sub ClearSearchCriteria() + Dim oSQL = $"DELETE FROM TBIDB_USER_SEARCH_CRITERIA WHERE SEARCH_PROFIL_ID = {PSEARCH_ID} AND USERID = {My.Application.User.UserId}" + My.DatabaseIDB.ExecuteNonQuery(oSQL) + End Sub + + Private Sub RenewSearchAttributes() + ClearSearchCriteria() + + For Each oControl As Control In TabSelected.Controls + Dim octrlType = oControl.GetType.ToString + + Select Case oControl.GetType.ToString + Case "DevExpress.XtraGrid.GridControl" + Dim oMyGridControl As GridControl = CType(oControl, GridControl) + Dim oMyGridView As DevExpress.XtraGrid.Views.Grid.GridView = CType(oMyGridControl.MainView, GridView) + Dim oSelectedRows As Integer() = oMyGridView.GetSelectedRows() + If oSelectedRows.Count = 0 Then + Continue For + End If + + Dim oAttrID = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).AttrID + Dim oAttrTitle = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).AttrTitle + For Each oRowHandle As Integer In oSelectedRows + Dim oResult = oMyGridView.GetRowCellValue(oRowHandle, oMyGridView.Columns(0).FieldName) + Dim oInsert = $"EXEC PRIDB_NEW_USER_SEARCH_CRITERIA {PSEARCH_ID.ToString},{My.Application.User.UserId.ToString},{oAttrID.ToString},'{oResult}','{My.Application.User.UserName}'" + My.DatabaseIDB.ExecuteNonQuery(oInsert) + Next + Case "DevExpress.XtraEditors.DateEdit" + ' MsgBox("Date") + + End Select + Next + End Sub + Private Sub FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) If DataLoaded = False Then Exit Sub Dim oCurrentView As GridView = DirectCast(sender, GridView) @@ -318,6 +360,7 @@ Public Class frmSearchStart Dim oResult As String = CType(rowView.Item(0), String) Dim oAttrID = DirectCast(oCurrentControl.Tag, ClassControlCreator.ControlMetadata).AttrID Dim oAttrTitle = DirectCast(oCurrentControl.Tag, ClassControlCreator.ControlMetadata).AttrTitle + RenewSearchAttributes() AddSearchAttribute(oAttrID, oAttrTitle, oResult) 'For Each oAttributeRow1 As DataRow In oDTAttributes.Rows ' If CInt(oAttributeRow1.Item("DEPENDING_ATTRIBUTE1")) = oAttrID Then @@ -391,12 +434,14 @@ Public Class frmSearchStart Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick Try 'Clear_token() + ClearSearchCriteria() DTSearchTerms.Clear() Catch ex As Exception MsgBox("Unexpected Error in Clearing Search Items: " & ex.Message, MsgBoxStyle.Critical) End Try TabSelected.Controls.Clear() + Load_Search_Attributes() End Sub Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick @@ -666,8 +711,41 @@ Public Class frmSearchStart My.UIConfig.SearchForm.Location = Me.Location My.UIConfigManager.Save() End Sub + Private Function GetSearchTermForType(pAttrID As Int16, pAttrTitle As String, pCriteria As String, pTERM As String) As String + Dim oRETURN As String = "" - Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click + Dim oFilter As String = $"GUID = {pAttrID}" + Dim oFilteredRows() As DataRow = My.DTAttributes.Select(oFilter) + If oFilteredRows.Length = 1 Then + For Each oRow As DataRow In oFilteredRows + Dim oType As Integer = CInt(oRow.Item("TYP_ID")) + If oType = 1 Or oType = 8 Then + oRETURN = $"{pAttrTitle} {pCriteria} '{pTERM.Replace("'", "''")}'" + ElseIf oType = 2 Or oType = 9 Then + oRETURN = $"{pAttrTitle} {pCriteria} {pTERM}" + ElseIf oType = 3 Then 'Float + oRETURN = $"{pAttrTitle} {pCriteria} Convert(float,'{pTERM.Replace(",", ".")}')" + ElseIf oType = 4 Then 'Decimal + oRETURN = $"{pAttrTitle} {pCriteria} Convert(decimal(19,2),'{pTERM.Replace(",", ".")}')" + ElseIf oType = 5 Then 'DATE + oRETURN = $"{pAttrTitle} {pCriteria} Convert(date,'{pTERM}')" + ElseIf oType = 7 Then + Dim oBit As Int16 + If CBool(pTERM) = True Then + oBit = 1 + Else + oBit = 0 + End If + oRETURN = $"{pAttrTitle} {pCriteria} '{oBit.ToString}'" + + End If + Next + + End If + Return oRETURN + End Function + + Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick Try Dim oSEARCH_SQL = SEARCH_SQL Dim oOperator As String @@ -721,40 +799,5 @@ Public Class frmSearchStart Catch ex As Exception End Try - End Sub - - Private Function GetSearchTermForType(pAttrID As Int16, pAttrTitle As String, pCriteria As String, pTERM As String) As String - Dim oRETURN As String = "" - - Dim oFilter As String = $"GUID = {pAttrID}" - Dim oFilteredRows() As DataRow = My.DTAttributes.Select(oFilter) - If oFilteredRows.Length = 1 Then - For Each oRow As DataRow In oFilteredRows - Dim oType As Integer = CInt(oRow.Item("TYP_ID")) - If oType = 1 Or oType = 8 Then - oRETURN = $"{pAttrTitle} {pCriteria} '{pTERM.Replace("'", "''")}'" - ElseIf oType = 2 Or oType = 9 Then - oRETURN = $"{pAttrTitle} {pCriteria} {pTERM}" - ElseIf oType = 3 Then 'Float - oRETURN = $"{pAttrTitle} {pCriteria} Convert(float,'{pTERM.Replace(",", ".")}')" - ElseIf oType = 4 Then 'Decimal - oRETURN = $"{pAttrTitle} {pCriteria} Convert(decimal(19,2),'{pTERM.Replace(",", ".")}')" - ElseIf oType = 5 Then 'DATE - oRETURN = $"{pAttrTitle} {pCriteria} Convert(date,'{pTERM}')" - ElseIf oType = 7 Then - Dim oBit As Int16 - If CBool(pTERM) = True Then - oBit = 1 - Else - oBit = 0 - End If - oRETURN = $"{pAttrTitle} {pCriteria} '{oBit.ToString}'" - - End If - Next - - End If - Return oRETURN - End Function End Class \ No newline at end of file