AppStd/Monorepo
8
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FlowSearch

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

32
GUIs.ZooFlow/Search/frmFlowSearch.vb
View File

@@ -74,7 +74,9 @@ Public Class frmFlowSearch
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
@@ -100,23 +102,22 @@ Public Class frmFlowSearch
TileControlMatch.Groups.Clear()
lblFoundResult.Visible = False
End Sub
Sub SearchContent(oSearchValue As String)
Sub SearchContent()
Try
If txtSearch.Text = String.Empty Then
Exit Sub
End If
Dim oSearchValue = Trim(txtSearch.Text)
oLastAttribute = ""
Dim oSQL = BASE_SEARCHCommand.Replace("@SEARCH_STRING", oSearchValue)
If BarToggleSwitchItemDateALL.Checked = False Then
If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then
oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
Else
If SEARCH_FACT_DATE = "MONTH(OBJ.ADDED_WHEN) <> 13" Then
SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13"
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
If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then
oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
Else
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
Dim oResultCountAttributes As Integer = 0
TileControlMatch.Groups.Clear()
@@ -160,6 +161,7 @@ Public Class frmFlowSearch
End If
Next
TileControlMatch.Groups.Add(oGroup)
Next
'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
Return pInput.Replace("@ATTRIBUTE", "OBJ.ADDED_WHEN")
Else
Dim oSTR = $"GRP_DATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]"
Dim oSTR = $"GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]"
Return pInput.Replace("@ATTRIBUTE", oSTR)
End If
Catch ex As Exception
@@ -459,14 +461,14 @@ Public Class frmFlowSearch
BarToggleSwitchItemLASTMONTH.Checked = False
BarToggleSwitchItemCURRENTMONTH.Checked = False
BarToggleSwitchItemTODAY.Checked = False
SEARCH_FACT_DATE = "MONTH(OBJ.ADDED_WHEN) <> 13"
'SEARCH_FACT_DATE = "MONTH(OBJ.ADDED_WHEN) <> 13"
End If
Start_FlowSearch()
End Sub
Sub Start_FlowSearch(Optional AllOver As Boolean = False)
If txtSearch.Text <> String.Empty Or AllOver = True Then
SearchContent(Trim(txtSearch.Text))
SearchContent()
End If
End Sub