Version 0.5.0.0

This commit is contained in:
Jonathan Jenne 2022-07-05 15:33:50 +02:00
parent ae92ac19ff
commit 98a4377277
3 changed files with 174 additions and 69 deletions

View File

@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("Monitor")>
<Assembly: AssemblyCopyright("Copyright © 2021")>
<Assembly: AssemblyTrademark("0.4.0.0")>
<Assembly: AssemblyTrademark("0.5.0.0")>
<Assembly: AssemblyCulture("")>
' Setting ComVisible to false makes the types in this assembly not visible
@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:
' [assembly: AssemblyVersion("1.0.*")]
<Assembly: AssemblyVersion("0.4.0.0")>
<Assembly: AssemblyVersion("0.5.0.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@ -70,7 +70,7 @@ Partial Class frmMonitor
Me.TreeListColumn8 = New DevExpress.XtraTreeList.Columns.TreeListColumn()
Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl()
Me.SplitContainerSQL = New DevExpress.XtraEditors.SplitContainerControl()
Me.GridControlResults = New DevExpress.XtraGrid.GridControl()
Me.GridViewResults = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl()
@ -84,7 +84,7 @@ Partial Class frmMonitor
Me.GridControl4 = New DevExpress.XtraGrid.GridControl()
Me.GridView4 = New DevExpress.XtraGrid.Views.Grid.GridView()
Me.XtraTabPageSQL4 = New DevExpress.XtraTab.XtraTabPage()
Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl()
Me.SplitContainerFileHTML = New DevExpress.XtraEditors.SplitContainerControl()
Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage()
Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage()
@ -114,12 +114,12 @@ Partial Class frmMonitor
CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl1.Panel2.SuspendLayout()
Me.SplitContainerControl1.SuspendLayout()
CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerControl3.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl3.Panel1.SuspendLayout()
CType(Me.SplitContainerControl3.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl3.Panel2.SuspendLayout()
Me.SplitContainerControl3.SuspendLayout()
CType(Me.SplitContainerSQL, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerSQL.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerSQL.Panel1.SuspendLayout()
CType(Me.SplitContainerSQL.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerSQL.Panel2.SuspendLayout()
Me.SplitContainerSQL.SuspendLayout()
CType(Me.GridControlResults, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridViewResults, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).BeginInit()
@ -134,12 +134,12 @@ Partial Class frmMonitor
CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GridView4, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabPageSQL4.SuspendLayout()
CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerControl2.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl2.Panel1.SuspendLayout()
CType(Me.SplitContainerControl2.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl2.Panel2.SuspendLayout()
Me.SplitContainerControl2.SuspendLayout()
CType(Me.SplitContainerFileHTML, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerFileHTML.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerFileHTML.Panel1.SuspendLayout()
CType(Me.SplitContainerFileHTML.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerFileHTML.Panel2.SuspendLayout()
Me.SplitContainerFileHTML.SuspendLayout()
CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControl2.SuspendLayout()
Me.XtraTabPage3.SuspendLayout()
@ -368,7 +368,9 @@ Partial Class frmMonitor
'
'RichEditControl2
'
Me.RichEditControl2.ActiveViewType = DevExpress.XtraRichEdit.RichEditViewType.Simple
Me.RichEditControl2.Dock = System.Windows.Forms.DockStyle.Fill
Me.RichEditControl2.LayoutUnit = DevExpress.XtraRichEdit.DocumentLayoutUnit.Pixel
Me.RichEditControl2.Location = New System.Drawing.Point(0, 0)
Me.RichEditControl2.MenuManager = Me.RibbonControl1
Me.RichEditControl2.Name = "RichEditControl2"
@ -538,33 +540,33 @@ Partial Class frmMonitor
'
'SplitContainerControl1.Panel2
'
Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl3)
Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerSQL)
Me.SplitContainerControl1.Panel2.Text = "Panel2"
Me.SplitContainerControl1.Size = New System.Drawing.Size(958, 563)
Me.SplitContainerControl1.SplitterPosition = 235
Me.SplitContainerControl1.TabIndex = 9
'
'SplitContainerControl3
'SplitContainerSQL
'
Me.SplitContainerControl3.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill
Me.SplitContainerControl3.Horizontal = False
Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 0)
Me.SplitContainerControl3.Name = "SplitContainerControl3"
Me.SplitContainerSQL.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
Me.SplitContainerSQL.Dock = System.Windows.Forms.DockStyle.Fill
Me.SplitContainerSQL.Horizontal = False
Me.SplitContainerSQL.Location = New System.Drawing.Point(0, 0)
Me.SplitContainerSQL.Name = "SplitContainerSQL"
'
'SplitContainerControl3.Panel1
'SplitContainerSQL.SplitContainerSQL_Panel1
'
Me.SplitContainerControl3.Panel1.Controls.Add(Me.GridControlResults)
Me.SplitContainerControl3.Panel1.Controls.Add(Me.TreeListResults)
Me.SplitContainerControl3.Panel1.Text = "Panel1"
Me.SplitContainerSQL.Panel1.Controls.Add(Me.GridControlResults)
Me.SplitContainerSQL.Panel1.Controls.Add(Me.TreeListResults)
Me.SplitContainerSQL.Panel1.Text = "Panel1"
'
'SplitContainerControl3.Panel2
'SplitContainerSQL.SplitContainerSQL_Panel2
'
Me.SplitContainerControl3.Panel2.Controls.Add(Me.XtraTabControl3)
Me.SplitContainerControl3.Panel2.Text = "Panel2"
Me.SplitContainerControl3.Size = New System.Drawing.Size(713, 563)
Me.SplitContainerControl3.SplitterPosition = 181
Me.SplitContainerControl3.TabIndex = 5
Me.SplitContainerSQL.Panel2.Controls.Add(Me.XtraTabControl3)
Me.SplitContainerSQL.Panel2.Text = "Panel2"
Me.SplitContainerSQL.Size = New System.Drawing.Size(713, 563)
Me.SplitContainerSQL.SplitterPosition = 181
Me.SplitContainerSQL.TabIndex = 5
'
'GridControlResults
'
@ -668,25 +670,25 @@ Partial Class frmMonitor
Me.XtraTabPageSQL4.Size = New System.Drawing.Size(711, 349)
Me.XtraTabPageSQL4.Text = "SQL 4"
'
'SplitContainerControl2
'SplitContainerFileHTML
'
Me.SplitContainerControl2.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
Me.SplitContainerControl2.Dock = System.Windows.Forms.DockStyle.Fill
Me.SplitContainerControl2.Location = New System.Drawing.Point(0, 0)
Me.SplitContainerControl2.Name = "SplitContainerControl2"
Me.SplitContainerFileHTML.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
Me.SplitContainerFileHTML.Dock = System.Windows.Forms.DockStyle.Fill
Me.SplitContainerFileHTML.Location = New System.Drawing.Point(0, 0)
Me.SplitContainerFileHTML.Name = "SplitContainerFileHTML"
'
'SplitContainerControl2.Panel1
'SplitContainerFileHTML.SplitContainerFileHTML_Panel1
'
Me.SplitContainerControl2.Panel1.Controls.Add(Me.SplitContainerControl1)
Me.SplitContainerControl2.Panel1.Text = "Panel1"
Me.SplitContainerFileHTML.Panel1.Controls.Add(Me.SplitContainerControl1)
Me.SplitContainerFileHTML.Panel1.Text = "Panel1"
'
'SplitContainerControl2.Panel2
'SplitContainerFileHTML.SplitContainerFileHTML_Panel2
'
Me.SplitContainerControl2.Panel2.Controls.Add(Me.XtraTabControl1)
Me.SplitContainerControl2.Panel2.Text = "Panel2"
Me.SplitContainerControl2.Size = New System.Drawing.Size(1377, 563)
Me.SplitContainerControl2.SplitterPosition = 958
Me.SplitContainerControl2.TabIndex = 10
Me.SplitContainerFileHTML.Panel2.Controls.Add(Me.XtraTabControl1)
Me.SplitContainerFileHTML.Panel2.Text = "Panel2"
Me.SplitContainerFileHTML.Size = New System.Drawing.Size(1377, 563)
Me.SplitContainerFileHTML.SplitterPosition = 958
Me.SplitContainerFileHTML.TabIndex = 10
'
'XtraTabControl2
'
@ -700,7 +702,7 @@ Partial Class frmMonitor
'
'XtraTabPage3
'
Me.XtraTabPage3.Controls.Add(Me.SplitContainerControl2)
Me.XtraTabPage3.Controls.Add(Me.SplitContainerFileHTML)
Me.XtraTabPage3.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.enablesearch
Me.XtraTabPage3.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16)
Me.XtraTabPage3.Name = "XtraTabPage3"
@ -761,12 +763,12 @@ Partial Class frmMonitor
Me.SplitContainerControl1.Panel2.ResumeLayout(False)
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl1.ResumeLayout(False)
CType(Me.SplitContainerControl3.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl3.Panel1.ResumeLayout(False)
CType(Me.SplitContainerControl3.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl3.Panel2.ResumeLayout(False)
CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl3.ResumeLayout(False)
CType(Me.SplitContainerSQL.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerSQL.Panel1.ResumeLayout(False)
CType(Me.SplitContainerSQL.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerSQL.Panel2.ResumeLayout(False)
CType(Me.SplitContainerSQL, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerSQL.ResumeLayout(False)
CType(Me.GridControlResults, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridViewResults, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.XtraTabControl3, System.ComponentModel.ISupportInitialize).EndInit()
@ -781,12 +783,12 @@ Partial Class frmMonitor
CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GridView4, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabPageSQL4.ResumeLayout(False)
CType(Me.SplitContainerControl2.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl2.Panel1.ResumeLayout(False)
CType(Me.SplitContainerControl2.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl2.Panel2.ResumeLayout(False)
CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl2.ResumeLayout(False)
CType(Me.SplitContainerFileHTML.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerFileHTML.Panel1.ResumeLayout(False)
CType(Me.SplitContainerFileHTML.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerFileHTML.Panel2.ResumeLayout(False)
CType(Me.SplitContainerFileHTML, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerFileHTML.ResumeLayout(False)
CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl2.ResumeLayout(False)
Me.XtraTabPage3.ResumeLayout(False)
@ -815,7 +817,7 @@ Partial Class frmMonitor
Friend WithEvents XtraTabPageHtml1 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents XtraTabPageHtml2 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents SplitContainerSQL As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents XtraTabControl3 As DevExpress.XtraTab.XtraTabControl
Friend WithEvents XtraTabPageSQL1 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl
@ -827,7 +829,7 @@ Partial Class frmMonitor
Friend WithEvents GridControl4 As DevExpress.XtraGrid.GridControl
Friend WithEvents GridView4 As DevExpress.XtraGrid.Views.Grid.GridView
Friend WithEvents XtraTabPageSQL4 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents SplitContainerControl2 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents SplitContainerFileHTML As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents XtraTabControl2 As DevExpress.XtraTab.XtraTabControl
Friend WithEvents XtraTabPage3 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents XtraTabPage4 As DevExpress.XtraTab.XtraTabPage

View File

@ -20,7 +20,7 @@ Imports DevExpress.XtraEditors.Controls
Imports DigitalData.GUIs.Monitor.SearchLoader
Imports DevExpress.XtraLayout
Imports DevExpress.XtraTreeList
Imports DevExpress.XtraGrid.Columns
Public Class frmMonitor
Public Property LogConfig As LogConfig
@ -30,6 +30,7 @@ Public Class frmMonitor
Public Property FormHelper As FormHelper
Public Property Patterns As Patterns2
Private ReadOnly ColumnMarkers As New List(Of String) From {"[HTML]", "[SQL]", "[FILENAME]"}
Private ReadOnly SQLColumns As New List(Of String) From {"SELECT1", "SELECT2", "SELECT3", "SELECT4"}
Private ReadOnly DocViewColumns As New List(Of String) From {"DOCVIEW1", "DOCVIEW2"}
Private ReadOnly HtmlViewColumns As New List(Of String) From {"HTML1", "HTML2"}
@ -45,20 +46,25 @@ Public Class frmMonitor
Private SQLResultGrids As List(Of GridControl)
Private SQLResultTabs As List(Of XtraTabPage)
Private SQLResultGridIndex As Integer = 0
Private ActiveSQLResultGrid As GridControl
Private FileResultViewers As List(Of DocumentViewer)
Private FileResultTabs As List(Of XtraTabPage)
Private FileResultViewerIndex As Integer = 0
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 Const STATE_WARNING As String = "WARNING"
Private Const STATE_WAITING As String = "WAITING"
Private Const STATE_HIGHLIGHT As String = "HIGHLIGHT"
Private MarkedColumns As New List(Of GridColumn)
Private Enum NodeImage
[Default] = 0
@ -158,8 +164,8 @@ Public Class frmMonitor
For Each oViewer As DocumentViewer In FileResultViewers
oViewer.Init(LogConfig, oLicense)
Next
SplitContainerControl3.Collapsed = True
SplitContainerControl2.Collapsed = True
SplitContainerSQL.Collapsed = True
SplitContainerFileHTML.Collapsed = True
Catch ex As Exception
FormHelper.ShowErrorMessage(ex, "frmStart_Load")
End Try
@ -186,6 +192,9 @@ Public Class frmMonitor
Dim oSearch As Search = cmbSearches.EditValue
Dim oMissingParams = False
MarkedColumns.Clear()
HideAllTabs()
With AdornerUIManager2.ValidationHintProperties
.State = VisualEffects.ValidationHintState.Invalid
.InvalidState.ShowBorder = True
@ -272,8 +281,22 @@ Public Class frmMonitor
TreeListResults.Dock = DockStyle.None
GridControlResults.DataSource = oTable
GridViewResults.PopulateColumns()
MarkedColumns = GridViewResults.Columns.AsEnumerable.
Where(Function(column)
Dim oCaption = column.FieldName.ToUpper.Trim
Return ColumnMarkers.Any(Function(marker) oCaption.EndsWith(marker))
End Function).ToList()
For Each oColumn In MarkedColumns
oColumn.VisibleIndex = -1
Next
End If
GridViewResults.FocusInvalidRow()
Return True
Catch ex As Exception
FormHelper.ShowErrorMessage(ex, "LoadData")
@ -472,8 +495,8 @@ Public Class frmMonitor
oTabPage.PageVisible = False
Next
SplitContainerControl3.Collapsed = True
SplitContainerControl2.Collapsed = True
SplitContainerSQL.Collapsed = True
SplitContainerFileHTML.Collapsed = True
For Each oSQLCommand As KeyValuePair(Of String, String) In oSQLCommands
Try
@ -770,11 +793,11 @@ Public Class frmMonitor
Next
If oShouldToggleSQL Then
SplitContainerControl3.Collapsed = Not SplitContainerControl3.Collapsed
SplitContainerSQL.Collapsed = Not SplitContainerSQL.Collapsed
End If
If oShouldToggleFile Then
SplitContainerControl2.Collapsed = Not SplitContainerControl2.Collapsed
SplitContainerFileHTML.Collapsed = Not SplitContainerFileHTML.Collapsed
End If
End If
End Sub
@ -786,5 +809,85 @@ Public Class frmMonitor
TreeListResults.DataSource = Nothing
GridControlResults.DataSource = Nothing
End Sub
Private Sub GridViewResults_FocusedRowChanged(sender As Object, e As Views.Base.FocusedRowChangedEventArgs) Handles GridViewResults.FocusedRowChanged
If GridViewResults.FocusedRowHandle < 0 Then
Exit Sub
End If
HideAllTabs()
Try
Dim oRow As DataRow = GridViewResults.GetDataRow(GridViewResults.FocusedRowHandle)
Dim oHtmlResultViewerIndex As Integer = 0
Dim oGridResultIndex As Integer = 0
Dim oViewerResultIndex As Integer = 0
For Each oColumn As GridColumn In MarkedColumns
Dim oValue = oRow.ItemEx(oColumn.FieldName, String.Empty)
If oValue.Length > 0 Then
If oColumn.FieldName.EndsWith("[HTML]") Then
Dim oViewer As RichEditControl = HtmlResultViewers.Item(oHtmlResultViewerIndex)
Dim oTitle = oColumn.FieldName.Replace("[HTML]", "").Trim()
oHtmlResultViewerIndex += 1
FillResultHtmlViewer(oViewer, oValue, oTitle)
SplitContainerFileHTML.Collapsed = False
ElseIf oColumn.FieldName.EndsWith("[SQL]") Then
Dim oTable As DataTable = Database.GetDatatable(oValue)
If oTable Is Nothing Then
Continue For
End If
Dim oGridControl As GridControl = SQLResultGrids.Item(oGridResultIndex)
Dim oTitle = oColumn.FieldName.Replace("[SQL]", "").Trim()
oGridResultIndex += 1
FillResultGrid(oGridControl, oTable, oTitle)
SplitContainerSQL.Collapsed = False
ElseIf oColumn.FieldName.EndsWith("[FILENAME]") Then
If oValue Is Nothing Then
Continue For
End If
If Not IO.File.Exists(oValue) Then
Continue For
End If
Dim oViewer As DocumentViewer = FileResultViewers.Item(oViewerResultIndex)
Dim oTitle = oColumn.FieldName.Replace("[FILENAME]", "").Trim()
oViewerResultIndex += 1
FillResultViewer(oViewer, oValue, oTitle)
SplitContainerFileHTML.Collapsed = False
End If
End If
Next
Catch ex As Exception
End Try
End Sub
Private Sub HideAllTabs()
Dim oAllTabs = SQLResultTabs.
Concat(FileResultTabs).
Concat(HtmlResultTabs)
For Each oTabPage In oAllTabs
oTabPage.PageVisible = False
Next
SplitContainerSQL.Collapsed = True
SplitContainerFileHTML.Collapsed = True
End Sub
End Class