diff --git a/GUIs.Monitor/Config.vb b/GUIs.Monitor/Config.vb index dd7f890..aa127cc 100644 --- a/GUIs.Monitor/Config.vb +++ b/GUIs.Monitor/Config.vb @@ -3,6 +3,4 @@ Public Class Config Public Property ConnectionString As String = String.Empty - Public Property DBPrefix As String = "DD_ECM" - Public Property SearchSQL As String = $"SELECT * FROM {DBPrefix}.[dbo].[TBMON_PROFILE] WHERE ACTIVE = 1 ORDER BY SEQUENCE" End Class diff --git a/GUIs.Monitor/My Project/Application.Designer.vb b/GUIs.Monitor/My Project/Application.Designer.vb index a6150f2..3c3ecf8 100644 --- a/GUIs.Monitor/My Project/Application.Designer.vb +++ b/GUIs.Monitor/My Project/Application.Designer.vb @@ -24,7 +24,7 @@ Namespace My _ Public Sub New() MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows) - Me.IsSingleInstance = false + Me.IsSingleInstance = true Me.EnableVisualStyles = true Me.SaveMySettingsOnExit = true Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses diff --git a/GUIs.Monitor/My Project/Application.myapp b/GUIs.Monitor/My Project/Application.myapp index fb6ccec..63bcdb2 100644 --- a/GUIs.Monitor/My Project/Application.myapp +++ b/GUIs.Monitor/My Project/Application.myapp @@ -2,7 +2,7 @@ true frmMonitor - false + true 0 true 0 diff --git a/GUIs.Monitor/SearchLoader.vb b/GUIs.Monitor/SearchLoader.vb index df4120e..7bb4c67 100644 --- a/GUIs.Monitor/SearchLoader.vb +++ b/GUIs.Monitor/SearchLoader.vb @@ -23,7 +23,7 @@ Public Class SearchLoader Try Searches.Clear() - Dim oSQL = Config.SearchSQL + Dim oSQL = $"SELECT * FROM TBMON_PROFILE WHERE ACTIVE = 1 ORDER BY SEQUENCE" Dim oTable = Database.GetDatatable(oSQL) For Each oRow As DataRow In oTable.Rows @@ -50,7 +50,7 @@ Public Class SearchLoader End Sub Public Sub LoadSearchParameters() - Dim oSQL As String = $"SELECT * FROM TBMON_PROFILE_PARAM WHERE ACTIVE = 1 ORDER BY SEQUENCE" + Dim oSQL As String = $"SELECT * FROM TBMON_PROFILE_PARAM WHERE ACTIVE = 1" Dim oTable As DataTable = Database.GetDatatable(oSQL) Dim oParameters As New List(Of SearchParameter) diff --git a/GUIs.Monitor/app.config b/GUIs.Monitor/app.config index 996e16a..8488be0 100644 --- a/GUIs.Monitor/app.config +++ b/GUIs.Monitor/app.config @@ -11,13 +11,13 @@ System - + True Skin/Office 2019 Colorful - Fire Brick + Yale diff --git a/GUIs.Monitor/frmMonitor.Designer.vb b/GUIs.Monitor/frmMonitor.Designer.vb index c2060be..21c16e7 100644 --- a/GUIs.Monitor/frmMonitor.Designer.vb +++ b/GUIs.Monitor/frmMonitor.Designer.vb @@ -39,6 +39,7 @@ Partial Class frmMonitor Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.XtraTabControlFileHTML = New DevExpress.XtraTab.XtraTabControl() @@ -221,14 +222,13 @@ Partial Class frmMonitor ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroup2, Me.RibbonPageGroup4}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.buttonSearch) - Me.RibbonPageGroup1.ItemLinks.Add(Me.btnReloadSearches) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Daten" ' @@ -248,6 +248,13 @@ Partial Class frmMonitor Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Export" ' + 'RibbonPageGroup4 + ' + Me.RibbonPageGroup4.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup4.ItemLinks.Add(Me.btnReloadSearches) + Me.RibbonPageGroup4.Name = "RibbonPageGroup4" + Me.RibbonPageGroup4.Text = "Suche" + ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.lbResultCount) @@ -291,7 +298,7 @@ Partial Class frmMonitor ' Me.XtraTabPageFile2.Controls.Add(Me.DocumentViewer2) Me.XtraTabPageFile2.Name = "XtraTabPageFile2" - Me.XtraTabPageFile2.Size = New System.Drawing.Size(388, 564) + Me.XtraTabPageFile2.Size = New System.Drawing.Size(388, 562) Me.XtraTabPageFile2.Text = "File 2" ' 'DocumentViewer2 @@ -300,14 +307,14 @@ Partial Class frmMonitor Me.DocumentViewer2.FileLoaded = False Me.DocumentViewer2.Location = New System.Drawing.Point(0, 0) Me.DocumentViewer2.Name = "DocumentViewer2" - Me.DocumentViewer2.Size = New System.Drawing.Size(388, 564) + Me.DocumentViewer2.Size = New System.Drawing.Size(388, 562) Me.DocumentViewer2.TabIndex = 1 ' 'XtraTabPageHtml1 ' Me.XtraTabPageHtml1.Controls.Add(Me.RichEditControl1) Me.XtraTabPageHtml1.Name = "XtraTabPageHtml1" - Me.XtraTabPageHtml1.Size = New System.Drawing.Size(388, 564) + Me.XtraTabPageHtml1.Size = New System.Drawing.Size(388, 562) Me.XtraTabPageHtml1.Text = "HTML 1" ' 'RichEditControl1 @@ -320,14 +327,14 @@ Partial Class frmMonitor Me.RichEditControl1.Name = "RichEditControl1" Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden - Me.RichEditControl1.Size = New System.Drawing.Size(388, 564) + Me.RichEditControl1.Size = New System.Drawing.Size(388, 562) Me.RichEditControl1.TabIndex = 0 ' 'XtraTabPageHtml2 ' Me.XtraTabPageHtml2.Controls.Add(Me.RichEditControl2) Me.XtraTabPageHtml2.Name = "XtraTabPageHtml2" - Me.XtraTabPageHtml2.Size = New System.Drawing.Size(388, 564) + Me.XtraTabPageHtml2.Size = New System.Drawing.Size(388, 562) Me.XtraTabPageHtml2.Text = "HTML 2" ' 'RichEditControl2 @@ -338,7 +345,7 @@ Partial Class frmMonitor Me.RichEditControl2.Location = New System.Drawing.Point(0, 0) Me.RichEditControl2.MenuManager = Me.RibbonControl1 Me.RichEditControl2.Name = "RichEditControl2" - Me.RichEditControl2.Size = New System.Drawing.Size(388, 564) + Me.RichEditControl2.Size = New System.Drawing.Size(388, 562) Me.RichEditControl2.TabIndex = 1 ' 'GridControl1 @@ -348,7 +355,7 @@ Partial Class frmMonitor Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(730, 373) + Me.GridControl1.Size = New System.Drawing.Size(730, 371) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -534,7 +541,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL2.Controls.Add(Me.GridControl3) Me.XtraTabPageSQL2.Name = "XtraTabPageSQL2" - Me.XtraTabPageSQL2.Size = New System.Drawing.Size(730, 373) + Me.XtraTabPageSQL2.Size = New System.Drawing.Size(730, 371) Me.XtraTabPageSQL2.Text = "SQL 2" ' 'GridControl3 @@ -544,7 +551,7 @@ Partial Class frmMonitor Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.MenuManager = Me.RibbonControl1 Me.GridControl3.Name = "GridControl3" - Me.GridControl3.Size = New System.Drawing.Size(730, 373) + Me.GridControl3.Size = New System.Drawing.Size(730, 371) Me.GridControl3.TabIndex = 1 Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -557,7 +564,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL3.Controls.Add(Me.GridControl4) Me.XtraTabPageSQL3.Name = "XtraTabPageSQL3" - Me.XtraTabPageSQL3.Size = New System.Drawing.Size(730, 373) + Me.XtraTabPageSQL3.Size = New System.Drawing.Size(730, 371) Me.XtraTabPageSQL3.Text = "SQL 3" ' 'GridControl4 @@ -567,7 +574,7 @@ Partial Class frmMonitor Me.GridControl4.MainView = Me.GridView4 Me.GridControl4.MenuManager = Me.RibbonControl1 Me.GridControl4.Name = "GridControl4" - Me.GridControl4.Size = New System.Drawing.Size(730, 373) + Me.GridControl4.Size = New System.Drawing.Size(730, 371) Me.GridControl4.TabIndex = 1 Me.GridControl4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4}) ' @@ -580,7 +587,7 @@ Partial Class frmMonitor ' Me.XtraTabPageSQL4.Controls.Add(Me.GridControl1) Me.XtraTabPageSQL4.Name = "XtraTabPageSQL4" - Me.XtraTabPageSQL4.Size = New System.Drawing.Size(730, 373) + Me.XtraTabPageSQL4.Size = New System.Drawing.Size(730, 371) Me.XtraTabPageSQL4.Text = "SQL 4" ' 'SplitContainerFileHTML @@ -628,7 +635,7 @@ Partial Class frmMonitor Me.XtraTabPage4.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.bo_dashboard Me.XtraTabPage4.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage4.Name = "XtraTabPage4" - Me.XtraTabPage4.Size = New System.Drawing.Size(1377, 587) + Me.XtraTabPage4.Size = New System.Drawing.Size(1377, 585) Me.XtraTabPage4.Text = "Dashboard" ' 'XtraSaveFileDialog1 @@ -778,4 +785,5 @@ Partial Class frmMonitor Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents SplashScreenManager1 As DevExpress.XtraSplashScreen.SplashScreenManager Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/GUIs.Monitor/frmMonitor.vb b/GUIs.Monitor/frmMonitor.vb index 63f586d..0296b24 100644 --- a/GUIs.Monitor/frmMonitor.vb +++ b/GUIs.Monitor/frmMonitor.vb @@ -90,15 +90,7 @@ Public Class frmMonitor End If End If - If ConfigManager.Config.DBPrefix <> "" Then - If ConfigManager.Config.SearchSQL.Contains("@IDB_PRAEFIX") Then - Dim oREPLACE = ConfigManager.Config.SearchSQL.Replace("@IDB_PRAEFIX", ConfigManager.Config.DBPrefix) - ConfigManager.Config.SearchSQL = oREPLACE - ConfigManager.Save() - End If - Console.WriteLine(ConfigManager.Config.SearchSQL) - End If Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString) Database = New MSSQLServer(LogConfig, oConnectionString) SearchLoader = New SearchLoader(LogConfig, ConfigManager.Config, Database)