Zooflow: Administration User

GUIs.ZooFlow/Administration/frmAdmin_Start.vb

@@ -38,7 +38,9 @@ Public Class frmAdmin_Start
             Dim oKey = $"{CurrentPage}-OVERVIEW"
 
             If DetailForm.DetailDataList.ContainsKey(oKey) Then
-                Load_GridData(DetailForm.DetailDataList.Item(oKey))
+                Dim oDetailData = DetailForm.DetailDataList.Item(oKey)
+
+                Load_GridData(oDetailData)
             Else
                 MsgBox($"Could not load data for Page [{oKey}] because it does not exist!", MsgBoxStyle.Critical, Text)
             End If
@@ -70,6 +72,7 @@ Public Class frmAdmin_Start
 
             Dim oItem = DetailForm.DetailDataList.Item(oKey)
             Load_GridData(oItem)
+            Load_GridLayout(oItem)
             CurrentItem = oItem
         Else
             MsgBox($"Page [{Page}] not found in AdminItems! Exiting." & vbNewLine &
@@ -130,6 +133,15 @@ Public Class frmAdmin_Start
         ViewMain.ShowLoadingPanel()
         Source.SQLResult = My.DatabaseECM.GetDatatable(Source.SQLCommand)
         GridMain.DataSource = Source.SQLResult
+        ViewMain.HideLoadingPanel()
+    End Sub
+
+    Private Sub Load_GridLayout(Source As ClassDetailForm.DetailData)
+        If Source Is Nothing OrElse Source.SQLResult Is Nothing Then
+            Exit Sub
+        End If
+
+        ViewMain.ShowLoadingPanel()
         GridMain.ForceInitialize()
         ViewMain.PopulateColumns()