Admin Globix und Flowsearch

2021-02-15 11:30:04 +01:00
parent 3f90e10417
commit 5b14c02146
5 changed files with 134 additions and 106 deletions
--- a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb
@@ -22,12 +22,13 @@ Partial Class frmFlowSearch
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch))
        Dim TileItemElement3 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
        Dim TileItemElement4 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
        Me.Panel1 = New System.Windows.Forms.Panel()
        Me.CheckButton1 = New DevExpress.XtraEditors.CheckButton()
-        Me.txtSearch = New System.Windows.Forms.TextBox()
+        Me.txtSearchTerm = New System.Windows.Forms.TextBox()
        Me.lblFoundResult = New System.Windows.Forms.Label()
        Me.Label1 = New System.Windows.Forms.Label()
        Me.Panel2 = New System.Windows.Forms.Panel()
@@ -36,6 +37,7 @@ Partial Class frmFlowSearch
        Me.TileItem1 = New DevExpress.XtraEditors.TileItem()
        Me.TileItem2 = New DevExpress.XtraEditors.TileItem()
        Me.TileGroup3 = New DevExpress.XtraEditors.TileGroup()
+        Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components)
        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
        Me.BarToggleSwitchItemDateALL = New DevExpress.XtraBars.BarToggleSwitchItem()
        Me.BarToggleSwitchItemCURRENTYEAR = New DevExpress.XtraBars.BarToggleSwitchItem()
@@ -64,7 +66,7 @@ Partial Class frmFlowSearch
        '
        Me.Panel1.BackColor = System.Drawing.Color.DimGray
        Me.Panel1.Controls.Add(Me.CheckButton1)
-        Me.Panel1.Controls.Add(Me.txtSearch)
+        Me.Panel1.Controls.Add(Me.txtSearchTerm)
        Me.Panel1.Controls.Add(Me.lblFoundResult)
        Me.Panel1.Controls.Add(Me.Label1)
        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
@@ -84,14 +86,14 @@ Partial Class frmFlowSearch
        Me.CheckButton1.TabIndex = 5
        Me.CheckButton1.Text = "Zeige Alles"
        '
-        'txtSearch
+        'txtSearchTerm
        '
-        Me.txtSearch.BackColor = System.Drawing.Color.White
-        Me.txtSearch.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.txtSearch.Location = New System.Drawing.Point(148, 11)
-        Me.txtSearch.Name = "txtSearch"
-        Me.txtSearch.Size = New System.Drawing.Size(167, 23)
-        Me.txtSearch.TabIndex = 0
+        Me.txtSearchTerm.BackColor = System.Drawing.Color.White
+        Me.txtSearchTerm.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtSearchTerm.Location = New System.Drawing.Point(148, 11)
+        Me.txtSearchTerm.Name = "txtSearchTerm"
+        Me.txtSearchTerm.Size = New System.Drawing.Size(167, 23)
+        Me.txtSearchTerm.TabIndex = 0
        '
        'lblFoundResult
        '
@@ -143,6 +145,7 @@ Partial Class frmFlowSearch
        Me.TileControlMatch.Size = New System.Drawing.Size(1237, 407)
        Me.TileControlMatch.TabIndex = 2
        Me.TileControlMatch.Text = "TileControl1"
+        Me.TileControlMatch.ToolTipController = Me.ToolTipController1
        '
        'TileGroup2
        '
@@ -176,6 +179,11 @@ Partial Class frmFlowSearch
        Me.TileGroup3.Name = "TileGroup3"
        Me.TileGroup3.Text = "Attribut2"
        '
+        'ToolTipController1
+        '
+        Me.ToolTipController1.Appearance.BorderColor = System.Drawing.Color.Red
+        Me.ToolTipController1.Appearance.Options.UseBorderColor = True
+        '
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
@@ -339,7 +347,7 @@ Partial Class frmFlowSearch
    End Sub

    Friend WithEvents Panel1 As Panel
-    Friend WithEvents txtSearch As TextBox
+    Friend WithEvents txtSearchTerm As TextBox
    Friend WithEvents Label1 As Label
    Friend WithEvents lblFoundResult As Label
    Friend WithEvents Panel2 As Panel
@@ -368,4 +376,5 @@ Partial Class frmFlowSearch
    Friend WithEvents CheckButton1 As DevExpress.XtraEditors.CheckButton
    Friend WithEvents BarEditItemDate As DevExpress.XtraBars.BarEditItem
    Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox
+    Friend WithEvents ToolTipController1 As DevExpress.Utils.ToolTipController
 End Class
--- a/GUIs.ZooFlow/Search/frmFlowSearch.resx
+++ b/GUIs.ZooFlow/Search/frmFlowSearch.resx
@@ -138,6 +138,9 @@
        MlYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
 </value>
  </data>
+  <metadata name="ToolTipController1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
  <data name="frmFlowSearch.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
--- a/GUIs.ZooFlow/Search/frmFlowSearch.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb
@@ -4,6 +4,7 @@ Imports DigitalData.GUIs.Common
 Imports DevExpress.XtraSplashScreen
 Imports DevExpress.XtraBars
 Imports DigitalData.GUIs.ZooFlow.ClassConstants
+Imports DevExpress.Utils

 Public Class frmFlowSearch
    Private Logger As Logger
@@ -82,10 +83,10 @@ Public Class frmFlowSearch
        End Try

    End Sub
-    Private Sub txtSearch_TextChanged(sender As Object, e As EventArgs) Handles txtSearch.TextChanged
+    Private Sub txtSearch_TextChanged(sender As Object, e As EventArgs) Handles txtSearchTerm.TextChanged
        Try

