Optimierungen
This commit is contained in:
@@ -1289,6 +1289,8 @@ Public Class frmMain
|
||||
Private Async Function Decide_Load(pIsFormLoad As Boolean, Optional ForceReload As Boolean = False) As Tasks.Task
|
||||
Dim refreshWasEnabled As Boolean = False
|
||||
Dim showLoadingPanel As Boolean = False
|
||||
Dim useWaitCursorApplied As Boolean = False
|
||||
Dim previousMessage As String = bsiMessage.Caption
|
||||
|
||||
Try
|
||||
LOGGER.Debug($"Decide_Load: pIsFormLoad [{pIsFormLoad}] - ForceReload [{ForceReload}] - GRID_LOAD_TYPE [{GRID_LOAD_TYPE}] ")
|
||||
@@ -1308,11 +1310,15 @@ Public Class frmMain
|
||||
TimerRefresh.Enabled = False
|
||||
End If
|
||||
|
||||
If GridControlWorkflows.Visible Then
|
||||
GridViewWorkflows.ShowLoadingPanel()
|
||||
showLoadingPanel = True
|
||||
If Me.UseWaitCursor = False Then
|
||||
Me.UseWaitCursor = True
|
||||
useWaitCursorApplied = True
|
||||
End If
|
||||
|
||||
bsiMessage.Caption = "Daten werden geladen..."
|
||||
GridViewWorkflows.ShowLoadingPanel()
|
||||
showLoadingPanel = True
|
||||
|
||||
TimerRefresh.Stop()
|
||||
FRONTEND_ACTION = "DECIDE_LOAD"
|
||||
|
||||
@@ -1350,6 +1356,10 @@ Public Class frmMain
|
||||
If showLoadingPanel Then
|
||||
GridViewWorkflows.HideLoadingPanel()
|
||||
End If
|
||||
If useWaitCursorApplied Then
|
||||
Me.UseWaitCursor = False
|
||||
End If
|
||||
bsiMessage.Caption = previousMessage
|
||||
If refreshWasEnabled Then
|
||||
TimerRefresh.Enabled = True
|
||||
End If
|
||||
@@ -1880,13 +1890,26 @@ Public Class frmMain
|
||||
Dim viewUpdateStarted As Boolean = False
|
||||
Dim layoutRestored As Boolean = False
|
||||
Dim resetLayoutTriggered As Boolean = False
|
||||
Dim showLoadingPanel As Boolean = False
|
||||
Dim useWaitCursorApplied As Boolean = False
|
||||
Dim previousMessage As String = bsiMessage.Caption
|
||||
Dim loadingMessageApplied As Boolean = False
|
||||
|
||||
GridControlWorkflows_Visible()
|
||||
GRID_LOAD_TYPE = "OVERVIEW"
|
||||
CURRENT_CLICKED_PROFILE_ID = 0
|
||||
|
||||
Try
|
||||
bsiMessage.Caption = ""
|
||||
If Me.UseWaitCursor = False Then
|
||||
Me.UseWaitCursor = True
|
||||
useWaitCursorApplied = True
|
||||
End If
|
||||
|
||||
bsiMessage.Caption = "Daten werden geladen..."
|
||||
loadingMessageApplied = True
|
||||
|
||||
GridViewWorkflows.ShowLoadingPanel()
|
||||
showLoadingPanel = True
|
||||
|
||||
If BASEDATA_DT_VW_PROFILE_USER.Rows.Count = 0 Then
|
||||
LOGGER.Info("Attention: No profiles for user: '" & USER_USERNAME & "' configured!", False)
|
||||
@@ -2098,6 +2121,15 @@ Public Class frmMain
|
||||
If gridUpdateStarted Then
|
||||
GridControlWorkflows.EndUpdate()
|
||||
End If
|
||||
If showLoadingPanel Then
|
||||
GridViewWorkflows.HideLoadingPanel()
|
||||
End If
|
||||
If useWaitCursorApplied Then
|
||||
Me.UseWaitCursor = False
|
||||
End If
|
||||
If loadingMessageApplied AndAlso bsiMessage.Caption = "Daten werden geladen..." Then
|
||||
bsiMessage.Caption = previousMessage
|
||||
End If
|
||||
oStopWatch.Done()
|
||||
End Try
|
||||
End Function
|
||||
@@ -2397,6 +2429,10 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
|
||||
.FilterExpression = "TYPE = 'SQL'",
|
||||
.SortByColumn = "PROFILE_ID,TAB_INDEX"
|
||||
})
|
||||
oSQL = String.Format("SELECT [dbo].[FNPM_LANGUAGE_CONTROL_TEXT] (NAME,'{0}',CTRL_TYPE,CTRL_TEXT) CTRL_CAPTION_LANG, * FROM TBPM_PROFILE_CONTROLS", {USER_LANGUAGE})
|
||||
BASEDATA_TBPM_PROFILE_CONTROLS = DatabaseFallback.GetDatatable("TBPM_PROFILE_CONTROLS_LANGUAGE", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
|
||||
.FilterExpression = String.Format("LANGUAGE = '{0}'", {USER_LANGUAGE})
|
||||
})
|
||||
If pMode = "Load" Then
|
||||
BASEDATA_DT_PROFILE_SEARCHES_SQL = BASEDATA_DT_PROFILES_SEARCHES_SQL.Clone()
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user