This commit is contained in:
Jonathan Jenne
2021-05-21 16:31:35 +02:00
parent e53e79b05a
commit f681a6bc69
10 changed files with 230 additions and 46 deletions

View File

@@ -27,7 +27,10 @@ Public Class frmMonitor
Concat(HtmlViewColumns).
ToList
Private ReadOnly DisplayColumns As New List(Of String) From {"COLUMN1", "COLUMN2", "COLUMN3"}
Private ReadOnly DisplayColumns As New List(Of String) From {"COLUMN1", "COLUMN2", "COLUMN3", "ADDED_WHEN"}
Private SQLResultGrids As List(Of GridControl)
Private SQLResultTabs As List(Of XtraTabPage)
@@ -38,6 +41,9 @@ Public Class frmMonitor
Private HtmlResultViewers As List(Of RichEditControl)
Private HtmlResultTabs As List(Of XtraTabPage)
Private Const STATE_SUCCESS As String = "SUCCESS"
Private Const STATE_FAILURE As String = "FAILURE"
Private Enum NodeImage
[Default] = 0
SQL = 1
@@ -46,8 +52,14 @@ Public Class frmMonitor
Success = 4
Failure = 5
Warning = 6
Waiting = 7
End Enum
Private ReadOnly StateIcons As New Dictionary(Of String, NodeImage) From {
{STATE_SUCCESS, NodeImage.Success},
{STATE_FAILURE, NodeImage.Failure}
}
Private GridBuilder As GridBuilder
Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -99,7 +111,7 @@ Public Class frmMonitor
Private Function LoadGDPicture() As String
Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
Return Database.GetScalarValue(oSQL)
Return Database.GetScalarValue(oSQL).ToString()
End Function
Private Sub buttonSearch_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles buttonSearch.ItemClick
@@ -270,9 +282,9 @@ Public Class frmMonitor
ExpandNodes(oNode)
Dim oColumn = TreeListResults.Columns.Item("COLOR")
Dim oColorString = NotNull(oNode.GetValue(oColumn), Nothing)
Dim oColorString As String = NotNull(oNode.GetValue(oColumn), String.Empty)
If oColorString IsNot Nothing AndAlso oColorString = "Red" Then
If oColorString = "Red" Then
oNode.Expand()
ExpandParentNode(oNode)
End If
@@ -338,19 +350,19 @@ Public Class frmMonitor
End Function
Private Sub TreeListResults_CustomDrawNodeCell(sender As Object, e As DevExpress.XtraTreeList.CustomDrawNodeCellEventArgs) Handles TreeListResults.CustomDrawNodeCell
Dim oColumn = TreeListResults.Columns.Item("COLOR")
Dim oColorString = NotNull(e.Node.GetValue(oColumn), Nothing)
Dim oColumn = TreeListResults.Columns.Item("STATE")
Dim oState = NotNull(e.Node.GetValue(oColumn), Nothing)
If oColorString Is Nothing Then
If oState Is Nothing Then
Exit Sub
End If
Dim oColor As Color = Nothing
Select Case oColorString.ToString
Case "Green"
Select Case oState.ToString
Case STATE_SUCCESS
oColor = Color.LightGreen
Case "Red"
Case STATE_FAILURE
oColor = Color.LightCoral
End Select
@@ -376,8 +388,10 @@ Public Class frmMonitor
Where(Function(v) v.Value IsNot Nothing).
Count()
Dim oColumn = TreeListResults.Columns.Item("COLOR")
Dim oColorString = NotNull(e.Node.GetValue(oColumn), Nothing)
Dim oIconColumn = TreeListResults.Columns.Item("ICON")
Dim oIcon = NotNull(e.Node.GetValue(oIconColumn), Nothing)
Dim oStateColumn = TreeListResults.Columns.Item("STATE")
Dim oState = NotNull(e.Node.GetValue(oStateColumn), Nothing)
If oSQLCommands > 0 Then
e.NodeImageIndex = NodeImage.SQL
@@ -386,17 +400,26 @@ Public Class frmMonitor
ElseIf oHtmlDocuments > 0 Then
e.NodeImageIndex = NodeImage.Mail
Else
If oColorString Is Nothing Then
If oState IsNot Nothing AndAlso StateIcons.ContainsKey(oState) Then
Dim oIconIndex = StateIcons.Item(oState)
e.NodeImageIndex = oIconIndex
Else
e.NodeImageIndex = NodeImage.Default
ElseIf oColorString = "Red" Then
e.NodeImageIndex = NodeImage.Failure
ElseIf oColorString = "Green" Then
e.NodeImageIndex = NodeImage.Success
ElseIf oColorString = "Yellow" Then
e.NodeImageIndex = NodeImage.Warning
End If
End If
End Sub
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
Dim oSQLConfig As New frmSQLConfig(LogConfig)
If oSQLConfig.ShowDialog() = DialogResult.OK Then
ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString
ConfigManager.Save()
Database = New MSSQLServer(LogConfig, oSQLConfig.ConnectionString)
LoadSearchKeys()
End If
End Sub
End Class
Friend Class SearchKey