diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index aa47718..58fadb6 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -70,8 +70,16 @@ Public Class ClassInit End If If CONFIG.Config.AppServerConfig <> String.Empty Then + + Try - _Client = New Client(LOGCONFIG, CONFIG.Config.AppServerConfig, 9000) + Dim oSplit() = CONFIG.Config.AppServerConfig.ToString.Split(";") + Dim oAppServer = oSplit(0) + Dim oAppServerPort = 9000 + If oSplit.Length = 2 Then + oAppServerPort = oSplit(1) + End If + _Client = New Client(LOGCONFIG, oAppServer, oAppServerPort) If Not IsNothing(_Client) Then If _Client.Connect() Then APPSERVER_ACTIVE = True diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index aea055d..3c5cd5a 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -78,7 +78,6 @@ INACTIVITY_DURATION = CInt(oInactivityDuration) Catch ex As Exception INACTIVITY_DURATION = 0 - End Try ElseIf oMode.StartsWith("PM.COL_LAST_EDITED") Then Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_EDITED=", "") @@ -122,6 +121,13 @@ SEARCH2 = "" End Try + ElseIf oMode.StartsWith("PM.TRAFFICLIGHT_ICON") Then + Dim oParam = oMode.Replace("PM.TRAFFICLIGHT_ICON=", "") + Try + TL_ICON = CBool(oParam) + Catch ex As Exception + TL_ICON = False + End Try Else LOGGER.Info($"Wrong oMode: {oMode}") End If diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index 7561983..45224e8 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -889,6 +889,9 @@ + + + diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index f5b63ca..d13d252 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -79,7 +79,7 @@ Module ModuleRuntimeVariables Public USE_APPSERVER As Boolean = False Public SEARCH1 As String = "" Public SEARCH2 As String = "" - + Public TL_ICON As Boolean = True Public LICENSE_COUNT As Integer = 0 Public LICENSE_EXPIRED As Boolean = False Public LICENSE_PROFILES As Integer = 0 diff --git a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb index 604b836..36c682f 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb +++ b/app/DD_PM_WINDREAM/My Project/Resources.Designer.vb @@ -180,6 +180,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property bullet_green1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("bullet_green1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -190,6 +200,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property bullet_orange1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("bullet_orange1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -200,6 +220,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property bullet_red1() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("bullet_red1", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/app/DD_PM_WINDREAM/My Project/Resources.resx b/app/DD_PM_WINDREAM/My Project/Resources.resx index aa645a5..c80b75a 100644 --- a/app/DD_PM_WINDREAM/My Project/Resources.resx +++ b/app/DD_PM_WINDREAM/My Project/Resources.resx @@ -121,9 +121,18 @@ ..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\asterisk_yellow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\hide_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -178,15 +187,15 @@ ..\Resources\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Search(Go)_5718.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\application_form_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Label_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\delete_12x12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -211,6 +220,9 @@ ..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Image_File.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -223,9 +235,6 @@ ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\dxf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -244,9 +253,6 @@ ..\Resources\Hammer_Builder_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -262,12 +268,6 @@ ..\Resources\properties_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\resultset_last.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bullet_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -280,17 +280,17 @@ ..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\A_1.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\doc_pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\book_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Search(Go)_5718.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\puzzle2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -298,11 +298,8 @@ ..\Resources\dtp.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\delete_12x12.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\book_open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Nextrequest_10302.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -310,8 +307,8 @@ ..\Resources\TextBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\resultset_last.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\shape_square_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -349,14 +346,14 @@ ..\Resources\flag_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bullet_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\resultset_previous.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Image_File.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\email_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Files_7954.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -367,6 +364,9 @@ ..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ExcelWorksheetView_11748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Monitor_Screen_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -379,6 +379,9 @@ ..\Resources\doc_text_image.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\pdf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -394,8 +397,8 @@ ..\Resources\WorkItem_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\resultset_first.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -409,14 +412,14 @@ ..\Resources\zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\database_save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bullet_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Checkbox.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\magifier_zoom_out.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\key1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -424,7 +427,13 @@ ..\Resources\user_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ExcelWorksheetView_11748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bullet_red1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\bullet_green1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\bullet_orange1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/Resources/bullet_green1.png b/app/DD_PM_WINDREAM/Resources/bullet_green1.png new file mode 100644 index 0000000..058ad26 Binary files /dev/null and b/app/DD_PM_WINDREAM/Resources/bullet_green1.png differ diff --git a/app/DD_PM_WINDREAM/Resources/bullet_orange1.png b/app/DD_PM_WINDREAM/Resources/bullet_orange1.png new file mode 100644 index 0000000..fa63024 Binary files /dev/null and b/app/DD_PM_WINDREAM/Resources/bullet_orange1.png differ diff --git a/app/DD_PM_WINDREAM/Resources/bullet_red1.png b/app/DD_PM_WINDREAM/Resources/bullet_red1.png new file mode 100644 index 0000000..0cd8031 Binary files /dev/null and b/app/DD_PM_WINDREAM/Resources/bullet_red1.png differ diff --git a/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb b/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb index e61483d..5a511cd 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdmin2.Designer.vb @@ -43,6 +43,7 @@ Partial Class frmAdmin2 Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem10 = New DevExpress.XtraBars.BarButtonItem() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -158,7 +159,8 @@ Partial Class frmAdmin2 Me.TBDD_GUI_LANGUAGE_PHRASETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_GUI_LANGUAGE_PHRASETableAdapter() Me.LayoutConverter1 = New DevExpress.XtraLayout.Converter.LayoutConverter(Me.components) Me.XtraSaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() - Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() + Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarButtonItem11 = New DevExpress.XtraBars.BarButtonItem() CType(Me.spcontwKonfMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.spcontwKonfMain.SuspendLayout() CType(Me.spcontwKonfleft, System.ComponentModel.ISupportInitialize).BeginInit() @@ -303,9 +305,9 @@ Partial Class frmAdmin2 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BbitemplateAdd, Me.BbitemplateSave, Me.BbitemplateDelete, Me.BarButtonItem1, Me.labelStatus, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarStaticItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BbitemplateAdd, Me.BbitemplateSave, Me.BbitemplateDelete, Me.BarButtonItem1, Me.labelStatus, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarStaticItem1, Me.BarButtonItem11}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 16 + Me.RibbonControl1.MaxItemId = 17 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -423,9 +425,15 @@ Partial Class frmAdmin2 Me.BarButtonItem10.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem10.ImageOptions.LargeImage"), System.Drawing.Image) Me.BarButtonItem10.Name = "BarButtonItem10" ' + 'BarStaticItem1 + ' + resources.ApplyResources(Me.BarStaticItem1, "BarStaticItem1") + Me.BarStaticItem1.Id = 15 + Me.BarStaticItem1.Name = "BarStaticItem1" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroup4}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -1423,11 +1431,19 @@ Partial Class frmAdmin2 ' resources.ApplyResources(Me.XtraSaveFileDialog1, "XtraSaveFileDialog1") ' - 'BarStaticItem1 + 'RibbonPageGroup4 ' - resources.ApplyResources(Me.BarStaticItem1, "BarStaticItem1") - Me.BarStaticItem1.Id = 15 - Me.BarStaticItem1.Name = "BarStaticItem1" + Me.RibbonPageGroup4.AllowTextClipping = False + Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem11) + Me.RibbonPageGroup4.Name = "RibbonPageGroup4" + resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4") + ' + 'BarButtonItem11 + ' + resources.ApplyResources(Me.BarButtonItem11, "BarButtonItem11") + Me.BarButtonItem11.Id = 16 + Me.BarButtonItem11.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem11.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem11.Name = "BarButtonItem11" ' 'frmAdmin2 ' @@ -1677,4 +1693,6 @@ Partial Class frmAdmin2 Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents XtraSaveFileDialog1 As SaveFileDialog Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem + Friend WithEvents BarButtonItem11 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/app/DD_PM_WINDREAM/frmAdmin2.resx b/app/DD_PM_WINDREAM/frmAdmin2.resx index 5a66d14..40dd3b1 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.resx +++ b/app/DD_PM_WINDREAM/frmAdmin2.resx @@ -586,6 +586,32 @@ BarStaticItem1 + + Neu laden + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ2hhbmdlVmlldyI+DQogICAgPHBh + dGggZD0iTTI0LjUsNy41QzIyLjMsNS4zLDE5LjMsNCwxNiw0QzEwLjEsNCw1LjEsOC4zLDQuMiwxNGg0 + LjFjMC45LTMuNCw0LTYsNy43LTZjMi4yLDAsNC4yLDAuOSw1LjYsMi40TDE4LDE0ICAgaDUuN2g0LjFI + MjhWNEwyNC41LDcuNXogTTE2LDI0Yy0yLjIsMC00LjItMC45LTUuNi0yLjRMMTQsMThIOC4yaC00SDR2 + MTBsMy41LTMuNUM5LjcsMjYuNywxMi43LDI4LDE2LDI4YzUuOSwwLDEwLjgtNC4zLDExLjgtMTAgICBo + LTQuMUMyMi44LDIxLjQsMTkuNywyNCwxNiwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2 + Zz4L + + 0, 0 @@ -598,6 +624,9 @@ Export + + Weitere Auswertungen + Start @@ -2023,7 +2052,7 @@ 1057, 523 - Weitere Konfigurationen + Weitere Auswertungen XtraTabPage3 @@ -2183,6 +2212,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarStaticItem1 + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -2621,11 +2656,17 @@ System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - BarStaticItem1 + + RibbonPageGroup4 - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem11 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a frmAdmin2 diff --git a/app/DD_PM_WINDREAM/frmAdmin2.vb b/app/DD_PM_WINDREAM/frmAdmin2.vb index 119d78a..3018890 100644 --- a/app/DD_PM_WINDREAM/frmAdmin2.vb +++ b/app/DD_PM_WINDREAM/frmAdmin2.vb @@ -1,6 +1,7 @@  Imports System.IO +Imports System.Threading Imports DevExpress.XtraGrid Imports DevExpress.XtraPrinting Imports DevExpress.XtraTab @@ -109,6 +110,7 @@ Public Class frmAdmin2 Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged RibbonPageGroup3.Enabled = True + RibbonPageGroup4.Enabled = False Select Case XtraTabControl1.SelectedTabPageIndex Case 0 RibbonPageGroup1.Enabled = True @@ -121,6 +123,7 @@ Public Class frmAdmin2 RibbonPageGroup2.Enabled = False RibbonPageGroup1.Enabled = False Load_More_Konfig_Grids() + RibbonPageGroup4.Enabled = True End Select End Sub Private Sub SET_GRID_DESCRIPTION(pGridView As Views.Grid.GridView, pDT As DataTable) @@ -133,7 +136,7 @@ Public Class frmAdmin2 pGridView.ViewCaption = objectCount_Descr End Sub Private Sub Load_More_Konfig_Grids() - + Me.Cursor = Cursors.WaitCursor Try Dim oSQL = "SELECT * FROM TBPM_FURTHER_KONFIG_VIEW" DT_FURTHER_KONFIG_VIEW = ClassDatabase.Return_Datatable(oSQL, "Monitor-Load_Grid_Data1") @@ -200,7 +203,7 @@ Public Class frmAdmin2 Catch ex As Exception MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Load_More_Konfig_Grids:") End Try - + Me.Cursor = Cursors.Default End Sub @@ -365,4 +368,7 @@ Public Class frmAdmin2 End Try End Sub + Private Sub BarButtonItem11_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem11.ItemClick + Load_More_Konfig_Grids() + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index 697695b..ef4edef 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -794,6 +794,7 @@ Partial Class frmAdministration resources.ApplyResources(Me.ADDED_WHOTextBox, "ADDED_WHOTextBox") Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox" Me.ADDED_WHOTextBox.ReadOnly = True + Me.ADDED_WHOTextBox.TabStop = False ' 'ADDED_WHENTextBox ' @@ -801,6 +802,7 @@ Partial Class frmAdministration resources.ApplyResources(Me.ADDED_WHENTextBox, "ADDED_WHENTextBox") Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox" Me.ADDED_WHENTextBox.ReadOnly = True + Me.ADDED_WHENTextBox.TabStop = False ' 'CHANGED_WHOTextBox ' @@ -808,6 +810,7 @@ Partial Class frmAdministration resources.ApplyResources(Me.CHANGED_WHOTextBox, "CHANGED_WHOTextBox") Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox" Me.CHANGED_WHOTextBox.ReadOnly = True + Me.CHANGED_WHOTextBox.TabStop = False ' 'CHANGED_WHENTextBox ' @@ -815,6 +818,7 @@ Partial Class frmAdministration resources.ApplyResources(Me.CHANGED_WHENTextBox, "CHANGED_WHENTextBox") Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox" Me.CHANGED_WHENTextBox.ReadOnly = True + Me.CHANGED_WHENTextBox.TabStop = False ' 'dlgWindreamsuche ' @@ -967,6 +971,7 @@ Partial Class frmAdministration resources.ApplyResources(Me.gridFinalIndex, "gridFinalIndex") Me.gridFinalIndex.MainView = Me.viewFinalIndex Me.gridFinalIndex.Name = "gridFinalIndex" + Me.gridFinalIndex.TabStop = False Me.gridFinalIndex.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewFinalIndex}) ' 'TBPM_PROFILE_FINAL_INDEXINGBindingSource @@ -1052,6 +1057,7 @@ Partial Class frmAdministration ' resources.ApplyResources(Me.PropertyGrid1, "PropertyGrid1") Me.PropertyGrid1.Name = "PropertyGrid1" + Me.PropertyGrid1.TabStop = False ' 'Label6 ' @@ -1459,6 +1465,7 @@ Partial Class frmAdministration resources.ApplyResources(Me.GridControl1, "GridControl1") Me.GridControl1.MainView = Me.GridViewProfile Me.GridControl1.Name = "GridControl1" + Me.GridControl1.TabStop = False Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfile}) ' 'GridViewProfile diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 112bea4..11ddd76 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -1138,7 +1138,7 @@ 345, 24 - 3 + 0 cmbObjekttypen @@ -1189,7 +1189,7 @@ 546, 23 - 1 + 8 FINAL_TEXTTextBox @@ -1216,7 +1216,7 @@ 55, 23 - 5 + 2 PRIORITYNumericUpDown @@ -1246,7 +1246,7 @@ 111, 23 - 49 + 7 Teste Suche @@ -1276,7 +1276,7 @@ 31, 23 - 29 + 6 ... @@ -1390,7 +1390,7 @@ 546, 23 - 6 + 5 WD_SEARCHTextBox @@ -1558,7 +1558,7 @@ 53, 16 - 90 + 1 Priorität @@ -1684,7 +1684,7 @@ 345, 24 - 85 + 3 DISPLAY_MODEComboBox @@ -1708,7 +1708,7 @@ 345, 24 - 83 + 10 cmbLOGIndex @@ -1732,7 +1732,7 @@ 345, 24 - 81 + 9 PM_VEKTOR_INDEXComboBox @@ -2215,7 +2215,7 @@ 984, 377 - 79 + 6 tabctrl_Profilkonfig @@ -2239,7 +2239,7 @@ 238, 24 - 78 + 3 Neueste Dokumente zuerst anzeigen diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 155e68d..32960b0 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -702,7 +702,7 @@ Public Class frmAdministration Private Sub ACTIVECheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles ACTIVECheckBox.CheckedChanged If ACTIVECheckBox.Checked Then - ACTIVECheckBox.BackColor = Color.Lime + ACTIVECheckBox.BackColor = Color.LightSteelBlue Else ACTIVECheckBox.BackColor = Color.Transparent End If diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index c04d453..75812ab 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -1179,7 +1179,7 @@ Public Class frmFormDesigner Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick If BarButtonItem3.Caption = "Designer locked" Then BarButtonItem3.Caption = "Designer active" - BarButtonItem3.ItemAppearance.Normal.BackColor = Color.Lime + BarButtonItem3.ItemAppearance.Normal.BackColor = Color.LightSteelBlue rpggrp_controls.Enabled = True Designer_Locked = False Else diff --git a/app/DD_PM_WINDREAM/frmKonfig.Designer.vb b/app/DD_PM_WINDREAM/frmKonfig.Designer.vb index ccde63f..ab28018 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.Designer.vb +++ b/app/DD_PM_WINDREAM/frmKonfig.Designer.vb @@ -173,7 +173,7 @@ Partial Class frmKonfig ' 'BtnConnect ' - Me.BtnConnect.Image = Global.DD_ProcessManager.My.Resources.Resources.database_save + Me.BtnConnect.Image = Global.DD_ProcessManager.My.Resources.Resources.database_go resources.ApplyResources(Me.BtnConnect, "BtnConnect") Me.BtnConnect.Name = "BtnConnect" Me.BtnConnect.UseVisualStyleBackColor = True diff --git a/app/DD_PM_WINDREAM/frmKonfig.resx b/app/DD_PM_WINDREAM/frmKonfig.resx index 8e53047..ddae1bf 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.resx +++ b/app/DD_PM_WINDREAM/frmKonfig.resx @@ -814,7 +814,7 @@ Speichere Log als... - 198, 70 + 198, 48 ContextMenuInternalLog diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index c9a4d31..e8c1ee8 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -171,6 +171,7 @@ Partial Class frmMain Me.bwBasicData = New System.ComponentModel.BackgroundWorker() Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components) + Me.BarStaticItemAppServer = New DevExpress.XtraBars.BarStaticItem() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel1.SuspendLayout() CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit() @@ -461,9 +462,9 @@ Partial Class frmMain 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItem2, Me.SearchItem1, Me.SearchItem2}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItem2, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 24 + Me.RibbonControl1.MaxItemId = 25 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.QuickToolbarItemLinks.Add(Me.bbtnitemInfo) @@ -722,6 +723,7 @@ Partial Class frmMain Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiUser) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiLicenses) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiUserLoggedIn) + Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemAppServer) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiGeneralInfo) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsiVersion) Me.RibbonStatusBar1.ItemLinks.Add(Me.bsilastsync) @@ -1338,6 +1340,13 @@ Partial Class frmMain 'TimerInactivity ' ' + 'BarStaticItemAppServer + ' + resources.ApplyResources(Me.BarStaticItemAppServer, "BarStaticItemAppServer") + Me.BarStaticItemAppServer.Id = 24 + Me.BarStaticItemAppServer.ImageOptions.SvgImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarStaticItemAppServer.Name = "BarStaticItemAppServer" + ' 'frmMain ' Me.Appearance.Options.UseFont = True @@ -1526,4 +1535,5 @@ Partial Class frmMain Friend WithEvents SearchItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents SearchItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarStaticItemAppServer As DevExpress.XtraBars.BarStaticItem End Class diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index 6e0b5a3..94c90de 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAASgBBwEoAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAATABBwEwAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1344,6 +1344,31 @@ NCwyOS41LDE5Ljd6IE04LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00ICBzNCwxLjgsNCw0UzEw LjIsMjYsOCwyNnogTTI0LDI2Yy0yLjIsMC00LTEuOC00LTRzMS44LTQsNC00czQsMS44LDQsNFMyNi4y LDI2LDI0LDI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== + + + + ApplicationServer Active + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIQDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3 + RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm + aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iU2VydmVyTW9kZSI+DQogICAg + PHBhdGggZD0iTTI3LDIwSDVjLTAuNSwwLTEsMC41LTEsMXY0YzAsMC41LDAuNSwxLDEsMWgyMmMwLjUs + MCwxLTAuNSwxLTF2LTRDMjgsMjAuNSwyNy41LDIwLDI3LDIweiBNOCwyNEg2di0yaDJWMjQgICB6IE0y + NywxMkg1Yy0wLjUsMC0xLDAuNS0xLDF2NGMwLDAuNSwwLjUsMSwxLDFoMjJjMC41LDAsMS0wLjUsMS0x + di00QzI4LDEyLjUsMjcuNSwxMiwyNywxMnogTTgsMTZINnYtMmgyVjE2eiBNMjcsNEg1ICAgQzQuNSw0 + LDQsNC41LDQsNXY0YzAsMC41LDAuNSwxLDEsMWgyMmMwLjUsMCwxLTAuNSwxLTFWNUMyOCw0LjUsMjcu + NSw0LDI3LDR6IE04LDhINlY2aDJWOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -2466,6 +2491,12 @@ System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + BarStaticItemAppServer + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmMain diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index adee7d7..605a96f 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -23,7 +23,7 @@ Public Class frmMain Private CURR_DT_OVERVIEW As DataTable Private OVERVIEW_ADDED_WHEN As String Private OVERVIEW_CHANGED_WHEN As String - + Private OVERVIEW_COUNT As Integer = 0 Private RedDocuments As Integer = 0 Private YellowDocuments As Integer = 0 Private GreenDocuments As Integer = 0 @@ -313,7 +313,12 @@ Public Class frmMain LOGGER.Debug($"Got the IDB_DOC_DATA_SQL..{IDB_DOC_DATA_SQL}") End If bsiGeneralInfo.Caption = "IDB active" + If APPSERVER_ACTIVE = True Then + BarStaticItemAppServer.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + Else + BarStaticItemAppServer.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End If + End If If BASIC_CONF_VISIBLE = False Then RibbonPageGroupBasicConf.Visible = False @@ -488,13 +493,25 @@ Public Class frmMain If GridView_Docs.Columns.Count > 0 Then GridView_Docs.Columns.Item("PROFILE_ID").Visible = False GridView_Docs.Columns.Item("GUID").Visible = False - GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False - 'GridView_Docs.Columns.Item("DocID").Visible = False - GridView_Docs.Columns.Item("TL_STATE").Visible = False - GridView_Docs.Columns.Item("ICON").MaxWidth = 24 - GridView_Docs.Columns.Item("ICON").MinWidth = 24 - GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White - GridView_Docs.Columns.Item("ICON").Fixed = FixedStyle.Left + Try + GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False + 'GridView_Docs.Columns.Item("DocID").Visible = False + GridView_Docs.Columns.Item("TL_STATE").Visible = False + Catch ex As Exception + + End Try + + Try + If TL_ICON = True Then + GridView_Docs.Columns.Item("ICON").MaxWidth = 24 + GridView_Docs.Columns.Item("ICON").MinWidth = 24 + GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White + GridView_Docs.Columns.Item("ICON").Fixed = FixedStyle.Left + End If + Catch ex As Exception + + End Try + If IDB_ACTIVE = True Then Try @@ -705,28 +722,33 @@ Public Class frmMain If ForceReload = True Then LOGGER.Info("ForceReload is true!") End If - Dim oADDED = GET_LAST_ADDED(CURR_DT_OVERVIEW) - Dim oChanged = GET_LAST_CHANGED(CURR_DT_OVERVIEW) - If oADDED = OVERVIEW_ADDED_WHEN And oChanged = OVERVIEW_CHANGED_WHEN Then - If ForceReload = False Then - LOGGER.Info("No changes on OverviewHash - so exit Refresh") - Exit Function + If Not IsNothing(CURR_DT_OVERVIEW) Then + Dim oADDED = GET_LAST_ADDED(CURR_DT_OVERVIEW) + Dim oChanged = GET_LAST_CHANGED(CURR_DT_OVERVIEW) + Dim oCOUNT = CURR_DT_OVERVIEW.Rows.Count + If oADDED = OVERVIEW_ADDED_WHEN And oChanged = OVERVIEW_CHANGED_WHEN And OVERVIEW_COUNT = oCOUNT Then + If ForceReload = False Then + LOGGER.Info("No changes on OverviewHash - so exit Refresh") + Exit Function + End If + + Else + OVERVIEW_ADDED_WHEN = oADDED + OVERVIEW_CHANGED_WHEN = oChanged + OVERVIEW_COUNT = oCOUNT End If + ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE + If CURR_DT_OVERVIEW.Rows.Count = 0 Then + NO_WORKFLOWITEMS = True + Else + NO_WORKFLOWITEMS = False + End If + Create_Basic_View() - Else - OVERVIEW_ADDED_WHEN = oADDED - OVERVIEW_CHANGED_WHEN = oChanged + RestoreLayout() + ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE End If - ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE - If CURR_DT_OVERVIEW.Rows.Count = 0 Then - NO_WORKFLOWITEMS = True - Else - NO_WORKFLOWITEMS = False - End If - Create_Basic_View() - RestoreLayout() - ToolStripLabelViewTape.Text = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE End If Catch ex As Exception @@ -744,32 +766,36 @@ Public Class frmMain LOGGER.Error(ex) LOGGER.Warn("Could not clear GridView_Docs.Columns") End Try + If TL_ICON = True Then + ' Spalte für Status Icon erstellen + Dim columnStateIcon As New DataColumn() + columnStateIcon.DataType = GetType(Image) + columnStateIcon.ColumnName = "ICON" + columnStateIcon.Caption = "" + CURR_DT_OVERVIEW.Columns.Add(columnStateIcon) + End If - ' Spalte für Status Icon erstellen - 'Dim columnStateIcon As New DataColumn() - 'columnStateIcon.DataType = GetType(Image) - 'columnStateIcon.ColumnName = "ICON" - 'columnStateIcon.Caption = "" - 'CURR_DT_OVERVIEW.Columns.Add(columnStateIcon) RedDocuments = 0 YellowDocuments = 0 GreenDocuments = 0 + If TL_ICON = True Then + For Each row As DataRow In CURR_DT_OVERVIEW.Rows + Dim State As Integer = row.Item("TL_STATE") + Select Case State + Case 1 + RedDocuments += 1 + row.Item("ICON") = My.Resources.bullet_red + Case 2 + YellowDocuments += 1 + row.Item("ICON") = My.Resources.bullet_orange + Case 3 + GreenDocuments += 1 + row.Item("ICON") = My.Resources.bullet_green + End Select + Next + End If - 'For Each row As DataRow In CURR_DT_OVERVIEW.Rows - ' Dim State As Integer = row.Item("TL_STATE") - ' Select Case State - ' Case 1 - ' RedDocuments += 1 - ' row.Item("ICON") = My.Resources.ampel_rot - ' Case 2 - ' YellowDocuments += 1 - ' row.Item("ICON") = My.Resources.ampel_gelb - ' Case 3 - ' GreenDocuments += 1 - ' row.Item("ICON") = My.Resources.ampel_gruen - ' End Select - 'Next If IDB_ACTIVE = True Then ' Spalte für Conversation erstellen Dim columnConvIcon As New DataColumn() @@ -814,13 +840,25 @@ Public Class frmMain GridView_Docs.Columns.Item("PROFILE_ID").Visible = False GridView_Docs.Columns.Item("GUID").Visible = False - GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False - 'GridView_Docs.Columns.Item("DocID").Visible = False - GridView_Docs.Columns.Item("TL_STATE").Visible = False - GridView_Docs.Columns.Item("ICON").MaxWidth = 24 - GridView_Docs.Columns.Item("ICON").MinWidth = 24 - GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White - GridView_Docs.Columns.Item("ICON").Fixed = FixedStyle.Left + Try + GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False + 'GridView_Docs.Columns.Item("DocID").Visible = False + GridView_Docs.Columns.Item("TL_STATE").Visible = False + Catch ex As Exception + + End Try + Try + If TL_ICON = True Then + GridView_Docs.Columns.Item("ICON").MaxWidth = 24 + GridView_Docs.Columns.Item("ICON").MinWidth = 24 + GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White + GridView_Docs.Columns.Item("ICON").Fixed = FixedStyle.Left + End If + Catch ex As Exception + + End Try + + Try GridView_Docs.Columns.Item("CONV_YN").Visible = False Catch ex As Exception @@ -1583,7 +1621,9 @@ Public Class frmMain LOGGER.Debug($"Datatable CURR_DT_OVERVIEW loaded: {CURR_DT_OVERVIEW.Rows.Count} rows") Dim oADDED = GET_LAST_ADDED(CURR_DT_OVERVIEW) Dim oChanged = GET_LAST_CHANGED(CURR_DT_OVERVIEW) - If oADDED = OVERVIEW_ADDED_WHEN And oChanged = OVERVIEW_CHANGED_WHEN Then + Dim oCOUNT = CURR_DT_OVERVIEW.Rows.Count + If oADDED = OVERVIEW_ADDED_WHEN And oChanged = OVERVIEW_CHANGED_WHEN And oCOUNT = OVERVIEW_COUNT Then + If ForceReload = False Then LOGGER.Info("No changes on OverviewHash - so exit Load_Grid_overview") Exit Function @@ -1594,6 +1634,7 @@ Public Class frmMain LOGGER.Debug($"oADDED/OVERVIEW_ADDED_WHEN: {oADDED}/{OVERVIEW_ADDED_WHEN}#oADDED/OVERVIEW_ADDED_WHEN: {oChanged}/{OVERVIEW_CHANGED_WHEN}") OVERVIEW_ADDED_WHEN = oADDED OVERVIEW_CHANGED_WHEN = oChanged + OVERVIEW_COUNT = oCOUNT End If If USER_LANGUAGE = "de-DE" Then ToolStripLabelViewTape.Text = "Gesamtübersicht" @@ -1629,32 +1670,37 @@ Public Class frmMain BindingNavigator1.Dock = DockStyle.Top GridControl_Docs.Visible = True + If TL_ICON = True Then + 'Spalte für Status Icon erstellen + Dim columnStateIcon As New DataColumn() + columnStateIcon.DataType = GetType(Image) + columnStateIcon.ColumnName = "ICON" + columnStateIcon.Caption = "" + CURR_DT_OVERVIEW.Columns.Add(columnStateIcon) + End If - ' Spalte für Status Icon erstellen - 'Dim columnStateIcon As New DataColumn() - 'columnStateIcon.DataType = GetType(Image) - 'columnStateIcon.ColumnName = "ICON" - 'columnStateIcon.Caption = "" - 'CURR_DT_OVERVIEW.Columns.Add(columnStateIcon) RedDocuments = 0 YellowDocuments = 0 GreenDocuments = 0 - 'For Each row As DataRow In CURR_DT_OVERVIEW.Rows - ' Dim State As Integer = row.Item("TL_STATE") - ' Select Case State - ' Case 1 - ' RedDocuments += 1 - ' row.Item("ICON") = My.Resources.ampel_rot - ' Case 2 - ' YellowDocuments += 1 - ' row.Item("ICON") = My.Resources.ampel_gelb - ' Case 3 - ' GreenDocuments += 1 - ' row.Item("ICON") = My.Resources.ampel_gruen - ' End Select - 'Next + If TL_ICON = True Then + For Each row As DataRow In CURR_DT_OVERVIEW.Rows + Dim State As Integer = row.Item("TL_STATE") + Select Case State + Case 1 + RedDocuments += 1 + row.Item("ICON") = My.Resources.bullet_red + Case 2 + YellowDocuments += 1 + row.Item("ICON") = My.Resources.bullet_orange + Case 3 + GreenDocuments += 1 + row.Item("ICON") = My.Resources.bullet_green + End Select + Next + End If + If IDB_ACTIVE = True Then ' Spalte für Conversation erstellen Dim columnConvIcon As New DataColumn() @@ -1743,13 +1789,26 @@ Public Class frmMain LOGGER.Debug("finished Grouping!") GridView_Docs.Columns.Item("PROFILE_ID").Visible = False GridView_Docs.Columns.Item("GUID").Visible = False - GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False - 'GridView_Docs.Columns.Item("DocID").Visible = False - GridView_Docs.Columns.Item("TL_STATE").Visible = False - GridView_Docs.Columns.Item("ICON").MaxWidth = 24 - GridView_Docs.Columns.Item("ICON").MinWidth = 24 - GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White - GridView_Docs.Columns.Item("ICON").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left + Try + GridView_Docs.Columns.Item("FULL_FILE_PATH").Visible = False + 'GridView_Docs.Columns.Item("DocID").Visible = False + GridView_Docs.Columns.Item("TL_STATE").Visible = False + Catch ex As Exception + + End Try + + If TL_ICON = True Then + Try + GridView_Docs.Columns.Item("ICON").MaxWidth = 24 + GridView_Docs.Columns.Item("ICON").MinWidth = 24 + GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White + GridView_Docs.Columns.Item("ICON").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left + Catch ex As Exception + + End Try + + End If + Try GridView_Docs.Columns.Item("CONV_YN").Visible = False Catch ex As Exception diff --git a/app/DD_PM_WINDREAM/frmMassValidator.vb b/app/DD_PM_WINDREAM/frmMassValidator.vb index 453c32b..6eec2bc 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.vb @@ -355,7 +355,7 @@ Public Class frmMassValidator AddHandler lookup.GotFocus, Sub(sender As Control, e As EventArgs) If DirectCast(lookup.Tag, ClassControlCreator.ControlMetadata).ReadOnly = False Then - lookup.BackColor = Color.Lime + lookup.BackColor = Color.LightSteelBlue End If End Sub AddHandler lookup.LostFocus, Sub(sender As Control, e As EventArgs) @@ -837,7 +837,7 @@ Public Class frmMassValidator Public Sub OnTextBoxFocus(sender As Object, e As EventArgs) Dim box As TextBox = sender - box.BackColor = Color.Lime + box.BackColor = Color.LightSteelBlue box.SelectAll() End Sub Public Sub OnTextBoxLostFocus(sender As System.Object, e As System.EventArgs) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 9ad18ea..cc86d49 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -6,7 +6,6 @@ Imports Independentsoft Imports System.IO Imports System.Text.RegularExpressions Imports System.ComponentModel -Imports DD_LIB_Standards Imports DigitalData.Controls.LookupGrid Imports DevExpress.XtraGrid Imports System.Reflection @@ -600,7 +599,7 @@ Public Class frmValidator oValue = value Catch ex As Exception LOGGER.Error(ex) - clsLogger.Add("Error in LoadSimpleData for TextBox: " & ex.Message) + End Try ElseIf TypeOf control Is ComboBox Then Try @@ -618,7 +617,7 @@ Public Class frmValidator Catch ex As Exception LOGGER.Error(ex) - clsLogger.Add("Error in LoadSimpleData for Combobox: " & ex.Message) + End Try ElseIf TypeOf control Is LookupControl2 Then Try @@ -627,7 +626,7 @@ Public Class frmValidator lookup.DataSource = oDTContent Catch ex As Exception LOGGER.Error(ex) - clsLogger.Add("Error in LoadSimpleData for LookupControl2: " & ex.Message) + End Try ElseIf TypeOf control Is GridControl Then Try @@ -654,14 +653,13 @@ Public Class frmValidator End If Catch ex As Exception LOGGER.Error(ex) - clsLogger.Add("Error in LoadSimpleData for DataGridView: " & ex.Message) + End Try End If Next Catch ex As Exception - LOGGER.Error(ex) + LOGGER.Warn($"{ex.Message} - Loading ControlID: {pControlId}") MsgBox("Error in LoadSQLData: " & ex.Message, MsgBoxStyle.Critical, ADDITIONAL_TITLE) - clsLogger.Add("Error in LoadSQLData: " & ex.Message) End Try End Sub 'Sub LoadSQLData2(control As Control, controlId As Integer) @@ -836,7 +834,7 @@ Public Class frmValidator AddHandler oComboBox.SelectedValueChanged, AddressOf OnCmbselectedIndex AddHandler oComboBox.GotFocus, Sub(sender As Control, e As EventArgs) If DirectCast(oComboBox.Tag, ClassControlCreator.ControlMetadata).ReadOnly = False Then - oComboBox.BackColor = Color.Lime + oComboBox.BackColor = Color.LightSteelBlue End If End Sub AddHandler oComboBox.LostFocus, Sub(sender As Control, e As EventArgs) @@ -1000,7 +998,7 @@ Public Class frmValidator AddHandler lookup.GotFocus, Sub(sender As Control, e As EventArgs) If DirectCast(lookup.Tag, ClassControlCreator.ControlMetadata).ReadOnly = False Then - lookup.BackColor = Color.Lime + lookup.BackColor = Color.LightSteelBlue End If End Sub AddHandler lookup.LostFocus, Sub(sender As Control, e As EventArgs) @@ -1178,7 +1176,7 @@ Public Class frmValidator Dim box As TextBox = sender If DirectCast(box.Tag, ClassControlCreator.ControlMetadata).ReadOnly = False Then - box.BackColor = Color.Lime + box.BackColor = Color.LightSteelBlue box.SelectAll() End If End Sub @@ -3274,8 +3272,11 @@ Public Class frmValidator Next Else If omytype = "System.String" Then - 'If USER_USERNAME.ToLower = "'marscheiber" Then MsgBox($"IDB Fill Grid [{oControl.Name}] with String") + LOGGER.Debug($"IDB Fill Grid [{oControl.Name}] with String") oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter) + If oColValuesfromSource.Length > 8 Then + LOGGER.Warn("Fill Grid Error - Max 8 columns can be configured!") + End If Select Case oColValuesfromSource.Length Case 1 oDataSource.Rows.Add(New String() {oColValuesfromSource(0)}) @@ -3285,15 +3286,26 @@ Public Class frmValidator oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) Case 4 oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) + Case 5 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4)}) + Case 6 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5)}) + Case 7 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6)}) + Case 8 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6), oColValuesfromSource(7)}) + End Select ElseIf omytype = "System.Data.DataTable" Then Dim oMyDatatable As DataTable = oValueFromSource - 'If USER_USERNAME.ToLower = "'marscheiber" Then MsgBox($"IDB Fill Grid [{oControl.Name}] with Datatable - Rows: " & oMyDatatable.Rows.Count) + LOGGER.Debug($"IDB Fill Grid [{oControl.Name}] with Datatable - Rows: " & oMyDatatable.Rows.Count) For Each oRow As DataRow In oMyDatatable.Rows LOGGER.Debug($"IDB ROW Vector {oRow.Item(0).ToString}...") oColValuesfromSource = Split(oRow.Item(0).ToString, PMDelimiter) 'If USER_USERNAME.ToLower = "'marscheiber" Then MsgBox($"IDB ROW Vector {oRow.Item(0).ToString}...") - + If oColValuesfromSource.Length > 8 Then + LOGGER.Warn("Fill Grid with DatatableSplit Error - Max 8 columns can be configured!") + End If Select Case oColValuesfromSource.Length Case 1 oDataSource.Rows.Add(New String() {oColValuesfromSource(0)}) @@ -3303,12 +3315,22 @@ Public Class frmValidator oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)}) Case 4 oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)}) + Case 5 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4)}) + Case 6 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5)}) + Case 7 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6)}) + Case 8 + oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6), oColValuesfromSource(7)}) + End Select Next End If End If + Else End If diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb b/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb index b1fea2d..e718d34 100644 --- a/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.Designer.vb @@ -24,12 +24,12 @@ Partial Class frmValidatorSearch Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmValidatorSearch)) - Dim GridLevelNode7 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode3 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode4 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim GridLevelNode5 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode6 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Me.SplitContainerControlDoc = New DevExpress.XtraEditors.SplitContainerControl() Me.XtraTabControlDocs = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageDoc1 = New DevExpress.XtraTab.XtraTabPage() @@ -47,6 +47,7 @@ Partial Class frmValidatorSearch Me.XtraTabPageDoc5 = New DevExpress.XtraTab.XtraTabPage() Me.GridControlDocSearch5 = New DevExpress.XtraGrid.GridControl() Me.GridViewDocSearch5 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.ToolStrip1 = New System.Windows.Forms.ToolStrip() Me.ToolStripDropDownButtonFile = New System.Windows.Forms.ToolStripDropDownButton() Me.DateiÖffnenToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem() @@ -83,7 +84,6 @@ Partial Class frmValidatorSearch Me.ContextMenuStripSQL = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() Me.ToolStripMenuItem4 = New System.Windows.Forms.ToolStripMenuItem() - Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() CType(Me.SplitContainerControlDoc, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControlDoc.SuspendLayout() CType(Me.XtraTabControlDocs, System.ComponentModel.ISupportInitialize).BeginInit() @@ -157,15 +157,15 @@ Partial Class frmValidatorSearch 'GridControlDocSearch1 ' resources.ApplyResources(Me.GridControlDocSearch1, "GridControlDocSearch1") - GridLevelNode7.RelationName = "Level1" - Me.GridControlDocSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode7}) + GridLevelNode1.RelationName = "Level1" + Me.GridControlDocSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) Me.GridControlDocSearch1.MainView = Me.GridViewDocSearch1 Me.GridControlDocSearch1.Name = "GridControlDocSearch1" Me.GridControlDocSearch1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewDocSearch1}) ' 'GridViewDocSearch1 ' - Me.GridViewDocSearch1.Appearance.EvenRow.BackColor = System.Drawing.Color.Aqua + Me.GridViewDocSearch1.Appearance.EvenRow.BackColor = System.Drawing.Color.PaleTurquoise Me.GridViewDocSearch1.Appearance.EvenRow.Options.UseBackColor = True Me.GridViewDocSearch1.Appearance.SelectedRow.BackColor = System.Drawing.Color.Lime Me.GridViewDocSearch1.Appearance.SelectedRow.Options.UseBackColor = True @@ -300,6 +300,11 @@ Partial Class frmValidatorSearch Me.GridViewDocSearch5.OptionsView.EnableAppearanceEvenRow = True Me.GridViewDocSearch5.OptionsView.ShowAutoFilterRow = True ' + 'DocumentViewer1 + ' + resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") + Me.DocumentViewer1.Name = "DocumentViewer1" + ' 'ToolStrip1 ' Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripDropDownButtonFile, Me.ToolStripButtonRefreshSearches}) @@ -365,8 +370,8 @@ Partial Class frmValidatorSearch 'GridControlSearch1 ' resources.ApplyResources(Me.GridControlSearch1, "GridControlSearch1") - GridLevelNode1.RelationName = "Level1" - Me.GridControlSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) + GridLevelNode2.RelationName = "Level1" + Me.GridControlSearch1.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) Me.GridControlSearch1.MainView = Me.GridViewSearch1 Me.GridControlSearch1.Name = "GridControlSearch1" Me.GridControlSearch1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSearch1}) @@ -397,8 +402,8 @@ Partial Class frmValidatorSearch 'GridControlSearch2 ' resources.ApplyResources(Me.GridControlSearch2, "GridControlSearch2") - GridLevelNode2.RelationName = "Level1" - Me.GridControlSearch2.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) + GridLevelNode3.RelationName = "Level1" + Me.GridControlSearch2.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3}) Me.GridControlSearch2.MainView = Me.GridViewSearch2 Me.GridControlSearch2.Name = "GridControlSearch2" Me.GridControlSearch2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSearch2}) @@ -429,8 +434,8 @@ Partial Class frmValidatorSearch 'GridControlSearch3 ' resources.ApplyResources(Me.GridControlSearch3, "GridControlSearch3") - GridLevelNode3.RelationName = "Level1" - Me.GridControlSearch3.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode3}) + GridLevelNode4.RelationName = "Level1" + Me.GridControlSearch3.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4}) Me.GridControlSearch3.MainView = Me.GridViewSearch3 Me.GridControlSearch3.Name = "GridControlSearch3" Me.GridControlSearch3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSearch3}) @@ -461,8 +466,8 @@ Partial Class frmValidatorSearch 'GridControlSearch4 ' resources.ApplyResources(Me.GridControlSearch4, "GridControlSearch4") - GridLevelNode4.RelationName = "Level1" - Me.GridControlSearch4.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode4}) + GridLevelNode5.RelationName = "Level1" + Me.GridControlSearch4.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode5}) Me.GridControlSearch4.MainView = Me.GridViewSearch4 Me.GridControlSearch4.Name = "GridControlSearch4" Me.GridControlSearch4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSearch4}) @@ -493,8 +498,8 @@ Partial Class frmValidatorSearch 'GridControlSearch5 ' resources.ApplyResources(Me.GridControlSearch5, "GridControlSearch5") - GridLevelNode5.RelationName = "Level1" - Me.GridControlSearch5.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode5}) + GridLevelNode6.RelationName = "Level1" + Me.GridControlSearch5.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode6}) Me.GridControlSearch5.MainView = Me.GridViewSearch5 Me.GridControlSearch5.Name = "GridControlSearch5" Me.GridControlSearch5.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewSearch5}) @@ -593,11 +598,6 @@ Partial Class frmValidatorSearch Me.ToolStripMenuItem4.Name = "ToolStripMenuItem4" resources.ApplyResources(Me.ToolStripMenuItem4, "ToolStripMenuItem4") ' - 'DocumentViewer1 - ' - resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") - Me.DocumentViewer1.Name = "DocumentViewer1" - ' 'frmValidatorSearch ' resources.ApplyResources(Me, "$this") diff --git a/app/DD_PM_WINDREAM/frmValidatorSearch.resx b/app/DD_PM_WINDREAM/frmValidatorSearch.resx index 400a76d..65db51a 100644 --- a/app/DD_PM_WINDREAM/frmValidatorSearch.resx +++ b/app/DD_PM_WINDREAM/frmValidatorSearch.resx @@ -131,6 +131,19 @@ 0, 0 + + Fill + + + 0, 0 + + + 349, 557 + + + + 0 + GridControlDocSearch1 @@ -164,10 +177,21 @@ 351, 582 - 4 + + Fill + + + 0, 0 + + + 349, 557 + + + 1 + GridControlDocSearch2 @@ -198,6 +222,18 @@ 1 + + Fill + + + 0, 0 + + + 349, 557 + + + 1 + GridControlDocSearch3 @@ -228,6 +264,18 @@ 2 + + Fill + + + 0, 0 + + + 349, 557 + + + 1 + GridControlDocSearch4 @@ -258,6 +306,18 @@ 3 + + Fill + + + 0, 0 + + + 349, 557 + + + 1 + GridControlDocSearch5 @@ -310,7 +370,7 @@ 0, 0 - 286, 582 + 284, 582 0 @@ -319,7 +379,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.0.4.1, Culture=neutral, PublicKeyToken=null SplitContainerControlDoc.Panel2 @@ -348,129 +408,39 @@ 0 - - Fill - - - 0, 0 - - - 349, 557 - - - 0 - - - GridControlDocSearch1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageDoc1 - - - 0 - - - Fill - - - 0, 0 - - - 349, 557 - - - 1 - - - GridControlDocSearch2 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageDoc2 - - - 0 - - - Fill - - - 0, 0 - - - 349, 557 - - - 1 - - - GridControlDocSearch3 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageDoc3 - - - 0 - - - Fill - - - 0, 0 - - - 349, 557 - - - 1 - - - GridControlDocSearch4 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageDoc4 - - - 0 - - - Fill - - - 0, 0 - - - 349, 557 - - - 1 - - - GridControlDocSearch5 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageDoc5 - - - 0 - 17, 17 + + 148, 22 + + + Öffnen + + + 148, 22 + + + Eigenschaften + + + Magenta + + + 63, 22 + + + Datei + + + Magenta + + + 131, 22 + + + Aktualisiere Ansicht + 0, 0 @@ -495,36 +465,6 @@ 3 - - Magenta - - - 63, 22 - - - Datei - - - 148, 22 - - - Öffnen - - - 148, 22 - - - Eigenschaften - - - Magenta - - - 131, 22 - - - Aktualisiere Ansicht - Fill @@ -537,6 +477,18 @@ 0, 0 + + Fill + + + 0, 0 + + + 561, 560 + + + 1 + GridControlSearch1 @@ -573,6 +525,18 @@ 4 + + Fill + + + 0, 0 + + + 561, 560 + + + 2 + GridControlSearch2 @@ -603,6 +567,18 @@ 1 + + Fill + + + 0, 0 + + + 561, 560 + + + 2 + GridControlSearch3 @@ -633,6 +609,18 @@ 2 + + Fill + + + 0, 0 + + + 561, 560 + + + 2 + GridControlSearch4 @@ -663,6 +651,18 @@ 3 + + Fill + + + 0, 0 + + + 561, 560 + + + 2 + GridControlSearch5 @@ -708,6 +708,12 @@ 595, 17 + + 91, 17 + + + No action so far + 0, 585 @@ -750,6 +756,18 @@ Bottom + + 61, 22 + + + tslblDocID + + + 91, 22 + + + No action so far + 0, 582 @@ -804,156 +822,9 @@ 2 - - Fill - - - 0, 0 - - - 561, 560 - - - 1 - - - GridControlSearch1 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageSearch1 - - - 0 - - - Fill - - - 0, 0 - - - 561, 560 - - - 2 - - - GridControlSearch2 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageSearch2 - - - 0 - - - Fill - - - 0, 0 - - - 561, 560 - - - 2 - - - GridControlSearch3 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageSearch3 - - - 0 - - - Fill - - - 0, 0 - - - 561, 560 - - - 2 - - - GridControlSearch4 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageSearch4 - - - 0 - - - Fill - - - 0, 0 - - - 561, 560 - - - 2 - - - GridControlSearch5 - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageSearch5 - - - 0 - - - 91, 17 - - - No action so far - - - 61, 22 - - - tslblDocID - - - 91, 22 - - - No action so far - 124, 17 - - 182, 98 - - - ContextMenuStripWMFile - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - iVBORw0KGgoAAAANSUhEUgAAACAAAAAZCAYAAABQDyyRAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6 @@ -1056,18 +927,18 @@ Layout zurücksetzen + + 182, 98 + + + ContextMenuStripWMFile + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 423, 17 - - 143, 32 - - - ContextMenuStripSQL - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 139, 6 @@ -1077,6 +948,15 @@ Aktualisieren + + 143, 32 + + + ContextMenuStripSQL + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + True