This commit is contained in:
2022-04-28 16:27:55 +02:00
parent abc4d664a0
commit b8a3325c2f
12 changed files with 635 additions and 111 deletions

View File

@@ -125,7 +125,6 @@ Public Class frmFlowSearch1
Else
cmbLimitationDateAttr.Items.Add(IDB_ADDED_WHEN_String_Englisch)
End If
'Dim oDT As DataTable = My.DatabaseIDB.GetDatatable($"SELECT * FROM VWIDB_BE_ATTRIBUTE WHERE TYPE_ID IN (5,6) AND LANG_ID = {My.Application.User.LanguageId}")
For Each oRow As DataRow In My.Tables.DTIDB_ATTRIBUTE.Rows
If CBool(oRow.Item("SYS_ATTRIBUTE")) = False And (oRow.Item("TYP_ID") = 5 Or oRow.Item("TYP_ID") = 6) Then
@@ -163,9 +162,9 @@ Public Class frmFlowSearch1
collection.Add(orow.Item("TERM"))
Next
txtSearchInput.MaskBox.AutoCompleteSource = AutoCompleteSource.CustomSource
txtSearchInput.MaskBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend
txtSearchInput.MaskBox.AutoCompleteCustomSource = collection
TextEditSearch.MaskBox.AutoCompleteSource = AutoCompleteSource.CustomSource
TextEditSearch.MaskBox.AutoCompleteMode = AutoCompleteMode.SuggestAppend
TextEditSearch.MaskBox.AutoCompleteCustomSource = collection
TogglesDate = New List(Of ToggleSwitch) From {
ToggleSwitchTomorrow,
@@ -190,7 +189,7 @@ Public Class frmFlowSearch1
Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
Try
Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue)
Dim oResult = Await SearchRunner.Run(TextEditSearch.Text, DateEditFrom.EditValue, DateEditTill.EditValue)
If oResult.OK = False Then
bsiStatus.Caption = oResult.ErrorMessage
End If
@@ -206,29 +205,8 @@ Public Class frmFlowSearch1
End Sub
Private Async Function txtSearchInput_KeyUp(sender As Object, e As KeyEventArgs) As Threading.Tasks.Task Handles txtSearchInput.KeyUp
If e.KeyCode = Keys.Return Then
If txtSearchInput.Text = String.Empty Then
Return
End If
Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
Try
Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue)
If oResult.OK = False Then
bsiStatus.Caption = oResult.ErrorMessage
End If
Catch ex As Exception
Logger.Error(ex)
Finally
SplashScreenManager.CloseOverlayForm(oHandle)
End Try
End If
End Function
Private Sub BarButtonReset_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonReset.ItemClick
txtSearchInput.Text = ""
TextEditSearch.Text = ""
ResetTogglesDate()
ToggleSwitchDateto.IsOn = False
SearchRunner.ExplicitDate = False
@@ -255,10 +233,13 @@ Public Class frmFlowSearch1
End Sub
Private Async Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click
RunSearch()
End Sub
Private Async Sub RunSearch()
Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
Try
Dim oResult = Await SearchRunner.Run(txtSearchInput.Text, DateEditFrom.EditValue, DateEditTill.EditValue)
Dim oResult = Await SearchRunner.Run(TextEditSearch.Text, DateEditFrom.EditValue, DateEditTill.EditValue)
If oResult.OK = False Then
bsiStatus.Caption = oResult.ErrorMessage
End If
@@ -268,4 +249,18 @@ Public Class frmFlowSearch1
SplashScreenManager.CloseOverlayForm(oHandle)
End Try
End Sub
Private Sub TextEditSearch_KeyUp(sender As Object, e As KeyEventArgs) Handles TextEditSearch.KeyUp
If e.KeyCode = Keys.Return Then
If TextEditSearch.Text = String.Empty Then
Return
End If
RunSearch()
End If
End Sub
Private Sub PictureEdit1_Click(sender As Object, e As EventArgs) Handles PictureEdit1.Click
RunSearch()
End Sub
End Class