diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index ef593f4..e7fc7d3 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAYABCwGAAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAYgBCwGIAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index 07d2544..0152806 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -1329,35 +1329,40 @@ Public Class frmMain BringMonitor2Front() End Sub 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 + Try LOGGER.Debug($"Decide_Load: pIsFormLoad [{pIsFormLoad}] - ForceReload [{ForceReload}] - GRID_LOAD_TYPE [{GRID_LOAD_TYPE}] ") If pIsFormLoad = True Then FormShown = False End If + GridIsLoaded = False If USER_EXISTS = False Then LOGGER.Warn($"USER IS NOT EXISTING - CHECK FNDD_LOGIN_USER_MODULE") Exit Function End If - If TimerRefresh.Enabled = True Then - LOGGER.Debug($"Decide_Load: TimerRefresh.Enabled = True") + + If TimerRefresh.Enabled Then + refreshWasEnabled = True TimerRefresh.Enabled = False End If - GridViewWorkflows.ShowLoadingPanel() + If GridControlWorkflows.Visible Then + GridViewWorkflows.ShowLoadingPanel() + showLoadingPanel = True + End If + TimerRefresh.Stop() FRONTEND_ACTION = "DECIDE_LOAD" - LOGGER.Debug($"Decide_Load: pIsFormLoad [{pIsFormLoad}] - ForceReload [{ForceReload}] - GRID_LOAD_TYPE [{GRID_LOAD_TYPE}] ") - If GRID_LOAD_TYPE = "OVERVIEW" Then + If GRID_LOAD_TYPE = "OVERVIEW" Then Await Load_Grid_Overview(pIsFormLoad, ForceReload, False) ElseIf GRID_LOAD_TYPE.StartsWith("PROFILE#") Then Await Load_single_Profile(ForceReload) End If - FRONTEND_ACTION = FA_NONE - GridViewWorkflows.HideLoadingPanel() - TimerRefresh.Start() If SHOW_MASS_VALIDATOR = False Then GridViewWorkflows.OptionsSelection.MultiSelect = False @@ -1365,29 +1370,36 @@ Public Class frmMain BarButtonItemMassValidation.Visibility = DevExpress.XtraBars.BarItemVisibility.Never Else BarButtonItemMassValidation.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - GridViewWorkflows.OptionsSelection.MultiSelect = True GridViewWorkflows.OptionsSelection.MultiSelectMode = GridMultiSelectMode.CheckBoxRowSelect End If + If GridViewWorkflows.OptionsView.ShowAutoFilterRow = True Then BarCheckItemAutofilter.Checked = True End If If GridViewWorkflows.OptionsFind.AlwaysVisible Then BarCheckItemShowSearch.Checked = True End If + COLUMNS_INVISIBLE() GridIsLoaded = True Catch ex As Exception GridIsLoaded = True LOGGER.Error(ex) LOGGER.Info("Unexpected error in Decide_load: " & ex.Message) + Finally + FRONTEND_ACTION = FA_NONE + If showLoadingPanel Then + GridViewWorkflows.HideLoadingPanel() + End If + If refreshWasEnabled Then + TimerRefresh.Enabled = True + End If + TimerRefresh.Start() + If pIsFormLoad = True Then + FormShown = True + End If End Try - If TimerRefresh.Enabled = False Then - TimerRefresh.Enabled = True - End If - If pIsFormLoad = True Then - FormShown = True - End If End Function Private Sub ToolStripButton2_Click_2(sender As Object, e As EventArgs)