From b278f26acb9d5d534c286caa5d49d57ef1ab2244 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Mon, 21 Jun 2021 16:56:29 +0200 Subject: [PATCH] =?UTF-8?q?MS=20IDB=20suffix,=20SQL,=20Beschriftungen,=20p?= =?UTF-8?q?arameter=C3=BCbergabe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- GUIs.Monitor/Config.vb | 4 +- GUIs.Monitor/frmMonitor.Designer.vb | 52 +++++++++++++++------ GUIs.Monitor/frmMonitor.resx | 70 +++++++++++++++++++++++++++++ GUIs.Monitor/frmMonitor.vb | 47 ++++++++++++++++--- 4 files changed, 151 insertions(+), 22 deletions(-) diff --git a/GUIs.Monitor/Config.vb b/GUIs.Monitor/Config.vb index 28269589..f4768d0f 100644 --- a/GUIs.Monitor/Config.vb +++ b/GUIs.Monitor/Config.vb @@ -3,6 +3,6 @@ Public Class Config Public Property ConnectionString As String = String.Empty - - Public Property SearchKeySQL As String = "SELECT ATTR_ID, ATTR_TITLE, TYPE_NAME FROM VWIDB_BE_ATTRIBUTE WHERE LANG_CODE = 'de-DE'" + Public Property IDB_Praefix As String = "IDB" + Public Property SearchKeySQL As String = $"SELECT T.ATTR_ID, T.ATTR_TITLE FROM {IDB_Praefix}.dbo.VWIDB_BE_ATTRIBUTE T, TBDD_MONITORING_ATTRIBUTES T1 WHERE T.ATTR_ID = T1.ATTRIBUTE_ID" End Class diff --git a/GUIs.Monitor/frmMonitor.Designer.vb b/GUIs.Monitor/frmMonitor.Designer.vb index 17ce1a92..004e1198 100644 --- a/GUIs.Monitor/frmMonitor.Designer.vb +++ b/GUIs.Monitor/frmMonitor.Designer.vb @@ -26,11 +26,13 @@ Partial Class frmMonitor _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMonitor)) Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.ApplicationMenu1 = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.buttonSearch = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -77,6 +79,7 @@ Partial Class frmMonitor Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPage4 = New DevExpress.XtraTab.XtraTabPage() Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ApplicationMenu1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -128,9 +131,9 @@ Partial Class frmMonitor ' Me.RibbonControl1.ApplicationButtonDropDownControl = Me.ApplicationMenu1 Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.BarButtonItem2}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.buttonSearch, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 5 + Me.RibbonControl1.MaxItemId = 7 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowToolbarCustomizeItem = False @@ -153,19 +156,28 @@ Partial Class frmMonitor ' 'buttonSearch ' - Me.buttonSearch.Caption = "Suchen" + Me.buttonSearch.Caption = "Sicht laden" Me.buttonSearch.Id = 1 Me.buttonSearch.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.gettingstarted Me.buttonSearch.Name = "buttonSearch" + Me.buttonSearch.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large ' 'BarButtonItem2 ' - Me.BarButtonItem2.Caption = "Export als XLSX" + Me.BarButtonItem2.Caption = "Export Grid als XLSX" Me.BarButtonItem2.Enabled = False Me.BarButtonItem2.Id = 4 Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.GUIs.Monitor.My.Resources.Resources.export Me.BarButtonItem2.Name = "BarButtonItem2" ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Export als XLSX" + Me.BarButtonItem3.Id = 5 + Me.BarButtonItem3.ImageOptions.Image = CType(resources.GetObject("BarButtonItem3.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem3.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -181,12 +193,14 @@ Partial Class frmMonitor 'RibbonPageGroup2 ' Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Export" ' 'RibbonStatusBar1 ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1) Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 749) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 @@ -268,9 +282,9 @@ Partial Class frmMonitor Me.LayoutItemSearchValue_Text.Name = "LayoutItemSearchValue_Text" Me.LayoutItemSearchValue_Text.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutItemSearchValue_Text.Size = New System.Drawing.Size(215, 46) - Me.LayoutItemSearchValue_Text.Text = "Suchwert" + Me.LayoutItemSearchValue_Text.Text = "Parameter" Me.LayoutItemSearchValue_Text.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutItemSearchValue_Text.TextSize = New System.Drawing.Size(63, 13) + Me.LayoutItemSearchValue_Text.TextSize = New System.Drawing.Size(88, 13) ' 'LayoutControlItem2 ' @@ -279,9 +293,9 @@ Partial Class frmMonitor Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutControlItem2.Size = New System.Drawing.Size(215, 46) - Me.LayoutControlItem2.Text = "Attribut" + Me.LayoutControlItem2.Text = "Sicht Titel" Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(63, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(88, 13) ' 'LayoutItemSearchValue_Date ' @@ -290,9 +304,9 @@ Partial Class frmMonitor Me.LayoutItemSearchValue_Date.Name = "LayoutItemSearchValue_Date" Me.LayoutItemSearchValue_Date.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) Me.LayoutItemSearchValue_Date.Size = New System.Drawing.Size(215, 46) - Me.LayoutItemSearchValue_Date.Text = "Suchwert" + Me.LayoutItemSearchValue_Date.Text = "Datum Parameter" Me.LayoutItemSearchValue_Date.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutItemSearchValue_Date.TextSize = New System.Drawing.Size(63, 13) + Me.LayoutItemSearchValue_Date.TextSize = New System.Drawing.Size(88, 13) Me.LayoutItemSearchValue_Date.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never ' 'LayoutControlItem3 @@ -304,7 +318,7 @@ Partial Class frmMonitor Me.LayoutControlItem3.Size = New System.Drawing.Size(215, 406) Me.LayoutControlItem3.Text = "Auswertung" Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(63, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(88, 13) ' 'XtraTabControl1 ' @@ -408,6 +422,7 @@ Partial Class frmMonitor Me.TreeListResults.Location = New System.Drawing.Point(0, 0) Me.TreeListResults.MenuManager = Me.RibbonControl1 Me.TreeListResults.Name = "TreeListResults" + Me.TreeListResults.OptionsView.ShowColumns = False Me.TreeListResults.Size = New System.Drawing.Size(713, 181) Me.TreeListResults.TabIndex = 4 ' @@ -421,6 +436,8 @@ Partial Class frmMonitor Me.SvgImageCollection1.Add("failure", "image://svgimages/icon builder/actions_deletecircled.svg") Me.SvgImageCollection1.Add("warning", "image://svgimages/business objects/bo_attention.svg") Me.SvgImageCollection1.Add("waiting", "image://svgimages/business objects/bo_audit_changehistory.svg") + Me.SvgImageCollection1.Add("actions_user", "image://svgimages/icon builder/actions_user.svg") + Me.SvgImageCollection1.Add("highimportance", "image://svgimages/outlook inspired/highimportance.svg") ' 'SplitContainerControl1 ' @@ -568,7 +585,7 @@ Partial Class frmMonitor Me.XtraTabPage3.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage3.Name = "XtraTabPage3" Me.XtraTabPage3.Size = New System.Drawing.Size(1377, 564) - Me.XtraTabPage3.Text = "Attribut Suche" + Me.XtraTabPage3.Text = "Auswahl Sicht" ' 'XtraTabPage4 ' @@ -576,12 +593,19 @@ Partial Class frmMonitor Me.XtraTabPage4.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) Me.XtraTabPage4.Name = "XtraTabPage4" Me.XtraTabPage4.Size = New System.Drawing.Size(1377, 564) - Me.XtraTabPage4.Text = "Auswertungen" + Me.XtraTabPage4.Text = "Dashboard" ' 'XtraSaveFileDialog1 ' Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1" ' + 'BarStaticItem1 + ' + Me.BarStaticItem1.Id = 6 + Me.BarStaticItem1.ImageOptions.Image = CType(resources.GetObject("BarStaticItem1.ImageOptions.Image"), System.Drawing.Image) + Me.BarStaticItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarStaticItem1.Name = "BarStaticItem1" + ' 'frmMonitor ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -696,4 +720,6 @@ Partial Class frmMonitor Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem End Class diff --git a/GUIs.Monitor/frmMonitor.resx b/GUIs.Monitor/frmMonitor.resx index 86c70e3c..1d78dfe6 100644 --- a/GUIs.Monitor/frmMonitor.resx +++ b/GUIs.Monitor/frmMonitor.resx @@ -120,6 +120,76 @@ 183, 17 + + + + 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 + TYIP2fNBkIMCKs8AAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAMdEVYdFRpdGxlAEFib3V0O1VEZxsAAAHFSURBVFhHxda9SkNBEIbh3ERUECxEUMErESwtxM5K + hICVIFZGvAbBwlIQhAiiWNkoeAla2FgKBv8QFH+O74STcHZm2GSDORZPsZOZ+ZYTTVLJsuxfucUyucUy + ucUymcJc/SxmDGs4wR2e8YhbHKGGYXizLTrPFLwhSPA+vpB18YFdDMHs0nmm4Awt4hVeWMwDZhHs03mm + oAbW4S3vlTyxJXR26jxTKDTLoLc0lVyi8yR0ninkjRN4g7ewH/J2VGHyTEGa0IC3SGv3e69pOzB5pkDT + JH7yoW5SLiD/HVWdFxwETZuFob+2rPOCg6DpUg3FpDwBcajzgoOgST7dvGFP6gWudV5wEM5QTOoFmjov + OAhnKGYgFxjkW3Cj84KDoOlKDcWkXqCh84KDoGlbDcWkXqCm84KDoGlGDcWkXOATIzovOAiaxGk+1E3K + BfZg8kxBmjAN+ej0FvXjCaMweaYgTTn5eeUtSyXfK/No7dV5ptBuzG3BW9orCV9FZ6fOM4Vic24F7/AC + Yl6wgGCfzjMFPZCbwjF6+Zr+xgHkh6zZpfNMwRsqkD/OOi7QRDv0HufYwDi82RadZwplc4tlcotlcovl + ySq/BghXOy4DehcAAAAASUVORK5CYII= + + 17, 17 diff --git a/GUIs.Monitor/frmMonitor.vb b/GUIs.Monitor/frmMonitor.vb index a0e6ed4b..15af0f75 100644 --- a/GUIs.Monitor/frmMonitor.vb +++ b/GUIs.Monitor/frmMonitor.vb @@ -50,6 +50,7 @@ Public Class frmMonitor Private Const STATE_FAILURE As String = "FAILURE" Private Const STATE_WARNING As String = "WARNING" Private Const STATE_WAITING As String = "WAITING" + Private Const STATE_HIGHLIGHT As String = "HIGHLIGHT" Private Enum NodeImage @@ -61,6 +62,8 @@ Public Class frmMonitor Failure = 5 Warning = 6 Waiting = 7 + User = 8 + Highlight = 9 End Enum Private ReadOnly StateIcons As New Dictionary(Of String, NodeImage) From { @@ -88,8 +91,16 @@ Public Class frmMonitor End If End If + If ConfigManager.Config.IDB_Praefix <> "" Then + If ConfigManager.Config.SearchKeySQL.Contains("@IDB_PRAEFIX") Then + Dim oREPLACE = ConfigManager.Config.SearchKeySQL.Replace("@IDB_PRAEFIX", ConfigManager.Config.IDB_Praefix) + ConfigManager.Config.SearchKeySQL = oREPLACE + ConfigManager.Save() + End If + Console.WriteLine(ConfigManager.Config.SearchKeySQL) - Dim oConnectionString = MSSQLServer.DecryptConnectionString(ConfigManager.Config.ConnectionString) + End If + 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. @@ -127,6 +138,8 @@ Public Class frmMonitor For Each oViewer As DocumentViewer In FileResultViewers oViewer.Init(LogConfig, oLicense) Next + SplitContainerControl3.Collapsed = True + SplitContainerControl2.Collapsed = True Catch ex As Exception ShowErrorMessage(ex) End Try @@ -143,7 +156,9 @@ Public Class frmMonitor Private Function LoadData() As Boolean Try - Dim oSQL As String = "EXEC [IDB].[dbo].[PRDD_MONITORING_GET_TREEVIEW_RESULT] 'TYPE1','sdsdd',2" + + + Dim oSQL As String = $"EXEC [{ConfigManager.Config.IDB_Praefix}].[dbo].[PRDD_MONITORING_GET_TREEVIEW_RESULT] '{cmbSearchKeys.EditValue}','{TextEdit1.EditValue.ToString}',1" Dim oTable As DataTable = Database.GetDatatable(oSQL) TreeListResults.DataSource = oTable @@ -154,8 +169,16 @@ Public Class frmMonitor ' Show all columns in DisplayColumns List For Each oColumn In TreeListResults.Columns oColumn.Visible = DisplayColumns.Contains(oColumn.FieldName) - Next + If oColumn.FieldName = "ADDED_WHEN" Then + oColumn.Format.FormatType = FormatType.DateTime + 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 @@ -165,7 +188,6 @@ Public Class frmMonitor Return oValue IsNot Nothing AndAlso (oValue = STATE_WARNING Or oValue = STATE_FAILURE) End Function) Next - Return True Catch ex As Exception ShowErrorMessage(ex) @@ -182,7 +204,7 @@ Public Class frmMonitor SearchKeys.Add(New SearchKey With { .Id = CInt(oRow.Item(0)), .Title = oRow.Item(1).ToString, - .TypeName = oRow.Item(2).ToString + .TypeName = "Varchar"'oRow.Item(2).ToString }) Next @@ -207,7 +229,9 @@ Public Class frmMonitor New ImageComboBoxItem("Failure", "FAILURE", NodeImage.Failure), New ImageComboBoxItem("Warning", "WARNING", NodeImage.Warning), New ImageComboBoxItem("Waiting", "WAITING", NodeImage.Waiting), - New ImageComboBoxItem("Default", "DEFAULT", NodeImage.Default) + New ImageComboBoxItem("Default", "DEFAULT", NodeImage.Default), + New ImageComboBoxItem("User", "USER", NodeImage.User), + New ImageComboBoxItem("Highlight", "HIGHLIGHT", NodeImage.Highlight) }) Dim oIconEdit As New RepositoryItemImageComboBox With { @@ -254,7 +278,7 @@ Public Class frmMonitor Case "VARCHAR" LayoutItemSearchValue_Date.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never LayoutItemSearchValue_Text.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always - + TextEdit1.EditValue = String.Empty Case "DATE" LayoutItemSearchValue_Date.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always LayoutItemSearchValue_Text.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never @@ -262,6 +286,7 @@ Public Class frmMonitor Case Else LayoutItemSearchValue_Date.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never LayoutItemSearchValue_Text.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always + BarStaticItem1.Caption = "oItem.TypeName=" + oItem.TypeName End Select End Sub @@ -537,6 +562,14 @@ Public Class frmMonitor End If End If End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + XtraSaveFileDialog1.Filter = "Excel Files (*.xlsx)|*.xlsx" + + If XtraSaveFileDialog1.ShowDialog() = DialogResult.OK Then + TreeListResults.ExportToXlsx(XtraSaveFileDialog1.FileName) + End If + End Sub End Class Friend Class SearchKey