diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index da101b92..e6559353 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -88,6 +88,7 @@ Partial Class frmAdmin_Start Me.Panel1 = New System.Windows.Forms.Panel() Me.labelTitle = New System.Windows.Forms.Label() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TreeListMenu, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MainTreeImages, System.ComponentModel.ISupportInitialize).BeginInit() @@ -117,6 +118,7 @@ Partial Class frmAdmin_Start CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl.SuspendLayout() Me.Panel1.SuspendLayout() + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 @@ -129,7 +131,7 @@ Partial Class frmAdmin_Start Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage_IDB, Me.RibbonPage_ClipboardWatcher, Me.RibbonPage_GlobalIndexer}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1328, 159) + Me.RibbonControl1.Size = New System.Drawing.Size(1077, 157) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -320,10 +322,10 @@ Partial Class frmAdmin_Start ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 729) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 654) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1328, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 22) ' 'RibbonPage2 ' @@ -354,7 +356,7 @@ Partial Class frmAdmin_Start Me.TreeListMenu.OptionsView.ShowIndicator = False Me.TreeListMenu.OptionsView.ShowVertLines = False Me.TreeListMenu.SelectImageList = Me.MainTreeImages - Me.TreeListMenu.Size = New System.Drawing.Size(193, 521) + Me.TreeListMenu.Size = New System.Drawing.Size(193, 448) Me.TreeListMenu.TabIndex = 8 ' 'TreeListColumn1 @@ -385,10 +387,10 @@ Partial Class frmAdmin_Start Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("ce81b5b5-eff5-4006-8018-548aa8413799") - Me.DockPanel1.Location = New System.Drawing.Point(0, 159) + Me.DockPanel1.Location = New System.Drawing.Point(0, 157) Me.DockPanel1.Name = "DockPanel1" Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.Size = New System.Drawing.Size(200, 570) + Me.DockPanel1.Size = New System.Drawing.Size(200, 497) Me.DockPanel1.Text = "Übersicht" ' 'DockPanel1_Container @@ -396,7 +398,7 @@ Partial Class frmAdmin_Start Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu) Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 521) + Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 448) Me.DockPanel1_Container.TabIndex = 0 ' 'TBIDB_ATTRIBUTEBindingSource @@ -435,7 +437,7 @@ Partial Class frmAdmin_Start ' Me.XtraTabPage_IDB.Controls.Add(Me.XtraTabControlIDB) Me.XtraTabPage_IDB.Name = "XtraTabPage_IDB" - Me.XtraTabPage_IDB.Size = New System.Drawing.Size(1126, 501) + Me.XtraTabPage_IDB.Size = New System.Drawing.Size(875, 428) Me.XtraTabPage_IDB.Text = "IDB" ' 'XtraTabControlIDB @@ -444,7 +446,7 @@ Partial Class frmAdmin_Start Me.XtraTabControlIDB.Location = New System.Drawing.Point(0, 0) Me.XtraTabControlIDB.Name = "XtraTabControlIDB" Me.XtraTabControlIDB.SelectedTabPage = Me.XtraTabPageIDB_Attributes_New - Me.XtraTabControlIDB.Size = New System.Drawing.Size(1126, 501) + Me.XtraTabControlIDB.Size = New System.Drawing.Size(875, 428) Me.XtraTabControlIDB.TabIndex = 0 Me.XtraTabControlIDB.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageIDB_Attributes_New, Me.XtraTabPageIDB_Entities}) ' @@ -452,16 +454,16 @@ Partial Class frmAdmin_Start ' Me.XtraTabPageIDB_Attributes_New.Controls.Add(Me.TreeList_IDBAttributes) Me.XtraTabPageIDB_Attributes_New.Name = "XtraTabPageIDB_Attributes_New" - Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(1124, 478) + Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(873, 405) Me.XtraTabPageIDB_Attributes_New.Text = "Attribute" ' - 'TreeListIDBAttributes + 'TreeList_IDBAttributes ' Me.TreeList_IDBAttributes.Dock = System.Windows.Forms.DockStyle.Fill Me.TreeList_IDBAttributes.Location = New System.Drawing.Point(0, 0) Me.TreeList_IDBAttributes.MenuManager = Me.RibbonControl1 - Me.TreeList_IDBAttributes.Name = "TreeListIDBAttributes" - Me.TreeList_IDBAttributes.Size = New System.Drawing.Size(1124, 478) + Me.TreeList_IDBAttributes.Name = "TreeList_IDBAttributes" + Me.TreeList_IDBAttributes.Size = New System.Drawing.Size(873, 405) Me.TreeList_IDBAttributes.StateImageList = Me.IDBImages Me.TreeList_IDBAttributes.TabIndex = 0 ' @@ -474,16 +476,16 @@ Partial Class frmAdmin_Start ' Me.XtraTabPageIDB_Entities.Controls.Add(Me.TreeList_IDBEntities) Me.XtraTabPageIDB_Entities.Name = "XtraTabPageIDB_Entities" - Me.XtraTabPageIDB_Entities.Size = New System.Drawing.Size(1124, 478) + Me.XtraTabPageIDB_Entities.Size = New System.Drawing.Size(873, 405) Me.XtraTabPageIDB_Entities.Text = "Entitäten" ' - 'TreeListIDBEntities + 'TreeList_IDBEntities ' Me.TreeList_IDBEntities.Dock = System.Windows.Forms.DockStyle.Fill Me.TreeList_IDBEntities.Location = New System.Drawing.Point(0, 0) Me.TreeList_IDBEntities.MenuManager = Me.RibbonControl1 - Me.TreeList_IDBEntities.Name = "TreeListIDBEntities" - Me.TreeList_IDBEntities.Size = New System.Drawing.Size(1124, 478) + Me.TreeList_IDBEntities.Name = "TreeList_IDBEntities" + Me.TreeList_IDBEntities.Size = New System.Drawing.Size(873, 405) Me.TreeList_IDBEntities.StateImageList = Me.IDBImages Me.TreeList_IDBEntities.TabIndex = 0 ' @@ -492,17 +494,17 @@ Partial Class frmAdmin_Start Me.XtraTabPage_GlobalIndexer.Controls.Add(Me.TreeList_GLOBIXProfiles) Me.XtraTabPage_GlobalIndexer.Name = "XtraTabPage_GlobalIndexer" Me.XtraTabPage_GlobalIndexer.PageVisible = False - Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 501) + Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(875, 428) Me.XtraTabPage_GlobalIndexer.Text = "Global Indexer" ' - 'TreeListGLOBIXProfiles + 'TreeList_GLOBIXProfiles ' Me.TreeList_GLOBIXProfiles.Dock = System.Windows.Forms.DockStyle.Fill Me.TreeList_GLOBIXProfiles.Location = New System.Drawing.Point(0, 0) Me.TreeList_GLOBIXProfiles.MenuManager = Me.RibbonControl1 - Me.TreeList_GLOBIXProfiles.Name = "TreeListGLOBIXProfiles" + Me.TreeList_GLOBIXProfiles.Name = "TreeList_GLOBIXProfiles" Me.TreeList_GLOBIXProfiles.PreviewFieldName = "Title" - Me.TreeList_GLOBIXProfiles.Size = New System.Drawing.Size(1126, 501) + Me.TreeList_GLOBIXProfiles.Size = New System.Drawing.Size(875, 428) Me.TreeList_GLOBIXProfiles.StateImageList = Me.GLOBIXImages Me.TreeList_GLOBIXProfiles.TabIndex = 0 ' @@ -517,7 +519,7 @@ Partial Class frmAdmin_Start Me.XtraTabPage_ClipboardWatcher.Controls.Add(Me.XtraTabControl1) Me.XtraTabPage_ClipboardWatcher.Name = "XtraTabPage_ClipboardWatcher" Me.XtraTabPage_ClipboardWatcher.PageVisible = False - Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(1126, 501) + Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(875, 428) Me.XtraTabPage_ClipboardWatcher.Text = "Clipboard Watcher" ' 'XtraTabControl1 @@ -526,7 +528,7 @@ Partial Class frmAdmin_Start Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageCWProfiles - Me.XtraTabControl1.Size = New System.Drawing.Size(1126, 501) + Me.XtraTabControl1.Size = New System.Drawing.Size(875, 428) Me.XtraTabControl1.TabIndex = 0 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageCWProfiles, Me.XtraTabPage2}) ' @@ -534,20 +536,18 @@ Partial Class frmAdmin_Start ' Me.XtraTabPageCWProfiles.Controls.Add(Me.TreeList_CWProfiles) Me.XtraTabPageCWProfiles.Name = "XtraTabPageCWProfiles" - Me.XtraTabPageCWProfiles.Size = New System.Drawing.Size(1124, 478) + Me.XtraTabPageCWProfiles.Size = New System.Drawing.Size(873, 405) Me.XtraTabPageCWProfiles.Text = "Profile" ' - 'TreeListCWProfiles + 'TreeList_CWProfiles ' Me.TreeList_CWProfiles.Dock = System.Windows.Forms.DockStyle.Fill Me.TreeList_CWProfiles.KeyFieldName = "" Me.TreeList_CWProfiles.Location = New System.Drawing.Point(0, 0) Me.TreeList_CWProfiles.MenuManager = Me.RibbonControl1 - Me.TreeList_CWProfiles.Name = "TreeListCWProfiles" - Me.TreeList_CWProfiles.OptionsView.ShowIndentAsRowStyle = True + Me.TreeList_CWProfiles.Name = "TreeList_CWProfiles" Me.TreeList_CWProfiles.ParentFieldName = "" - Me.TreeList_CWProfiles.Size = New System.Drawing.Size(1124, 478) - Me.TreeList_CWProfiles.StateImageList = Me.CWImages + Me.TreeList_CWProfiles.Size = New System.Drawing.Size(873, 405) Me.TreeList_CWProfiles.TabIndex = 2 ' 'CWImages @@ -555,21 +555,22 @@ Partial Class frmAdmin_Start Me.CWImages.Add("detailed", "image://svgimages/outlook inspired/detailed.svg") Me.CWImages.Add("newtablestyle", "image://svgimages/actions/newtablestyle.svg") Me.CWImages.Add("bo_appointment", "image://svgimages/business objects/bo_appointment.svg") + Me.CWImages.Add("editnames", "image://svgimages/dashboards/editnames.svg") ' 'XtraTabPage2 ' Me.XtraTabPage2.Name = "XtraTabPage2" - Me.XtraTabPage2.Size = New System.Drawing.Size(1124, 478) + Me.XtraTabPage2.Size = New System.Drawing.Size(873, 405) Me.XtraTabPage2.Text = "XtraTabPage2" ' 'XtraTabControl ' Me.XtraTabControl.Dock = System.Windows.Forms.DockStyle.Fill - Me.XtraTabControl.Location = New System.Drawing.Point(200, 205) + Me.XtraTabControl.Location = New System.Drawing.Point(200, 203) Me.XtraTabControl.Name = "XtraTabControl" Me.XtraTabControl.SelectedTabPage = Me.XtraTabPage_IDB Me.XtraTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True] - Me.XtraTabControl.Size = New System.Drawing.Size(1128, 524) + Me.XtraTabControl.Size = New System.Drawing.Size(877, 451) Me.XtraTabControl.TabIndex = 4 Me.XtraTabControl.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage_ClipboardWatcher, Me.XtraTabPage_GlobalIndexer, Me.XtraTabPage_IDB}) ' @@ -577,9 +578,9 @@ Partial Class frmAdmin_Start ' Me.Panel1.Controls.Add(Me.labelTitle) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Location = New System.Drawing.Point(200, 159) + Me.Panel1.Location = New System.Drawing.Point(200, 157) Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(1128, 46) + Me.Panel1.Size = New System.Drawing.Size(877, 46) Me.Panel1.TabIndex = 8 Me.Panel1.TabStop = True ' @@ -590,7 +591,7 @@ Partial Class frmAdmin_Start Me.labelTitle.Location = New System.Drawing.Point(0, 0) Me.labelTitle.Name = "labelTitle" Me.labelTitle.Padding = New System.Windows.Forms.Padding(5, 0, 0, 0) - Me.labelTitle.Size = New System.Drawing.Size(1128, 46) + Me.labelTitle.Size = New System.Drawing.Size(877, 46) Me.labelTitle.TabIndex = 0 Me.labelTitle.Text = "labelTitle" Me.labelTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft @@ -602,11 +603,16 @@ Partial Class frmAdmin_Start Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem2.Name = "BarButtonItem2" ' + 'SvgImageCollection1 + ' + Me.SvgImageCollection1.Add("actions_checkcircled", "image://svgimages/icon builder/actions_checkcircled.svg") + Me.SvgImageCollection1.Add("paymentunpaid", "image://svgimages/outlook inspired/paymentunpaid.svg") + ' 'frmAdmin_Start ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1328, 751) + Me.ClientSize = New System.Drawing.Size(1077, 676) Me.Controls.Add(Me.XtraTabControl) Me.Controls.Add(Me.Panel1) Me.Controls.Add(Me.DockPanel1) @@ -646,6 +652,7 @@ Partial Class frmAdmin_Start CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl.ResumeLayout(False) Me.Panel1.ResumeLayout(False) + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -715,4 +722,5 @@ Partial Class frmAdmin_Start Friend WithEvents IDBImages As DevExpress.Utils.SvgImageCollection Friend WithEvents BarButtonItem10 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx index c570cbab..7412b67a 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx @@ -260,9 +260,6 @@ 531, 56 - - 17, 17 - 264, 17 @@ -307,6 +304,9 @@ 277, 56 + + 17, 17 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z @@ -323,4 +323,7 @@ IC8+DQo8L3N2Zz4L + + 633, 48 + \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 89b8f72d..72cbc288 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -1,6 +1,8 @@ Imports System.ComponentModel Imports DevExpress.Utils Imports DevExpress.XtraBars.Ribbon +Imports DevExpress.XtraEditors.Controls +Imports DevExpress.XtraEditors.Repository Imports DevExpress.XtraTab Imports DevExpress.XtraTreeList Imports DigitalData.Modules.Logging @@ -181,34 +183,75 @@ Public Class frmAdmin_Start End Sub Private Sub Load_Tree(Source As List(Of AdminItem), TreeList As TreeList) + ' === ACTIVE COLUMN + Dim oActiveEditor As New RepositoryItemImageComboBox With { + .SmallImages = SvgImageCollection1, + .GlyphAlignment = HorzAlignment.Center + } + oActiveEditor.Buttons.Clear() + oActiveEditor.Items.AddRange(New List(Of ImageComboBoxItem) From { + New ImageComboBoxItem("Active", True, 0), + New ImageComboBoxItem("Inactive", False, 1) + }) + Dim oActiveColumn = New Columns.TreeListColumn() With { + .Name = "columnActive", + .Caption = "Aktiv", + .FieldName = "Active", + .Visible = True, + .VisibleIndex = 1, + .ColumnEdit = oActiveEditor, + .MaxWidth = 30, + .MinWidth = 30 + } + oActiveColumn.OptionsColumn.AllowEdit = False + + ' === TYPE/SCOPE COLUMN + Dim oTypeEditor As New RepositoryItemImageComboBox With { + .SmallImages = CWImages, + .GlyphAlignment = HorzAlignment.Center + } + oTypeEditor.Buttons.Clear() + oTypeEditor.Items.AddRange(New List(Of ImageComboBoxItem) From { + New ImageComboBoxItem("Profil", "PROFILE", 0), + New ImageComboBoxItem("Prozess", "PROCESS", 1), + New ImageComboBoxItem("Fenster", "WINDOW", 2), + New ImageComboBoxItem("Feld", "CONTROL", 3) + }) + Dim oTypeColumn = New Columns.TreeListColumn() With { + .Name = "columnType", + .Caption = "Typ", + .FieldName = "Scope", + .Visible = True, + .VisibleIndex = 2, + .ColumnEdit = oTypeEditor, + .MaxWidth = 30, + .MinWidth = 30 + } + oTypeColumn.OptionsColumn.AllowEdit = False + Dim oColumns As New List(Of Columns.TreeListColumn) From { + oActiveColumn, + oTypeColumn, New Columns.TreeListColumn() With { .Name = "columnTitle", .Caption = "Titel", .FieldName = "Title", .Visible = True, - .VisibleIndex = 0 + .VisibleIndex = 5 }, New Columns.TreeListColumn() With { .Name = "columnScope", .Caption = "Typ", .FieldName = "Scope", .Visible = True, - .VisibleIndex = 1 + .VisibleIndex = 6 }, New Columns.TreeListColumn() With { .Name = "columnSummary", .Caption = "Beschreibung", .FieldName = "Summary", .Visible = True, - .VisibleIndex = 2 - }, - New Columns.TreeListColumn() With { - .Name = "columnActive", - .Caption = "Aktiv", - .FieldName = "Active", - .Visible = True, - .VisibleIndex = 3 + .VisibleIndex = 7 } } @@ -239,6 +282,9 @@ Public Class frmAdmin_Start .ShowAutoFilterRow = True .EnableAppearanceEvenRow = True .ShowIndicator = False + .ShowHorzLines = True + .ShowVertLines = True + .ShowTreeLines = True End With With TreeList.OptionsClipboard @@ -278,7 +324,12 @@ Public Class frmAdmin_Start Load_IDBEntity(oItem.RealGuid) Case TreeList_CWProfiles.Name - Load_CWProfile(oItem.RealGuid) + Select Case oItem.Scope + Case "PROFILE" + Load_CWProfile(oItem.RealGuid) + Case Else + ShowError($"Scope {oItem.Scope} is not implemented!") + End Select End Select End If Catch ex As Exception @@ -358,52 +409,4 @@ Public Class frmAdmin_Start Private Sub ResetStatus() labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End Sub - - - - Private Sub TreeList1_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeList_CWProfiles.GetStateImage - Dim oTreeList As TreeList = DirectCast(sender, TreeList) - Dim oItem As AdminItem = DirectCast(oTreeList.GetRow(e.Node.Id), AdminItem) - - Select Case oItem.Scope - Case "PROFILE" - e.NodeImageIndex = 0 - - Case "PROCESS" - e.NodeImageIndex = 1 - - Case "WINDOW" - e.NodeImageIndex = 2 - - Case "CONTROL" - e.NodeImageIndex = 3 - End Select - - End Sub - - Private Sub TreeList2_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeList_GLOBIXProfiles.GetStateImage - Dim oTreeList As TreeList = DirectCast(sender, TreeList) - Dim oItem As AdminItem = DirectCast(oTreeList.GetRow(e.Node.Id), AdminItem) - - Select Case oItem.Scope - Case "PROFILE" - e.NodeImageIndex = 0 - - Case "INDEX_MAN" - e.NodeImageIndex = 1 - - Case "INDEX_AUTO" - e.NodeImageIndex = 2 - - End Select - - End Sub - - Private Sub TreeListIDBAttributes_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeList_IDBAttributes.GetStateImage - e.NodeImageIndex = 1 - End Sub - - Private Sub TreeListIDBEntities_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeList_IDBEntities.GetStateImage - e.NodeImageIndex = 0 - End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmGlobix_Dokumentart.Designer.vb b/GUIs.ZooFlow/Administration/frmGlobix_Dokumentart.Designer.vb index 8c5b7487..c67e6fbd 100644 --- a/GUIs.ZooFlow/Administration/frmGlobix_Dokumentart.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmGlobix_Dokumentart.Designer.vb @@ -407,7 +407,6 @@ Partial Class frmGlobix_Dokumentart Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing - Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'TBDD_DOKUMENTARTTableAdapter diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index 8c580bc3..1d0173c1 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -3117,29 +3117,9 @@ Namespace DSIDB_StammdatenTableAdapters Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBIDB_ATTRIBUTE_TYPE] WHERE (([GUID] = @Original_GUID) AND ([NAME_TY"& _ - "PE] = @Original_NAME_TYPE) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ("& _ - "[COMMENT] = @Original_COMMENT)) AND ([BIT1] = @Original_BIT1) AND ([BIT2] = @Ori"& _ - "ginal_BIT2) AND ([BIT3] = @Original_BIT3) AND ([BIT4] = @Original_BIT4) AND ([AD"& _ - "DED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND (("& _ - "@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original"& _ - "_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([C"& _ - "HANGED_WHEN] = @Original_CHANGED_WHEN)))" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBIDB_ATTRIBUTE_TYPE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.TinyInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_NAME_TYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME_TYPE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_BIT1", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "BIT1", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_BIT2", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "BIT2", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_BIT3", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "BIT3", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_BIT4", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "BIT4", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBIDB_ATTRIBUTE_TYPE] ([NAME_TYPE], [COMMENT], [BIT1], [BIT2], [BIT3"& _ @@ -3275,48 +3255,8 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Delete, true)> _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Byte, ByVal Original_NAME_TYPE As String, ByVal Original_COMMENT As String, ByVal Original_BIT1 As Boolean, ByVal Original_BIT2 As Boolean, ByVal Original_BIT3 As Boolean, ByVal Original_BIT4 As Boolean, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Byte) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Byte) - If (Original_NAME_TYPE Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_NAME_TYPE") - Else - Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_NAME_TYPE,String) - End If - If (Original_COMMENT Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(2).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(3).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(2).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_COMMENT,String) - End If - Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_BIT1,Boolean) - Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_BIT2,Boolean) - Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_BIT3,Boolean) - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(Original_BIT4,Boolean) - If (Original_ADDED_WHO Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") - Else - Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_ADDED_WHO,String) - End If - If (Original_ADDED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(Original_ADDED_WHEN.Value,Date) - Else - Me.Adapter.DeleteCommand.Parameters(9).Value = Global.System.DBNull.Value - End If - If (Original_CHANGED_WHO Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(10).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(11).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(10).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(11).Value = CType(Original_CHANGED_WHO,String) - End If - If (Original_CHANGED_WHEN.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(12).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(13).Value = CType(Original_CHANGED_WHEN.Value,Date) - Else - Me.Adapter.DeleteCommand.Parameters(12).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(13).Value = Global.System.DBNull.Value - End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index 85649680..8d9e6aa7 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -155,23 +155,11 @@ WHERE (GUID = @GUID) - - DELETE FROM [TBIDB_ATTRIBUTE_TYPE] WHERE (([GUID] = @Original_GUID) AND ([NAME_TYPE] = @Original_NAME_TYPE) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([BIT1] = @Original_BIT1) AND ([BIT2] = @Original_BIT2) AND ([BIT3] = @Original_BIT3) AND ([BIT4] = @Original_BIT4) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ([ADDED_WHEN] = @Original_ADDED_WHEN) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN))) + + DELETE FROM TBIDB_ATTRIBUTE_TYPE +WHERE (GUID = @Original_GUID) - - - - - - - - - - - - - - + @@ -258,7 +246,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + @@ -297,7 +285,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + @@ -354,7 +342,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + @@ -412,7 +400,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + \ No newline at end of file diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xss b/GUIs.ZooFlow/DSIDB_Stammdaten.xss index 6991d83d..46c14097 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xss +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xss @@ -7,7 +7,7 @@ - + @@ -15,11 +15,11 @@ 677 - 96 + 97 610 - 96 + 97 diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 800c0e65..325d91b7 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -133,6 +133,13 @@ Form + + frmGlobix_Dokumentart.vb + + + Form + + @@ -294,6 +301,9 @@ frmAdmin_IDBEntity.vb + + frmGlobix_Dokumentart.vb + frmtest.vb