diff --git a/GUIs.Common/frmNotification_Startup.Designer.vb b/GUIs.Common/frmNotification_Startup.Designer.vb index 95ed5db1..f1869874 100644 --- a/GUIs.Common/frmNotification_Startup.Designer.vb +++ b/GUIs.Common/frmNotification_Startup.Designer.vb @@ -48,14 +48,14 @@ Partial Class frmNotification_Startup ' 'SplitContainerControl1.Panel1 ' - resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") Me.SplitContainerControl1.Panel1.Controls.Add(Me.ListBoxControl1) + resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") ' 'SplitContainerControl1.Panel2 ' - resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") Me.SplitContainerControl1.Panel2.Controls.Add(Me.RichEditControl1) Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1) + resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") Me.SplitContainerControl1.SplitterPosition = 255 ' 'ListBoxControl1 @@ -68,28 +68,31 @@ Partial Class frmNotification_Startup resources.ApplyResources(Me.RichEditControl1, "RichEditControl1") Me.RichEditControl1.MenuManager = Me.RibbonControl Me.RichEditControl1.Name = "RichEditControl1" + Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden + Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden + Me.RichEditControl1.ReadOnly = True ' 'RibbonControl ' - resources.ApplyResources(Me.RibbonControl, "RibbonControl") Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer) - Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer) - Me.RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.RibbonControl.ExpandCollapseItem.SearchTags = resources.GetString("RibbonControl.ExpandCollapseItem.SearchTags") Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCloseForm, Me.lbStatus, Me.btnMarkAsRead}) + resources.ApplyResources(Me.RibbonControl, "RibbonControl") Me.RibbonControl.MaxItemId = 4 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl.ShowToolbarCustomizeItem = False Me.RibbonControl.StatusBar = Me.RibbonStatusBar + Me.RibbonControl.Toolbar.ShowCustomizeItem = False ' 'btnCloseForm ' resources.ApplyResources(Me.btnCloseForm, "btnCloseForm") Me.btnCloseForm.Id = 1 - Me.btnCloseForm.ImageOptions.ImageIndex = CType(resources.GetObject("btnCloseForm.ImageOptions.ImageIndex"), Integer) - Me.btnCloseForm.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnCloseForm.ImageOptions.LargeImageIndex"), Integer) Me.btnCloseForm.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.clearheaderandfooter Me.btnCloseForm.Name = "btnCloseForm" ' @@ -97,17 +100,13 @@ Partial Class frmNotification_Startup ' resources.ApplyResources(Me.lbStatus, "lbStatus") Me.lbStatus.Id = 2 - Me.lbStatus.ImageOptions.ImageIndex = CType(resources.GetObject("lbStatus.ImageOptions.ImageIndex"), Integer) - Me.lbStatus.ImageOptions.LargeImageIndex = CType(resources.GetObject("lbStatus.ImageOptions.LargeImageIndex"), Integer) - Me.lbStatus.ImageOptions.SvgImage = CType(resources.GetObject("lbStatus.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.lbStatus.Name = "lbStatus" + Me.lbStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' 'btnMarkAsRead ' resources.ApplyResources(Me.btnMarkAsRead, "btnMarkAsRead") Me.btnMarkAsRead.Id = 3 - Me.btnMarkAsRead.ImageOptions.ImageIndex = CType(resources.GetObject("btnMarkAsRead.ImageOptions.ImageIndex"), Integer) - Me.btnMarkAsRead.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnMarkAsRead.ImageOptions.LargeImageIndex"), Integer) Me.btnMarkAsRead.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.check Me.btnMarkAsRead.Name = "btnMarkAsRead" ' @@ -126,25 +125,26 @@ Partial Class frmNotification_Startup ' 'RibbonStatusBar ' - resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") Me.RibbonStatusBar.ItemLinks.Add(Me.lbStatus) + resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl ' 'DocumentViewer1 ' - resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") Me.DocumentViewer1.FileLoaded = False + resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") Me.DocumentViewer1.Name = "DocumentViewer1" ' - 'frmNotification_Startup2 + 'frmNotification_Startup ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonControl) - Me.Name = "frmNotification_Startup2" + Me.IconOptions.SvgImage = CType(resources.GetObject("frmNotification_Startup.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.Name = "frmNotification_Startup" Me.Ribbon = Me.RibbonControl Me.StatusBar = Me.RibbonStatusBar CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/GUIs.Common/frmNotification_Startup.fr.resx b/GUIs.Common/frmNotification_Startup.fr.resx index d978203f..cc7abdb0 100644 --- a/GUIs.Common/frmNotification_Startup.fr.resx +++ b/GUIs.Common/frmNotification_Startup.fr.resx @@ -123,12 +123,12 @@ Marquer comme lu - - Début - Fonctions + + Début + Messages diff --git a/GUIs.Common/frmNotification_Startup.resx b/GUIs.Common/frmNotification_Startup.resx index 84e74bd1..3c4833ee 100644 --- a/GUIs.Common/frmNotification_Startup.resx +++ b/GUIs.Common/frmNotification_Startup.resx @@ -117,262 +117,247 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this - - - DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - lbStatus - - - - 444, 36 - - - 0, 632 - - - RibbonControl - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Als gelesen markieren - - - SplitContainerControl1.Panel1 - - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - SplitContainerControl1 - - - - - - 1 - - - 0 - - - SplitContainerControl1.Panel2 - - - 21, 45 - - - - 1 - - - RibbonPageGroup1 - - - -1 - - - DevExpress.XtraEditors.ListBoxControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DocumentViewer1 - - - Panel2 - - - DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnCloseForm - - - 1050, 22 - - - 2 - - - 400, 322 - - - DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.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 - - - 0 - - - Hinweise schließen - - - 329, 331 - - - -1 - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 0, 0 - - - frmNotification_Startup2 - - - - - - 0 - - - $this - - - btnMarkAsRead - - - -1 - - - Start - - - 255, 474 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RichEditControl1 - - - 2 - - - 0 - - - ListBoxControl1 - - - RibbonStatusBar - - - -1 - - - -1 - - - 1050, 654 - - - 0 - - - 6, 13 - - - SplitContainerControl1 - - - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - - - - SplitContainerControl1.Panel2 - - - SplitContainerControl1.Panel1 - - - SplitContainerControl1 - - - frmNotification_Startup2 - - - RibbonPage1 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Funktionen - Fill - - 1050, 158 - - - 1 - - - 0 - - - 0, 0 - - - lbStatus - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - 1 - - - Panel1 - - - $this - - - SplitContainerControl1.Panel2 - - - -1 - - - -1 - - - 1050, 474 - + 0, 158 Fill + + 0, 0 + + + 255, 361 + + + + 0 + + + ListBoxControl1 + + + DevExpress.XtraEditors.ListBoxControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1.Panel1 + + + 0 + + + Panel1 + + + SplitContainerControl1.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 0 + + + 21, 45 + + + Hinweise schließen + + + lbStatus + + + Als gelesen markieren + + + 0, 0 + + + Funktionen + + + Start + + + 1050, 158 + + + 0, 519 + + + 1050, 22 + + + RibbonStatusBar + + + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 1 + + + RibbonControl + + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 2 + + + 400, 322 + + + 1 + + + RichEditControl1 + + + DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1.Panel2 + + + 0 + + + 444, 36 + + + 329, 331 + + + 0 + + + DocumentViewer1 + + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + + + SplitContainerControl1.Panel2 + + + 1 + + + Panel2 + + + SplitContainerControl1.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 1 + + + 1050, 361 + + + 2 + + + SplitContainerControl1 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 + True - - fr - - + + 6, 13 + + + 1050, 541 + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAkDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iQ29tcGF0aWJpbGl0eSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5l + dyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIx + MTU7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0K + ICA8cGF0aCBkPSJNMTYuNCwxMS40YzAuNi0wLjksMS41LTEuNCwyLjYtMS40czIuMSwwLjUsMi42LDEu + NEwyMiwxMlY0SDNDMi40LDQsMiwzLjYsMiwzYzAtMC42LDAuNC0xLDEtMWgxOVYxICBjMC0wLjYtMC40 + LTEtMS0xSDNDMS4zLDAsMCwxLjMsMCwzdjIwYzAsMS43LDEuMywzLDMsM2g0LjRMMTYuNCwxMS40eiIg + Y2xhc3M9IkJsdWUiIC8+DQogIDxwYXRoIGQ9Ik0xOC4xLDEyLjVMOC4xLDI4LjZDNy43LDI5LjIsOC4z + LDMwLDkuMSwzMGgxOS45YzAuOCwwLDEuMy0wLjgsMC45LTEuNGwtOS45LTE2LjEgIEMxOS41LDExLjgs + MTguNSwxMS44LDE4LjEsMTIuNXoiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDxwYXRoIGQ9Ik0yMCwyNGgt + MnYtOGgyVjI0eiBNMjAsMjZoLTJ2MmgyVjI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== + + + + frmNotification_Startup2 + + + btnCloseForm + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + lbStatus + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnMarkAsRead + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage1 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup1 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + frmNotification_Startup + + + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + \ No newline at end of file diff --git a/GUIs.Common/frmNotification_Startup.vb b/GUIs.Common/frmNotification_Startup.vb index 9031d7b6..128061ac 100644 --- a/GUIs.Common/frmNotification_Startup.vb +++ b/GUIs.Common/frmNotification_Startup.vb @@ -101,7 +101,7 @@ Public Class frmNotification_Startup Next End If - If oType = "MESSAGE" Then + If oType.ToUpper = "MESSAGE" Then RichEditControl1.Text = oMSG_STRING RichEditControl1.Visible = True RichEditControl1.Dock = Windows.Forms.DockStyle.Fill @@ -159,13 +159,16 @@ Public Class frmNotification_Startup If oSuccess = False Then lbStatus.Caption = "Error while setting History!" lbStatus.ItemAppearance.Normal.BackColor = Color.Red + lbStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Else lbStatus.Caption = "History successfully saved!" lbStatus.ItemAppearance.Normal.BackColor = Color.Green + lbStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always If _NotificationsTable.Rows.Count = 1 Then Me.Close() End If End If + Catch ex As Exception Dim oMsgBox As New frmDialog(ex.Message, "Unexpected Error HistoryInsert:", frmDialog.DialogType.Error) oMsgBox.ShowDialog() diff --git a/GUIs.Test.GraphQLTest/App.config b/GUIs.Test.GraphQLTest/App.config index b87bc4f4..9c1654e0 100644 --- a/GUIs.Test.GraphQLTest/App.config +++ b/GUIs.Test.GraphQLTest/App.config @@ -6,7 +6,7 @@ - + diff --git a/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj b/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj index 854e337e..86e6f5ba 100644 --- a/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj +++ b/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj @@ -11,7 +11,7 @@ GUIs.Test.GraphQLTest 512 WindowsForms - v4.6.2 + v4.8 true diff --git a/Services.EmailService/EmailService.vb b/Services.EmailService/EmailService.vb index 017c6727..430ecbd7 100644 --- a/Services.EmailService/EmailService.vb +++ b/Services.EmailService/EmailService.vb @@ -42,10 +42,12 @@ Public Class EmailService _LogConfig.Debug = _Config.Debug + Dim oCurrentDomain As AppDomain = AppDomain.CurrentDomain AddHandler oCurrentDomain.UnhandledException, AddressOf AppDomain_UnhandledException _Logger = _LogConfig.GetLogger() + _Logger.Info($"DEBUG = {_LogConfig.Debug}") _Logger.Info("Starting {0}", ServiceName) @@ -92,11 +94,9 @@ Public Class EmailService _limilab = New Limilab(_LogConfig) _MailSender = New MailSender(_LogConfig) - _Logger.EndBlock() - ' === Initialize Queue === - _Logger.NewBlock("Inititalize Queue") + _Logger.Debug("Inititalize Queue") If _AnyDatabaseInitialized Then _EmailQueue = New BackgroundWorker() With { @@ -108,11 +108,9 @@ Public Class EmailService AddHandler _EmailQueue.RunWorkerCompleted, AddressOf EmailQueue_Completed End If - _Logger.EndBlock() - ' === Initialize & Start Timer === - _Logger.NewBlock("Initialize & Start Timer") + _Logger.Debug("Initialize & Start Timer") If _AnyDatabaseInitialized Then _QueueTimer = New Timer With { @@ -123,8 +121,6 @@ Public Class EmailService AddHandler _QueueTimer.Elapsed, AddressOf QueueTimer_Elapsed End If - _Logger.EndBlock() - ' === Initial Run === If _AnyDatabaseInitialized Then @@ -476,7 +472,7 @@ Public Class EmailService End If MSSQLInstance.ExecuteNonQuery(oSQL) End Select - _Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo} - althogh there was an error in connection close!") + _Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo} - although there was an error in connection close!") End If