AppCustom/Monitor
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Referenzen aktualisiert. GDPicture Lizenz&nuget

Browse Source
This commit is contained in:
PitzM
2026-02-17 15:18:33 +01:00
parent 4fa3a666ef
commit 6912f290cd
4 changed files with 319 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
GUIs.Monitor/Forms/frmMonitor.vb
View File

@@ -22,7 +22,6 @@ Imports DigitalData.GUIs.Monitor.Constants
Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Config
Imports DigitalData.Modules.Database
Imports DigitalData.Modules.Language.Utils
Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Patterns
@@ -104,7 +103,7 @@ Public Class frmMonitor
Patterns = New Patterns2(LogConfig)
FormHelper = New FormHelper(LogConfig, Me)
ControlHelper = New Common.ControlHelper(LogConfig)
Workspace = New DocumentResultList.Workspace(Of Config)(LogConfig, ConfigManager, WorkspaceManager1)
Workspace = New DocumentResultList.Workspace(Of Config)(LogConfig, ConfigManager, WorkspaceManager1, "de-DE")
SplitContainerBuilderHTML = New SplitContainerBuilder(LogConfig, Me, SplitContainerFileHTML)
SplitContainerBuilderHTML.InitAutoResize()
@@ -165,7 +164,8 @@ Public Class frmMonitor
LoadSearches()
Dim oLicense = LoadGDPicture()
' TODO - GDPicture Version konfigurierbar machen
Dim oLicense = LoadGDPicture("11.2024")
For Each oGrid In SQLResultGrids
AddHandler oGrid.Enter, Sub()
@@ -194,8 +194,8 @@ Public Class frmMonitor
End Try
End Sub
Private Function LoadGDPicture() As String
Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'"
Private Function LoadGDPicture(pVersion As String) As String
Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' AND VERSION = '" + pVersion + "'"
Return CStr(Database.GetScalarValue(oSQL))
End Function
@@ -277,7 +277,7 @@ Public Class frmMonitor
For Each oNode As TreeListNode In TreeListResults.Nodes
ExpandNodes(oNode, Function(n)
Dim oObjectValue = n.GetValue(oStateColumn)
Dim oValue As String = NotNull(oObjectValue.ToString, String.Empty)
Dim oValue As String = ObjectEx.NotNull(oObjectValue.ToString, String.Empty)
Return oValue IsNot Nothing AndAlso (oValue = State.STATE_WARNING Or oValue = State.STATE_FAILURE)
End Function)
Next
@@ -900,7 +900,7 @@ Public Class frmMonitor
Try
Dim oExtracted = ExtractTitle(oSQLCommand.Value)
Dim oCommand = oExtracted.Item1
Dim oTitle = NotNull(oExtracted.Item2, oSQLCommand.Key)
Dim oTitle = ObjectEx.NotNull(oExtracted.Item2, oSQLCommand.Key)
Dim oTable As DataTable = Database.GetDatatable(oCommand)
@@ -1004,7 +1004,7 @@ Public Class frmMonitor
End Sub
Private Sub ExpandCollapseNode(pNode As TreeListNode)
Dim oExpanded As TristateBoolean = NotNull(pNode.Item("EXPANDED"), TristateBoolean.Indeterminate)
Dim oExpanded As TristateBoolean = ObjectEx.NotNull(pNode.Item("EXPANDED"), TristateBoolean.Indeterminate)
Select Case oExpanded
Case TristateBoolean.False
pNode.Collapse()
@@ -1020,7 +1020,7 @@ Public Class frmMonitor
Dim oTabPage = DirectCast(RichEditControl.Parent, XtraTabPage)
oTabPage.PageVisible = True
oTabPage.Text = NotNull(Title, oTabPage.Text)
oTabPage.Text = ObjectEx.NotNull(Title, oTabPage.Text)
XtraTabControlFileHTML.SelectedTabPage = oTabPage
End Sub
@@ -1030,7 +1030,7 @@ Public Class frmMonitor
Dim oTabPage = DirectCast(DocumentViewer.Parent, XtraTabPage)
oTabPage.PageVisible = True
oTabPage.Text = NotNull(Title, oTabPage.Text)
oTabPage.Text = ObjectEx.NotNull(Title, oTabPage.Text)
XtraTabControlFileHTML.SelectedTabPage = oTabPage
End Sub
@@ -1043,7 +1043,7 @@ Public Class frmMonitor
Dim oTabPage = DirectCast(GridControl.Parent, XtraTabPage)
oTabPage.PageVisible = True
oTabPage.Text = $"{NotNull(Title, oTabPage.Text)} ({Table.Rows.Count})"
oTabPage.Text = $"{ObjectEx.NotNull(Title, oTabPage.Text)} ({Table.Rows.Count})"
XtraTabControlSQL.SelectedTabPage = oTabPage
End Sub
@@ -1077,7 +1077,7 @@ Public Class frmMonitor
Private Sub TreeListResults_CustomDrawNodeCell(sender As Object, e As DevExpress.XtraTreeList.CustomDrawNodeCellEventArgs)
Dim oColumn = TreeListResults.Columns.Item("STATE")
Dim oState = NotNull(e.Node.GetValue(oColumn), Nothing)
Dim oState = ObjectEx.NotNull(e.Node.GetValue(oColumn), Nothing)
If oState Is Nothing Then
Exit Sub