Zooflow: Replace old Usermenu, waiting overlay for search and globix

This commit is contained in:
Jonathan Jenne
2022-02-21 16:41:11 +01:00
parent 77597f0ef2
commit 227bd7cf1b
25 changed files with 685 additions and 586 deletions

View File

@@ -24,8 +24,8 @@ Partial Class frmFlowSearch
Private Sub InitializeComponent()
Me.components = New System.ComponentModel.Container()
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowSearch))
Dim TileItemElement7 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
Dim TileItemElement8 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
Dim TileItemElement1 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
Dim TileItemElement2 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement()
Me.CheckButton1 = New DevExpress.XtraEditors.CheckButton()
Me.txtSearchTerm = New System.Windows.Forms.TextBox()
Me.lblFoundResult = New System.Windows.Forms.Label()
@@ -124,7 +124,7 @@ Partial Class frmFlowSearch
'Panel2
'
Me.Panel2.Dock = System.Windows.Forms.DockStyle.Bottom
Me.Panel2.Location = New System.Drawing.Point(202, 627)
Me.Panel2.Location = New System.Drawing.Point(202, 625)
Me.Panel2.Name = "Panel2"
Me.Panel2.Size = New System.Drawing.Size(1035, 18)
Me.Panel2.TabIndex = 1
@@ -144,7 +144,7 @@ Partial Class frmFlowSearch
Me.TileControlMatch.Name = "TileControlMatch"
Me.TileControlMatch.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollBar
Me.TileControlMatch.ShowGroupText = True
Me.TileControlMatch.Size = New System.Drawing.Size(1035, 413)
Me.TileControlMatch.Size = New System.Drawing.Size(1035, 418)
Me.TileControlMatch.TabIndex = 2
Me.TileControlMatch.TabStop = False
Me.TileControlMatch.Text = "TileControl1"
@@ -161,8 +161,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.Options.UseBackColor = True
TileItemElement7.Text = "TileItem1"
Me.TileItem1.Elements.Add(TileItemElement7)
TileItemElement1.Text = "TileItem1"
Me.TileItem1.Elements.Add(TileItemElement1)
Me.TileItem1.Id = 0
Me.TileItem1.ItemSize = DevExpress.XtraEditors.TileItemSize.Wide
Me.TileItem1.Name = "TileItem1"
@@ -171,8 +171,8 @@ Partial Class frmFlowSearch
'
Me.TileItem2.AppearanceItem.Normal.BackColor = System.Drawing.Color.White
Me.TileItem2.AppearanceItem.Normal.Options.UseBackColor = True
TileItemElement8.Text = "TileItem2"
Me.TileItem2.Elements.Add(TileItemElement8)
TileItemElement2.Text = "TileItem2"
Me.TileItem2.Elements.Add(TileItemElement2)
Me.TileItem2.Id = 1
Me.TileItem2.ItemSize = DevExpress.XtraEditors.TileItemSize.Medium
Me.TileItem2.Name = "TileItem2"
@@ -198,7 +198,7 @@ Partial Class frmFlowSearch
Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.MacOffice
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl1.ShowToolbarCustomizeItem = False
Me.RibbonControl1.Size = New System.Drawing.Size(1237, 148)
Me.RibbonControl1.Size = New System.Drawing.Size(1237, 141)
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
'
@@ -215,10 +215,10 @@ Partial Class frmFlowSearch
'RibbonStatusBar1
'
Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticInfoItem)
Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 645)
Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 643)
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
Me.RibbonStatusBar1.Size = New System.Drawing.Size(1237, 22)
Me.RibbonStatusBar1.Size = New System.Drawing.Size(1237, 24)
'
'RibbonPage2
'
@@ -238,10 +238,10 @@ Partial Class frmFlowSearch
Me.panelContainer1.Controls.Add(Me.DockPanel3)
Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left
Me.panelContainer1.ID = New System.Guid("2c41e5f4-f976-4b22-a22e-afe12cfdaa3d")
Me.panelContainer1.Location = New System.Drawing.Point(0, 148)
Me.panelContainer1.Location = New System.Drawing.Point(0, 141)
Me.panelContainer1.Name = "panelContainer1"
Me.panelContainer1.OriginalSize = New System.Drawing.Size(202, 200)
Me.panelContainer1.Size = New System.Drawing.Size(202, 497)
Me.panelContainer1.Size = New System.Drawing.Size(202, 502)
Me.panelContainer1.Tabbed = True
Me.panelContainer1.Text = "panelContainer1"
'
@@ -253,13 +253,13 @@ Partial Class frmFlowSearch
Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
Me.DockPanel1.Font = New System.Drawing.Font("Calibri", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.DockPanel1.ID = New System.Guid("1ff5d42b-085b-405c-85c0-e49f75099dd0")
Me.DockPanel1.Location = New System.Drawing.Point(3, 46)
Me.DockPanel1.Location = New System.Drawing.Point(3, 26)
Me.DockPanel1.Name = "DockPanel1"
Me.DockPanel1.Options.AllowFloating = False
Me.DockPanel1.Options.ShowCloseButton = False
Me.DockPanel1.Options.ShowMaximizeButton = False
Me.DockPanel1.OriginalSize = New System.Drawing.Size(195, 421)
Me.DockPanel1.Size = New System.Drawing.Size(195, 419)
Me.DockPanel1.OriginalSize = New System.Drawing.Size(195, 419)
Me.DockPanel1.Size = New System.Drawing.Size(195, 447)
Me.DockPanel1.Text = "Einschränkungen"
'
'DockPanel1_Container
@@ -276,7 +276,7 @@ Partial Class frmFlowSearch
Me.DockPanel1_Container.Controls.Add(Me.ToggleSwitchToday)
Me.DockPanel1_Container.Location = New System.Drawing.Point(0, 0)
Me.DockPanel1_Container.Name = "DockPanel1_Container"
Me.DockPanel1_Container.Size = New System.Drawing.Size(195, 419)
Me.DockPanel1_Container.Size = New System.Drawing.Size(195, 447)
Me.DockPanel1_Container.TabIndex = 0
'
'Label3
@@ -299,7 +299,7 @@ Partial Class frmFlowSearch
Me.CheckedListBoxCategories.CheckOnClick = True
Me.CheckedListBoxCategories.Location = New System.Drawing.Point(12, 217)
Me.CheckedListBoxCategories.Name = "CheckedListBoxCategories"
Me.CheckedListBoxCategories.Size = New System.Drawing.Size(174, 199)
Me.CheckedListBoxCategories.Size = New System.Drawing.Size(174, 227)
Me.CheckedListBoxCategories.TabIndex = 15
'
'ToggleSwitchLastMonth
@@ -412,18 +412,18 @@ Partial Class frmFlowSearch
Me.DockPanel3.Controls.Add(Me.DockPanel3_Container)
Me.DockPanel3.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
Me.DockPanel3.ID = New System.Guid("08fbe6c7-4310-499d-bd16-beeb37a1d906")
Me.DockPanel3.Location = New System.Drawing.Point(3, 46)
Me.DockPanel3.Location = New System.Drawing.Point(3, 26)
Me.DockPanel3.Name = "DockPanel3"
Me.DockPanel3.Options.AllowFloating = False
Me.DockPanel3.OriginalSize = New System.Drawing.Size(195, 421)
Me.DockPanel3.Size = New System.Drawing.Size(195, 419)
Me.DockPanel3.OriginalSize = New System.Drawing.Size(195, 419)
Me.DockPanel3.Size = New System.Drawing.Size(195, 447)
Me.DockPanel3.Text = "Attribute"
'
'DockPanel3_Container
'
Me.DockPanel3_Container.Location = New System.Drawing.Point(0, 0)
Me.DockPanel3_Container.Name = "DockPanel3_Container"
Me.DockPanel3_Container.Size = New System.Drawing.Size(195, 419)
Me.DockPanel3_Container.Size = New System.Drawing.Size(195, 447)
Me.DockPanel3_Container.TabIndex = 0
'
'Panel1
@@ -434,7 +434,7 @@ Partial Class frmFlowSearch
Me.Panel1.Controls.Add(Me.lblFoundResult)
Me.Panel1.Controls.Add(Me.Label1)
Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
Me.Panel1.Location = New System.Drawing.Point(202, 148)
Me.Panel1.Location = New System.Drawing.Point(202, 141)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(1035, 66)
Me.Panel1.TabIndex = 0
@@ -444,9 +444,9 @@ Partial Class frmFlowSearch
Me.Panel3.BackColor = System.Drawing.Color.Transparent
Me.Panel3.Controls.Add(Me.TileControlMatch)
Me.Panel3.Dock = System.Windows.Forms.DockStyle.Fill
Me.Panel3.Location = New System.Drawing.Point(202, 214)
Me.Panel3.Location = New System.Drawing.Point(202, 207)
Me.Panel3.Name = "Panel3"
Me.Panel3.Size = New System.Drawing.Size(1035, 413)
Me.Panel3.Size = New System.Drawing.Size(1035, 418)
Me.Panel3.TabIndex = 9
'
'frmFlowSearch

View File

@@ -1,11 +1,11 @@
Imports DevExpress.XtraEditors
Imports DevExpress.XtraSplashScreen
Imports DigitalData.GUIs.Common
Imports DigitalData.GUIs.ZooFlow.ClassConstants
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.ZooFlow
Public Class frmFlowSearch1
Private _Params As ClipboardWatcherParams
Private _Environment As Environment
Private Logger As Logger
@@ -222,24 +222,27 @@ Public Class frmFlowSearch1
End Sub
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
Search_GO()
End Sub
Private Sub Search_GO()
Dim owTITLE
Private Async Function BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) As Threading.Tasks.Task Handles BarButtonItem1.ItemClick
Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
Try
Await Search_GO()
Catch ex As Exception
Logger.Error(ex)
Finally
SplashScreenManager.CloseOverlayForm(oHandle)
End Try
End Function
Private Async Function Search_GO() As Threading.Tasks.Task
Dim oWindowTitle
Dim oSearchTerm = txtSearchInput.Text
If My.Application.User.Language = "de-DE" Then
owTITLE = $"Suche nach ""{oSearchTerm}"""
End If
_Params = New ClipboardWatcherParams()
_Params.ClipboardContents = oSearchTerm
Dim oParams = New DocumentResultList.Params() With {
.WindowGuid = "FlowSearch",
.WindowTitle = GetResultWindowString(oSearchTerm),
.OperationModeOverride = Modules.ZooFlow.Constants.OperationMode.ZooFlow,
.ProfileGuid = 354522
}
}
Dim oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~{SEARCH_PARAM3}"
If ExplizitDate Then
@@ -250,44 +253,38 @@ Public Class frmFlowSearch1
oDate2 = CDate(DateEditFrom.EditValue)
End If
Dim oProc = $"EXEC PRIDB_SEARCH_ADD_USR_DATE {My.Application.User.UserId},'{CDate(DateEditFrom.EditValue)}','{oDate2}'"
If My.DatabaseIDB.ExecuteNonQuery(oProc) = True Then
If Await My.Database.ExecuteNonQueryIDBAsync(oProc) = True Then
oP3 = $"{SEARCH_FACT_DATE_ATTRIBUTE}~DATEPART"
End If
End If
Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'"
If My.DatabaseIDB.ExecuteNonQuery(oSQL) = True Then
Dim oDTDocResult = My.DatabaseIDB.GetDatatable(oBASESEARCH)
Dim oSQL = $"EXEC PRIDB_SEARCH_TEXT_GET_RESULTS {My.Application.User.UserId},'{oSearchTerm}','{oP3}'"
If Await My.Database.ExecuteNonQueryIDBAsync(oSQL) = True Then
Dim oDTDocResult = Await My.Database.GetDatatableIDBAsync(oBASESEARCH)
If oDTDocResult.Rows.Count > 0 Then
oParams.Results.Add(New DocumentResultList.DocumentResult() With {
.Title = "FlowSearchXYZ",
.Datatable = oDTDocResult})
.Title = "FlowSearchXYZ",
.Datatable = oDTDocResult
})
Dim oForm As New frmDocumentResultList(My.LogConfig, _Environment, oParams)
'AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed
'AddHandler oForm.NeedsRefresh, AddressOf ProfileResultForm_NeedsRefresh
'OpenForms.Add(oForm)
oForm.Show()
Else
bsiStatus.Caption = "No Results"
End If
Else
bsiStatus.Caption = "Error oin FlowSearch - Check Your log"
bsiStatus.Caption = "Error in FlowSearch - Check Your log"
End If
'
End Function
End Sub
Private Sub txtSearchInput_KeyUp(sender As Object, e As KeyEventArgs) Handles txtSearchInput.KeyUp
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
Exit Sub
Return
End If
Search_GO()
Await Search_GO()
End If
End Sub
End Function
Private Function GetResultWindowString(SearchContent As String) As String
If SearchContent <> String.Empty Then
If My.Application.User.Language = State.UserState.LANG_DE_DE Then
@@ -308,7 +305,7 @@ Public Class frmFlowSearch1
End Function
Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
Me.txtSearchInput.Text = ""
txtSearchInput.Text = ""
ResetTogglesDate()
ToggleSwitchDateto.IsOn = False
ExplizitDate = False