Merge branch 'master' of https://vcs.digitaldata.works/AppStd/EmailProfiler

App/EmailProfiler.Form/My Project/licenses.licx

@@ -1,3 +1,4 @@
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

App/EmailProfiler.Form/frmMain.vb

@@ -75,6 +75,7 @@ Public Class frmMain
 
         If Set_ConnectionStrings() Then
             Load_AllData()
+            LoadMonitoringIntoGrid()
             Check_Steps()
             Active_Color(ACTIVECheckBox)
             Active_Color(ACTIVECheckBox1)
@@ -480,7 +481,6 @@ Public Class frmMain
     Private Sub ToolStripButton10_Click(sender As Object, e As EventArgs) Handles ToolStripButton10.Click
         Load_Processes()
     End Sub
-
     Private Sub ToolStripButton8_Click(sender As Object, e As EventArgs) Handles ToolStripButton8.Click
         Try
             TBEMLP_POLL_PROCESSBindingSource.EndEdit()
@@ -687,8 +687,8 @@ Public Class frmMain
         If _LoadInProgress = True Then Exit Sub
         LogConfig.Debug = LOG_ERRORS_ONLYCheckBox.Checked
         ConfigManager.Save()
-        Dim upd = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1"
+        Dim upr = $"UPDATE TBEMLP_CONFIG SET CHANGED_WHO = '{Environment.UserName}',LOG_ERRORS_ONLY = '{LOG_ERRORS_ONLYCheckBox.Checked}' WHERE GUID = 1"
-        _database.ExecuteNonQuery(upd)
+        _database.ExecuteNonQuery(upr)
         Load_Config()
 
     End Sub
@@ -1043,4 +1043,47 @@ Public Class frmMain
     Private Sub COMMENT_PROFILESTextBox_TextChanged(sender As Object, e As EventArgs) Handles COMMENT_PROFILESTextBox.TextChanged
 
     End Sub
+
+    ' Loads the TBEMLP_HISTORY table into the monitoring grid and formats columns
+    Private Sub LoadMonitoringIntoGrid()
+        Try
+            ' Fill dataset table (adapter exists in designer)
+            Me.TBEMLP_HISTORYTableAdapter.Fill(Me.MyDataset.TBEMLP_HISTORY)
+
+            ' Bind the grid to the binding source defined in the designer
+            Me.gridMonitoring.DataSource = Me.TBEMLP_HISTORYBindingSource
+
+            ' Format columns on the view
+            Dim gv = TryCast(Me.GridView5, DevExpress.XtraGrid.Views.Grid.GridView)
+            If gv IsNot Nothing Then
+                gv.PopulateColumns()
+
+                ' Hide all columns first
+                For Each column As DevExpress.XtraGrid.Columns.GridColumn In gv.Columns
+                    column.Visible = False
+                Next
+
+                ' Show only the desired columns
+                Dim visibleColumns = New String() {"GUID", "EMAIL_MSGID", "EMAIL_FROM", "EMAIL_SUBJECT", "EMAIL_DATE", "ADDED_WHEN", "STATUS", "PROFILE_ID"}
+                For Each columnName In visibleColumns
+                    Dim column = gv.Columns.ColumnByFieldName(columnName)
+                    If column IsNot Nothing Then
+                        column.Visible = True
+                    End If
+                Next
+
+                ' Optionally format specific columns
+                If gv.Columns.ColumnByFieldName("EMAIL_DATE") IsNot Nothing Then
+                    gv.Columns("EMAIL_DATE").DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime
+                    gv.Columns("EMAIL_DATE").DisplayFormat.FormatString = "yyyy-MM-dd HH:mm:ss"
+                End If
+
+                gv.OptionsView.ColumnAutoWidth = False
+                gv.BestFitColumns()
+            End If
+
+        Catch ex As Exception
+            If Logger IsNot Nothing Then Logger.Error(ex) Else Debug.WriteLine(ex.ToString())
+        End Try
+    End Sub
 End Class

App/wisag_check_Att/wisag_check_Att.vbproj

@@ -57,13 +57,13 @@
     <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Database">
-      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
     <Reference Include="DigitalData.Modules.Logging">
-      <HintPath>..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="EmailProfiler.Common">
       <HintPath>..\EmailProfiler.Common\bin\Debug\EmailProfiler.Common.dll</HintPath>