Loading Form, center integer columns, use sequence field, simplify, fix layout

GUIs.Monitor/SearchLoader.vb

@@ -4,7 +4,7 @@ Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
 Imports DigitalData.GUIs.Monitor.Constants
 
-Partial Public Class SearchLoader
+Public Class SearchLoader
     Inherits BaseClass
 
     Private ReadOnly Config As Config
@@ -30,6 +30,7 @@ Partial Public Class SearchLoader
                 Dim oSearchId = oRow.ItemEx("GUID", 0)
                 Dim oParams = Parameters.
                     Where(Function(param) param.SearchId = oSearchId).
+                    OrderBy(Function(param) param.Sequence).
                     ToList()
 
                 Searches.Add(New Search With {
@@ -48,43 +49,6 @@ Partial Public Class SearchLoader
         End Try
     End Sub
 
-    Public Function GetItemType(pTypeString As String) As ItemTypeEnum
-        Select Case pTypeString
-            Case "LIST"
-                Return ItemTypeEnum.List
-            Case "SQL"
-                Return ItemTypeEnum.SQL
-            Case Else
-                Return ItemTypeEnum.Undefined
-        End Select
-    End Function
-
-    Public Function GetReturnType(pTypeString As String) As ReturnTypeEnum
-        Select Case pTypeString
-            Case "Table"
-                Return ReturnTypeEnum.Table
-            Case "TreeView"
-                Return ReturnTypeEnum.TreeView
-            Case Else
-                Return ReturnTypeEnum.Undefined
-        End Select
-    End Function
-
-    Public Function GetDataType(pTypeString As String) As DataTypeEnum
-        Select Case pTypeString
-            Case "BIT"
-                Return DataTypeEnum.Boolean
-            Case "VARCHAR"
-                Return DataTypeEnum.String
-            Case "INT"
-                Return DataTypeEnum.Integer
-            Case "DATE"
-                Return DataTypeEnum.Date
-            Case Else
-                Return DataTypeEnum.Undefined
-        End Select
-    End Function
-
     Public Sub LoadSearchParameters()
         Dim oSQL As String = $"SELECT * FROM TBMON_PROFILE_PARAM WHERE ACTIVE = 1 ORDER BY SEQUENCE"
         Dim oTable As DataTable = Database.GetDatatable(oSQL)
@@ -101,11 +65,51 @@ Partial Public Class SearchLoader
                 .Required = oRow.ItemEx("REQUIRED", True),
                 .PatternTitle = oRow.ItemEx("PATTERN", String.Empty),
                 .SearchId = oRow.ItemEx("PROFILE_ID", 0),
-                .DefaultValue = oRow.ItemEx("DEFAULT_VALUE", String.Empty)
+                .DefaultValue = oRow.ItemEx("DEFAULT_VALUE", String.Empty),
+                .Sequence = oRow.ItemEx("SEQUENCE", 0)
             })
         Next
 
         Parameters = oParameters
     End Sub
 
+    Private Function GetItemType(pTypeString As String) As ItemTypeEnum
+        Select Case pTypeString
+            Case "LIST"
+                Return ItemTypeEnum.List
+            Case "SQL"
+                Return ItemTypeEnum.SQL
+            Case Else
+                Return ItemTypeEnum.Undefined
+        End Select
+    End Function
+
+    Private Function GetReturnType(pTypeString As String) As ReturnTypeEnum
+        Select Case pTypeString
+            Case "Table"
+                Return ReturnTypeEnum.Table
+            Case "TreeView"
+                Return ReturnTypeEnum.TreeView
+            Case Else
+                Return ReturnTypeEnum.Undefined
+        End Select
+    End Function
+
+    Private Function GetDataType(pTypeString As String) As DataTypeEnum
+        Select Case pTypeString
+            Case "BIT"
+                Return DataTypeEnum.Boolean
+            Case "VARCHAR"
+                Return DataTypeEnum.String
+            Case "INT"
+                Return DataTypeEnum.Integer
+            Case "DATE"
+                Return DataTypeEnum.Date
+            Case Else
+                Return DataTypeEnum.Undefined
+        End Select
+    End Function
+
+
+
 End Class