diff --git a/GUIs.ZooFlow/Administration/ClassConstants.vb b/GUIs.ZooFlow/Administration/ClassConstants.vb index d69f0c2e..1dd281cd 100644 --- a/GUIs.ZooFlow/Administration/ClassConstants.vb +++ b/GUIs.ZooFlow/Administration/ClassConstants.vb @@ -8,6 +8,7 @@ Public Const PAGE_IDB_OBJECT_STORES = "IDB_OBJECT_STORES" Public Const PAGE_IDB_DOCTYPE_CONFIG = "IDB_DOCTYPE_CONFIG" Public Const PAGE_IDB_DOCTYPE = "DOCTYPE_DEF" + Public Const PAGE_IDB_DOCTYPE_BE = "DOCTYPE_BE" Public Const MODULE_GI = "GLOBIX" Public Const PAGE_GI_PROFILES = "GI_PROFILES" diff --git a/GUIs.ZooFlow/Administration/ClassDetailForm.vb b/GUIs.ZooFlow/Administration/ClassDetailForm.vb index 4e62915e..67bef96e 100644 --- a/GUIs.ZooFlow/Administration/ClassDetailForm.vb +++ b/GUIs.ZooFlow/Administration/ClassDetailForm.vb @@ -70,7 +70,13 @@ Public Class ClassDetailForm .[Module] = MODULE_IDB, .Entity = PAGE_IDB_DOCTYPE }}, - {PAGE_USERS_USERLIST, New DetailSettings With { + {PAGE_IDB_DOCTYPE_BE, New DetailSettings With { + .GridTitle = "Doctype BE Relations", + .NewRecordTitle = "New Relation", + .[Module] = MODULE_IDB, + .Entity = PAGE_IDB_DOCTYPE_BE + }}, + {PAGE_USERS_USERLIST, New DetailSettings With { .GridTitle = "Benutzer Übersicht", .NewRecordTitle = "Neuer Benutzer", .[Module] = MODULE_USERS, @@ -96,7 +102,7 @@ Public Class ClassDetailForm Public Function LoadData() As Boolean Try - Dim oTable As DataTable = My.DatabaseECM.GetDatatable("SELECT * FROM TBZF_ADMIN_SOURCE_SQL WHERE SCOPE = 'OVERVIEW'") + Dim oTable As DataTable = My.DatabaseECM.GetDatatable("SELECT * FROM TBZF_ADMIN_SOURCE_SQL WHERE SCOPE = 'OVERVIEW' ORDER BY GUID") DetailDataList.Clear() For Each oRow As DataRow In oTable.Rows @@ -176,6 +182,10 @@ Public Class ClassDetailForm Dim oForm As New frmAdmin_Doctype(0) oForm.ShowDialog() Return True + Case PAGE_IDB_DOCTYPE_BE + Dim oForm As New frmAdmin_Doctype(0) + oForm.ShowDialog() + Return True Case PAGE_USERS_USERLIST Load_User(PrimaryKey, IsInsert) diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb index 9b93c355..114a3f45 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb @@ -46,6 +46,8 @@ Partial Class frmAdmin_Globix Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageProfile = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlProfile = New DevExpress.XtraLayout.LayoutControl() + Me.IDB_DOCTYPE_IDComboBox = New System.Windows.Forms.ComboBox() + Me.VWIDB_DOCTYPE_LANGUAGEBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() Me.IDB_OBJECT_STORE_IDComboBox = New System.Windows.Forms.ComboBox() Me.VWIDB_OBJECT_STOREBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -57,13 +59,11 @@ Partial Class frmAdmin_Globix Me.TextEditGeandertWer = New DevExpress.XtraEditors.TextEdit() Me.TextEditNamenkonvention = New DevExpress.XtraEditors.TextEdit() Me.TextEditBeschreibung = New DevExpress.XtraEditors.TextEdit() - Me.TextEditKurzname = New DevExpress.XtraEditors.TextEdit() Me.TextEditBezeichnung = New DevExpress.XtraEditors.TextEdit() Me.TextEditDoctypeID = New DevExpress.XtraEditors.TextEdit() Me.ComboBoxEditDupl_handling = New DevExpress.XtraEditors.ComboBoxEdit() Me.SimpleButtonNameconvention = New DevExpress.XtraEditors.SimpleButton() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem30 = New DevExpress.XtraLayout.LayoutControlItem() @@ -80,6 +80,7 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem36 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem28 = New DevExpress.XtraLayout.LayoutControlItem() Me.EmptySpaceItem12 = New DevExpress.XtraLayout.EmptySpaceItem() + Me.LayoutControlItem61 = New DevExpress.XtraLayout.LayoutControlItem() Me.XtraTabControl2 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageManIndexe = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControlManIndexe = New DevExpress.XtraLayout.LayoutControl() @@ -243,6 +244,10 @@ Partial Class frmAdmin_Globix Me.RadioGroup1 = New DevExpress.XtraEditors.RadioGroup() Me.LayoutControlItem38 = New DevExpress.XtraLayout.LayoutControlItem() Me.TBGI_REGEX_DOCTYPETableAdapter = New DigitalData.GUIs.ZooFlow.GlobixDatasetTableAdapters.TBGI_REGEX_DOCTYPETableAdapter() + Me.VWIDB_DOCTYPE_LANGUAGETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.VWIDB_DOCTYPE_LANGUAGETableAdapter() + Me.GridLookUpEdit1 = New DevExpress.XtraEditors.GridLookUpEdit() + Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem() + Me.GridLookUpEdit1View = New DevExpress.XtraGrid.Views.Grid.GridView() SEQUENCELabel = New System.Windows.Forms.Label() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -253,6 +258,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPageProfile.SuspendLayout() CType(Me.LayoutControlProfile, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControlProfile.SuspendLayout() + CType(Me.VWIDB_DOCTYPE_LANGUAGEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWIDB_OBJECT_STOREBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SEQUENCENumericUpDown, System.ComponentModel.ISupportInitialize).BeginInit() @@ -261,12 +267,10 @@ Partial Class frmAdmin_Globix CType(Me.TextEditGeandertWer.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEditNamenkonvention.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEditBeschreibung.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEditKurzname.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEditBezeichnung.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEditDoctypeID.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ComboBoxEditDupl_handling.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).BeginInit() @@ -283,6 +287,7 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem36, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EmptySpaceItem12, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem61, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl2.SuspendLayout() Me.XtraTabPageManIndexe.SuspendLayout() @@ -412,6 +417,9 @@ Partial Class frmAdmin_Globix CType(Me.viewAvailableGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem38, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridLookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridLookUpEdit1View, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SEQUENCELabel @@ -523,6 +531,8 @@ Partial Class frmAdmin_Globix Me.TableAdapterManager.TBIDB_CATALOG_USERTableAdapter = Nothing Me.TableAdapterManager.TBIDB_CATALOGTableAdapter = Nothing Me.TableAdapterManager.TBIDB_DOCTYPE_HANDLINGTableAdapter = Nothing + Me.TableAdapterManager.TBIDB_DOCTYPETableAdapter = Nothing + Me.TableAdapterManager.TBIDB_LANGUAGETableAdapter = Nothing Me.TableAdapterManager.TBIDB_OBJECT_STORETableAdapter = Nothing Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Nothing Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete @@ -564,6 +574,8 @@ Partial Class frmAdmin_Globix ' 'LayoutControlProfile ' + Me.LayoutControlProfile.Controls.Add(Me.GridLookUpEdit1) + Me.LayoutControlProfile.Controls.Add(Me.IDB_DOCTYPE_IDComboBox) Me.LayoutControlProfile.Controls.Add(Me.TextEdit1) Me.LayoutControlProfile.Controls.Add(Me.IDB_OBJECT_STORE_IDComboBox) Me.LayoutControlProfile.Controls.Add(Me.SEQUENCENumericUpDown) @@ -573,7 +585,6 @@ Partial Class frmAdmin_Globix Me.LayoutControlProfile.Controls.Add(Me.TextEditGeandertWer) Me.LayoutControlProfile.Controls.Add(Me.TextEditNamenkonvention) Me.LayoutControlProfile.Controls.Add(Me.TextEditBeschreibung) - Me.LayoutControlProfile.Controls.Add(Me.TextEditKurzname) Me.LayoutControlProfile.Controls.Add(Me.TextEditBezeichnung) Me.LayoutControlProfile.Controls.Add(Me.TextEditDoctypeID) Me.LayoutControlProfile.Controls.Add(Me.ComboBoxEditDupl_handling) @@ -586,13 +597,30 @@ Partial Class frmAdmin_Globix Me.LayoutControlProfile.TabIndex = 0 Me.LayoutControlProfile.Text = "LayoutControl1" ' + 'IDB_DOCTYPE_IDComboBox + ' + Me.IDB_DOCTYPE_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBDD_DOKUMENTARTBindingSource, "IDB_DOCTYPE_ID", True)) + Me.IDB_DOCTYPE_IDComboBox.DataSource = Me.VWIDB_DOCTYPE_LANGUAGEBindingSource + Me.IDB_DOCTYPE_IDComboBox.DisplayMember = "Doctype" + Me.IDB_DOCTYPE_IDComboBox.FormattingEnabled = True + Me.IDB_DOCTYPE_IDComboBox.Location = New System.Drawing.Point(166, 45) + Me.IDB_DOCTYPE_IDComboBox.Name = "IDB_DOCTYPE_IDComboBox" + Me.IDB_DOCTYPE_IDComboBox.Size = New System.Drawing.Size(379, 21) + Me.IDB_DOCTYPE_IDComboBox.TabIndex = 60 + Me.IDB_DOCTYPE_IDComboBox.ValueMember = "Doctype_ID" + ' + 'VWIDB_DOCTYPE_LANGUAGEBindingSource + ' + Me.VWIDB_DOCTYPE_LANGUAGEBindingSource.DataMember = "VWIDB_DOCTYPE_LANGUAGE" + Me.VWIDB_DOCTYPE_LANGUAGEBindingSource.DataSource = Me.DSIDB_Stammdaten + ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWANN", True)) - Me.TextEdit1.Location = New System.Drawing.Point(166, 226) + Me.TextEdit1.Location = New System.Drawing.Point(166, 251) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.Size = New System.Drawing.Size(387, 20) + Me.TextEdit1.Size = New System.Drawing.Size(379, 20) Me.TextEdit1.StyleController = Me.LayoutControlProfile Me.TextEdit1.TabIndex = 59 ' @@ -603,9 +631,9 @@ Partial Class frmAdmin_Globix Me.IDB_OBJECT_STORE_IDComboBox.DataSource = Me.VWIDB_OBJECT_STOREBindingSource Me.IDB_OBJECT_STORE_IDComboBox.DisplayMember = "Objectstore" Me.IDB_OBJECT_STORE_IDComboBox.FormattingEnabled = True - Me.IDB_OBJECT_STORE_IDComboBox.Location = New System.Drawing.Point(166, 135) + Me.IDB_OBJECT_STORE_IDComboBox.Location = New System.Drawing.Point(166, 160) Me.IDB_OBJECT_STORE_IDComboBox.Name = "IDB_OBJECT_STORE_IDComboBox" - Me.IDB_OBJECT_STORE_IDComboBox.Size = New System.Drawing.Size(388, 21) + Me.IDB_OBJECT_STORE_IDComboBox.Size = New System.Drawing.Size(379, 21) Me.IDB_OBJECT_STORE_IDComboBox.TabIndex = 57 Me.IDB_OBJECT_STORE_IDComboBox.ValueMember = "GUID" ' @@ -617,10 +645,10 @@ Partial Class frmAdmin_Globix 'SEQUENCENumericUpDown ' Me.SEQUENCENumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_INDEX_MANBindingSource, "SEQUENCE", True)) - Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(399, 15) + Me.SEQUENCENumericUpDown.Location = New System.Drawing.Point(395, 15) Me.SEQUENCENumericUpDown.Minimum = New Decimal(New Integer() {1, 0, 0, 0}) Me.SEQUENCENumericUpDown.Name = "SEQUENCENumericUpDown" - Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(37, 22) + Me.SEQUENCENumericUpDown.Size = New System.Drawing.Size(34, 22) Me.SEQUENCENumericUpDown.TabIndex = 56 Me.SEQUENCENumericUpDown.Value = New Decimal(New Integer() {1, 0, 0, 0}) ' @@ -632,9 +660,9 @@ Partial Class frmAdmin_Globix 'AKTIVCheckBox ' Me.AKTIVCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBDD_DOKUMENTARTBindingSource, "AKTIV", True)) - Me.AKTIVCheckBox.Location = New System.Drawing.Point(443, 12) + Me.AKTIVCheckBox.Location = New System.Drawing.Point(436, 12) Me.AKTIVCheckBox.Name = "AKTIVCheckBox" - Me.AKTIVCheckBox.Size = New System.Drawing.Size(278, 20) + Me.AKTIVCheckBox.Size = New System.Drawing.Size(274, 20) Me.AKTIVCheckBox.TabIndex = 25 Me.AKTIVCheckBox.Text = "Aktiv" Me.AKTIVCheckBox.UseVisualStyleBackColor = True @@ -642,69 +670,59 @@ Partial Class frmAdmin_Globix 'GEAENDERTWANNTextBox ' Me.GEAENDERTWANNTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GEAENDERTWANN", True)) - Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(714, 226) + Me.GEAENDERTWANNTextBox.Location = New System.Drawing.Point(706, 251) Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox" Me.GEAENDERTWANNTextBox.ReadOnly = True - Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(390, 20) + Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(381, 20) Me.GEAENDERTWANNTextBox.TabIndex = 39 ' 'TextEditErstelltWer ' Me.TextEditErstelltWer.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "ERSTELLTWER", True)) - Me.TextEditErstelltWer.Location = New System.Drawing.Point(166, 196) + Me.TextEditErstelltWer.Location = New System.Drawing.Point(166, 221) Me.TextEditErstelltWer.MenuManager = Me.RibbonControl1 Me.TextEditErstelltWer.Name = "TextEditErstelltWer" - Me.TextEditErstelltWer.Size = New System.Drawing.Size(387, 20) + Me.TextEditErstelltWer.Size = New System.Drawing.Size(379, 20) Me.TextEditErstelltWer.StyleController = Me.LayoutControlProfile Me.TextEditErstelltWer.TabIndex = 44 ' 'TextEditGeandertWer ' Me.TextEditGeandertWer.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "GEANDERTWER", True)) - Me.TextEditGeandertWer.Location = New System.Drawing.Point(714, 196) + Me.TextEditGeandertWer.Location = New System.Drawing.Point(706, 221) Me.TextEditGeandertWer.MenuManager = Me.RibbonControl1 Me.TextEditGeandertWer.Name = "TextEditGeandertWer" - Me.TextEditGeandertWer.Size = New System.Drawing.Size(390, 20) + Me.TextEditGeandertWer.Size = New System.Drawing.Size(381, 20) Me.TextEditGeandertWer.StyleController = Me.LayoutControlProfile Me.TextEditGeandertWer.TabIndex = 45 ' 'TextEditNamenkonvention ' Me.TextEditNamenkonvention.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "NAMENKONVENTION", True)) - Me.TextEditNamenkonvention.Location = New System.Drawing.Point(166, 105) + Me.TextEditNamenkonvention.Location = New System.Drawing.Point(166, 130) Me.TextEditNamenkonvention.MenuManager = Me.RibbonControl1 Me.TextEditNamenkonvention.Name = "TextEditNamenkonvention" - Me.TextEditNamenkonvention.Size = New System.Drawing.Size(675, 20) + Me.TextEditNamenkonvention.Size = New System.Drawing.Size(662, 20) Me.TextEditNamenkonvention.StyleController = Me.LayoutControlProfile Me.TextEditNamenkonvention.TabIndex = 46 ' 'TextEditBeschreibung ' Me.TextEditBeschreibung.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "BESCHREIBUNG", True)) - Me.TextEditBeschreibung.Location = New System.Drawing.Point(166, 166) + Me.TextEditBeschreibung.Location = New System.Drawing.Point(166, 191) Me.TextEditBeschreibung.MenuManager = Me.RibbonControl1 Me.TextEditBeschreibung.Name = "TextEditBeschreibung" - Me.TextEditBeschreibung.Size = New System.Drawing.Size(938, 20) + Me.TextEditBeschreibung.Size = New System.Drawing.Size(921, 20) Me.TextEditBeschreibung.StyleController = Me.LayoutControlProfile Me.TextEditBeschreibung.TabIndex = 48 ' - 'TextEditKurzname - ' - Me.TextEditKurzname.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "KURZNAME", True)) - Me.TextEditKurzname.Location = New System.Drawing.Point(853, 45) - Me.TextEditKurzname.MenuManager = Me.RibbonControl1 - Me.TextEditKurzname.Name = "TextEditKurzname" - Me.TextEditKurzname.Size = New System.Drawing.Size(251, 20) - Me.TextEditKurzname.StyleController = Me.LayoutControlProfile - Me.TextEditKurzname.TabIndex = 50 - ' 'TextEditBezeichnung ' Me.TextEditBezeichnung.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "BEZEICHNUNG", True)) - Me.TextEditBezeichnung.Location = New System.Drawing.Point(166, 45) + Me.TextEditBezeichnung.Location = New System.Drawing.Point(706, 45) Me.TextEditBezeichnung.MenuManager = Me.RibbonControl1 Me.TextEditBezeichnung.Name = "TextEditBezeichnung" - Me.TextEditBezeichnung.Size = New System.Drawing.Size(526, 20) + Me.TextEditBezeichnung.Size = New System.Drawing.Size(381, 20) Me.TextEditBezeichnung.StyleController = Me.LayoutControlProfile Me.TextEditBezeichnung.TabIndex = 51 ' @@ -714,19 +732,19 @@ Partial Class frmAdmin_Globix Me.TextEditDoctypeID.Location = New System.Drawing.Point(166, 15) Me.TextEditDoctypeID.MenuManager = Me.RibbonControl1 Me.TextEditDoctypeID.Name = "TextEditDoctypeID" - Me.TextEditDoctypeID.Size = New System.Drawing.Size(72, 20) + Me.TextEditDoctypeID.Size = New System.Drawing.Size(68, 20) Me.TextEditDoctypeID.StyleController = Me.LayoutControlProfile Me.TextEditDoctypeID.TabIndex = 52 ' 'ComboBoxEditDupl_handling ' Me.ComboBoxEditDupl_handling.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "DUPLICATE_HANDLING", True)) - Me.ComboBoxEditDupl_handling.Location = New System.Drawing.Point(166, 75) + Me.ComboBoxEditDupl_handling.Location = New System.Drawing.Point(166, 100) Me.ComboBoxEditDupl_handling.MenuManager = Me.RibbonControl1 Me.ComboBoxEditDupl_handling.Name = "ComboBoxEditDupl_handling" Me.ComboBoxEditDupl_handling.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) Me.ComboBoxEditDupl_handling.Properties.Items.AddRange(New Object() {"New version", "Default", "Question"}) - Me.ComboBoxEditDupl_handling.Size = New System.Drawing.Size(938, 20) + Me.ComboBoxEditDupl_handling.Size = New System.Drawing.Size(921, 20) Me.ComboBoxEditDupl_handling.StyleController = Me.LayoutControlProfile Me.ComboBoxEditDupl_handling.TabIndex = 54 ' @@ -734,9 +752,9 @@ Partial Class frmAdmin_Globix ' Me.SimpleButtonNameconvention.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButtonNameconvention.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.SimpleButtonNameconvention.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) - Me.SimpleButtonNameconvention.Location = New System.Drawing.Point(848, 102) + Me.SimpleButtonNameconvention.Location = New System.Drawing.Point(835, 127) Me.SimpleButtonNameconvention.Name = "SimpleButtonNameconvention" - Me.SimpleButtonNameconvention.Size = New System.Drawing.Size(259, 22) + Me.SimpleButtonNameconvention.Size = New System.Drawing.Size(255, 22) Me.SimpleButtonNameconvention.StyleController = Me.LayoutControlProfile Me.SimpleButtonNameconvention.TabIndex = 58 Me.SimpleButtonNameconvention.Text = "Editor" @@ -745,28 +763,18 @@ Partial Class frmAdmin_Globix ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem12, Me.LayoutControlItem10, Me.LayoutControlItem3, Me.LayoutControlItem30, Me.LayoutControlItem20, Me.LayoutControlItem4, Me.EmptySpaceItem1, Me.LayoutControlItem22, Me.LayoutControlItem25, Me.EmptySpaceItem3, Me.LayoutControlItem26, Me.LayoutControlItem1, Me.LayoutControlItem32, Me.LayoutControlItem5, Me.LayoutControlItem36, Me.LayoutControlItem28, Me.EmptySpaceItem12}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem10, Me.LayoutControlItem3, Me.LayoutControlItem30, Me.LayoutControlItem20, Me.LayoutControlItem4, Me.EmptySpaceItem1, Me.LayoutControlItem22, Me.LayoutControlItem25, Me.EmptySpaceItem3, Me.LayoutControlItem26, Me.LayoutControlItem1, Me.LayoutControlItem32, Me.LayoutControlItem5, Me.LayoutControlItem36, Me.LayoutControlItem28, Me.EmptySpaceItem12, Me.LayoutControlItem61, Me.LayoutControlItem12}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(1119, 280) + Me.Root.Size = New System.Drawing.Size(1102, 296) Me.Root.TextVisible = False ' - 'LayoutControlItem12 - ' - Me.LayoutControlItem12.Control = Me.TextEditKurzname - Me.LayoutControlItem12.Location = New System.Drawing.Point(687, 30) - Me.LayoutControlItem12.Name = "LayoutControlItem12" - Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem12.Size = New System.Drawing.Size(412, 30) - Me.LayoutControlItem12.Text = "Kurzname" - Me.LayoutControlItem12.TextSize = New System.Drawing.Size(139, 13) - ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.TextEditBezeichnung - Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 30) + Me.LayoutControlItem10.Location = New System.Drawing.Point(540, 30) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem10.Size = New System.Drawing.Size(687, 30) + Me.LayoutControlItem10.Size = New System.Drawing.Size(542, 31) Me.LayoutControlItem10.Text = "Bezeichnung" Me.LayoutControlItem10.TextSize = New System.Drawing.Size(139, 13) ' @@ -776,20 +784,20 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem3.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem3.Control = Me.TextEditErstelltWer Me.LayoutControlItem3.Enabled = False - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 181) + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 206) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem3.Size = New System.Drawing.Size(548, 30) + Me.LayoutControlItem3.Size = New System.Drawing.Size(540, 30) Me.LayoutControlItem3.Text = "Erstellt wer" Me.LayoutControlItem3.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem30 ' Me.LayoutControlItem30.Control = Me.TextEditNamenkonvention - Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 90) + Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 115) Me.LayoutControlItem30.Name = "LayoutControlItem30" Me.LayoutControlItem30.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem30.Size = New System.Drawing.Size(836, 30) + Me.LayoutControlItem30.Size = New System.Drawing.Size(823, 30) Me.LayoutControlItem30.Text = "Namenkonvention" Me.LayoutControlItem30.TextSize = New System.Drawing.Size(139, 13) ' @@ -797,10 +805,10 @@ Partial Class frmAdmin_Globix ' Me.LayoutControlItem20.Control = Me.SEQUENCENumericUpDown Me.LayoutControlItem20.CustomizationFormText = "SEQUENCE" - Me.LayoutControlItem20.Location = New System.Drawing.Point(233, 0) + Me.LayoutControlItem20.Location = New System.Drawing.Point(229, 0) Me.LayoutControlItem20.Name = "LayoutControlItem20" Me.LayoutControlItem20.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem20.Size = New System.Drawing.Size(198, 30) + Me.LayoutControlItem20.Size = New System.Drawing.Size(195, 30) Me.LayoutControlItem20.Text = "Reihenfolge" Me.LayoutControlItem20.TextSize = New System.Drawing.Size(139, 13) ' @@ -812,24 +820,24 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem4.Size = New System.Drawing.Size(233, 30) + Me.LayoutControlItem4.Size = New System.Drawing.Size(229, 30) Me.LayoutControlItem4.Text = "ID" Me.LayoutControlItem4.TextSize = New System.Drawing.Size(139, 13) ' 'EmptySpaceItem1 ' Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(713, 0) + Me.EmptySpaceItem1.Location = New System.Drawing.Point(702, 0) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(386, 30) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(380, 30) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem22 ' Me.LayoutControlItem22.Control = Me.AKTIVCheckBox - Me.LayoutControlItem22.Location = New System.Drawing.Point(431, 0) + Me.LayoutControlItem22.Location = New System.Drawing.Point(424, 0) Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Size = New System.Drawing.Size(282, 30) + Me.LayoutControlItem22.Size = New System.Drawing.Size(278, 30) Me.LayoutControlItem22.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem22.TextVisible = False ' @@ -838,37 +846,37 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem25.AppearanceItemCaption.Font = New System.Drawing.Font("Segoe UI", 8.25!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.LayoutControlItem25.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem25.Control = Me.IDB_OBJECT_STORE_IDComboBox - Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 120) + Me.LayoutControlItem25.Location = New System.Drawing.Point(0, 145) Me.LayoutControlItem25.Name = "LayoutControlItem25" Me.LayoutControlItem25.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem25.Size = New System.Drawing.Size(549, 31) + Me.LayoutControlItem25.Size = New System.Drawing.Size(540, 31) Me.LayoutControlItem25.Text = "File-Store:" Me.LayoutControlItem25.TextSize = New System.Drawing.Size(139, 13) ' 'EmptySpaceItem3 ' Me.EmptySpaceItem3.AllowHotTrack = False - Me.EmptySpaceItem3.Location = New System.Drawing.Point(0, 241) + Me.EmptySpaceItem3.Location = New System.Drawing.Point(0, 266) Me.EmptySpaceItem3.Name = "EmptySpaceItem3" - Me.EmptySpaceItem3.Size = New System.Drawing.Size(1099, 19) + Me.EmptySpaceItem3.Size = New System.Drawing.Size(1082, 10) Me.EmptySpaceItem3.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem26 ' Me.LayoutControlItem26.Control = Me.ComboBoxEditDupl_handling - Me.LayoutControlItem26.Location = New System.Drawing.Point(0, 60) + Me.LayoutControlItem26.Location = New System.Drawing.Point(0, 85) Me.LayoutControlItem26.Name = "LayoutControlItem26" Me.LayoutControlItem26.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem26.Size = New System.Drawing.Size(1099, 30) + Me.LayoutControlItem26.Size = New System.Drawing.Size(1082, 30) Me.LayoutControlItem26.Text = "Verhalten Datei vorhanden" Me.LayoutControlItem26.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem1 ' Me.LayoutControlItem1.Control = Me.SimpleButtonNameconvention - Me.LayoutControlItem1.Location = New System.Drawing.Point(836, 90) + Me.LayoutControlItem1.Location = New System.Drawing.Point(823, 115) Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Size = New System.Drawing.Size(263, 30) + Me.LayoutControlItem1.Size = New System.Drawing.Size(259, 30) Me.LayoutControlItem1.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem1.TextVisible = False ' @@ -878,10 +886,10 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem32.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem32.Control = Me.TextEdit1 Me.LayoutControlItem32.Enabled = False - Me.LayoutControlItem32.Location = New System.Drawing.Point(0, 211) + Me.LayoutControlItem32.Location = New System.Drawing.Point(0, 236) Me.LayoutControlItem32.Name = "LayoutControlItem32" Me.LayoutControlItem32.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem32.Size = New System.Drawing.Size(548, 30) + Me.LayoutControlItem32.Size = New System.Drawing.Size(540, 30) Me.LayoutControlItem32.Text = "Erstellt wann" Me.LayoutControlItem32.TextSize = New System.Drawing.Size(139, 13) ' @@ -891,10 +899,10 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem5.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem5.Control = Me.TextEditGeandertWer Me.LayoutControlItem5.Enabled = False - Me.LayoutControlItem5.Location = New System.Drawing.Point(548, 181) + Me.LayoutControlItem5.Location = New System.Drawing.Point(540, 206) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem5.Size = New System.Drawing.Size(551, 30) + Me.LayoutControlItem5.Size = New System.Drawing.Size(542, 30) Me.LayoutControlItem5.Text = "Geändert wer" Me.LayoutControlItem5.TextSize = New System.Drawing.Size(139, 13) ' @@ -904,31 +912,41 @@ Partial Class frmAdmin_Globix Me.LayoutControlItem36.AppearanceItemCaption.Options.UseFont = True Me.LayoutControlItem36.Control = Me.GEAENDERTWANNTextBox Me.LayoutControlItem36.Enabled = False - Me.LayoutControlItem36.Location = New System.Drawing.Point(548, 211) + Me.LayoutControlItem36.Location = New System.Drawing.Point(540, 236) Me.LayoutControlItem36.Name = "LayoutControlItem36" Me.LayoutControlItem36.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem36.Size = New System.Drawing.Size(551, 30) + Me.LayoutControlItem36.Size = New System.Drawing.Size(542, 30) Me.LayoutControlItem36.Text = "Geändert wann:" Me.LayoutControlItem36.TextSize = New System.Drawing.Size(139, 13) ' 'LayoutControlItem28 ' Me.LayoutControlItem28.Control = Me.TextEditBeschreibung - Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 151) + Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 176) Me.LayoutControlItem28.Name = "LayoutControlItem28" Me.LayoutControlItem28.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem28.Size = New System.Drawing.Size(1099, 30) + Me.LayoutControlItem28.Size = New System.Drawing.Size(1082, 30) Me.LayoutControlItem28.Text = "Beschreibung" Me.LayoutControlItem28.TextSize = New System.Drawing.Size(139, 13) ' 'EmptySpaceItem12 ' Me.EmptySpaceItem12.AllowHotTrack = False - Me.EmptySpaceItem12.Location = New System.Drawing.Point(549, 120) + Me.EmptySpaceItem12.Location = New System.Drawing.Point(540, 145) Me.EmptySpaceItem12.Name = "EmptySpaceItem12" - Me.EmptySpaceItem12.Size = New System.Drawing.Size(550, 31) + Me.EmptySpaceItem12.Size = New System.Drawing.Size(542, 31) Me.EmptySpaceItem12.TextSize = New System.Drawing.Size(0, 0) ' + 'LayoutControlItem61 + ' + Me.LayoutControlItem61.Control = Me.IDB_DOCTYPE_IDComboBox + Me.LayoutControlItem61.Location = New System.Drawing.Point(0, 30) + Me.LayoutControlItem61.Name = "LayoutControlItem61" + Me.LayoutControlItem61.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem61.Size = New System.Drawing.Size(540, 31) + Me.LayoutControlItem61.Text = "Dokumentart" + Me.LayoutControlItem61.TextSize = New System.Drawing.Size(139, 13) + ' 'XtraTabControl2 ' Me.XtraTabControl2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ @@ -2650,6 +2668,40 @@ Partial Class frmAdmin_Globix ' Me.TBGI_REGEX_DOCTYPETableAdapter.ClearBeforeFill = True ' + 'VWIDB_DOCTYPE_LANGUAGETableAdapter + ' + Me.VWIDB_DOCTYPE_LANGUAGETableAdapter.ClearBeforeFill = True + ' + 'GridLookUpEdit1 + ' + Me.GridLookUpEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBDD_DOKUMENTARTBindingSource, "IDB_DOCTYPE_ID", True)) + Me.GridLookUpEdit1.Location = New System.Drawing.Point(163, 73) + Me.GridLookUpEdit1.MenuManager = Me.RibbonControl1 + Me.GridLookUpEdit1.Name = "GridLookUpEdit1" + Me.GridLookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.GridLookUpEdit1.Properties.DataSource = Me.VWIDB_DOCTYPE_LANGUAGEBindingSource + Me.GridLookUpEdit1.Properties.DisplayMember = "Doctype" + Me.GridLookUpEdit1.Properties.PopupView = Me.GridLookUpEdit1View + Me.GridLookUpEdit1.Properties.ValueMember = "Doctype_ID" + Me.GridLookUpEdit1.Size = New System.Drawing.Size(927, 20) + Me.GridLookUpEdit1.StyleController = Me.LayoutControlProfile + Me.GridLookUpEdit1.TabIndex = 61 + ' + 'LayoutControlItem12 + ' + Me.LayoutControlItem12.Control = Me.GridLookUpEdit1 + Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 61) + Me.LayoutControlItem12.Name = "LayoutControlItem12" + Me.LayoutControlItem12.Size = New System.Drawing.Size(1082, 24) + Me.LayoutControlItem12.TextSize = New System.Drawing.Size(139, 13) + ' + 'GridLookUpEdit1View + ' + Me.GridLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.GridLookUpEdit1View.Name = "GridLookUpEdit1View" + Me.GridLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = False + Me.GridLookUpEdit1View.OptionsView.ShowGroupPanel = False + ' 'frmAdmin_Globix ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2672,6 +2724,7 @@ Partial Class frmAdmin_Globix Me.XtraTabPageProfile.ResumeLayout(False) CType(Me.LayoutControlProfile, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControlProfile.ResumeLayout(False) + CType(Me.VWIDB_DOCTYPE_LANGUAGEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWIDB_OBJECT_STOREBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SEQUENCENumericUpDown, System.ComponentModel.ISupportInitialize).EndInit() @@ -2680,12 +2733,10 @@ Partial Class frmAdmin_Globix CType(Me.TextEditGeandertWer.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEditNamenkonvention.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEditBeschreibung.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEditKurzname.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEditBezeichnung.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEditDoctypeID.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ComboBoxEditDupl_handling.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem30, System.ComponentModel.ISupportInitialize).EndInit() @@ -2702,6 +2753,7 @@ Partial Class frmAdmin_Globix CType(Me.LayoutControlItem36, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem28, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EmptySpaceItem12, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem61, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.XtraTabControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.XtraTabControl2.ResumeLayout(False) Me.XtraTabPageManIndexe.ResumeLayout(False) @@ -2831,6 +2883,9 @@ Partial Class frmAdmin_Globix CType(Me.viewAvailableGroups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RadioGroup1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem38, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridLookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridLookUpEdit1View, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -2897,12 +2952,10 @@ Partial Class frmAdmin_Globix Friend WithEvents LayoutControlItem29 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents TextEditNamenkonvention As DevExpress.XtraEditors.TextEdit Friend WithEvents TextEditBeschreibung As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEditKurzname As DevExpress.XtraEditors.TextEdit Friend WithEvents TextEditBezeichnung As DevExpress.XtraEditors.TextEdit Friend WithEvents TextEditDoctypeID As DevExpress.XtraEditors.TextEdit Friend WithEvents LayoutControlItem30 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem28 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents LayoutControlItem12 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents GUIDTextBoxMANINDEX As DevExpress.XtraEditors.TextEdit @@ -3052,4 +3105,11 @@ Partial Class frmAdmin_Globix Friend WithEvents LayoutControlItem49 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents OPTIONALCheckBox As CheckBox Friend WithEvents LayoutControlItem62 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents IDB_DOCTYPE_IDComboBox As ComboBox + Friend WithEvents LayoutControlItem61 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents VWIDB_DOCTYPE_LANGUAGEBindingSource As BindingSource + Friend WithEvents VWIDB_DOCTYPE_LANGUAGETableAdapter As DSIDB_StammdatenTableAdapters.VWIDB_DOCTYPE_LANGUAGETableAdapter + Friend WithEvents GridLookUpEdit1 As DevExpress.XtraEditors.GridLookUpEdit + Friend WithEvents GridLookUpEdit1View As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents LayoutControlItem12 As DevExpress.XtraLayout.LayoutControlItem End Class diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx index 882d0694..79f6700a 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx @@ -171,6 +171,9 @@ 981, 17 + + 17, 134 + 246, 56 @@ -513,6 +516,9 @@ 765, 95 + + 311, 134 + 161 diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb index 22bfafa3..d449bcf5 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb @@ -23,13 +23,17 @@ Public Class frmAdmin_Globix Private Sub frmAdmin_Globix_Load(sender As Object, e As EventArgs) Handles MyBase.Load InitializeBaseForm(My.LogConfig) Try + VWIDB_DOCTYPE_LANGUAGETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString TBDD_DOKUMENTARTTableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString - TBDD_DOKUMENTARTTableAdapter.Fill(Me.GlobixDataset.TBDD_DOKUMENTART, PrimaryKey) - TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString Me.TBGI_REGEX_DOCTYPETableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString Me.VWIDB_OBJECT_STORETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString - Me.VWIDB_OBJECT_STORETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_OBJECT_STORE) Me.VWIDB_BE_ATTRIBUTETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString + TBDD_INDEX_MANTableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString + + Me.VWIDB_DOCTYPE_LANGUAGETableAdapter.FillByLanguage(Me.DSIDB_Stammdaten.VWIDB_DOCTYPE_LANGUAGE, My.Application.User.Language) + TBDD_DOKUMENTARTTableAdapter.Fill(Me.GlobixDataset.TBDD_DOKUMENTART, PrimaryKey) + Me.VWIDB_OBJECT_STORETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_OBJECT_STORE) + Try Me.VWIDB_BE_ATTRIBUTETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE, My.Application.User.Language) Catch ex As Exception @@ -236,10 +240,10 @@ Public Class frmAdmin_Globix End Function Private Function Insert_Doctype() As Boolean Try - Dim oIns = $"INSERT INTO [TBDD_DOKUMENTART] ([BEZEICHNUNG] ,[OBJEKTTYP] ,[EINGANGSART_ID] ,[KURZNAME] ,[ZIEL_PFAD] ,[BESCHREIBUNG] + Dim oIns = $"INSERT INTO [TBDD_DOKUMENTART] ([BEZEICHNUNG] ,[OBJEKTTYP] ,[EINGANGSART_ID] ,[IDB_DOCTYPE_ID] ,[ZIEL_PFAD] ,[BESCHREIBUNG] ,[WINDREAM_DIRECT] ,[FOLDER_FOR_INDEX] ,[DUPLICATE_HANDLING],[AKTIV],[LANGUAGE], [SEQUENCE],[NAMENKONVENTION],[ERSTELLTWER],IDB_OBJECT_STORE_ID) VALUES - ('{TextEditBezeichnung.Text}','IDB_DRIVEN',1,'{TextEditKurzname.Text}','IDB_STORE','{TextEditBeschreibung.Text}' + ('{TextEditBezeichnung.Text}','IDB_DRIVEN',1,{IDB_DOCTYPE_IDComboBox.SelectedValue},'IDB_STORE','{TextEditBeschreibung.Text}' ,'False','{FOLDER_FOR_INDEXTextEdit.Text}','{ComboBoxEditDupl_handling.EditValue}' ,'{AKTIVCheckBox.Checked}','{My.Application.User.Language}' , {SEQUENCENumericUpDown.Value},'{TextEditNamenkonvention.Text}','{My.Application.User.UserName}',{IDB_OBJECT_STORE_IDComboBox.SelectedValue})" If My.DatabaseECM.ExecuteNonQuery(oIns) = True Then @@ -261,7 +265,7 @@ Public Class frmAdmin_Globix End Function Private Function Update_Doctype() As Boolean Try - Dim oUpd = $"UPDATE TBDD_DOKUMENTART SET [BEZEICHNUNG] = '{TextEditBezeichnung.Text}' ,[KURZNAME] = '{TextEditKurzname.Text}' ,[BESCHREIBUNG] = '{TextEditBeschreibung.Text}' + Dim oUpd = $"UPDATE TBDD_DOKUMENTART SET [BEZEICHNUNG] = '{TextEditBezeichnung.Text}' ,[IDB_DOCTYPE_ID] = {IDB_DOCTYPE_IDComboBox.SelectedValue} ,[BESCHREIBUNG] = '{TextEditBeschreibung.Text}' ,[DUPLICATE_HANDLING] = '{ComboBoxEditDupl_handling.EditValue}',[AKTIV] = '{AKTIVCheckBox.Checked}',[SEQUENCE] = {SEQUENCENumericUpDown.Value} ,[NAMENKONVENTION] = '{TextEditNamenkonvention.Text}', [FOLDER_FOR_INDEX] = '{FOLDER_FOR_INDEXTextEdit.Text}',[GEANDERTWER] = '{My.Application.User.UserName}',IDB_OBJECT_STORE_ID = {IDB_OBJECT_STORE_IDComboBox.SelectedValue} WHERE GUID = {TextEditDoctypeID.Text}" diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_Doctype.vb b/GUIs.ZooFlow/Administration/IDB/frmAdmin_Doctype.vb index cffafd0a..8118c0b6 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_Doctype.vb +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_Doctype.vb @@ -82,7 +82,7 @@ Public Class frmAdmin_Doctype Private Sub GridView1_FocusedRowChanged(sender As Object, e As DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs) Handles GridView1.FocusedRowChanged Dim oView As GridView = sender - SelSystitle = oView.GetFocusedRowCellValue(oView.Columns(2)).ToString() + SelSystitle = oView.GetFocusedRowCellValue(oView.Columns("SystemTitle")).ToString() SelLanguage = oView.GetFocusedRowCellValue(oView.Columns("Language")).ToString() BarButtonItemSaveChange.Enabled = False End Sub diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 1cc1f6a0..1cc16c7a 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -62,7 +62,6 @@ Partial Class frmAdmin_Start Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup20 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.TreeListMenu = New DevExpress.XtraTreeList.TreeList() @@ -367,7 +366,7 @@ Partial Class frmAdmin_Start ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1, Me.RibbonPageGroup20}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Start" ' @@ -386,12 +385,6 @@ Partial Class frmAdmin_Start Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Datensätze" ' - 'RibbonPageGroup20 - ' - Me.RibbonPageGroup20.ItemLinks.Add(Me.BarButtonItem26) - Me.RibbonPageGroup20.Name = "RibbonPageGroup20" - Me.RibbonPageGroup20.Text = "RibbonPageGroup20" - ' 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) @@ -422,20 +415,22 @@ Partial Class frmAdmin_Start Me.TreeListMenu.AppendNode(New Object() {"Attribute"}, 0, 2, 2, -1, "IDB_ATTRIBUTES") Me.TreeListMenu.AppendNode(New Object() {"Attribute Relations"}, 1, 9, 9, -1, "ATTRIBUTE_RELATIONS") Me.TreeListMenu.AppendNode(New Object() {"Business Entities"}, 0, 1, 1, -1, "IDB_BUSINESS_ENTITIES") + Me.TreeListMenu.AppendNode(New Object() {Nothing}, 3) Me.TreeListMenu.AppendNode(New Object() {"Doctypes"}, 0, 10, 10, -1, "DOCTYPE_DEF") - Me.TreeListMenu.AppendNode(New Object() {"Doctype Config"}, 4, 10, 10, -1, "IDB_DOCTYPE_CONFIG") + Me.TreeListMenu.AppendNode(New Object() {"Doctypes Config"}, 5, 10, 10, -1, "IDB_DOCTYPE_CONFIG") + Me.TreeListMenu.AppendNode(New Object() {"Doctypes - Business Entities"}, 5, 9, 9, -1, "DOCTYPE_BE") Me.TreeListMenu.AppendNode(New Object() {"Object Stores"}, 0, "IDB_OBJECT_STORES") Me.TreeListMenu.AppendNode(New Object() {"Global Indexer"}, -1, 6, 6, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 7, 4, 4, -1, "GI_PROFILES") - Me.TreeListMenu.AppendNode(New Object() {"Profile Relations"}, 8, 9, 9, -1, "GI_RELATIONS") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 9, 4, 4, -1, "GI_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profile Relations"}, 10, 9, 9, -1, "GI_RELATIONS") Me.TreeListMenu.AppendNode(New Object() {"Clipboard Watcher"}, -1, 7, 7, -1, "") - Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 10, 4, 4, -1, "CW_PROFILES") + Me.TreeListMenu.AppendNode(New Object() {"Profiles"}, 12, 4, 4, -1, "CW_PROFILES") Me.TreeListMenu.AppendNode(New Object() {"Administration"}, -1) - Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 12, 3, 3, -1, "META_SOURCE_SQL") + Me.TreeListMenu.AppendNode(New Object() {"Source SQL"}, 14, 3, 3, -1, "META_SOURCE_SQL") Me.TreeListMenu.AppendNode(New Object() {"User Management"}, -1, 11, 11, -1) - Me.TreeListMenu.AppendNode(New Object() {"User List"}, 14, 5, 5, -1, "USERS_USERLIST") - Me.TreeListMenu.AppendNode(New Object() {"Group List"}, 14, 12, 12, -1, "USERS_GROUPLIST") - Me.TreeListMenu.AppendNode(New Object() {"Module List"}, 14, 13, 13, -1, "USERS_MODULELIST") + Me.TreeListMenu.AppendNode(New Object() {"User List"}, 16, 5, 5, -1, "USERS_USERLIST") + Me.TreeListMenu.AppendNode(New Object() {"Group List"}, 16, 12, 12, -1, "USERS_GROUPLIST") + Me.TreeListMenu.AppendNode(New Object() {"Module List"}, 16, 13, 13, -1, "USERS_MODULELIST") Me.TreeListMenu.EndUnboundLoad() Me.TreeListMenu.OptionsBehavior.Editable = False Me.TreeListMenu.OptionsView.ShowColumns = False @@ -937,5 +932,4 @@ Partial Class frmAdmin_Start Friend WithEvents RibbonGroup_ClipboardWatcher_Profile As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonPage_ClipboardWatcher As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents BarButtonItem26 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup20 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx index b3dc977c..c847b024 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx @@ -288,6 +288,9 @@ 531, 17 + + 531, 17 + 1043, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index a7ae4836..3fc09f7d 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -98,7 +98,8 @@ Public Class frmAdmin_Start Select Case CurrentPage Case PAGE_IDB_DOCTYPE btnAddRecord.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - + Case PAGE_IDB_DOCTYPE_BE + btnAddRecord.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End Select End If diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index 3bb1eec4..73bbad40 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -5634,6 +5634,8 @@ Partial Public Class DSIDB_Stammdaten Private columnChanged_When As Global.System.Data.DataColumn + Private columnDoctype_ID As Global.System.Data.DataColumn + _ Public Sub New() @@ -5717,6 +5719,14 @@ Partial Public Class DSIDB_Stammdaten End Get End Property + _ + Public ReadOnly Property Doctype_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnDoctype_ID + End Get + End Property + _ @@ -5754,9 +5764,9 @@ Partial Public Class DSIDB_Stammdaten _ - Public Overloads Function AddVWIDB_DOCTYPE_LANGUAGERow(ByVal ID As Long, ByVal SystemTitle As String, ByVal Doctype As String, ByVal Language As String, ByVal Added_When As Date, ByVal Changed_When As Date) As VWIDB_DOCTYPE_LANGUAGERow + Public Overloads Function AddVWIDB_DOCTYPE_LANGUAGERow(ByVal ID As Long, ByVal SystemTitle As String, ByVal Doctype As String, ByVal Language As String, ByVal Added_When As Date, ByVal Changed_When As Date, ByVal Doctype_ID As Long) As VWIDB_DOCTYPE_LANGUAGERow Dim rowVWIDB_DOCTYPE_LANGUAGERow As VWIDB_DOCTYPE_LANGUAGERow = CType(Me.NewRow,VWIDB_DOCTYPE_LANGUAGERow) - Dim columnValuesArray() As Object = New Object() {ID, SystemTitle, Doctype, Language, Added_When, Changed_When} + Dim columnValuesArray() As Object = New Object() {ID, SystemTitle, Doctype, Language, Added_When, Changed_When, Doctype_ID} rowVWIDB_DOCTYPE_LANGUAGERow.ItemArray = columnValuesArray Me.Rows.Add(rowVWIDB_DOCTYPE_LANGUAGERow) Return rowVWIDB_DOCTYPE_LANGUAGERow @@ -5791,6 +5801,7 @@ Partial Public Class DSIDB_Stammdaten Me.columnLanguage = MyBase.Columns("Language") Me.columnAdded_When = MyBase.Columns("Added When") Me.columnChanged_When = MyBase.Columns("Changed When") + Me.columnDoctype_ID = MyBase.Columns("Doctype_ID") End Sub _ + Public Property Doctype_ID() As Long + Get + Return CType(Me(Me.tableVWIDB_DOCTYPE_LANGUAGE.Doctype_IDColumn),Long) + End Get + Set + Me(Me.tableVWIDB_DOCTYPE_LANGUAGE.Doctype_IDColumn) = value + End Set + End Property + _ Public Function IsChanged_WhenNull() As Boolean @@ -13784,6 +13809,7 @@ Namespace DSIDB_StammdatenTableAdapters tableMapping.ColumnMappings.Add("Language", "Language") tableMapping.ColumnMappings.Add("Added When", "Added When") tableMapping.ColumnMappings.Add("Changed When", "Changed When") + tableMapping.ColumnMappings.Add("Doctype_ID", "Doctype_ID") Me._adapter.TableMappings.Add(tableMapping) End Sub @@ -13797,13 +13823,20 @@ Namespace DSIDB_StammdatenTableAdapters _ Private Sub InitCommandCollection() - Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT ID, SYS_TITLE AS SystemTitle, Doctype, LANG_CODE AS Language, ADDED"& _ - "_WHEN AS [Added When], CHANGED_WHEN AS [Changed When]"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWIDB_DOC"& _ - "TYPE_LANGUAGE" + "_WHEN AS [Added When], CHANGED_WHEN AS [Changed When], Doctype_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ + " VWIDB_DOCTYPE_LANGUAGE" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(1).Connection = Me.Connection + Me._commandCollection(1).CommandText = "SELECT ID, SYS_TITLE AS SystemTitle, Doctype, LANG_CODE AS Language, ADDED"& _ + "_WHEN AS [Added When], CHANGED_WHEN AS [Changed When], Doctype_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ + " VWIDB_DOCTYPE_LANGUAGE WHERE LANG_CODE = @LANG_CODE" + Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LANG_CODE", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "Language", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub _ + Public Overloads Overridable Function FillByLanguage(ByVal dataTable As DSIDB_Stammdaten.VWIDB_DOCTYPE_LANGUAGEDataTable, ByVal LANG_CODE As String) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(1) + If (LANG_CODE Is Nothing) Then + Throw New Global.System.ArgumentNullException("LANG_CODE") + Else + Me.Adapter.SelectCommand.Parameters(0).Value = CType(LANG_CODE,String) + End If + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetDataByLanguage(ByVal LANG_CODE As String) As DSIDB_Stammdaten.VWIDB_DOCTYPE_LANGUAGEDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(1) + If (LANG_CODE Is Nothing) Then + Throw New Global.System.ArgumentNullException("LANG_CODE") + Else + Me.Adapter.SelectCommand.Parameters(0).Value = CType(LANG_CODE,String) + End If + Dim dataTable As DSIDB_Stammdaten.VWIDB_DOCTYPE_LANGUAGEDataTable = New DSIDB_Stammdaten.VWIDB_DOCTYPE_LANGUAGEDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function End Class ''' diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsc b/GUIs.ZooFlow/DSIDB_Stammdaten.xsc index f103d8cb..82618466 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsc +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsc @@ -42,11 +42,9 @@ - - + - - + diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index d3645242..de8b6610 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -827,7 +827,7 @@ SELECT GUID, LANG_CODE, CREATE_DEFAULT_ENTRY, COMMENT, ADDED_WHO, ADDED_WHEN, CH - SELECT ID, SYS_TITLE AS SystemTitle, Doctype, LANG_CODE AS Language, ADDED_WHEN AS [Added When], CHANGED_WHEN AS [Changed When] + SELECT ID, SYS_TITLE AS SystemTitle, Doctype, LANG_CODE AS Language, ADDED_WHEN AS [Added When], CHANGED_WHEN AS [Changed When], Doctype_ID FROM VWIDB_DOCTYPE_LANGUAGE @@ -841,8 +841,21 @@ FROM VWIDB_DOCTYPE_LANGUAGE + - + + + + + SELECT ID, SYS_TITLE AS SystemTitle, Doctype, LANG_CODE AS Language, ADDED_WHEN AS [Added When], CHANGED_WHEN AS [Changed When], Doctype_ID +FROM VWIDB_DOCTYPE_LANGUAGE WHERE LANG_CODE = @LANG_CODE + + + + + + + @@ -933,7 +946,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -972,7 +985,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1031,7 +1044,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1088,7 +1101,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1129,7 +1142,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1188,7 +1201,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1241,7 +1254,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1278,7 +1291,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1292,7 +1305,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1330,7 +1343,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1343,7 +1356,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1382,7 +1395,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1403,7 +1416,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1441,7 +1454,7 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - + @@ -1468,10 +1481,11 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR + - + @@ -1565,9 +1579,9 @@ SELECT GUID, TITLE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FR - - - + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Modules/Globix/GlobixDataset.Designer.vb b/GUIs.ZooFlow/Modules/Globix/GlobixDataset.Designer.vb index 3825440b..3292e904 100644 --- a/GUIs.ZooFlow/Modules/Globix/GlobixDataset.Designer.vb +++ b/GUIs.ZooFlow/Modules/Globix/GlobixDataset.Designer.vb @@ -476,6 +476,8 @@ Partial Public Class GlobixDataset Private columnIDB_OBJECT_STORE_ID As Global.System.Data.DataColumn + Private columnIDB_DOCTYPE_ID As Global.System.Data.DataColumn + _ Public Sub New() @@ -663,6 +665,14 @@ Partial Public Class GlobixDataset End Get End Property + _ + Public ReadOnly Property IDB_DOCTYPE_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnIDB_DOCTYPE_ID + End Get + End Property + _ @@ -718,9 +728,10 @@ Partial Public Class GlobixDataset ByVal ERSTELLTWANN As Date, _ ByVal GEANDERTWER As String, _ ByVal GEAENDERTWANN As Date, _ - ByVal IDB_OBJECT_STORE_ID As Integer) As TBDD_DOKUMENTARTRow + ByVal IDB_OBJECT_STORE_ID As Integer, _ + ByVal IDB_DOCTYPE_ID As Integer) As TBDD_DOKUMENTARTRow Dim rowTBDD_DOKUMENTARTRow As TBDD_DOKUMENTARTRow = CType(Me.NewRow,TBDD_DOKUMENTARTRow) - Dim columnValuesArray() As Object = New Object() {Nothing, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, WINDREAM_DIRECT, FOLDER_FOR_INDEX, DUPLICATE_HANDLING, AKTIV, LANGUAGE, SEQUENCE, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, IDB_OBJECT_STORE_ID} + Dim columnValuesArray() As Object = New Object() {Nothing, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, WINDREAM_DIRECT, FOLDER_FOR_INDEX, DUPLICATE_HANDLING, AKTIV, LANGUAGE, SEQUENCE, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, IDB_OBJECT_STORE_ID, IDB_DOCTYPE_ID} rowTBDD_DOKUMENTARTRow.ItemArray = columnValuesArray Me.Rows.Add(rowTBDD_DOKUMENTARTRow) Return rowTBDD_DOKUMENTARTRow @@ -768,6 +779,7 @@ Partial Public Class GlobixDataset Me.columnGEANDERTWER = MyBase.Columns("GEANDERTWER") Me.columnGEAENDERTWANN = MyBase.Columns("GEAENDERTWANN") Me.columnIDB_OBJECT_STORE_ID = MyBase.Columns("IDB_OBJECT_STORE_ID") + Me.columnIDB_DOCTYPE_ID = MyBase.Columns("IDB_DOCTYPE_ID") End Sub _ + Public Property IDB_DOCTYPE_ID() As Integer + Get + Return CType(Me(Me.tableTBDD_DOKUMENTART.IDB_DOCTYPE_IDColumn),Integer) + End Get + Set + Me(Me.tableTBDD_DOKUMENTART.IDB_DOCTYPE_IDColumn) = value + End Set + End Property + _ Public Function IsBESCHREIBUNGNull() As Boolean @@ -4256,6 +4282,7 @@ Namespace GlobixDatasetTableAdapters tableMapping.ColumnMappings.Add("GEANDERTWER", "GEANDERTWER") tableMapping.ColumnMappings.Add("GEAENDERTWANN", "GEAENDERTWANN") tableMapping.ColumnMappings.Add("IDB_OBJECT_STORE_ID", "IDB_OBJECT_STORE_ID") + tableMapping.ColumnMappings.Add("IDB_DOCTYPE_ID", "IDB_DOCTYPE_ID") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -4266,14 +4293,14 @@ Namespace GlobixDatasetTableAdapters Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_DOKUMENTART"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (BEZEICHNUNG, EINGANGSART_"& _ "ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, OBJE"& _ - "KTTYP, WINDREAM_DIRECT, FOLDER_FOR_INDEX, SEQUENCE, DUPLICATE_HANDLING)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES "& _ - " (@BEZEICHNUNG,@EINGANGSART_ID,@KURZNAME,@ZIEL_PFAD,@BESCHREIBUNG,@AKTIV,@"& _ - "NAMENKONVENTION,@ERSTELLTWER,@OBJEKTTYP,@WINDREAM_DIRECT,@FOLDER_FOR_INDEX,@SEQU"& _ - "ENCE,@DUPLICATE_HANDLING); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_"& _ - "ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, WINDREAM_DIRECT, FOLDER_FOR_INDEX, DUPLIC"& _ - "ATE_HANDLING, AKTIV, LANGUAGE, SEQUENCE, NAMENKONVENTION, ERSTELLTWER, ERSTELLTW"& _ - "ANN, GEANDERTWER, GEAENDERTWANN FROM TBDD_DOKUMENTART WHERE (GUID = SCOPE_IDENTI"& _ - "TY())" + "KTTYP, WINDREAM_DIRECT, FOLDER_FOR_INDEX, SEQUENCE, DUPLICATE_HANDLING, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " IDB_DOCTYPE_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@BEZEICHNUNG,@EINGANGSART_ID,"& _ + "@KURZNAME,@ZIEL_PFAD,@BESCHREIBUNG,@AKTIV,@NAMENKONVENTION,@ERSTELLTWER,@OBJEKTT"& _ + "YP,@WINDREAM_DIRECT,@FOLDER_FOR_INDEX,@SEQUENCE,@DUPLICATE_HANDLING,@IDB_DOCTYPE"& _ + "_ID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_P"& _ + "FAD, BESCHREIBUNG, WINDREAM_DIRECT, FOLDER_FOR_INDEX, DUPLICATE_HANDLING, AKTIV,"& _ + " LANGUAGE, SEQUENCE, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GE"& _ + "AENDERTWANN FROM TBDD_DOKUMENTART WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EINGANGSART_ID", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "EINGANGSART_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -4288,6 +4315,7 @@ Namespace GlobixDatasetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLDER_FOR_INDEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLDER_FOR_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DUPLICATE_HANDLING", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "DUPLICATE_HANDLING", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IDB_DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "IDB_DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_DOKUMENTART"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET BEZEICHNUNG = @BEZEICHNUNG, EIN"& _ @@ -4296,11 +4324,11 @@ Namespace GlobixDatasetTableAdapters "NTION = @NAMENKONVENTION, GEANDERTWER = @GEANDERTWER, OBJEKTTYP = @OBJEKTTYP, WI"& _ "NDREAM_DIRECT = @WINDREAM_DIRECT, FOLDER_FOR_INDEX = @FOLDER_FOR_INDEX, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " SEQUENCE = @SEQUENCE, DUPLICATE_HANDLING = @DUPLICATE_HANDLIN"& _ - "G"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, BEZEICHNUNG, OBJEKTTYP"& _ - ", EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, WINDREAM_DIRECT, FOLDER_FOR"& _ - "_INDEX, DUPLICATE_HANDLING, AKTIV, LANGUAGE, SEQUENCE, NAMENKONVENTION, ERSTELLT"& _ - "WER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBDD_DOKUMENTART WHERE (GUID "& _ - "= @GUID)" + "G, IDB_DOCTYPE_ID = @IDB_DOCTYPE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ + "SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHR"& _ + "EIBUNG, WINDREAM_DIRECT, FOLDER_FOR_INDEX, DUPLICATE_HANDLING, AKTIV, LANGUAGE, "& _ + "SEQUENCE, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN"& _ + " FROM TBDD_DOKUMENTART WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@BEZEICHNUNG", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "BEZEICHNUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EINGANGSART_ID", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "EINGANGSART_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -4315,6 +4343,7 @@ Namespace GlobixDatasetTableAdapters Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLDER_FOR_INDEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLDER_FOR_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DUPLICATE_HANDLING", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "DUPLICATE_HANDLING", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IDB_DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "IDB_DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -4335,8 +4364,8 @@ Namespace GlobixDatasetTableAdapters Me._commandCollection(0).CommandText = "SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, "& _ "BESCHREIBUNG, WINDREAM_DIRECT, FOLDER_FOR_INDEX, DUPLICATE_HANDLING, AKTIV, LANG"& _ "UAGE, SEQUENCE, NAMENKONVENTION, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" ERSTELLTWER, ERSTELL"& _ - "TWANN, GEANDERTWER, GEAENDERTWANN, IDB_OBJECT_STORE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_DOK"& _ - "UMENTART"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @GUID)" + "TWANN, GEANDERTWER, GEAENDERTWANN, IDB_OBJECT_STORE_ID, IDB_DOCTYPE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ + " TBDD_DOKUMENTART"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @GUID)" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() @@ -4349,11 +4378,12 @@ Namespace GlobixDatasetTableAdapters "D_DOKUMENTART.LANGUAGE, TBDD_DOKUMENTART.SEQUENCE, TBDD_DOKUMENTART.NAMENKONVENT"& _ "ION, TBDD_DOKUMENTART.ERSTELLTWER, TBDD_DOKUMENTART.ERSTELLTWANN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ " TBDD_DOKUMENTART.GEANDERTWER, TBDD_DOKUMENTART.GEAENDERTWANN, TBDD_"& _ - "DOKUMENTART.IDB_OBJECT_STORE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_DOKUMENTART INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " TBDD_DOKUMENTART_MODULE ON TBDD_DOKUMENTART.GUID = TBDD_D"& _ - "OKUMENTART_MODULE.DOKART_ID INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBDD_MODULES ON"& _ - " TBDD_DOKUMENTART_MODULE.MODULE_ID = TBDD_MODULES.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (TBDD_MODUL"& _ - "ES.SHORT_NAME = 'GLOBIX')"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY TBDD_DOKUMENTART.BEZEICHNUNG" + "DOKUMENTART.IDB_OBJECT_STORE_ID, TBDD_DOKUMENTART.IDB_DOCTYPE_ID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ + " TBDD_DOKUMENTART INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBDD_DOKUMENTART_MODULE "& _ + "ON TBDD_DOKUMENTART.GUID = TBDD_DOKUMENTART_MODULE.DOKART_ID INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ + " TBDD_MODULES ON TBDD_DOKUMENTART_MODULE.MODULE_ID = TBDD_MODUL"& _ + "ES.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (TBDD_MODULES.SHORT_NAME = 'GLOBIX')"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY TBDD_DOKUME"& _ + "NTART.BEZEICHNUNG" Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text End Sub @@ -4460,24 +4490,20 @@ Namespace GlobixDatasetTableAdapters 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.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal BEZEICHNUNG As String, ByVal EINGANGSART_ID As Global.System.Nullable(Of Byte), ByVal KURZNAME As String, ByVal ZIEL_PFAD As String, ByVal BESCHREIBUNG As String, ByVal AKTIV As Boolean, ByVal NAMENKONVENTION As String, ByVal ERSTELLTWER As String, ByVal OBJEKTTYP As String, ByVal WINDREAM_DIRECT As Boolean, ByVal FOLDER_FOR_INDEX As String, ByVal SEQUENCE As Integer, ByVal DUPLICATE_HANDLING As String) As Integer + Public Overloads Overridable Function Insert(ByVal BEZEICHNUNG As String, ByVal EINGANGSART_ID As Byte, ByVal KURZNAME As String, ByVal ZIEL_PFAD As String, ByVal BESCHREIBUNG As String, ByVal AKTIV As Boolean, ByVal NAMENKONVENTION As String, ByVal ERSTELLTWER As String, ByVal OBJEKTTYP As String, ByVal WINDREAM_DIRECT As Boolean, ByVal FOLDER_FOR_INDEX As String, ByVal SEQUENCE As Integer, ByVal DUPLICATE_HANDLING As String, ByVal IDB_DOCTYPE_ID As Integer) As Integer If (BEZEICHNUNG Is Nothing) Then Throw New Global.System.ArgumentNullException("BEZEICHNUNG") Else Me.Adapter.InsertCommand.Parameters(0).Value = CType(BEZEICHNUNG,String) End If - If (EINGANGSART_ID.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(1).Value = CType(EINGANGSART_ID.Value,Byte) - Else - Me.Adapter.InsertCommand.Parameters(1).Value = Global.System.DBNull.Value - End If + Me.Adapter.InsertCommand.Parameters(1).Value = CType(EINGANGSART_ID,Byte) If (KURZNAME Is Nothing) Then Throw New Global.System.ArgumentNullException("KURZNAME") Else Me.Adapter.InsertCommand.Parameters(2).Value = CType(KURZNAME,String) End If If (ZIEL_PFAD Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("ZIEL_PFAD") Else Me.Adapter.InsertCommand.Parameters(3).Value = CType(ZIEL_PFAD,String) End If @@ -4498,7 +4524,7 @@ Namespace GlobixDatasetTableAdapters Me.Adapter.InsertCommand.Parameters(7).Value = CType(ERSTELLTWER,String) End If If (OBJEKTTYP Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("OBJEKTTYP") Else Me.Adapter.InsertCommand.Parameters(8).Value = CType(OBJEKTTYP,String) End If @@ -4514,6 +4540,7 @@ Namespace GlobixDatasetTableAdapters Else Me.Adapter.InsertCommand.Parameters(12).Value = CType(DUPLICATE_HANDLING,String) End If + Me.Adapter.InsertCommand.Parameters(13).Value = CType(IDB_DOCTYPE_ID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -4533,24 +4560,36 @@ Namespace GlobixDatasetTableAdapters 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.Update, true)> _ - Public Overloads Overridable Function Update(ByVal BEZEICHNUNG As String, ByVal EINGANGSART_ID As Global.System.Nullable(Of Byte), ByVal KURZNAME As String, ByVal ZIEL_PFAD As String, ByVal BESCHREIBUNG As String, ByVal AKTIV As Boolean, ByVal NAMENKONVENTION As String, ByVal GEANDERTWER As String, ByVal OBJEKTTYP As String, ByVal WINDREAM_DIRECT As Boolean, ByVal FOLDER_FOR_INDEX As String, ByVal SEQUENCE As Integer, ByVal DUPLICATE_HANDLING As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Update( _ + ByVal BEZEICHNUNG As String, _ + ByVal EINGANGSART_ID As Byte, _ + ByVal KURZNAME As String, _ + ByVal ZIEL_PFAD As String, _ + ByVal BESCHREIBUNG As String, _ + ByVal AKTIV As Boolean, _ + ByVal NAMENKONVENTION As String, _ + ByVal GEANDERTWER As String, _ + ByVal OBJEKTTYP As String, _ + ByVal WINDREAM_DIRECT As Boolean, _ + ByVal FOLDER_FOR_INDEX As String, _ + ByVal SEQUENCE As Integer, _ + ByVal DUPLICATE_HANDLING As String, _ + ByVal IDB_DOCTYPE_ID As Integer, _ + ByVal Original_GUID As Integer, _ + ByVal GUID As Integer) As Integer If (BEZEICHNUNG Is Nothing) Then Throw New Global.System.ArgumentNullException("BEZEICHNUNG") Else Me.Adapter.UpdateCommand.Parameters(0).Value = CType(BEZEICHNUNG,String) End If - If (EINGANGSART_ID.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(1).Value = CType(EINGANGSART_ID.Value,Byte) - Else - Me.Adapter.UpdateCommand.Parameters(1).Value = Global.System.DBNull.Value - End If + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(EINGANGSART_ID,Byte) If (KURZNAME Is Nothing) Then Throw New Global.System.ArgumentNullException("KURZNAME") Else Me.Adapter.UpdateCommand.Parameters(2).Value = CType(KURZNAME,String) End If If (ZIEL_PFAD Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("ZIEL_PFAD") Else Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ZIEL_PFAD,String) End If @@ -4571,7 +4610,7 @@ Namespace GlobixDatasetTableAdapters Me.Adapter.UpdateCommand.Parameters(7).Value = CType(GEANDERTWER,String) End If If (OBJEKTTYP Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("OBJEKTTYP") Else Me.Adapter.UpdateCommand.Parameters(8).Value = CType(OBJEKTTYP,String) End If @@ -4587,8 +4626,9 @@ Namespace GlobixDatasetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(12).Value = CType(DUPLICATE_HANDLING,String) End If - Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(14).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(IDB_DOCTYPE_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then diff --git a/GUIs.ZooFlow/Modules/Globix/GlobixDataset.xsc b/GUIs.ZooFlow/Modules/Globix/GlobixDataset.xsc index 3e057f38..178d300b 100644 --- a/GUIs.ZooFlow/Modules/Globix/GlobixDataset.xsc +++ b/GUIs.ZooFlow/Modules/Globix/GlobixDataset.xsc @@ -9,34 +9,53 @@ - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + - + + + + + + + + + diff --git a/GUIs.ZooFlow/Modules/Globix/GlobixDataset.xsd b/GUIs.ZooFlow/Modules/Globix/GlobixDataset.xsd index ec24f5dc..e5470271 100644 --- a/GUIs.ZooFlow/Modules/Globix/GlobixDataset.xsd +++ b/GUIs.ZooFlow/Modules/Globix/GlobixDataset.xsd @@ -2,14 +2,15 @@ - + + - + DELETE FROM TBDD_DOKUMENTART @@ -20,32 +21,34 @@ WHERE (GUID = @Original_GUID) - + INSERT INTO TBDD_DOKUMENTART - (BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, OBJEKTTYP, WINDREAM_DIRECT, FOLDER_FOR_INDEX, SEQUENCE, DUPLICATE_HANDLING) -VALUES (@BEZEICHNUNG,@EINGANGSART_ID,@KURZNAME,@ZIEL_PFAD,@BESCHREIBUNG,@AKTIV,@NAMENKONVENTION,@ERSTELLTWER,@OBJEKTTYP,@WINDREAM_DIRECT,@FOLDER_FOR_INDEX,@SEQUENCE,@DUPLICATE_HANDLING); + (BEZEICHNUNG, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, AKTIV, NAMENKONVENTION, ERSTELLTWER, OBJEKTTYP, WINDREAM_DIRECT, FOLDER_FOR_INDEX, SEQUENCE, DUPLICATE_HANDLING, + IDB_DOCTYPE_ID) +VALUES (@BEZEICHNUNG,@EINGANGSART_ID,@KURZNAME,@ZIEL_PFAD,@BESCHREIBUNG,@AKTIV,@NAMENKONVENTION,@ERSTELLTWER,@OBJEKTTYP,@WINDREAM_DIRECT,@FOLDER_FOR_INDEX,@SEQUENCE,@DUPLICATE_HANDLING,@IDB_DOCTYPE_ID); SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, WINDREAM_DIRECT, FOLDER_FOR_INDEX, DUPLICATE_HANDLING, AKTIV, LANGUAGE, SEQUENCE, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBDD_DOKUMENTART WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - - - - - - + + + + + + + + + + + + + + SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, WINDREAM_DIRECT, FOLDER_FOR_INDEX, DUPLICATE_HANDLING, AKTIV, LANGUAGE, SEQUENCE, NAMENKONVENTION, - ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, IDB_OBJECT_STORE_ID + ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN, IDB_OBJECT_STORE_ID, IDB_DOCTYPE_ID FROM TBDD_DOKUMENTART WHERE (GUID = @GUID) @@ -54,29 +57,30 @@ WHERE (GUID = @GUID) - + UPDATE TBDD_DOKUMENTART SET BEZEICHNUNG = @BEZEICHNUNG, EINGANGSART_ID = @EINGANGSART_ID, KURZNAME = @KURZNAME, ZIEL_PFAD = @ZIEL_PFAD, BESCHREIBUNG = @BESCHREIBUNG, AKTIV = @AKTIV, NAMENKONVENTION = @NAMENKONVENTION, GEANDERTWER = @GEANDERTWER, OBJEKTTYP = @OBJEKTTYP, WINDREAM_DIRECT = @WINDREAM_DIRECT, FOLDER_FOR_INDEX = @FOLDER_FOR_INDEX, - SEQUENCE = @SEQUENCE, DUPLICATE_HANDLING = @DUPLICATE_HANDLING -WHERE (GUID = @Original_GUID); + SEQUENCE = @SEQUENCE, DUPLICATE_HANDLING = @DUPLICATE_HANDLING, IDB_DOCTYPE_ID = @IDB_DOCTYPE_ID +WHERE (GUID = @Original_GUID); SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHREIBUNG, WINDREAM_DIRECT, FOLDER_FOR_INDEX, DUPLICATE_HANDLING, AKTIV, LANGUAGE, SEQUENCE, NAMENKONVENTION, ERSTELLTWER, ERSTELLTWANN, GEANDERTWER, GEAENDERTWANN FROM TBDD_DOKUMENTART WHERE (GUID = @GUID) - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -102,15 +106,16 @@ SELECT GUID, BEZEICHNUNG, OBJEKTTYP, EINGANGSART_ID, KURZNAME, ZIEL_PFAD, BESCHR + - + SELECT TBDD_DOKUMENTART.GUID, TBDD_DOKUMENTART.BEZEICHNUNG, TBDD_DOKUMENTART.OBJEKTTYP, TBDD_DOKUMENTART.EINGANGSART_ID, TBDD_DOKUMENTART.KURZNAME, TBDD_DOKUMENTART.ZIEL_PFAD, TBDD_DOKUMENTART.BESCHREIBUNG, TBDD_DOKUMENTART.WINDREAM_DIRECT, TBDD_DOKUMENTART.FOLDER_FOR_INDEX, TBDD_DOKUMENTART.DUPLICATE_HANDLING, TBDD_DOKUMENTART.AKTIV, TBDD_DOKUMENTART.LANGUAGE, TBDD_DOKUMENTART.SEQUENCE, TBDD_DOKUMENTART.NAMENKONVENTION, TBDD_DOKUMENTART.ERSTELLTWER, TBDD_DOKUMENTART.ERSTELLTWANN, - TBDD_DOKUMENTART.GEANDERTWER, TBDD_DOKUMENTART.GEAENDERTWANN, TBDD_DOKUMENTART.IDB_OBJECT_STORE_ID + TBDD_DOKUMENTART.GEANDERTWER, TBDD_DOKUMENTART.GEAENDERTWANN, TBDD_DOKUMENTART.IDB_OBJECT_STORE_ID, TBDD_DOKUMENTART.IDB_DOCTYPE_ID FROM TBDD_DOKUMENTART INNER JOIN TBDD_DOKUMENTART_MODULE ON TBDD_DOKUMENTART.GUID = TBDD_DOKUMENTART_MODULE.DOKART_ID INNER JOIN TBDD_MODULES ON TBDD_DOKUMENTART_MODULE.MODULE_ID = TBDD_MODULES.GUID @@ -394,7 +399,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -403,7 +408,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -491,10 +496,11 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN + - + @@ -576,7 +582,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -633,7 +639,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -685,9 +691,9 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - - - + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index 8e6f8d80..be09c0c2 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,21 +1,21 @@ -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a