-            If txtSearch.Text = String.Empty Then
+            If txtSearchTerm.Text = String.Empty Then
                Reset_Form()
                Exit Sub
            End If
@@ -104,10 +105,10 @@ Public Class frmFlowSearch
    End Sub
    Sub SearchContent()
        Try
-            If txtSearch.Text = String.Empty Then
+            If txtSearchTerm.Text = String.Empty Then
                Exit Sub
            End If
-            Dim oSearchValue = Trim(txtSearch.Text)
+            Dim oSearchValue = Trim(txtSearchTerm.Text)
            oLastAttribute = ""
            Dim oSQL = BASE_SEARCHCommand.Replace("@SEARCH_STRING", oSearchValue)

@@ -147,10 +148,11 @@ Public Class frmFlowSearch
                oNewTable.DefaultView.Sort = "COUNT ASC"
                oNewTable = oNewTable.DefaultView.ToTable

+                '#### CREATE THE GROUPS FOR EACH ATTRIBUTE ####
                For Each oGroupRow As DataRow In oNewTable.Rows
                    Dim oGroup As New TileGroup
-
                    oGroup.Text = $"{oGroupRow.Item(0).ToString} ({oGroupRow.Item(1).ToString} {Language_Term_Object})"
+                    oGroup.Tag = oGroupRow.Item(0)
                    oGroup.Visible = True
                    For Each oitemRow As DataRow In oResultsfromSearchDT.Rows
                        If oitemRow.Item("ATTRIBUTE") = oGroupRow.Item(0) Then
@@ -166,7 +168,7 @@ Public Class frmFlowSearch

                'Wenn weniger als 45 Belege gefunden wurden wird direkt die Suche ausgeführt
                If oResultCountAttributes > 0 And oResultCountAttributes <= 45 Then
-                    StartSearch_Full(oSearchValue)
+                    StartSearch_Full(oSearchValue, "")
                Else
                    If oResultsfromSearchDT.Rows.Count = 0 Then
                        Reset_Form()
@@ -185,7 +187,7 @@ Public Class frmFlowSearch


    End Sub
-    Private Function StartSearch_Full(pSearchValue As String) As Boolean
+    Private Function StartSearch_Full(pSearchValue As String, pOptAttribute As String) As Boolean
        Dim oHandle As IOverlaySplashScreenHandle = Nothing
        Dim oItemsFound As Boolean = False
        Dim oSearchData = My.Application.Search
@@ -193,7 +195,7 @@ Public Class frmFlowSearch
        Try
            oHandle = SplashScreenManager.ShowOverlayForm(Me)

-            Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}','{SEARCH_FACT_DATE}', {My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}'"
+            Dim oEXECSQL = $"EXEC PRFLOW_SEARCH_GET_RESULT '{pSearchValue}','{SEARCH_FACT_DATE}', {My.Application.User.UserId},'{oSearchData.SelectInStringAttributeIds}','{oSearchData.SelectInIntegerAttributeIds}',{My.Application.User.LanguageID},'{pOptAttribute}'"
            Dim oDTOBJECT_RESULT As DataTable = My.DatabaseIDB.GetDatatable(oEXECSQL)
            If Not IsNothing(oDTOBJECT_RESULT) Then
                If oDTOBJECT_RESULT.Rows.Count = 0 Then
@@ -333,10 +335,15 @@ Public Class frmFlowSearch

    End Function

-    Private Sub txtSearch_Enter(sender As Object, e As EventArgs) Handles txtSearch.GotFocus
+    Private Sub txtSearch_Enter(sender As Object, e As EventArgs) Handles txtSearchTerm.GotFocus
        Label1.Visible = True
+        Dim oTEXTBOX As TextBox = CType(sender, TextBox)
+        oTEXTBOX.BackColor = Color.FromArgb(255, 214, 47)
+    End Sub
+    Private Sub txtSearchTerm_Leave(sender As Object, e As EventArgs) Handles txtSearchTerm.Leave
+        Dim oTEXTBOX As TextBox = CType(sender, TextBox)
+        oTEXTBOX.BackColor = Color.White
    End Sub
-


    Private Sub TileControlMatch_ItemClick(sender As Object, e As TileItemEventArgs) Handles TileControlMatch.ItemClick
@@ -467,7 +474,7 @@ Public Class frmFlowSearch

    End Sub
    Sub Start_FlowSearch(Optional AllOver As Boolean = False)
-        If txtSearch.Text <> String.Empty Or AllOver = True Then
+        If txtSearchTerm.Text <> String.Empty Or AllOver = True Then
            SearchContent()
        End If
    End Sub
@@ -488,11 +495,18 @@ Public Class frmFlowSearch
                Exit Sub
            End If
        End If
-        StartSearch_Full("")
+        StartSearch_Full("", "")
        CheckButton1.Checked = True
    End Sub

-    Private Sub BarEditItemDate_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarEditItemDate.ItemClick
-
+    Private Sub TileControlMatch_Click(sender As Object, ByVal e As MouseEventArgs) Handles TileControlMatch.Click
+        Dim tc As TileControl = TryCast(sender, TileControl)
+        Dim hi = tc.CalcHitInfo(e.Location)
+        If hi.HitTest = DevExpress.XtraEditors.TileControlHitTest.GroupCaption Then
+            Console.WriteLine(hi.GroupInfo.Group.Tag)
+            StartSearch_Full(RTrim(LTrim(txtSearchTerm.Text)), hi.GroupInfo.Group.Tag)
+        End If
    End Sub
+
+
 End Class