Zooflow: Readd Load_recent_files, add second service config
This commit is contained in:
@@ -206,12 +206,12 @@ Public Class frmFlowForm
|
||||
' === Initialization ===
|
||||
Init = New ClassInit(My.LogConfig, Me)
|
||||
AddHandler Init.Completed, Async Sub() Await Init_Completed(sender, e)
|
||||
|
||||
Init.InitializeApplication()
|
||||
|
||||
' === Register Sidebar ===
|
||||
RegisterBar(ABEdge.ABE_RIGHT)
|
||||
|
||||
' Disable Form until init has completed
|
||||
Enabled = False
|
||||
End Sub
|
||||
|
||||
@@ -231,8 +231,9 @@ Public Class frmFlowForm
|
||||
ErrorHandler = New BaseErrorHandler(My.LogConfig, Logger, Me)
|
||||
Modules = New ClassModules(My.LogConfig, My.SystemConfig)
|
||||
FileEx = New Filesystem.File(My.LogConfig)
|
||||
Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch")
|
||||
Search.BaseSearchSQL = DocResultBaseSearch
|
||||
Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch") With {
|
||||
.BaseSearchSQL = DocResultBaseSearch
|
||||
}
|
||||
|
||||
' === Initialize Theming ===
|
||||
If My.Application.Palette = "" Then
|
||||
@@ -242,14 +243,13 @@ Public Class frmFlowForm
|
||||
End If
|
||||
|
||||
' === Setup Timers ===
|
||||
AddHandler TimerRefreshSidebarData.Tick, AddressOf TimerRefreshData_Tick
|
||||
TimerRefreshSidebarData.Enabled = True
|
||||
' No timers right now
|
||||
|
||||
' === Setup Event Handlers ===
|
||||
AddHandler KeyDown, AddressOf frmFlowForm_KeyDown
|
||||
AddHandler KeyUp, AddressOf frmFlowForm_KeyDown
|
||||
AddHandler Watcher.ClipboardChanged, AddressOf Watcher_ClipboardChanged
|
||||
|
||||
AddHandler Search.Closed, AddressOf SearchRunner_Closed
|
||||
|
||||
PictureBoxSearch.Visible = False
|
||||
For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows
|
||||
@@ -259,12 +259,7 @@ Public Class frmFlowForm
|
||||
End If
|
||||
Next
|
||||
|
||||
Dim oSql = $"SELECT TOP 10 * FROM VWIDB_DOCRESULT_DE WHERE [Changed who] = '{My.Application.User.UserName}' ORDER BY [Changed when] DESC"
|
||||
Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(oSql)
|
||||
|
||||
GridControl1.DataSource = AccessedFilesTable
|
||||
colPrimary.FieldName = "DisplayFileName"
|
||||
colSecondary.FieldName = "Changed when"
|
||||
Await Load_Recent_Files()
|
||||
|
||||
If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then
|
||||
Try
|
||||
@@ -354,6 +349,24 @@ Public Class frmFlowForm
|
||||
Enabled = True
|
||||
End Try
|
||||
End Function
|
||||
|
||||
Private Async Sub SearchRunner_Closed(sender As Object, e As Integer)
|
||||
Await Load_Recent_Files()
|
||||
End Sub
|
||||
|
||||
Private Async Function Load_Recent_Files() As Task
|
||||
Try
|
||||
Dim oSql = $"SELECT TOP 10 * FROM VWIDB_DOCRESULT_DE WHERE [Changed who] = '{My.Application.User.UserName}' ORDER BY [Changed when] DESC"
|
||||
Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(oSql)
|
||||
|
||||
GridControl1.DataSource = AccessedFilesTable
|
||||
colPrimary.FieldName = "DisplayFileName"
|
||||
colSecondary.FieldName = "Changed when"
|
||||
Catch ex As Exception
|
||||
ShowErrorMessage(ex)
|
||||
End Try
|
||||
End Function
|
||||
|
||||
Async Function ConfigureQuicksearch1(Reload As Boolean) As Threading.Tasks.Task
|
||||
If Reload Then
|
||||
Dim oSQL = $"SELECT * FROM TBIDB_CATALOG_USER WHERE USR_ID = {My.Application.User.UserId}"
|
||||
@@ -1144,7 +1157,18 @@ Public Class frmFlowForm
|
||||
End Sub
|
||||
|
||||
Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnServiceConfig.ItemClick
|
||||
frmServiceConfig.ShowDialog()
|
||||
Try
|
||||
Dim oForm As New frmServiceConfig() With {
|
||||
.ServiceAddress = My.Application.Service.Client.ServerAddress,
|
||||
.ServiceOnline = My.Application.Service.Client.IsOnline
|
||||
}
|
||||
oForm.ShowDialog()
|
||||
|
||||
My.SystemConfig.AppServerConfig = oForm.ServiceAddress
|
||||
My.SystemConfigManager.Save()
|
||||
Catch ex As Exception
|
||||
ErrorHandler.ShowErrorMessage("Service Config")
|
||||
End Try
|
||||
End Sub
|
||||
|
||||
Private Async Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnBasicConfig.ItemClick
|
||||
@@ -1217,24 +1241,6 @@ Public Class frmFlowForm
|
||||
CopyToDataTable()
|
||||
|
||||
Search.Run(oResult, "Suche")
|
||||
|
||||
'Dim oParams = New DocumentResultList.Params() With {
|
||||
' .WindowGuid = "SingleDocument",
|
||||
' .WindowTitle = "Einzelnes Dokument",
|
||||
' .OperationModeOverride = DigitalData.Modules.ZooFlow.Constants.OperationMode.ZooFlow,
|
||||
' .ProfileGuid = 354521,
|
||||
' .ShowBackNavigation = False,
|
||||
' .ShowFileList = False,
|
||||
' .Results = New List(Of DocumentResultList.DocumentResult) From {
|
||||
' New DocumentResultList.DocumentResult() With {
|
||||
' .Title = "Einzelnes Dokument",
|
||||
' .Datatable = oResult
|
||||
' }
|
||||
' }
|
||||
'}
|
||||
|
||||
'Dim oForm As New frmDocumentResultList(My.LogConfig, Environment, oParams)
|
||||
'oForm.Show()
|
||||
Catch ex As Exception
|
||||
ErrorHandler.ShowErrorMessage(ex, "Laden eines Dokuments")
|
||||
Finally
|
||||
|
||||
Reference in New Issue
Block a user