DateColumn, Xlsx Export, Column Headers, Default Values

GUIs.Monitor/SearchLoader.vb

@@ -2,36 +2,17 @@
 Imports DigitalData.Modules.Database
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Language
+Imports DigitalData.GUIs.Monitor.Constants
 
-Public Class SearchLoader
+Partial Public Class SearchLoader
     Inherits BaseClass
 
-    Private Config As Config
-    Private Database As MSSQLServer
+    Private ReadOnly Config As Config
+    Private ReadOnly Database As MSSQLServer
 
     Public Searches As New List(Of Search)
     Public Parameters As New List(Of SearchParameter)
 
-    Public Enum ReturnTypeEnum
-        Undefined
-        Table
-        TreeView
-    End Enum
-
-    Public Enum DataTypeEnum
-        Undefined
-        [Boolean]
-        [String]
-        [Integer]
-        [Date]
-    End Enum
-
-    Public Enum ItemTypeEnum
-        Undefined
-        List
-        SQL
-    End Enum
-
     Public Sub New(pLogConfig As LogConfig, pConfig As Config, pDatabase As MSSQLServer)
         MyBase.New(pLogConfig)
         Config = pConfig
@@ -119,47 +100,12 @@ Public Class SearchLoader
                 .ItemType = GetItemType(oRow.ItemEx("ITEM_TYPE", String.Empty)),
                 .Required = oRow.ItemEx("REQUIRED", True),
                 .PatternTitle = oRow.ItemEx("PATTERN", String.Empty),
-                .SearchId = oRow.ItemEx("PROFILE_ID", 0)
+                .SearchId = oRow.ItemEx("PROFILE_ID", 0),
+                .DefaultValue = oRow.ItemEx("DEFAULT_VALUE", String.Empty)
             })
         Next
 
         Parameters = oParameters
     End Sub
 
-    Public Class Search
-        Public Id As Integer
-        Public Title As String
-        Public Description As String
-        Public SQLCommand As String
-        Public ReturnType As ReturnTypeEnum
-
-        Public Parameters As List(Of SearchParameter)
-
-        Public Overrides Function ToString() As String
-            Return Title
-        End Function
-    End Class
-
-    Public Class SearchParameter
-        Public Id As Integer
-        Public Title As String
-        Public PatternTitle As String
-        Public Description As String
-        Public DataType As DataTypeEnum
-        Public ItemString As String
-        Public ItemType As ItemTypeEnum
-        Public Required As Boolean
-        Public SearchId As Integer
-
-        Public ReadOnly Property HasItems As Boolean
-            Get
-                Return ItemType <> ItemTypeEnum.Undefined
-            End Get
-        End Property
-
-        Public Overrides Function ToString() As String
-            Return Title
-        End Function
-    End Class
-
 End Class