Monitor: UI Changes
This commit is contained in:
Jonathan Jenne
@@ -1,12 +1,12 @@
|
||||
Imports DevExpress.XtraGrid
|
||||
Imports DevExpress.XtraGrid.Views.Grid
|
||||
Imports DevExpress.XtraTreeList.Nodes
|
||||
Imports DigitalData.Controls.SQLConfig
|
||||
Imports DigitalData.GUIs.Common
|
||||
Imports DigitalData.Modules.Config
|
||||
Imports DigitalData.Modules.Database
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports DigitalData.Modules.Language.Utils
|
||||
Imports DigitalData.Controls.SQLConfig
|
||||
Imports DevExpress.XtraTab
|
||||
Imports DigitalData.Controls.DocumentViewer
|
||||
Imports DevExpress.XtraEditors
|
||||
@@ -100,7 +100,7 @@ Public Class frmMonitor
|
||||
Console.WriteLine(ConfigManager.Config.SearchKeySQL)
|
||||
|
||||
End If
|
||||
Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
|
||||
Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString)
|
||||
Database = New MSSQLServer(LogConfig, oConnectionString)
|
||||
GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3, GridView4})
|
||||
GridBuilder.
|
||||
@@ -125,21 +125,23 @@ Public Class frmMonitor
|
||||
For Each oGrid In SQLResultGrids
|
||||
AddHandler oGrid.Enter, Sub()
|
||||
ActiveSQLResultGrid = oGrid
|
||||
BarButtonItem2.Enabled = True
|
||||
btnExportGrid.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
|
||||
End Sub
|
||||
|
||||
AddHandler oGrid.Leave, Sub()
|
||||
ActiveSQLResultGrid = Nothing
|
||||
BarButtonItem2.Enabled = False
|
||||
btnExportGrid.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
|
||||
End Sub
|
||||
Next
|
||||
|
||||
AddHandler TreeListResults.Enter, Sub() btnExportTreeview.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
|
||||
AddHandler TreeListResults.Leave, Sub() btnExportTreeview.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
|
||||
|
||||
For Each oViewer As DocumentViewer In FileResultViewers
|
||||
oViewer.Init(LogConfig, oLicense)
|
||||
Next
|
||||
SplitContainerControl3.Collapsed = True
|
||||
SplitContainerControl2.Collapsed = True
|
||||
SplitContainerMain.Collapsed = True
|
||||
Catch ex As Exception
|
||||
ShowErrorMessage(ex)
|
||||
End Try
|
||||
@@ -147,19 +149,27 @@ 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
|
||||
LoadData()
|
||||
If cmbSearchKeys.EditValue Is Nothing Then
|
||||
Exit Sub
|
||||
End If
|
||||
Dim oAttributeId As Integer = cmbSearchKeys.EditValue
|
||||
Dim oAttributeValue As String = TextEdit1.EditValue.ToString
|
||||
|
||||
LoadData(oAttributeId, oAttributeValue)
|
||||
End Sub
|
||||
|
||||
Private Function LoadData() As Boolean
|
||||
Private Function LoadData(pAttribute As Integer, pValue As String) As Boolean
|
||||
Try
|
||||
TreeListResults.ShowLoadingPanel()
|
||||
SplitContainerContent.Enabled = False
|
||||
|
||||
|
||||
Dim oSQL As String = $"EXEC [{ConfigManager.Config.IDB_Praefix}].[dbo].[PRDD_MONITORING_GET_TREEVIEW_RESULT] '{cmbSearchKeys.EditValue}','{TextEdit1.EditValue.ToString}',1"
|
||||
Dim oSQL As String = $"EXEC [{ConfigManager.Config.IDB_Praefix}].[dbo].[PRDD_MONITORING_GET_TREEVIEW_RESULT] '{pAttribute}','{pValue}',1"
|
||||
Dim oTable As DataTable = Database.GetDatatable(oSQL)
|
||||
Dim oStateColumn As TreeListColumn = TreeListResults.Columns.Item("STATE")
|
||||
|
||||
TreeListResults.DataSource = oTable
|
||||
TreeListResults.PopulateColumns()
|
||||
@@ -171,19 +181,14 @@ Public Class frmMonitor
|
||||
oColumn.Visible = DisplayColumns.Contains(oColumn.FieldName)
|
||||
If oColumn.FieldName = "ADDED_WHEN" Then
|
||||
oColumn.Format.FormatType = FormatType.DateTime
|
||||
oColumn.Format.FormatString = "dd.MM.yyyy HH:MM:ss"
|
||||
oColumn.Format.FormatString = "dd.MM.yyyy HH:mm:ss"
|
||||
End If
|
||||
|
||||
Next
|
||||
'Dim edit As New RepositoryItemDateEdit()
|
||||
'TreeListResults.Columns("ADDED_WHEN").ColumnEdit = edit
|
||||
'edit.Mask.EditMask = "g"
|
||||
'edit.Mask.UseMaskAsDisplayFormat = True
|
||||
Dim oStateColumn As TreeListColumn = TreeListResults.Columns.Item("STATE")
|
||||
|
||||
For Each oNode As TreeListNode In TreeListResults.Nodes
|
||||
ExpandNodes(oNode, Function(n)
|
||||
Dim oObjectValue = n.GetValue(oStateColumn)
|
||||
Dim oObjectValue = n.GetValue(oStateColumn)?.ToString
|
||||
Dim oValue As String = NotNull(oObjectValue, String.Empty)
|
||||
Return oValue IsNot Nothing AndAlso (oValue = STATE_WARNING Or oValue = STATE_FAILURE)
|
||||
End Function)
|
||||
@@ -192,6 +197,9 @@ Public Class frmMonitor
|
||||
Catch ex As Exception
|
||||
ShowErrorMessage(ex)
|
||||
Return False
|
||||
Finally
|
||||
SplitContainerContent.Enabled = False
|
||||
TreeListResults.HideLoadingPanel()
|
||||
End Try
|
||||
End Function
|
||||
|
||||
@@ -321,7 +329,7 @@ Public Class frmMonitor
|
||||
Next
|
||||
|
||||
SplitContainerControl3.Collapsed = oSQLCommands.Count = 0
|
||||
SplitContainerControl2.Collapsed = (oFilePaths.Count + oHtmlDocuments.Count) = 0
|
||||
SplitContainerMain.Collapsed = (oFilePaths.Count + oHtmlDocuments.Count) = 0
|
||||
|
||||
For Each oSQLCommand As KeyValuePair(Of String, String) In oSQLCommands
|
||||
Try
|
||||
@@ -542,7 +550,7 @@ Public Class frmMonitor
|
||||
End Sub
|
||||
|
||||
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
|
||||
Dim oSQLConfig As New frmSQLConfig(LogConfig)
|
||||
Dim oSQLConfig As New DigitalData.Controls.SQLConfig.frmSQLConfig(LogConfig)
|
||||
If oSQLConfig.ShowDialog() = DialogResult.OK Then
|
||||
ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString
|
||||
ConfigManager.Save()
|
||||
@@ -553,7 +561,7 @@ Public Class frmMonitor
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
|
||||
Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExportGrid.ItemClick
|
||||
If ActiveSQLResultGrid IsNot Nothing Then
|
||||
XtraSaveFileDialog1.Filter = "Excel Files (*.xlsx)|*.xlsx"
|
||||
|
||||
@@ -563,13 +571,22 @@ Public Class frmMonitor
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
|
||||
Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExportTreeview.ItemClick
|
||||
XtraSaveFileDialog1.Filter = "Excel Files (*.xlsx)|*.xlsx"
|
||||
|
||||
If XtraSaveFileDialog1.ShowDialog() = DialogResult.OK Then
|
||||
TreeListResults.ExportToXlsx(XtraSaveFileDialog1.FileName)
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub TextEdit1_KeyDown(sender As Object, e As KeyEventArgs) Handles TextEdit1.KeyDown
|
||||
If e.KeyCode = Keys.Enter Or e.KeyCode = Keys.F5 Then
|
||||
Dim oAttributeId As Integer = cmbSearchKeys.EditValue
|
||||
Dim oAttributeValue As String = TextEdit1.EditValue.ToString
|
||||
|
||||
LoadData(oAttributeId, oAttributeValue)
|
||||
End If
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
Friend Class SearchKey
|
||||
|
||||
Reference in New Issue
Block a user