diff --git a/app/TaskFlow/ControlCreator/GridControl.vb b/app/TaskFlow/ControlCreator/GridControl.vb index 7a8df33..7f7c28a 100644 --- a/app/TaskFlow/ControlCreator/GridControl.vb +++ b/app/TaskFlow/ControlCreator/GridControl.vb @@ -237,6 +237,7 @@ Namespace ControlCreator End If Catch ex As Exception _Logger.Warn("⚠️ Could not load data for column {0} in control {1}", oRow.Item("SPALTENNAME"), pControlName) + _Logger.Warn("⚠️ ErrMessage {0}", ex.Message) _Logger.Error(ex) End Try End If @@ -272,13 +273,18 @@ Namespace ControlCreator If pDataTable IsNot Nothing Then For Each oRow2 As DataRow In pDataTable.Rows - Dim oValue = oRow2.Item(0) + Dim oValue As String = ObjectEx.NotNull(oRow2.Item(0), String.Empty).ToString() Try If oRow2.ItemArray.Length > 1 Then - oValue &= $" | {oRow2.Item(1)}" + Dim oSecondValue As String = ObjectEx.NotNull(oRow2.Item(1), String.Empty).ToString() + If Not String.IsNullOrEmpty(oSecondValue) Then + oValue &= $" | {oSecondValue}" + End If End If Catch ex As Exception + _Logger.Warn("⚠️ Could not format ComboBox item for column [{0}]", pColumnName) + _Logger.Error(ex) End Try oEditor.Items.Add(oValue) diff --git a/app/TaskFlow/frmCockpitConfig.Designer.vb b/app/TaskFlow/frmCockpitConfig.Designer.vb index 4660d19..032fec5 100644 --- a/app/TaskFlow/frmCockpitConfig.Designer.vb +++ b/app/TaskFlow/frmCockpitConfig.Designer.vb @@ -41,8 +41,8 @@ Partial Class frmCockpitConfig Me.bsitm_added_Changed = 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() - Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RbmPgGrp_Node = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RbmPgGrp_Cockpit = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl() @@ -88,6 +88,7 @@ Partial Class frmCockpitConfig Me.LabelControl11 = New DevExpress.XtraEditors.LabelControl() Me.TextEditCockpit_Bez = New DevExpress.XtraEditors.TextEdit() Me.LabelControl12 = New DevExpress.XtraEditors.LabelControl() + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookUpEditCockpit.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.CheckEdit_Cockpit_Active.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -120,6 +121,12 @@ Partial Class frmCockpitConfig CType(Me.PanelControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.PanelControl2.SuspendLayout() CType(Me.TextEditCockpit_Bez.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel1.SuspendLayout() + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel2.SuspendLayout() + Me.SplitContainerControl1.SuspendLayout() Me.SuspendLayout() ' 'RibbonControl1 @@ -135,7 +142,7 @@ Partial Class frmCockpitConfig Me.RibbonControl1.OptionsMenuMinWidth = 385 Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(974, 158) + Me.RibbonControl1.Size = New System.Drawing.Size(1451, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -189,14 +196,14 @@ Partial Class frmCockpitConfig ' 'bbtnitm_NodeProfilAdd ' - Me.bbtnitm_NodeProfilAdd.Caption = "Profil hinzufügen" + Me.bbtnitm_NodeProfilAdd.Caption = "Hinzufügen" Me.bbtnitm_NodeProfilAdd.Id = 8 Me.bbtnitm_NodeProfilAdd.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitm_NodeProfilAdd.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.bbtnitm_NodeProfilAdd.Name = "bbtnitm_NodeProfilAdd" ' 'bbtnitmCopy ' - Me.bbtnitmCopy.Caption = "Knoten kopieren" + Me.bbtnitmCopy.Caption = "Kopieren" Me.bbtnitmCopy.Id = 9 Me.bbtnitmCopy.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmCopy.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.bbtnitmCopy.Name = "bbtnitmCopy" @@ -238,7 +245,7 @@ Partial Class frmCockpitConfig ' '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.RbmPgGrp_Cockpit, Me.RbmPgGrp_Node}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -250,27 +257,27 @@ Partial Class frmCockpitConfig Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Aktionen" ' - 'RibbonPageGroup2 + 'RbmPgGrp_Node ' - Me.RibbonPageGroup2.AllowTextClipping = False - Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnitm_Save) - Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnSQL_Data) - Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnSQL_Count) - Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem4) - Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnitm_NodeOverviewAdd) - Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnitm_NodeProfilAdd) - Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnitmCopy) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "Knoten Aktionen" + Me.RbmPgGrp_Node.AllowTextClipping = False + Me.RbmPgGrp_Node.ItemLinks.Add(Me.bbtnitm_NodeProfilAdd) + Me.RbmPgGrp_Node.ItemLinks.Add(Me.bbtnitm_NodeOverviewAdd) + Me.RbmPgGrp_Node.ItemLinks.Add(Me.bbtnitmCopy) + Me.RbmPgGrp_Node.ItemLinks.Add(Me.bbtnitm_Save) + Me.RbmPgGrp_Node.ItemLinks.Add(Me.bbtnSQL_Data) + Me.RbmPgGrp_Node.ItemLinks.Add(Me.bbtnSQL_Count) + Me.RbmPgGrp_Node.ItemLinks.Add(Me.BarButtonItem4) + Me.RbmPgGrp_Node.Name = "RbmPgGrp_Node" + Me.RbmPgGrp_Node.Text = "Knoten Aktionen" ' - 'RibbonPageGroup3 + 'RbmPgGrp_Cockpit ' - Me.RibbonPageGroup3.AllowTextClipping = False - Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtnitm_DeleteCockpit) - Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtnitm_AddCockpit) - Me.RibbonPageGroup3.ItemLinks.Add(Me.bbtnitmsave_Cocpit) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - Me.RibbonPageGroup3.Text = "Cockpit Aktionen" + Me.RbmPgGrp_Cockpit.AllowTextClipping = False + Me.RbmPgGrp_Cockpit.ItemLinks.Add(Me.bbtnitm_AddCockpit) + Me.RbmPgGrp_Cockpit.ItemLinks.Add(Me.bbtnitmsave_Cocpit) + Me.RbmPgGrp_Cockpit.ItemLinks.Add(Me.bbtnitm_DeleteCockpit) + Me.RbmPgGrp_Cockpit.Name = "RbmPgGrp_Cockpit" + Me.RbmPgGrp_Cockpit.Text = "Cockpit Aktionen" ' 'RibbonStatusBar1 ' @@ -280,7 +287,7 @@ Partial Class frmCockpitConfig Me.RibbonStatusBar1.Margin = New System.Windows.Forms.Padding(4) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(974, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1451, 22) ' 'RibbonPage2 ' @@ -291,7 +298,7 @@ Partial Class frmCockpitConfig ' Me.LabelControl1.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl1.Appearance.Options.UseFont = True - Me.LabelControl1.Location = New System.Drawing.Point(13, 167) + Me.LabelControl1.Location = New System.Drawing.Point(12, 7) Me.LabelControl1.Name = "LabelControl1" Me.LabelControl1.Size = New System.Drawing.Size(83, 17) Me.LabelControl1.TabIndex = 16 @@ -299,7 +306,7 @@ Partial Class frmCockpitConfig ' 'LookUpEditCockpit ' - Me.LookUpEditCockpit.Location = New System.Drawing.Point(13, 184) + Me.LookUpEditCockpit.Location = New System.Drawing.Point(12, 24) Me.LookUpEditCockpit.MenuManager = Me.RibbonControl1 Me.LookUpEditCockpit.Name = "LookUpEditCockpit" Me.LookUpEditCockpit.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -310,7 +317,7 @@ Partial Class frmCockpitConfig ' 'CheckEdit_Cockpit_Active ' - Me.CheckEdit_Cockpit_Active.Location = New System.Drawing.Point(343, 188) + Me.CheckEdit_Cockpit_Active.Location = New System.Drawing.Point(342, 28) Me.CheckEdit_Cockpit_Active.MenuManager = Me.RibbonControl1 Me.CheckEdit_Cockpit_Active.Name = "CheckEdit_Cockpit_Active" Me.CheckEdit_Cockpit_Active.Properties.Caption = "Active" @@ -333,7 +340,7 @@ Partial Class frmCockpitConfig Me.TreeList_Cockpit.Font = New System.Drawing.Font("Tahoma", 9.75!) Me.TreeList_Cockpit.ImageIndexFieldName = "ICON_ID" Me.TreeList_Cockpit.KeyFieldName = "PK_CFG_COCKPIT_DEFINITION_ID" - Me.TreeList_Cockpit.Location = New System.Drawing.Point(12, 236) + Me.TreeList_Cockpit.Location = New System.Drawing.Point(11, 76) Me.TreeList_Cockpit.MenuManager = Me.RibbonControl1 Me.TreeList_Cockpit.Name = "TreeList_Cockpit" Me.TreeList_Cockpit.OptionsBehavior.Editable = False @@ -352,14 +359,14 @@ Partial Class frmCockpitConfig Me.TreeList_Cockpit.OptionsView.TreeLineStyle = DevExpress.XtraTreeList.LineStyle.Dark Me.TreeList_Cockpit.ParentFieldName = "PARENT_ID" Me.TreeList_Cockpit.SelectImageList = Me.ImageCollection1 - Me.TreeList_Cockpit.Size = New System.Drawing.Size(383, 210) + Me.TreeList_Cockpit.Size = New System.Drawing.Size(383, 156) Me.TreeList_Cockpit.TabIndex = 24 ' 'LabelControl2 ' Me.LabelControl2.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl2.Appearance.Options.UseFont = True - Me.LabelControl2.Location = New System.Drawing.Point(418, 236) + Me.LabelControl2.Location = New System.Drawing.Point(417, 76) Me.LabelControl2.Name = "LabelControl2" Me.LabelControl2.Size = New System.Drawing.Size(12, 17) Me.LabelControl2.TabIndex = 27 @@ -369,7 +376,7 @@ Partial Class frmCockpitConfig ' Me.LabelControl3.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl3.Appearance.Options.UseFont = True - Me.LabelControl3.Location = New System.Drawing.Point(495, 236) + Me.LabelControl3.Location = New System.Drawing.Point(494, 76) Me.LabelControl3.Name = "LabelControl3" Me.LabelControl3.Size = New System.Drawing.Size(49, 17) Me.LabelControl3.TabIndex = 28 @@ -379,7 +386,7 @@ Partial Class frmCockpitConfig ' Me.LabelControl4.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl4.Appearance.Options.UseFont = True - Me.LabelControl4.Location = New System.Drawing.Point(418, 286) + Me.LabelControl4.Location = New System.Drawing.Point(417, 126) Me.LabelControl4.Name = "LabelControl4" Me.LabelControl4.Size = New System.Drawing.Size(67, 17) Me.LabelControl4.TabIndex = 29 @@ -387,7 +394,7 @@ Partial Class frmCockpitConfig ' 'TextEdit_PK_CFG_COCKPIT_DEFINITION_ID ' - Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Location = New System.Drawing.Point(418, 256) + Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Location = New System.Drawing.Point(417, 96) Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.MenuManager = Me.RibbonControl1 Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Name = "TextEdit_PK_CFG_COCKPIT_DEFINITION_ID" Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -398,7 +405,7 @@ Partial Class frmCockpitConfig ' 'TextEdit_ParentID ' - Me.TextEdit_ParentID.Location = New System.Drawing.Point(495, 256) + Me.TextEdit_ParentID.Location = New System.Drawing.Point(494, 96) Me.TextEdit_ParentID.MenuManager = Me.RibbonControl1 Me.TextEdit_ParentID.Name = "TextEdit_ParentID" Me.TextEdit_ParentID.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -409,7 +416,7 @@ Partial Class frmCockpitConfig ' 'LookUpEditTypeID ' - Me.LookUpEditTypeID.Location = New System.Drawing.Point(418, 309) + Me.LookUpEditTypeID.Location = New System.Drawing.Point(417, 149) Me.LookUpEditTypeID.MenuManager = Me.RibbonControl1 Me.LookUpEditTypeID.Name = "LookUpEditTypeID" Me.LookUpEditTypeID.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -420,7 +427,7 @@ Partial Class frmCockpitConfig ' 'TextEdit_Bezeichnung ' - Me.TextEdit_Bezeichnung.Location = New System.Drawing.Point(566, 256) + Me.TextEdit_Bezeichnung.Location = New System.Drawing.Point(565, 96) Me.TextEdit_Bezeichnung.MenuManager = Me.RibbonControl1 Me.TextEdit_Bezeichnung.Name = "TextEdit_Bezeichnung" Me.TextEdit_Bezeichnung.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -432,26 +439,26 @@ Partial Class frmCockpitConfig ' Me.LabelControl5.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl5.Appearance.Options.UseFont = True - Me.LabelControl5.Location = New System.Drawing.Point(566, 236) + Me.LabelControl5.Location = New System.Drawing.Point(565, 76) Me.LabelControl5.Name = "LabelControl5" - Me.LabelControl5.Size = New System.Drawing.Size(72, 17) + Me.LabelControl5.Size = New System.Drawing.Size(120, 17) Me.LabelControl5.TabIndex = 35 - Me.LabelControl5.Text = "Bezeichnung" + Me.LabelControl5.Text = "Knoten Bezeichnung:" ' 'CheckEdit_Active ' - Me.CheckEdit_Active.Location = New System.Drawing.Point(855, 257) + Me.CheckEdit_Active.Location = New System.Drawing.Point(854, 97) Me.CheckEdit_Active.MenuManager = Me.RibbonControl1 Me.CheckEdit_Active.Name = "CheckEdit_Active" Me.CheckEdit_Active.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.CheckEdit_Active.Properties.Appearance.Options.UseFont = True Me.CheckEdit_Active.Properties.Caption = "Active" - Me.CheckEdit_Active.Size = New System.Drawing.Size(75, 21) + Me.CheckEdit_Active.Size = New System.Drawing.Size(70, 21) Me.CheckEdit_Active.TabIndex = 37 ' 'LookUpEdit_Image ' - Me.LookUpEdit_Image.Location = New System.Drawing.Point(418, 419) + Me.LookUpEdit_Image.Location = New System.Drawing.Point(417, 204) Me.LookUpEdit_Image.MenuManager = Me.RibbonControl1 Me.LookUpEdit_Image.Name = "LookUpEdit_Image" Me.LookUpEdit_Image.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -464,7 +471,7 @@ Partial Class frmCockpitConfig ' Me.LabelControl6.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl6.Appearance.Options.UseFont = True - Me.LabelControl6.Location = New System.Drawing.Point(418, 396) + Me.LabelControl6.Location = New System.Drawing.Point(417, 181) Me.LabelControl6.Name = "LabelControl6" Me.LabelControl6.Size = New System.Drawing.Size(47, 17) Me.LabelControl6.TabIndex = 38 @@ -472,19 +479,19 @@ Partial Class frmCockpitConfig ' 'TextEdit_Comment ' - Me.TextEdit_Comment.Location = New System.Drawing.Point(573, 419) + Me.TextEdit_Comment.Location = New System.Drawing.Point(565, 204) Me.TextEdit_Comment.MenuManager = Me.RibbonControl1 Me.TextEdit_Comment.Name = "TextEdit_Comment" Me.TextEdit_Comment.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.TextEdit_Comment.Properties.Appearance.Options.UseFont = True - Me.TextEdit_Comment.Size = New System.Drawing.Size(360, 24) + Me.TextEdit_Comment.Size = New System.Drawing.Size(359, 24) Me.TextEdit_Comment.TabIndex = 41 ' 'LabelControl7 ' Me.LabelControl7.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl7.Appearance.Options.UseFont = True - Me.LabelControl7.Location = New System.Drawing.Point(573, 396) + Me.LabelControl7.Location = New System.Drawing.Point(566, 181) Me.LabelControl7.Name = "LabelControl7" Me.LabelControl7.Size = New System.Drawing.Size(65, 17) Me.LabelControl7.TabIndex = 40 @@ -494,7 +501,7 @@ Partial Class frmCockpitConfig ' Me.LabelControl_Profil.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl_Profil.Appearance.Options.UseFont = True - Me.LabelControl_Profil.Location = New System.Drawing.Point(566, 286) + Me.LabelControl_Profil.Location = New System.Drawing.Point(565, 126) Me.LabelControl_Profil.Name = "LabelControl_Profil" Me.LabelControl_Profil.Size = New System.Drawing.Size(30, 17) Me.LabelControl_Profil.TabIndex = 42 @@ -502,31 +509,31 @@ Partial Class frmCockpitConfig ' 'LookUpEditProfil ' - Me.LookUpEditProfil.Location = New System.Drawing.Point(566, 309) + Me.LookUpEditProfil.Location = New System.Drawing.Point(565, 149) Me.LookUpEditProfil.MenuManager = Me.RibbonControl1 Me.LookUpEditProfil.Name = "LookUpEditProfil" Me.LookUpEditProfil.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LookUpEditProfil.Properties.Appearance.Options.UseFont = True Me.LookUpEditProfil.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.LookUpEditProfil.Size = New System.Drawing.Size(364, 24) + Me.LookUpEditProfil.Size = New System.Drawing.Size(359, 24) Me.LookUpEditProfil.TabIndex = 43 ' 'LookUpEditChart ' - Me.LookUpEditChart.Location = New System.Drawing.Point(418, 366) + Me.LookUpEditChart.Location = New System.Drawing.Point(566, 149) Me.LookUpEditChart.MenuManager = Me.RibbonControl1 Me.LookUpEditChart.Name = "LookUpEditChart" Me.LookUpEditChart.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LookUpEditChart.Properties.Appearance.Options.UseFont = True Me.LookUpEditChart.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.LookUpEditChart.Size = New System.Drawing.Size(143, 24) + Me.LookUpEditChart.Size = New System.Drawing.Size(359, 24) Me.LookUpEditChart.TabIndex = 45 ' 'LabelControl_Chart ' Me.LabelControl_Chart.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl_Chart.Appearance.Options.UseFont = True - Me.LabelControl_Chart.Location = New System.Drawing.Point(418, 343) + Me.LabelControl_Chart.Location = New System.Drawing.Point(566, 126) Me.LabelControl_Chart.Name = "LabelControl_Chart" Me.LabelControl_Chart.Size = New System.Drawing.Size(91, 17) Me.LabelControl_Chart.TabIndex = 44 @@ -534,20 +541,20 @@ Partial Class frmCockpitConfig ' 'LookUpEditMonitor ' - Me.LookUpEditMonitor.Location = New System.Drawing.Point(567, 366) + Me.LookUpEditMonitor.Location = New System.Drawing.Point(565, 149) Me.LookUpEditMonitor.MenuManager = Me.RibbonControl1 Me.LookUpEditMonitor.Name = "LookUpEditMonitor" Me.LookUpEditMonitor.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LookUpEditMonitor.Properties.Appearance.Options.UseFont = True Me.LookUpEditMonitor.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.LookUpEditMonitor.Size = New System.Drawing.Size(143, 24) + Me.LookUpEditMonitor.Size = New System.Drawing.Size(359, 24) Me.LookUpEditMonitor.TabIndex = 47 ' 'LabelControl_Monitor ' Me.LabelControl_Monitor.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl_Monitor.Appearance.Options.UseFont = True - Me.LabelControl_Monitor.Location = New System.Drawing.Point(567, 343) + Me.LabelControl_Monitor.Location = New System.Drawing.Point(565, 126) Me.LabelControl_Monitor.Name = "LabelControl_Monitor" Me.LabelControl_Monitor.Size = New System.Drawing.Size(107, 17) Me.LabelControl_Monitor.TabIndex = 46 @@ -556,12 +563,11 @@ Partial Class frmCockpitConfig 'XtraTabControl1 ' Me.XtraTabControl1.AllowDrop = True - Me.XtraTabControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.XtraTabControl1.Location = New System.Drawing.Point(12, 452) + Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.Size = New System.Drawing.Size(921, 229) + Me.XtraTabControl1.Size = New System.Drawing.Size(1451, 267) Me.XtraTabControl1.TabIndex = 50 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2}) ' @@ -571,7 +577,7 @@ Partial Class frmCockpitConfig Me.XtraTabPage1.Controls.Add(Me.gridAvailableUsers) Me.XtraTabPage1.Controls.Add(Me.PanelControl1) Me.XtraTabPage1.Name = "XtraTabPage1" - Me.XtraTabPage1.Size = New System.Drawing.Size(919, 206) + Me.XtraTabPage1.Size = New System.Drawing.Size(1449, 244) Me.XtraTabPage1.Text = "User zu Cockpit" ' 'gridAssignedUsers @@ -581,7 +587,7 @@ Partial Class frmCockpitConfig Me.gridAssignedUsers.Location = New System.Drawing.Point(406, 33) Me.gridAssignedUsers.MainView = Me.viewAssignedUsers Me.gridAssignedUsers.Name = "gridAssignedUsers" - Me.gridAssignedUsers.Size = New System.Drawing.Size(513, 173) + Me.gridAssignedUsers.Size = New System.Drawing.Size(1043, 211) Me.gridAssignedUsers.TabIndex = 7 Me.gridAssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedUsers}) ' @@ -600,7 +606,7 @@ Partial Class frmCockpitConfig Me.gridAvailableUsers.Location = New System.Drawing.Point(0, 33) Me.gridAvailableUsers.MainView = Me.viewAvailableUsers Me.gridAvailableUsers.Name = "gridAvailableUsers" - Me.gridAvailableUsers.Size = New System.Drawing.Size(406, 173) + Me.gridAvailableUsers.Size = New System.Drawing.Size(406, 211) Me.gridAvailableUsers.TabIndex = 6 Me.gridAvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableUsers}) ' @@ -621,7 +627,7 @@ Partial Class frmCockpitConfig Me.PanelControl1.Dock = System.Windows.Forms.DockStyle.Top Me.PanelControl1.Location = New System.Drawing.Point(0, 0) Me.PanelControl1.Name = "PanelControl1" - Me.PanelControl1.Size = New System.Drawing.Size(919, 33) + Me.PanelControl1.Size = New System.Drawing.Size(1449, 33) Me.PanelControl1.TabIndex = 0 ' 'LabelControl9 @@ -725,7 +731,7 @@ Partial Class frmCockpitConfig ' 'TextEditCockpit_Bez ' - Me.TextEditCockpit_Bez.Location = New System.Drawing.Point(418, 187) + Me.TextEditCockpit_Bez.Location = New System.Drawing.Point(417, 27) Me.TextEditCockpit_Bez.MenuManager = Me.RibbonControl1 Me.TextEditCockpit_Bez.Name = "TextEditCockpit_Bez" Me.TextEditCockpit_Bez.Properties.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -737,44 +743,64 @@ Partial Class frmCockpitConfig ' Me.LabelControl12.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LabelControl12.Appearance.Options.UseFont = True - Me.LabelControl12.Location = New System.Drawing.Point(418, 167) + Me.LabelControl12.Location = New System.Drawing.Point(417, 7) Me.LabelControl12.Name = "LabelControl12" - Me.LabelControl12.Size = New System.Drawing.Size(120, 17) + Me.LabelControl12.Size = New System.Drawing.Size(122, 17) Me.LabelControl12.TabIndex = 54 - Me.LabelControl12.Text = "Bezeichnung ändern:" + Me.LabelControl12.Text = "Cockpit Bezeichnung:" + ' + 'SplitContainerControl1 + ' + Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerControl1.Horizontal = False + Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 158) + Me.SplitContainerControl1.Name = "SplitContainerControl1" + ' + 'SplitContainerControl1.Panel1 + ' + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl1) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.TextEditCockpit_Bez) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LookUpEditCockpit) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl12) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.CheckEdit_Cockpit_Active) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.TreeList_Cockpit) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LookUpEditMonitor) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl2) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl_Monitor) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl3) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LookUpEditChart) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl4) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl_Chart) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LookUpEditProfil) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.TextEdit_ParentID) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl_Profil) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LookUpEditTypeID) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.TextEdit_Comment) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl5) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl7) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.TextEdit_Bezeichnung) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LookUpEdit_Image) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.CheckEdit_Active) + Me.SplitContainerControl1.Panel1.Controls.Add(Me.LabelControl6) + Me.SplitContainerControl1.Panel1.Text = "Panel1" + ' + 'SplitContainerControl1.Panel2 + ' + Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControl1) + Me.SplitContainerControl1.Panel2.Text = "Panel2" + Me.SplitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.[True] + Me.SplitContainerControl1.Size = New System.Drawing.Size(1451, 527) + Me.SplitContainerControl1.SplitterPosition = 250 + Me.SplitContainerControl1.TabIndex = 58 ' 'frmCockpitConfig ' Me.Appearance.Options.UseFont = True Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(974, 707) - Me.Controls.Add(Me.TextEditCockpit_Bez) - Me.Controls.Add(Me.LabelControl12) - Me.Controls.Add(Me.XtraTabControl1) - Me.Controls.Add(Me.LabelControl1) - Me.Controls.Add(Me.LookUpEditMonitor) - Me.Controls.Add(Me.LabelControl_Monitor) - Me.Controls.Add(Me.LookUpEditChart) - Me.Controls.Add(Me.LabelControl_Chart) - Me.Controls.Add(Me.LookUpEditProfil) - Me.Controls.Add(Me.LabelControl_Profil) - Me.Controls.Add(Me.TextEdit_Comment) - Me.Controls.Add(Me.LabelControl7) - Me.Controls.Add(Me.LookUpEdit_Image) - Me.Controls.Add(Me.LabelControl6) - Me.Controls.Add(Me.CheckEdit_Active) - Me.Controls.Add(Me.TextEdit_Bezeichnung) - Me.Controls.Add(Me.LabelControl5) - Me.Controls.Add(Me.LookUpEditTypeID) - Me.Controls.Add(Me.TextEdit_ParentID) - Me.Controls.Add(Me.TextEdit_PK_CFG_COCKPIT_DEFINITION_ID) - Me.Controls.Add(Me.LabelControl4) - Me.Controls.Add(Me.LabelControl3) - Me.Controls.Add(Me.LabelControl2) - Me.Controls.Add(Me.TreeList_Cockpit) - Me.Controls.Add(Me.CheckEdit_Cockpit_Active) - Me.Controls.Add(Me.LookUpEditCockpit) + Me.ClientSize = New System.Drawing.Size(1451, 707) + Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) Me.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) @@ -818,6 +844,13 @@ Partial Class frmCockpitConfig Me.PanelControl2.ResumeLayout(False) Me.PanelControl2.PerformLayout() CType(Me.TextEditCockpit_Bez.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel1.ResumeLayout(False) + Me.SplitContainerControl1.Panel1.PerformLayout() + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel2.ResumeLayout(False) + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -826,7 +859,7 @@ Partial Class frmCockpitConfig Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RbmPgGrp_Node As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem @@ -882,9 +915,10 @@ Partial Class frmCockpitConfig Friend WithEvents ViewAvailableGroups As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents bbtnitm_DeleteCockpit As DevExpress.XtraBars.BarButtonItem Friend WithEvents bbtnitm_AddCockpit As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RbmPgGrp_Cockpit As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents bbtnitmsave_Cocpit As DevExpress.XtraBars.BarButtonItem Friend WithEvents TextEditCockpit_Bez As DevExpress.XtraEditors.TextEdit Friend WithEvents LabelControl12 As DevExpress.XtraEditors.LabelControl Friend WithEvents bsitm_added_Changed As DevExpress.XtraBars.BarStaticItem + Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl End Class diff --git a/app/TaskFlow/frmCockpitConfig.vb b/app/TaskFlow/frmCockpitConfig.vb index 33533be..43070c5 100644 --- a/app/TaskFlow/frmCockpitConfig.vb +++ b/app/TaskFlow/frmCockpitConfig.vb @@ -6,6 +6,7 @@ Imports taskFLOW.DD_DMSLiteDataSetTableAdapters Public Class frmCockpitConfig Private Selected_Cockpit_ID As Integer Private Load_CP_InAction As Boolean = False + Private Node_change_inAction As Boolean = False Private _treeNodeCounts As New Dictionary(Of Integer, Integer) Private _currentCockpitDefinition As CockpitDefinitionData ' <-- NEU ' ===== NESTED CLASS FÜR COCKPIT-DEFINITION ===== @@ -257,6 +258,7 @@ Public Class frmCockpitConfig Load_Free_User_2_Cockpit() Load_Assigned_User_2_Cockpit() Display_Added_Changed("Cockpit") + Enable_GrpCockpit() Catch ex As Exception LOGGER.Error($"Error in LookUpEdit1_EditValueChanged: {ex.Message}") End Try @@ -272,6 +274,32 @@ Public Class frmCockpitConfig Load_Chart_LookUp() Load_Monitor_LookUp() Load_CFG_COCKPIT() + ' ===== POSITIONEN ANGLEICHEN (falls nicht im Designer gemacht) ===== + Align_LookUp_Positions() + End Sub + + ' ===== NEUE HILFSMETHODE: POSITIONEN ANGLEICHEN ===== + Private Sub Align_LookUp_Positions() + Try + ' Referenzposition von LookUpEditProfil + Dim refLocation As Point = LookUpEditProfil.Location + Dim refSize As Size = LookUpEditProfil.Size + Dim refLabelLocation As Point = LabelControl_Profil.Location + + ' Chart auf gleiche Position setzen + LookUpEditChart.Location = refLocation + LookUpEditChart.Size = refSize + LabelControl_Chart.Location = refLabelLocation + + ' Monitor auf gleiche Position setzen + LookUpEditMonitor.Location = refLocation + LookUpEditMonitor.Size = refSize + LabelControl_Monitor.Location = refLabelLocation + + LOGGER.Debug($"LookUp positions aligned to: {refLocation}, Label position: {refLabelLocation}") + Catch ex As Exception + LOGGER.Error($"Error in Align_LookUp_Positions: {ex.Message}") + End Try End Sub Private Sub Load_TreeView_CONFIG(pDTNodes As DataTable) Try @@ -443,6 +471,7 @@ Public Class frmCockpitConfig End Sub Private Function ProcessTreeListNodeAsync(oNode As DevExpress.XtraTreeList.Nodes.TreeListNode) Try + ' Daten in formularweites Objekt laden _currentCockpitDefinition = CockpitDefinitionData.FromTreeNode(oNode) @@ -453,6 +482,8 @@ Public Class frmCockpitConfig LOGGER.Debug("ProcessTreeListNodeAsync: TYPE_ID is Nothing - Folder node, skipping") Exit Function End If + Enable_GrpNode() + Node_change_inAction = True Display_Added_Changed("CockpitDefinition") ' Jetzt können Sie überall im Formular auf _currentCockpitDefinition zugreifen ' z.B. _currentCockpitDefinition.SQL_Query, _currentCockpitDefinition.TypeID.Value etc. @@ -501,35 +532,44 @@ Public Class frmCockpitConfig LookUpEditMonitor.EditValue = 0 End If - ' TYPE_ID im LookUpEdit setzen + ' ===== TYPE_ID BESTIMMT SICHTBARKEIT ===== If _currentCockpitDefinition.TypeID.HasValue Then LookUpEditTypeID.EditValue = _currentCockpitDefinition.TypeID.Value + + ' Buttons zurücksetzen bbtnSQL_Data.Visibility = DevExpress.XtraBars.BarItemVisibility.Never bbtnSQL_Count.Visibility = DevExpress.XtraBars.BarItemVisibility.Never bbtnitm_NodeOverviewAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Never bbtnitm_NodeProfilAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + + ' Alle LookUps ausblenden ProfileID_display(False) Monitor_display(False) Chart_display(False) + Select Case _currentCockpitDefinition.TypeID.Value Case 0 ' Overview bbtnSQL_Data.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnSQL_Count.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnitm_NodeOverviewAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnitm_NodeProfilAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - LOGGER.Debug("Selected node is of type Overview") + LOGGER.Debug("Selected node is of type Overview - keine FK-Felder angezeigt") + Case 1 ' Profil bbtnSQL_Data.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnSQL_Count.Visibility = DevExpress.XtraBars.BarItemVisibility.Always bbtnitm_NodeProfilAdd.Visibility = DevExpress.XtraBars.BarItemVisibility.Always ProfileID_display(True) - LOGGER.Debug("Selected node is of type Profil") + LOGGER.Debug("Selected node is of type Profil - LookUpEditProfil angezeigt") + Case 2 ' Monitor - LOGGER.Debug("Selected node is of type Monitor") Monitor_display(True) + LOGGER.Debug("Selected node is of type Monitor - LookUpEditMonitor angezeigt") + Case 3 ' Chart - LOGGER.Debug("Selected node is of type Chart") Chart_display(True) + LOGGER.Debug("Selected node is of type Chart - LookUpEditChart angezeigt") + Case Else LOGGER.Warn($"Selected node has an unknown TYPE_ID: {_currentCockpitDefinition.TypeID.Value}") End Select @@ -547,18 +587,39 @@ Public Class frmCockpitConfig Catch ex As Exception LOGGER.Error(ex) Finally - + Node_change_inAction = False End Try End Function Sub Monitor_display(visible As Boolean) + ' Chart und Profil ausblenden + LookUpEditChart.Visible = False + LabelControl_Chart.Visible = False + LookUpEditProfil.Visible = False + LabelControl_Profil.Visible = False + + ' Monitor anzeigen LookUpEditMonitor.Visible = visible LabelControl_Monitor.Visible = visible End Sub Sub Chart_display(visible As Boolean) + ' Monitor und Profil ausblenden + LookUpEditMonitor.Visible = False + LabelControl_Monitor.Visible = False + LookUpEditProfil.Visible = False + LabelControl_Profil.Visible = False + + ' Chart anzeigen LookUpEditChart.Visible = visible LabelControl_Chart.Visible = visible End Sub Sub ProfileID_display(visible As Boolean) + ' Monitor und Chart ausblenden + LookUpEditMonitor.Visible = False + LabelControl_Monitor.Visible = False + LookUpEditChart.Visible = False + LabelControl_Chart.Visible = False + + ' Profil anzeigen LookUpEditProfil.Visible = visible LabelControl_Profil.Visible = visible End Sub @@ -713,7 +774,7 @@ Public Class frmCockpitConfig Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnSQL_Count.ItemClick Try - Dim praefix As String = $"DECLARE @PROFILE_ID INT = {_currentCockpitDefinition.FK_ProfileID} " & vbCrLf + Dim praefix As String = $"DECLARE @PROFILE_ID INT = {_currentCockpitDefinition.FK_ProfileID} --only for testing/runtime, removed while saving sql" & vbCrLf Dim oSQL = praefix & _currentCockpitDefinition.SQL_Query_Count Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 0} oForm.ShowDialog() @@ -729,7 +790,7 @@ Public Class frmCockpitConfig Private Sub bbtnSQL_Data_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnSQL_Data.ItemClick Try - Dim praefix As String = $"DECLARE @PROFILE_ID INT = {_currentCockpitDefinition.FK_ProfileID} " & vbCrLf + Dim praefix As String = $"DECLARE @PROFILE_ID INT = {_currentCockpitDefinition.FK_ProfileID} --only for testing/runtime, removed while saving sql" & vbCrLf Dim oSQL = praefix & _currentCockpitDefinition.SQL_Query Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {.SQLCommand = oSQL, .SQLConnection = 0} oForm.ShowDialog() @@ -770,12 +831,21 @@ Public Class frmCockpitConfig End If ' FK_PROFILE_ID - If LookUpEditProfil.EditValue IsNot Nothing AndAlso IsNumeric(LookUpEditProfil.EditValue) AndAlso CInt(LookUpEditProfil.EditValue) > 0 Then - _currentCockpitDefinition.FK_ProfileID = CInt(LookUpEditProfil.EditValue) + If LookUpEditTypeID.EditValue IsNot Nothing AndAlso IsNumeric(LookUpEditTypeID.EditValue) Then + If LookUpEditTypeID.EditValue = 1 Then ' Nur wenn es ein PRofil ist brauchen wir eine FKPRofileID + If LookUpEditProfil.EditValue IsNot Nothing AndAlso IsNumeric(LookUpEditProfil.EditValue) AndAlso CInt(LookUpEditProfil.EditValue) > 0 Then + _currentCockpitDefinition.FK_ProfileID = CInt(LookUpEditProfil.EditValue) + Else + _currentCockpitDefinition.FK_ProfileID = Nothing + End If + Else + _currentCockpitDefinition.FK_ProfileID = Nothing + End If Else _currentCockpitDefinition.FK_ProfileID = Nothing End If + ' FK_CHART_ID If LookUpEditChart.EditValue IsNot Nothing AndAlso IsNumeric(LookUpEditChart.EditValue) AndAlso CInt(LookUpEditChart.EditValue) > 0 Then _currentCockpitDefinition.FK_ChartID = CInt(LookUpEditChart.EditValue) @@ -823,11 +893,42 @@ Public Class frmCockpitConfig WHERE PK_CFG_COCKPIT_DEFINITION_ID = {_currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID}" If DatabaseFallback.ExecuteNonQueryECM(updateSQL) Then + ' ===== AKTUELLEN KNOTEN IM TREEVIEW AKTUALISIEREN ===== + Dim currentNode = TreeList_Cockpit.FocusedNode + If currentNode IsNot Nothing Then + ' NAME aktualisieren + currentNode.SetValue("NAME", _currentCockpitDefinition.Name) + + ' ICON_ID aktualisieren wenn geändert + Dim currentIconId As Object = currentNode.GetValue("ICON_ID") + Dim newIconId As Integer? = _currentCockpitDefinition.IconID + + If (currentIconId Is Nothing OrElse IsDBNull(currentIconId)) AndAlso newIconId.HasValue Then + ' Altes Icon war NULL, neues ist gesetzt + currentNode.SetValue("ICON_ID", newIconId.Value) + LOGGER.Debug($"Icon aktualisiert: NULL -> {newIconId.Value}") + ElseIf currentIconId IsNot Nothing AndAlso Not IsDBNull(currentIconId) AndAlso newIconId.HasValue Then + ' Beide haben Werte - prüfen ob unterschiedlich + If CInt(currentIconId) <> newIconId.Value Then + currentNode.SetValue("ICON_ID", newIconId.Value) + LOGGER.Debug($"Icon aktualisiert: {currentIconId} -> {newIconId.Value}") + End If + ElseIf (currentIconId IsNot Nothing AndAlso Not IsDBNull(currentIconId)) AndAlso Not newIconId.HasValue Then + ' Altes Icon war gesetzt, neues ist NULL + currentNode.SetValue("ICON_ID", DBNull.Value) + LOGGER.Debug($"Icon aktualisiert: {currentIconId} -> NULL") + End If + + ' ACTIVE-Status aktualisieren (für CustomDrawNodeCell) + currentNode.SetValue("ACTIVE", _currentCockpitDefinition.Active) + + ' TreeView visuell aktualisieren + TreeList_Cockpit.RefreshNode(currentNode) + End If + MsgBox("Node definition saved successfully.", MsgBoxStyle.Information) LOGGER.Debug($"Saved node definition ID={_currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID}, Name={_currentCockpitDefinition.Name}") - ' TreeView neu laden, um Änderungen anzuzeigen - Load_TBTF_CFG_COCKPIT_DEFINITION() Else MsgBox("Error saving node definition. No rows were updated.", MsgBoxStyle.Exclamation) LOGGER.Warn($"No rows updated for PK_CFG_COCKPIT_DEFINITION_ID={_currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID}") @@ -867,55 +968,74 @@ Public Class frmCockpitConfig Private Function Add_Node(oVariant As String) Try - If IsNothing(_currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID) Then - MsgBox("Kein Knoten ausgewählt. Bitte wählen Sie einen Knoten aus, unter dem der neue Knoten hinzugefügt werden soll.", MsgBoxStyle.Exclamation) - Exit Function - End If - Dim oParentID As Integer = _currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID + Dim oParentID As Integer = 0 Dim oType As Integer = 0 Dim oIcon As Integer = 0 If oVariant = "Overview" Then + ' Overview-Knoten hat immer PARENT_ID = 0 oParentID = 0 oType = 0 oIcon = 0 + oVariant = "Overview-Node" ElseIf oVariant = "Profil" Then + ' Profil-Knoten braucht einen Eltern-Knoten + If _currentCockpitDefinition Is Nothing OrElse _currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID = 0 Then + MsgBox("Kein Knoten ausgewählt. Bitte wählen Sie einen Knoten aus, unter dem der neue Knoten hinzugefügt werden soll.", MsgBoxStyle.Exclamation) + Return False + End If + oParentID = _currentCockpitDefinition.PK_CFG_COCKPIT_DEFINITION_ID oType = 1 oIcon = 1 + oVariant = "New Node" End If + + ' Prüfen ob Selected_Cockpit_ID gesetzt ist + If Selected_Cockpit_ID = 0 Then + LOGGER.Error("Add_Node: Selected_Cockpit_ID ist 0 - kein Cockpit ausgewählt") + MsgBox("Kein Cockpit ausgewählt. Bitte wählen Sie zuerst ein Cockpit aus.", MsgBoxStyle.Exclamation) + Return False + End If + Dim oInsert = $"INSERT INTO TBTF_CFG_COCKPIT_DEFINITION ( - FK_CFG_COCKPIT_ID, - [ACTIVE] - ,[PARENT_ID] - ,[TYPE_ID] - ,[ICON_ID] - ,[NAME] - ,[FK_PROFILE_ID] - ,[FK_CHART_ID] - ,[FK_MONITOR_ID] - ,[SQL_QUERY] - ,[SQL_QUERY_COUNT] - ,[COMMENT]) - VALUES ( - {Selected_Cockpit_ID}, - 0, - {oParentID}, - {oType}, - {oIcon}, - 'New {oVariant}-Node', - 0, - 0, - 0, - '', - '', - '')" + FK_CFG_COCKPIT_ID, + [ACTIVE] + ,[PARENT_ID] + ,[TYPE_ID] + ,[ICON_ID] + ,[NAME] + ,[FK_PROFILE_ID] + ,[FK_CHART_ID] + ,[FK_MONITOR_ID] + ,[SQL_QUERY] + ,[SQL_QUERY_COUNT] + ,[COMMENT], + ADDED_WHO) + VALUES ( + {Selected_Cockpit_ID}, + 0, + {oParentID}, + {oType}, + {oIcon}, + '{oVariant}', + 0, + 0, + 0, + '', + '', + '', + '{USER_USERNAME}')" If DatabaseFallback.ExecuteNonQueryECM(oInsert) Then + LOGGER.Debug($"Add_Node: {oVariant}-Knoten erfolgreich angelegt für Cockpit_ID={Selected_Cockpit_ID}") Load_TBTF_CFG_COCKPIT_DEFINITION() + Return True Else MsgBox($"Fehler beim Anlegen eines {oVariant}-Knotens. Prüfen Sie Ihr Log", MsgBoxStyle.Exclamation) + Return False End If Catch ex As Exception MsgBox($"Unerwarteter Fehler beim Anlegen eines {oVariant}-Knotens." & vbNewLine & vbNewLine & ex.Message, MsgBoxStyle.Critical) LOGGER.Error(ex) + Return False End Try @@ -1660,4 +1780,84 @@ Public Class frmCockpitConfig Private Sub viewAvailableUsers_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles viewAvailableUsers.FocusedRowChanged bsitm_added_Changed.Caption = "" End Sub + + Private Sub LookUpEditProfil_EditValueChanged(sender As Object, e As EventArgs) Handles LookUpEditProfil.EditValueChanged + If Load_CP_InAction Or Node_change_inAction Then + Exit Sub + End If + Try + If Not IsNothing(LookUpEditProfil.EditValue) Then + TextEdit_Bezeichnung.Text = LookUpEditProfil.Text + End If + Catch ex As Exception + LOGGER.Error($"Error in LookUpEditProfil_EditValueChanged: {ex.Message}") + End Try + + End Sub + + Private Sub LookUpEditTypeID_EditValueChanged(sender As Object, e As EventArgs) Handles LookUpEditTypeID.EditValueChanged + If Load_CP_InAction Or Node_change_inAction Then + Exit Sub + End If + + Try + If Not IsNothing(LookUpEditTypeID.EditValue) Then + ' Icon automatisch setzen + LookUpEdit_Image.EditValue = LookUpEditTypeID.EditValue + + ' ===== SICHTBARKEIT DER FK-FELDER STEUERN ===== + Dim selectedType As Integer = CInt(LookUpEditTypeID.EditValue) + + ' Alle ausblenden + ProfileID_display(False) + Monitor_display(False) + Chart_display(False) + + Select Case selectedType + Case 1 ' Profil + ProfileID_display(True) + LOGGER.Debug("TypeID changed to Profil - showing LookUpEditProfil") + + Case 2 ' Monitor + Monitor_display(True) + LOGGER.Debug("TypeID changed to Monitor - showing LookUpEditMonitor") + + Case 3 ' Chart + Chart_display(True) + LOGGER.Debug("TypeID changed to Chart - showing LookUpEditChart") + + Case Else + LOGGER.Debug($"TypeID changed to {selectedType} - no FK fields displayed") + End Select + End If + Catch ex As Exception + LOGGER.Error($"Error in LookUpEditTypeID_EditValueChanged: {ex.Message}") + End Try + End Sub + + Private Sub CheckEdit_Cockpit_Active_CheckedChanged(sender As Object, e As EventArgs) Handles CheckEdit_Cockpit_Active.CheckedChanged + If Load_CP_InAction Or Node_change_inAction Then + Exit Sub + End If + Enable_GrpCockpit() + End Sub + + Private Sub TextEditCockpit_Bez_TextChanged(sender As Object, e As EventArgs) Handles TextEditCockpit_Bez.TextChanged + If Load_CP_InAction Or Node_change_inAction Then + Exit Sub + End If + Enable_GrpCockpit() + End Sub + + Private Sub TextEditCockpit_Bez_Click(sender As Object, e As EventArgs) Handles TextEditCockpit_Bez.Click + Enable_GrpCockpit() + End Sub + Sub Enable_GrpCockpit() + RbmPgGrp_Node.Enabled = False + RbmPgGrp_Cockpit.Enabled = True + End Sub + Sub Enable_GrpNode() + RbmPgGrp_Node.Enabled = True + RbmPgGrp_Cockpit.Enabled = False + End Sub End Class \ No newline at end of file diff --git a/app/TaskFlow/frmMonitor.Designer.vb b/app/TaskFlow/frmMonitor.Designer.vb index 641a3d3..8ae79d8 100644 --- a/app/TaskFlow/frmMonitor.Designer.vb +++ b/app/TaskFlow/frmMonitor.Designer.vb @@ -48,22 +48,39 @@ Partial Class frmMonitor Me.XtraSaveFileDialog1 = New System.Windows.Forms.SaveFileDialog() Me.SplitContainerControlMain = New DevExpress.XtraEditors.SplitContainerControl() Me.DocumentViewerMonitor = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel1.SuspendLayout() + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel2.SuspendLayout() Me.SplitContainerControl1.SuspendLayout() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl2.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl2.Panel1.SuspendLayout() + CType(Me.SplitContainerControl2.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl2.Panel2.SuspendLayout() Me.SplitContainerControl2.SuspendLayout() CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl3.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl3.Panel1.SuspendLayout() + CType(Me.SplitContainerControl3.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl3.Panel2.SuspendLayout() Me.SplitContainerControl3.SuspendLayout() CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControlMain, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControlMain.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControlMain.Panel1.SuspendLayout() + CType(Me.SplitContainerControlMain.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControlMain.Panel2.SuspendLayout() Me.SplitContainerControlMain.SuspendLayout() Me.SuspendLayout() ' @@ -71,13 +88,13 @@ Partial Class frmMonitor ' Me.RibbonControl1.AutoHideEmptyItems = True Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarStaticItemInfoDoc, Me.BarStaticItemInfo}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarStaticItemInfoDoc, Me.BarStaticItemInfo, Me.BarButtonItem5}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 7 + Me.RibbonControl1.MaxItemId = 8 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(1202, 146) + Me.RibbonControl1.Size = New System.Drawing.Size(1202, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -136,6 +153,7 @@ Partial Class frmMonitor ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem5) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem4) @@ -146,10 +164,10 @@ Partial Class frmMonitor ' Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemInfoDoc) Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItemInfo) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 676) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 675) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1202, 21) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1202, 22) ' 'RibbonPage2 ' @@ -161,11 +179,17 @@ Partial Class frmMonitor Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 0) Me.SplitContainerControl1.Name = "SplitContainerControl1" + ' + 'SplitContainerControl1.Panel1 + ' Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControl1) Me.SplitContainerControl1.Panel1.Text = "Panel1" + ' + 'SplitContainerControl1.Panel2 + ' Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2) Me.SplitContainerControl1.Panel2.Text = "Panel2" - Me.SplitContainerControl1.Size = New System.Drawing.Size(864, 530) + Me.SplitContainerControl1.Size = New System.Drawing.Size(866, 517) Me.SplitContainerControl1.SplitterPosition = 510 Me.SplitContainerControl1.TabIndex = 2 ' @@ -176,7 +200,7 @@ Partial Class frmMonitor Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(510, 530) + Me.GridControl1.Size = New System.Drawing.Size(510, 517) Me.GridControl1.TabIndex = 0 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' @@ -203,11 +227,17 @@ Partial Class frmMonitor Me.SplitContainerControl2.Horizontal = False Me.SplitContainerControl2.Location = New System.Drawing.Point(0, 0) Me.SplitContainerControl2.Name = "SplitContainerControl2" + ' + 'SplitContainerControl2.Panel1 + ' Me.SplitContainerControl2.Panel1.Controls.Add(Me.GridControl2) Me.SplitContainerControl2.Panel1.Text = "Panel1" + ' + 'SplitContainerControl2.Panel2 + ' Me.SplitContainerControl2.Panel2.Controls.Add(Me.SplitContainerControl3) Me.SplitContainerControl2.Panel2.Text = "Panel2" - Me.SplitContainerControl2.Size = New System.Drawing.Size(342, 530) + Me.SplitContainerControl2.Size = New System.Drawing.Size(346, 517) Me.SplitContainerControl2.SplitterPosition = 270 Me.SplitContainerControl2.TabIndex = 0 ' @@ -218,7 +248,7 @@ Partial Class frmMonitor Me.GridControl2.MainView = Me.GridView2 Me.GridControl2.MenuManager = Me.RibbonControl1 Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(342, 270) + Me.GridControl2.Size = New System.Drawing.Size(346, 270) Me.GridControl2.TabIndex = 1 Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) ' @@ -244,11 +274,17 @@ Partial Class frmMonitor Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 0) Me.SplitContainerControl3.Name = "SplitContainerControl3" + ' + 'SplitContainerControl3.Panel1 + ' Me.SplitContainerControl3.Panel1.Controls.Add(Me.GridControl3) Me.SplitContainerControl3.Panel1.Text = "Panel1" + ' + 'SplitContainerControl3.Panel2 + ' Me.SplitContainerControl3.Panel2.Controls.Add(Me.GridControl4) Me.SplitContainerControl3.Panel2.Text = "Panel2" - Me.SplitContainerControl3.Size = New System.Drawing.Size(342, 248) + Me.SplitContainerControl3.Size = New System.Drawing.Size(346, 237) Me.SplitContainerControl3.SplitterPosition = 400 Me.SplitContainerControl3.TabIndex = 0 ' @@ -259,7 +295,7 @@ Partial Class frmMonitor Me.GridControl3.MainView = Me.GridView3 Me.GridControl3.MenuManager = Me.RibbonControl1 Me.GridControl3.Name = "GridControl3" - Me.GridControl3.Size = New System.Drawing.Size(330, 248) + Me.GridControl3.Size = New System.Drawing.Size(336, 237) Me.GridControl3.TabIndex = 2 Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3}) ' @@ -311,23 +347,38 @@ Partial Class frmMonitor ' Me.SplitContainerControlMain.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1 Me.SplitContainerControlMain.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControlMain.Location = New System.Drawing.Point(0, 146) + Me.SplitContainerControlMain.Location = New System.Drawing.Point(0, 158) Me.SplitContainerControlMain.Name = "SplitContainerControlMain" + ' + 'SplitContainerControlMain.Panel1 + ' Me.SplitContainerControlMain.Panel1.Controls.Add(Me.DocumentViewerMonitor) Me.SplitContainerControlMain.Panel1.Text = "Panel1" + ' + 'SplitContainerControlMain.Panel2 + ' Me.SplitContainerControlMain.Panel2.Controls.Add(Me.SplitContainerControl1) Me.SplitContainerControlMain.Panel2.Text = "Panel2" - Me.SplitContainerControlMain.Size = New System.Drawing.Size(1202, 530) + Me.SplitContainerControlMain.Size = New System.Drawing.Size(1202, 517) Me.SplitContainerControlMain.SplitterPosition = 326 Me.SplitContainerControlMain.TabIndex = 5 ' 'DocumentViewerMonitor ' Me.DocumentViewerMonitor.Dock = System.Windows.Forms.DockStyle.Fill + Me.DocumentViewerMonitor.FileLoaded = False Me.DocumentViewerMonitor.Location = New System.Drawing.Point(0, 0) Me.DocumentViewerMonitor.Name = "DocumentViewerMonitor" - Me.DocumentViewerMonitor.Size = New System.Drawing.Size(326, 530) + Me.DocumentViewerMonitor.Size = New System.Drawing.Size(326, 517) Me.DocumentViewerMonitor.TabIndex = 0 + Me.DocumentViewerMonitor.Viewer_ForceTemporaryMode = False + ' + 'BarButtonItem5 + ' + Me.BarButtonItem5.Caption = "Aktualisieren" + Me.BarButtonItem5.Id = 7 + Me.BarButtonItem5.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem5.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem5.Name = "BarButtonItem5" ' 'frmMonitor ' @@ -343,20 +394,36 @@ Partial Class frmMonitor Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Monitoring" CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel2.ResumeLayout(False) CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.ResumeLayout(False) CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl2.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl2.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl2.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl2.Panel2.ResumeLayout(False) CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl2.ResumeLayout(False) CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl3.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl3.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl3.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl3.Panel2.ResumeLayout(False) CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl3.ResumeLayout(False) CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridControl4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControlMain.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControlMain.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControlMain.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControlMain.Panel2.ResumeLayout(False) CType(Me.SplitContainerControlMain, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControlMain.ResumeLayout(False) Me.ResumeLayout(False) @@ -389,4 +456,5 @@ Partial Class frmMonitor Friend WithEvents BarStaticItemInfoDoc As DevExpress.XtraBars.BarStaticItem Friend WithEvents BarStaticItemInfo As DevExpress.XtraBars.BarStaticItem Friend WithEvents DocumentViewerMonitor As DigitalData.Controls.DocumentViewer.DocumentViewer + Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/app/TaskFlow/frmMonitor.resx b/app/TaskFlow/frmMonitor.resx index 075a5db..5aec7c5 100644 --- a/app/TaskFlow/frmMonitor.resx +++ b/app/TaskFlow/frmMonitor.resx @@ -122,71 +122,92 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEV4cG9ydDtYbHM7RXhwb3J0VG9Y - bHM7TKCZ/gAAAHFJREFUOE/dkMkNgDAMBKmaCtwDJfCiCL5pyrBIG8XGgP1lpFEuMoqYVNUoIloxDGT5 - a+A0TQ/M66IViQmAaIRb26814Bm4BfihD4xzroEJ8DJGfyk6A+kXUO6Rz38AxvnrCyqSHnCmCQPYzPIY - yCt6APRYR9ABL1x3AAAAAElFTkSuQmCC + bHM7TKCZ/gAAAGxJREFUOE9j+P//PwMybmlp+U8KRtEMM4BYMFwNQFeED8ANKFs+/T8pGKsBIICNBuG1 + pw7CNeE1AKYQ3QBkNk4DYJpBNLombHIYBsAUwDQiG4DuEpwGoNPobLwuIAVjGEBxOkDGFKdEkCApGAD0 + WEfQztmY3AAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAddEVYdFRpdGxlAEV4cG9ydDtYbHM7RXhwb3J0VG9Y - bHM7TKCZ/gAAATNJREFUWEflkD1uwkAQhTmfj5ID5ARuXUQUVK4pKZGQ6NJRUruKlEOEYvMe4qHNemyP - rcX85EmflpmdZT55EUK4K2ZzTszmnJjNOTGbpCzLMJIvUAC+bWHtIGaT4BEOfzhfVdWprusCZfpff+oY - s3lhVCjQNI0pMSjwvl6FqSj6YpYEBTDbgnfZBZhUwi3AWKfYHQ/nHqOeEgswF4kfSowS0BLVurNq9ZhU - gJEE7grMDgtoOU/WjO6se80wFOjhG7PDAkzfFxBx3xNKYNYnkJ5KXFtfoC9ugSl48hQC1mW2DAos3zYt - +ChnrB1o5xPYfHxyyRlGv2OS/h5lPgG8udJV64z6/0Sgq4/cTqArydxtBLwgLyjgSTT74AJeGLzJKzCB - xxAYQ26BLTAXdbC9CtyPsPgFto7Q9L8du98AAAAASUVORK5CYII= + bHM7TKCZ/gAAARxJREFUWEflkzsOgkAQhjkfR/EAnGBaCmNBRU1JSWJiZ2dpTWXiIbRYM8YhZGbYB49F + 9E++rDvi/F9MSIwxyZqIQWzEIDZiEBsxIADABHIDgBQA8LcCvt9LICT4fJ7nz7IsU2WX2O8U4AWuoEDb + tqqEUyCrCjOWvgBGk0CBrCoEiwhoEt4CGO0kjtdLV2ITwHwkHigRJEAlmgC/2wQwJIFvBy9XBagcT62Q + f88FLNx5uSpAy6mYC/Sf4wK2oAQvHxTgJ6V/1/4BW7wFxuCTTQgI+JIpcQocdrVAe62mhO9HZhWo92cs + eYOhz33Y/DSrgKWouyvzPxEYmi8qMJQoAr78poBPtiPgC1vqjJfACL5DIIS5BRpe4KDpBNbkBbaO0PRj + TUUSAAAAAElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAE3SURB - VDhPpZKxSsRQEEXzG5ba+QHCYuMX+Df6AxIIWKQMiGBSprEQLBYbixSRFNkopNDeRgxaCAsmYZzzyJO3 - MeKqAwfe3Ll3svsST0T+xaT4G74Ivu/vKqdRFEkQBAbtH9CYjf1ucFO5SpJEFouFNE0jXdcZOKMxw4N3 - ZYEKe8pLnufairwtW7m+e5TDsxvTu4UHLxltPcLbymtd18ZA+Pj8VvaP5oapwkuGLAvmRVEMIzFPtuHv - FlBkyLJg2bbtIIv52essIEP2xwUu7p24Cy7s5VHjv+DCzJbmDsiyYEt5rqrKDMaXaEFjRuElQ9a+xp0w - DCXLMmNwXyNwtmE86n8io+3Kh7SRpqnEcSxlWZqPp+97A2c09eTKJV6b+1xg0eFMOVHulfcBzmizsX+l - +QuT4vqI9wEq0AjdmqGMVgAAAABJRU5ErkJggg== + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAExSURB + VDhPpZKxSsRQFET3Nyy18wOExcYv8G/0B+TAgkXKgAhmyzQWgsViY7FFZItsFFJobyMuWggLJuHKPHzh + mSgavDBwM3dmktz3RmY2+g96xFD0CGAXOI3j2CaTiQPwIE6zrj40bgJX0+nUlsulrVYrq+vaQb04zaSR + 9ksAsAe8ZFlmqrd1Zdd3j3Z4duOew5JGWnlcALANvJZl2ZqPz29t/2jm8F1JK4+8CpgtFot2qDd7808B + KnnkVcC6qqp2oM/+S4A88v4aECLcSRhw4Zen6v5CCM18AQfyKmALeC6Kwg26S/QQp5lKWnnk9ce4E0WR + zefzNsQfo6Dem6UBnuTpXqSNNE0tSRLL89xdnqZpHNSLAzLgUtreTQyCxsAJcA+8f0K9uHFX3wsYih4x + FB8q0AjdQAvTBwAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAJtSURB - VFhHxZY/i1NBFMV3/RJbbG1nJX4Nuy23sfVLiLJWsRC22jIhFpYhhEggKcXCLCEWaU3EQDCLaJAVEhzP - 7zmTvPfmPo0ujBd+kDlz7rk3m3974Jz7r5hiSkwxJaaYElNMiSmmxBSrqNVq98RT0RcfxXcPj9G4w4M3 - wso0xTxqvCVOxTvh9gQvPfT++wJquiOGIgtuNBpuMBi46XTqVquVW6/XGTxG4w5P8PteMv5+ATU8FNfC - NZtNNxqNJO9XeOmh12eQZc6JBBkPBZUFdLtdybv69OXatd68d49evHWnzwZetYvekEOg6lByYV7hADI9 - F1nTZDKRtKvJh8/u7OWlu//k1ZY/FRkhj2xJhXmFgwwPgnk+n0vaFc+8PHyfBSiyQi4zJMUL6OJYfMM0 - Ho8lFYs/e3n4vgtQZPoFmHEsKVrgAkO73dYxLl7zmyxAke2XuNAxWuCKy+VyqWNcvOFuugDZfoErHaMF - llwuFgsd46pawKLq00G2X4BnGS1wzmWr1dIxrqqXwAKvVWT7Bc51jBY4El8x9Ho9ScWqehNa4C0XmX44 - M44kFRcAXZyIHxhns5mkXVV9DMvgwZsvssj02SeStjMLC4AMZ94cff1aX0R5uMOTLzJCHtmSCvMKhwDG - 0NTpdNxms5H8q8pfxcBjtPwzp4fekEOm5GhWJATUwM9p9p6o1+tuOBxK3q/w0uMHk0GWOccUA2q6LV6L - LIzQfr9f+XPMXW4w0EsGWeYMU8yjRn4deXNeinz478BLD73ZcLDyTbEKhdwVj0XVv2Tc4dkOzWNlmmJK - TDElppgSU0yJKabEFNPhDn4CUL0KSeYATWkAAAAASUVORK5CYII= + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNob3c7RXllO0njByUAAAJSSURB + VFhHxZY9i1NBFIZ3/RNbbG1nJf4Nuy232dY/IcpavRYLW22ZEAvLEEIkkJRiYZYQi7QmYiCYRTTICgmO + PNe5YXJmbj4WvR544XLmnPc8k/sxOXDOHfxPRYmyFSXKVpQoW1GibEWJshUlNknSI0kvJHUkfZb004tr + cqxRQ20k67cTgKR7kk4lfZDkdhS19NB7dwBJDyT1cuNqteq63a4bjUZuPp+7xWKRiWtyrFETgNCLx/4A + kp5IusWoVqu5fr/vdg1q6fEQeOAVzUgCSDrUn8gMWq3WmvmXb7eu/u6je/rqvTt92V1bs0Fv8GsQh3Ze + CuAibxoOh2uGw09f3fnra/f4+ZuVtgUeAcSFnWeHn+XFk8lkzYid2+G7ABB4BRBnSQBJx5J+UDQYDKxH + 9rPb4bsCEHh6AGYcpwCuKGg0GrY3C+65Hb4PAIG3h7hKAdywOJvNbF8WPHB2+L4AeHuAmxTAjMXpdGr7 + sigCSKno7cDbA7DLCOCSxXq9bvuyKLoFKVGbCrw9wGUK4EjSdwra7bbtLXwIU6LWBp5+ODOOIgAPcSLp + F4Xj8XjNoOg1tKKG2jDw8sPxPglnrgF4iPP8nbWf39SHyA6nJgw8cj+87bwIwEI0m023XC5XhvZTjLgm + F+6cHno3DS8E8BAcp9kzUalUXK/XW5lvC2rpCe45XtGMjQAe4r6kt/kuMO10OoXHMWvBYEQvHvsfxwEE + pyMP53VgvE3U0kNvNvzOAAbmoaRnG/6SsUbNauhfBfgXihJlK0qUrShRtqJE2YoSZes3UL0KST/PhM0A + AAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENsZWFyO0VyYXNlO1JlbW92ZTtC - YXJzO1JpYmJvbjuHgINzAAAAjElEQVQ4T6WQ2w2AIBAE7ckW/KUKO7EqS7GbkyV3eMCCBj8mvnYmwUVE - fkFfXvvmCRFRcF9siwcDI8XLNFKIBgY6rGUjRxoZ6ICJnoDtrJzAfloGLECHHdojkFGP5yeG41wjgqt+ - YIInycACkI23SJYBC4wijVwfYRQpZOAD3YiNRliARuoxg778jiw3qLGCwJyNBO4AAAAASUVORK5CYII= + YXJzO1JpYmJvbjuHgINzAAAAg0lEQVQ4T6WQ0QnAIAwF3akr+OsUbuJUjuI2KRG1qS+xSj8ORXIH0RGR + +wM8MCV6SSjRU4PvRwEpqxGQRUCTIQJyC6zkEVEDm3IFAieyFYChBbiCMmTxfGJI+QopE5+bK1RZBlju + fEWGbAVWEZDnFVaRlzwHzIj8YIseUCPzsAY8nHIDqLGCwDZPXeAAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAENsZWFyO0VyYXNlO1JlbW92ZTtC - YXJzO1JpYmJvbjuHgINzAAABNUlEQVRYR8WR0W3DMAxEs1NX6K+n6CadqqNkG1Vn6ASSPtmSJTgfD7EJ - 8t4hfqWUPoocPokcWt4/3yNsmVTAs8y0yKEFIZ1YeXcJObQgoAMlJ3uJCPOdTKGOA2dycijBfCdTxMNA - j5y4Esx3MoU9CozISS3BfCdT8CBwR072Esx3MgWWAzNysjH/IIzk5dXyHeYfhJG8vFwOmH8QRvLycnlm - 6BMsl2dqvpNFyrIKucsuB3Q4oaUsq5C7VDmgx0kt5WgVUg7ci6UcrsDJgfW4l+337yuT8FsOVeAIBzmw - TiUnsyWkHLQKWPlsiaYcjBQAoyVO5aBVIH4CS2+JSzloFZgt0SUHZwXuluiWg6sCoyWG5KCnwGUJGzJD - fcihimYJ3s1SH3JoC1Vi/T/wKeTwSeTwOdLrH2+P6VJXa4e4AAAAAElFTkSuQmCC + YXJzO1JpYmJvbjuHgINzAAAA6UlEQVRYR8WSyxGEIAxA7Wlb8EoVdmJVlmI3OOzsOpCEkJ94eCOTQ94b + cMk5L2+CBrNBA8i5rRrSua35RzmjfRA0gBCSHrVcHIEGEEJEQcmbCEhkACfvRkQFSORkRESARo4ivAEW + eRPhCfDI7whrQIT8iyUgTF7QBoTKtU8QLhf/hE/JRQFPyqUBcIEHUj4roJGzAWk/Pmk/cvkGPQGSdwMq + +R9vBCnnAmq5N6Ir1wZYIlg5FwCfwBIxlHMB3giRfBRgjRDLJQHaCJVcGjCMqJd4uA9EABsBF1m5D4Sc + i4i/gbdAg9mgwWwub4/pUvK+XdgAAAAASUVORK5CYII= + + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJlZnJlc2hfMV8iPg0KICAgIDxwYXRoIGQ9Ik0yNC41 + LDcuNUMyMi4zLDUuMywxOS4zLDQsMTYsNEMxMC4xLDQsNS4xLDguMyw0LjIsMTRoNC4xYzAuOS0zLjQs + NC02LDcuNy02YzIuMiwwLDQuMiwwLjksNS42LDIuNEwxOCwxNCAgIGg1LjdoNC4xSDI4VjRMMjQuNSw3 + LjV6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTE2LjIsMjRjLTIuMiwwLTQuMi0wLjkt + NS42LTIuNGwzLjYtMy42SDguNEg0LjRINC4ydjEwbDMuNS0zLjVjMi4yLDIuMiw1LjIsMy41LDguNSwz + LjUgICBDMjIuMSwyOCwyNywyMy43LDI4LDE4aC00LjFDMjMsMjEuNCwxOS45LDI0LDE2LjIsMjR6IiBj + bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= @@ -196,11 +217,10 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAEZpbmQ7SWQ7TG9jYXRlO1NlYXJj - aMjN118AAADxSURBVFhH7ZJRDsIwDEN3Qa7BQdAuwU24XUZQi1zPrbJ1G2Lax5OIcRxTMZjZT5HikUjx - SKTI3B4vI5Rn5mOPQopMNDjqQ6TIRIOjPkSKGQ5klvoUUsykgDuGIeRTfHazTyHFDIZUQJ/iKvDHBSio - RtiL2YgUnbTY+vVRmq8gRQeXO9mvAHlrLCtAy5vD94rBScYtnp6RL1EMDpo35mQFKnstrgK7FwjBezPh - bfIDqwqM42hL8L0ixEkHugqgLuYn+r5fZNKB7hdwTc2o++cixOFDNcTeSQr0kIP5EM6o+2cZtBYMRo3m - 9p+whxwcxcyGCV++4POOhQ6sAAAAAElFTkSuQmCC + aMjN118AAADRSURBVFhH7ZJrCsMwDIN7wV1jBxm5xG6y23l0UDCS4jlN0z3Ijw9qIStK6GJmyych4WxI + OBsSFJfbwwDlIR96FCQossFZn4cERTY46/OQEAUirT4FCaLAFQMxGHXHaxdzDyuw/YxCnwX+oIAIU6S9 + mJ8tEN0+S/gKJPxUAfDWaCsgAg4Fz6sVCG++E/kSs8DuApW9iFlgeIEUuEdCT4FSirUwrIDXxXwfXmAL + V7PXowJvEXvyQJy/v0AP6kCcvb5+U0gPPthrMMc/YQ/+xhnWnSdfvuDzi8ClJgAAAABJRU5ErkJggg== \ No newline at end of file diff --git a/app/TaskFlow/frmMonitor.vb b/app/TaskFlow/frmMonitor.vb index 7d78d39..4395671 100644 --- a/app/TaskFlow/frmMonitor.vb +++ b/app/TaskFlow/frmMonitor.vb @@ -201,6 +201,9 @@ Public Class frmMonitor End Try End Sub Private Async Sub frmMonitor_Load(sender As Object, e As EventArgs) Handles Me.Load + Await Initial_Load() + End Sub + Private Async Function Initial_Load() As Threading.Tasks.Task SplitContainerControlMain.Collapsed = True Me.Text = COCKPIT_MONITOR_CAPTION Dim _GridList As New List(Of GridView) From { @@ -247,7 +250,8 @@ Public Class frmMonitor Catch ex As Exception LOGGER.Error(ex) End Try - End Sub + End Function + Async Function Load_Grid_Data() As Threading.Tasks.Task Try FormShown = False @@ -503,4 +507,8 @@ Public Class frmMonitor Await Load_Grid_Data() GridView1.HideLoadingPanel() End Sub + + Private Async Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem5.ItemClick + Await Initial_Load() + End Sub End Class \ No newline at end of file diff --git a/app/TaskFlow/taskFLOW.vbproj b/app/TaskFlow/taskFLOW.vbproj index 70dc920..37f97ac 100644 --- a/app/TaskFlow/taskFLOW.vbproj +++ b/app/TaskFlow/taskFLOW.vbproj @@ -1304,11 +1304,11 @@ - + PreserveNewest