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 a6c93703..114a3f45 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb @@ -47,6 +47,7 @@ Partial Class frmAdmin_Globix 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) @@ -243,8 +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_LANGUAGEBindingSource = New System.Windows.Forms.BindingSource(Me.components) 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() @@ -255,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() @@ -413,7 +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.VWIDB_DOCTYPE_LANGUAGEBindingSource, 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 @@ -568,6 +574,7 @@ 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) @@ -592,23 +599,28 @@ Partial Class frmAdmin_Globix ' 'IDB_DOCTYPE_IDComboBox ' - Me.IDB_DOCTYPE_IDComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "IDB_DOCTYPE_ID", True)) + 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(387, 21) + 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, 227) + 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 ' @@ -619,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, 136) + 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(387, 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" ' @@ -633,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}) ' @@ -648,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 @@ -658,59 +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, 227) + 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, 197) + 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, 197) + 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, 106) + 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, 167) + 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 ' 'TextEditBezeichnung ' Me.TextEditBezeichnung.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_DOKUMENTARTBindingSource, "BEZEICHNUNG", True)) - Me.TextEditBezeichnung.Location = New System.Drawing.Point(714, 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(390, 20) + Me.TextEditBezeichnung.Size = New System.Drawing.Size(381, 20) Me.TextEditBezeichnung.StyleController = Me.LayoutControlProfile Me.TextEditBezeichnung.TabIndex = 51 ' @@ -720,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, 76) + 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 ' @@ -740,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, 103) + 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" @@ -751,18 +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.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.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 ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.TextEditBezeichnung - Me.LayoutControlItem10.Location = New System.Drawing.Point(548, 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(551, 31) + Me.LayoutControlItem10.Size = New System.Drawing.Size(542, 31) Me.LayoutControlItem10.Text = "Bezeichnung" Me.LayoutControlItem10.TextSize = New System.Drawing.Size(139, 13) ' @@ -772,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, 182) + 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, 91) + 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) ' @@ -793,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) ' @@ -808,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 ' @@ -834,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, 121) + 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(548, 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, 242) + Me.EmptySpaceItem3.Location = New System.Drawing.Point(0, 266) Me.EmptySpaceItem3.Name = "EmptySpaceItem3" - Me.EmptySpaceItem3.Size = New System.Drawing.Size(1099, 18) + 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, 61) + 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, 91) + 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 ' @@ -874,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, 212) + 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) ' @@ -887,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, 182) + 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) ' @@ -900,29 +912,29 @@ 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, 212) + 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, 152) + 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(548, 121) + Me.EmptySpaceItem12.Location = New System.Drawing.Point(540, 145) Me.EmptySpaceItem12.Name = "EmptySpaceItem12" - Me.EmptySpaceItem12.Size = New System.Drawing.Size(551, 31) + Me.EmptySpaceItem12.Size = New System.Drawing.Size(542, 31) Me.EmptySpaceItem12.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem61 @@ -931,7 +943,7 @@ Partial Class frmAdmin_Globix 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(548, 31) + Me.LayoutControlItem61.Size = New System.Drawing.Size(540, 31) Me.LayoutControlItem61.Text = "Dokumentart" Me.LayoutControlItem61.TextSize = New System.Drawing.Size(139, 13) ' @@ -2656,15 +2668,40 @@ Partial Class frmAdmin_Globix ' Me.TBGI_REGEX_DOCTYPETableAdapter.ClearBeforeFill = True ' - 'VWIDB_DOCTYPE_LANGUAGEBindingSource - ' - Me.VWIDB_DOCTYPE_LANGUAGEBindingSource.DataMember = "VWIDB_DOCTYPE_LANGUAGE" - Me.VWIDB_DOCTYPE_LANGUAGEBindingSource.DataSource = Me.DSIDB_Stammdaten - ' '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!) @@ -2687,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() @@ -2845,7 +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.VWIDB_DOCTYPE_LANGUAGEBindingSource, 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() @@ -3069,4 +3109,7 @@ Partial Class frmAdmin_Globix 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 04bdffbf..79f6700a 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx @@ -159,9 +159,6 @@ 350, 17 - - 350, 17 - 17, 17 @@ -212,6 +209,9 @@ NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + 752, 56 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -276,6 +276,26 @@ MC41LTAuMSwwLjctMC4yYzAuMi0wLjEsMC40LTAuMiwwLjYtMC41YzAuMi0wLjIsMC41LTAuNywxLTEu NEwyMSwyNC4zaC0xLjFsMC4zLTEuNCAgYzAuNi0wLjEsMS4yLTAuMywxLjctMC42SDIyLjV6IiBjbGFz cz0iQmx1ZSIgLz4NCjwvc3ZnPgs= + + + + 17, 95 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFycm93MUxlZnQiPg0KICAgIDxwb2x5Z29uIHBvaW50 + cz0iMjgsMTQgMTQsMTQgMTQsMTMuMyAxNCw2IDQsMTYgMTQsMjYgMTQsMTguNyAxNCwxOCAyOCwxOCAg + IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -299,6 +319,26 @@ MTBoLTR2NGg0VjEweiBNMTQsMTZoLTR2MTJoNFYxNnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQog IDxwYXRoIGQ9Ik0yNSwxNmwtNCw0aDNjMCwyLjItMS44LDQtNCw0di0zbC00LDRsNCw0di0zYzMuMyww LDYtMi43LDYtNmgzTDI1LDE2eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD + MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls + bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w + LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs + YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw + IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH + cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -317,6 +357,22 @@ MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw== + + + + 511, 95 + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj + aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r + K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml + rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz + xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR + 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh + zQ3o4jAe74EDiAAAAABJRU5ErkJggg== @@ -370,93 +426,6 @@ bDEuOCwxLjNsMS40LTEuNGwtMS4zLTEuOCAgIGMwLjMtMC41LDAuNi0xLjIsMC44LTEuOEwzMCwyNXog TTIyLDI2Yy0xLjEsMC0yLTAuOS0yLTJzMC45LTIsMi0yczIsMC45LDIsMlMyMy4xLDI2LDIyLDI2eiIg Y2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN - YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz - MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 - QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs - MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x - VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx - LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x - LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM - MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - 752, 56 - - - 752, 56 - - - 17, 95 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFycm93MUxlZnQiPg0KICAgIDxwb2x5Z29uIHBvaW50 - cz0iMjgsMTQgMTQsMTQgMTQsMTMuMyAxNCw2IDQsMTYgMTQsMjYgMTQsMTguNyAxNCwxOCAyOCwxOCAg - IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - 17, 95 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD - MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls - bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w - LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs - YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw - IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH - cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - - - 511, 95 - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAEZvcmNlIFRlc3Q7VGVzdDtDaGVj - aztSZXBvcnQ74hwgxgAAAR1JREFUWEfdkrENwjAQRcNmINEzBBtQUFNkB0ago0FswBDMQMEKx32Tiw7r - K0CwD0HxlPjb9/+PlUZEvgoVI6FiJFR8Rtu2G0UyoNHzQ1DxGRaar6sVUOO9C3kVzFA/DxXB5biQ62ml - rw9f+C4NPOBlvjlUBFmB0TdQqsBoPi7QAaMxpPniBdj59W47VQRPdzamgAtPuLNlC6i50X+tezdm5mHz - xQpA1wDgAz0oY+cmNl/0BrDXBdFwYB42X+MG8hJ9ODAPmy9awMNCvW7zxQucl/ODoq/9WjotrSMKIJCR - 9iMKsBJJx361AmaM/SxcpXsxPKsXyMMdabZaAUODBn9Cd7ZOgTf4nwIf8bsFSpL7G1SMhIqRUDESKsYh - zQ3o4jAe74EDiAAAAABJRU5ErkJggg== @@ -508,6 +477,28 @@ NFYyNHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8L2c+DQogICAgPHJlY3QgeD0iMTgiIHk9IjE4IiB3 aWR0aD0iNCIgaGVpZ2h0PSI0IiByeD0iMCIgcnk9IjAiIGNsYXNzPSJHcmVlbiIgLz4NCiAgPC9nPg0K PC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHcDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLnN0MHtvcGFjaXR5OjAuNTt9Cjwvc3R5bGU+DQogIDxnIGlkPSJN + YW5hZ2VfUmVsYXRpb25zIj4NCiAgICA8ZyBjbGFzcz0ic3QwIj4NCiAgICAgIDxwYXRoIGQ9Ik0zMSwz + MmgtOGMtMC41LDAtMS0wLjUtMS0xdi04YzAtMC41LDAuNS0xLDEtMWg4YzAuNSwwLDEsMC41LDEsMXY4 + QzMyLDMxLjUsMzEuNSwzMiwzMSwzMnogTTMyLDlWMSAgICBjMC0wLjYtMC41LTEtMS0xaC04Yy0wLjUs + MC0xLDAuNC0xLDF2OGMwLDAuNiwwLjUsMSwxLDFoOEMzMS41LDEwLDMyLDkuNiwzMiw5eiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cGF0aCBkPSJNMTEsMjJIMWMtMC42LDAtMS0wLjUtMS0x + VjExYzAtMC42LDAuNC0xLDEtMWgxMGMwLjYsMCwxLDAuNCwxLDF2MTBDMTIsMjEuNSwxMS42LDIyLDEx + LDIyeiIgY2xhc3M9IkJsdWUiIC8+DQogICAgPHBhdGggZD0iTTIwLDJ2NmwtMi4zLTIuM2wtNCw0bC0x + LjQtMS40bDQtNEwxNCwySDIweiBNMTcuNywyNi4zbC00LTRsLTEuNCwxLjRsNCw0TDE0LDMwaDZ2LTZM + MTcuNywyNi4zeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb index eafa00a8..d449bcf5 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb @@ -21,19 +21,19 @@ Public Class frmAdmin_Globix End Sub Private Sub frmAdmin_Globix_Load(sender As Object, e As EventArgs) Handles MyBase.Load - 'TODO: Diese Codezeile lädt Daten in die Tabelle "DSIDB_Stammdaten.VWIDB_DOCTYPE_LANGUAGE". Sie können sie bei Bedarf verschieben oder entfernen. - 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 - Me.VWIDB_DOCTYPE_LANGUAGETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_DOCTYPE_LANGUAGE) + 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 @@ -243,7 +243,7 @@ Public Class frmAdmin_Globix 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,'{IDB_DOCTYPE_IDComboBox.SelectedValue}','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 @@ -265,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}' ,[IDB_DOCTYPE_ID] = '{IDB_DOCTYPE_IDComboBox.SelectedValue}' ,[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/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb index e7cf3ce3..03004f64 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb @@ -761,7 +761,7 @@ Public Class frmGlobix_Index Dim oObjectStore As String = SelectedDocType.ObjectStore Dim oObjectKind As String = "DOC" Dim oBusinessEntity As String = "DEFAULT" - sd + Dim oProfileId As Integer = SelectedDocType.Guid Dim oAttributes As List(Of UserAttributeValue) = oValues Dim oOptions As New Options.ImportFileOptions diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index ee5f50a7..be09c0c2 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,20 +1,21 @@ -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.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.LookUpEdit, DevExpress.XtraEditors.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.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.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.ComboBoxEdit, DevExpress.XtraEditors.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.CheckEdit, DevExpress.XtraEditors.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.TileControl, 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.XtraEditors.Repository.RepositoryItemComboBox, 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.DateEdit, 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.XtraBars.Docking.DockManager, DevExpress.XtraBars.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.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.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