From ad289ae66664500b81d13e62e102a5fc623f2c9d Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Wed, 29 Jun 2022 09:24:29 +0200
Subject: [PATCH] Clean up

---
 GUIs.Monitor/SearchLoader.vb        |  8 ++++----
 GUIs.Monitor/frmMonitor.Designer.vb |  7 ++-----
 GUIs.Monitor/frmMonitor.vb          | 18 ++++++++++--------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/GUIs.Monitor/SearchLoader.vb b/GUIs.Monitor/SearchLoader.vb
index b03de46..851255f 100644
--- a/GUIs.Monitor/SearchLoader.vb
+++ b/GUIs.Monitor/SearchLoader.vb
@@ -44,10 +44,10 @@ Public Class SearchLoader
 
         For Each oRow As DataRow In oTable.Rows
             oAttributes.Add(New SearchAttribute With {
-                .Id = oRow.Item("GUID"),
-                .Caption = oRow.Item("CAPTION"),
-                .Description = oRow.Item("DESCRIPTION"),
-                .DataType = oRow.Item("DATA_TYPE")
+                .Id = oRow.ItemEx("GUID", 0),
+                .Caption = oRow.ItemEx("CAPTION", String.Empty),
+                .Description = oRow.ItemEx("DESCRIPTION", String.Empty),
+                .DataType = oRow.ItemEx("DATA_TYPE", "VARCHAR")
             })
         Next
 
diff --git a/GUIs.Monitor/frmMonitor.Designer.vb b/GUIs.Monitor/frmMonitor.Designer.vb
index bc8f7c4..e53d21f 100644
--- a/GUIs.Monitor/frmMonitor.Designer.vb
+++ b/GUIs.Monitor/frmMonitor.Designer.vb
@@ -1,9 +1,6 @@
-Imports DigitalData.GUIs.Common.Base
-
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmMonitor
-    'Inherits DevExpress.XtraBars.Ribbon.RibbonForm
-    Inherits BaseRibbonForm
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
     <System.Diagnostics.DebuggerNonUserCode()> _
diff --git a/GUIs.Monitor/frmMonitor.vb b/GUIs.Monitor/frmMonitor.vb
index 5cd22a1..81f0b3e 100644
--- a/GUIs.Monitor/frmMonitor.vb
+++ b/GUIs.Monitor/frmMonitor.vb
@@ -22,8 +22,10 @@ Imports DevExpress.XtraTreeList
 
 Public Class frmMonitor
     Public Property LogConfig As LogConfig
+    Public Property Logger As Logger
     Public Property ConfigManager As ConfigManager(Of Config)
     Public Property Database As MSSQLServer
+    Public Property FormHelper As FormHelper
 
     Private ReadOnly SQLColumns As New List(Of String) From {"SELECT1", "SELECT2", "SELECT3", "SELECT4"}
     Private ReadOnly DocViewColumns As New List(Of String) From {"DOCVIEW1", "DOCVIEW2"}
@@ -78,9 +80,9 @@ Public Class frmMonitor
     Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Try
             LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "Monitor")
+            Logger = LogConfig.GetLogger()
             ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.UserAppDataPath, Application.UserAppDataPath, Application.StartupPath)
-
-            InitializeBaseForm(LogConfig)
+            FormHelper = New FormHelper(LogConfig, Me)
 
             If ConfigManager.Config.ConnectionString = String.Empty Then
                 Dim oSQLConfig As New frmSQLConfig(LogConfig)
@@ -89,7 +91,7 @@ Public Class frmMonitor
                     ConfigManager.Save()
                     Application.Restart()
                 Else
-                    ShowErrorMessage("No Database configured. Application will close!")
+                    FormHelper.ShowErrorMessage(New ApplicationException("No Database configured. Application will close!"), "Form Load")
                     Application.Exit()
 
                 End If
@@ -145,7 +147,7 @@ Public Class frmMonitor
             SplitContainerControl3.Collapsed = True
             SplitContainerControl2.Collapsed = True
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "frmStart_Load")
         End Try
     End Sub
 
@@ -193,14 +195,14 @@ 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, String.Empty)
+                                       Dim oValue As String = NotNull(oObjectValue.ToString, String.Empty)
                                        Return oValue IsNot Nothing AndAlso (oValue = STATE_WARNING Or oValue = STATE_FAILURE)
                                    End Function)
             Next
 
             Return True
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "LoadData")
             Return False
         End Try
     End Function
@@ -212,7 +214,7 @@ Public Class frmMonitor
             cmbSearches.Properties.Items.Clear()
             cmbSearches.Properties.Items.AddRange(SearchLoader.Searches)
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "LoadSearches")
         End Try
     End Sub
 
@@ -411,7 +413,7 @@ Public Class frmMonitor
                 End Try
             Next
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "TreeListResults_FocusedNodeChanged")
         End Try
     End Sub