FlowSearch

This commit is contained in:
SchreiberM 2021-02-12 14:13:49 +01:00
parent 7e6a7c6db3
commit 599101d824
3 changed files with 25 additions and 22 deletions

View File

@ -27,7 +27,7 @@
Public Const NOTIFICATION_DELAY = 2500 Public Const NOTIFICATION_DELAY = 2500
Public Const SQLCMD_FLOW_SEARCH_LOWER_LIMIT = "FLOW_SEARCH_LOWER_LIMIT" Public Const SQLCMD_FLOW_SEARCH_LOWER_LIMIT = "FLOW_SEARCH_ATTRIBUTE_GROUP"
Public Const SQLCMD_FLOW_SEARCH_TILE = "FLOW_SEARCH_PER_TILE" Public Const SQLCMD_FLOW_SEARCH_TILE = "FLOW_SEARCH_PER_TILE"
Public Const RESULTLIST_COL_ADDED_WHEN_DE = "Erstellt wann" Public Const RESULTLIST_COL_ADDED_WHEN_DE = "Erstellt wann"

View File

@ -23,8 +23,8 @@ Partial Class frmFlowSearch
<System.Diagnostics.DebuggerStepThrough()> <System.Diagnostics.DebuggerStepThrough()>
Private Sub InitializeComponent() Private Sub InitializeComponent()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch)) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch))
Dim TileItemElement1 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() Dim TileItemElement3 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
Dim TileItemElement2 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.Panel1 = New System.Windows.Forms.Panel()
Me.CheckButton1 = New DevExpress.XtraEditors.CheckButton() Me.CheckButton1 = New DevExpress.XtraEditors.CheckButton()
Me.txtSearch = New System.Windows.Forms.TextBox() Me.txtSearch = New System.Windows.Forms.TextBox()
@ -155,8 +155,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.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 Me.TileItem1.AppearanceItem.Normal.Options.UseBackColor = True
TileItemElement1.Text = "TileItem1" TileItemElement3.Text = "TileItem1"
Me.TileItem1.Elements.Add(TileItemElement1) Me.TileItem1.Elements.Add(TileItemElement3)
Me.TileItem1.Id = 0 Me.TileItem1.Id = 0
Me.TileItem1.ItemSize = DevExpress.XtraEditors.TileItemSize.Wide Me.TileItem1.ItemSize = DevExpress.XtraEditors.TileItemSize.Wide
Me.TileItem1.Name = "TileItem1" Me.TileItem1.Name = "TileItem1"
@ -165,8 +165,8 @@ Partial Class frmFlowSearch
' '
Me.TileItem2.AppearanceItem.Normal.BackColor = System.Drawing.Color.White Me.TileItem2.AppearanceItem.Normal.BackColor = System.Drawing.Color.White
Me.TileItem2.AppearanceItem.Normal.Options.UseBackColor = True Me.TileItem2.AppearanceItem.Normal.Options.UseBackColor = True
TileItemElement2.Text = "TileItem2" TileItemElement4.Text = "TileItem2"
Me.TileItem2.Elements.Add(TileItemElement2) Me.TileItem2.Elements.Add(TileItemElement4)
Me.TileItem2.Id = 1 Me.TileItem2.Id = 1
Me.TileItem2.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium Me.TileItem2.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium
Me.TileItem2.Name = "TileItem2" Me.TileItem2.Name = "TileItem2"
@ -174,6 +174,7 @@ Partial Class frmFlowSearch
'TileGroup3 'TileGroup3
' '
Me.TileGroup3.Name = "TileGroup3" Me.TileGroup3.Name = "TileGroup3"
Me.TileGroup3.Text = "Attribut2"
' '
'RibbonControl1 'RibbonControl1
' '

View File

@ -74,7 +74,9 @@ Public Class frmFlowSearch
SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN"
Else Else
SEARCH_FACT_DATE_ATTRIBUTE = oEditValue SEARCH_FACT_DATE_ATTRIBUTE = oEditValue
SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13"
End If End If
SearchContent()
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) Logger.Error(ex)
End Try End Try
@ -100,23 +102,22 @@ Public Class frmFlowSearch
TileControlMatch.Groups.Clear() TileControlMatch.Groups.Clear()
lblFoundResult.Visible = False lblFoundResult.Visible = False
End Sub End Sub
Sub SearchContent(oSearchValue As String) Sub SearchContent()
Try Try
If txtSearch.Text = String.Empty Then
Exit Sub
End If
Dim oSearchValue = Trim(txtSearch.Text)
oLastAttribute = "" oLastAttribute = ""
Dim oSQL = BASE_SEARCHCommand.Replace("@SEARCH_STRING", oSearchValue) Dim oSQL = BASE_SEARCHCommand.Replace("@SEARCH_STRING", oSearchValue)
If BarToggleSwitchItemDateALL.Checked = False Then If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then
If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE) Else
Else oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
If SEARCH_FACT_DATE = "MONTH(OBJ.ADDED_WHEN) <> 13" Then oSQL = oSQL.Replace("--INNER JOIN VWIDB_GROUP_DATA_DATE", "INNER JOIN VWIDB_GROUP_DATA_DATE")
SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13" End If
End If
oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
oSQL = oSQL.Replace("--INNER JOIN VWIDB_GROUP_DATA_DATE", "INNER JOIN VWIDB_GROUP_DATA_DATE")
End If
End If
Dim oResultCountAttributes As Integer = 0 Dim oResultCountAttributes As Integer = 0
TileControlMatch.Groups.Clear() TileControlMatch.Groups.Clear()
@ -160,6 +161,7 @@ Public Class frmFlowSearch
End If End If
Next Next
TileControlMatch.Groups.Add(oGroup) TileControlMatch.Groups.Add(oGroup)
Next Next
'Wenn weniger als 45 Belege gefunden wurden wird direkt die Suche ausgeführt 'Wenn weniger als 45 Belege gefunden wurden wird direkt die Suche ausgeführt
@ -374,7 +376,7 @@ Public Class frmFlowSearch
If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then
Return pInput.Replace("@ATTRIBUTE", "OBJ.ADDED_WHEN") Return pInput.Replace("@ATTRIBUTE", "OBJ.ADDED_WHEN")
Else Else
Dim oSTR = $"GRP_DATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]" Dim oSTR = $"GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]"
Return pInput.Replace("@ATTRIBUTE", oSTR) Return pInput.Replace("@ATTRIBUTE", oSTR)
End If End If
Catch ex As Exception Catch ex As Exception
@ -459,14 +461,14 @@ Public Class frmFlowSearch
BarToggleSwitchItemLASTMONTH.Checked = False BarToggleSwitchItemLASTMONTH.Checked = False
BarToggleSwitchItemCURRENTMONTH.Checked = False BarToggleSwitchItemCURRENTMONTH.Checked = False
BarToggleSwitchItemTODAY.Checked = False BarToggleSwitchItemTODAY.Checked = False
SEARCH_FACT_DATE = "MONTH(OBJ.ADDED_WHEN) <> 13" 'SEARCH_FACT_DATE = "MONTH(OBJ.ADDED_WHEN) <> 13"
End If End If
Start_FlowSearch() Start_FlowSearch()
End Sub End Sub
Sub Start_FlowSearch(Optional AllOver As Boolean = False) Sub Start_FlowSearch(Optional AllOver As Boolean = False)
If txtSearch.Text <> String.Empty Or AllOver = True Then If txtSearch.Text <> String.Empty Or AllOver = True Then
SearchContent(Trim(txtSearch.Text)) SearchContent()
End If End If
End Sub End Sub