diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb index 9b93c355..a6c93703 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb @@ -46,6 +46,7 @@ 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.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 +58,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 +79,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 +243,8 @@ 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() SEQUENCELabel = New System.Windows.Forms.Label() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -261,12 +263,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 +283,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 +413,7 @@ 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() Me.SuspendLayout() ' 'SEQUENCELabel @@ -523,6 +525,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 +568,7 @@ Partial Class frmAdmin_Globix ' 'LayoutControlProfile ' + 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 +578,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,10 +590,22 @@ 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("Text", 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.TabIndex = 60 + Me.IDB_DOCTYPE_IDComboBox.ValueMember = "Doctype_ID" + ' '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, 227) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Size = New System.Drawing.Size(387, 20) @@ -603,9 +619,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, 136) 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(387, 21) Me.IDB_OBJECT_STORE_IDComboBox.TabIndex = 57 Me.IDB_OBJECT_STORE_IDComboBox.ValueMember = "GUID" ' @@ -642,7 +658,7 @@ 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(714, 227) Me.GEAENDERTWANNTextBox.Name = "GEAENDERTWANNTextBox" Me.GEAENDERTWANNTextBox.ReadOnly = True Me.GEAENDERTWANNTextBox.Size = New System.Drawing.Size(390, 20) @@ -651,7 +667,7 @@ Partial Class frmAdmin_Globix '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, 197) Me.TextEditErstelltWer.MenuManager = Me.RibbonControl1 Me.TextEditErstelltWer.Name = "TextEditErstelltWer" Me.TextEditErstelltWer.Size = New System.Drawing.Size(387, 20) @@ -661,7 +677,7 @@ Partial Class frmAdmin_Globix '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(714, 197) Me.TextEditGeandertWer.MenuManager = Me.RibbonControl1 Me.TextEditGeandertWer.Name = "TextEditGeandertWer" Me.TextEditGeandertWer.Size = New System.Drawing.Size(390, 20) @@ -671,7 +687,7 @@ Partial Class frmAdmin_Globix '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, 106) Me.TextEditNamenkonvention.MenuManager = Me.RibbonControl1 Me.TextEditNamenkonvention.Name = "TextEditNamenkonvention" Me.TextEditNamenkonvention.Size = New System.Drawing.Size(675, 20) @@ -681,30 +697,20 @@ Partial Class frmAdmin_Globix '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, 167) Me.TextEditBeschreibung.MenuManager = Me.RibbonControl1 Me.TextEditBeschreibung.Name = "TextEditBeschreibung" Me.TextEditBeschreibung.Size = New System.Drawing.Size(938, 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(714, 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(390, 20) Me.TextEditBezeichnung.StyleController = Me.LayoutControlProfile Me.TextEditBezeichnung.TabIndex = 51 ' @@ -721,7 +727,7 @@ Partial Class frmAdmin_Globix '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, 76) 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)}) @@ -734,7 +740,7 @@ 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(848, 103) Me.SimpleButtonNameconvention.Name = "SimpleButtonNameconvention" Me.SimpleButtonNameconvention.Size = New System.Drawing.Size(259, 22) Me.SimpleButtonNameconvention.StyleController = Me.LayoutControlProfile @@ -745,28 +751,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.Root.Name = "Root" Me.Root.Size = New System.Drawing.Size(1119, 280) 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(548, 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(551, 31) Me.LayoutControlItem10.Text = "Bezeichnung" Me.LayoutControlItem10.TextSize = New System.Drawing.Size(139, 13) ' @@ -776,7 +772,7 @@ 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, 182) 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) @@ -786,7 +782,7 @@ Partial Class frmAdmin_Globix 'LayoutControlItem30 ' Me.LayoutControlItem30.Control = Me.TextEditNamenkonvention - Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 90) + Me.LayoutControlItem30.Location = New System.Drawing.Point(0, 91) 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) @@ -838,25 +834,25 @@ 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, 121) 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(548, 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, 242) Me.EmptySpaceItem3.Name = "EmptySpaceItem3" - Me.EmptySpaceItem3.Size = New System.Drawing.Size(1099, 19) + Me.EmptySpaceItem3.Size = New System.Drawing.Size(1099, 18) 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, 61) 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) @@ -866,7 +862,7 @@ Partial Class frmAdmin_Globix 'LayoutControlItem1 ' Me.LayoutControlItem1.Control = Me.SimpleButtonNameconvention - Me.LayoutControlItem1.Location = New System.Drawing.Point(836, 90) + Me.LayoutControlItem1.Location = New System.Drawing.Point(836, 91) Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Size = New System.Drawing.Size(263, 30) Me.LayoutControlItem1.TextSize = New System.Drawing.Size(0, 0) @@ -878,7 +874,7 @@ 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, 212) 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) @@ -891,7 +887,7 @@ 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(548, 182) 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) @@ -904,7 +900,7 @@ 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(548, 212) 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) @@ -914,7 +910,7 @@ Partial Class frmAdmin_Globix 'LayoutControlItem28 ' Me.LayoutControlItem28.Control = Me.TextEditBeschreibung - Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 151) + Me.LayoutControlItem28.Location = New System.Drawing.Point(0, 152) 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) @@ -924,11 +920,21 @@ Partial Class frmAdmin_Globix 'EmptySpaceItem12 ' Me.EmptySpaceItem12.AllowHotTrack = False - Me.EmptySpaceItem12.Location = New System.Drawing.Point(549, 120) + Me.EmptySpaceItem12.Location = New System.Drawing.Point(548, 121) Me.EmptySpaceItem12.Name = "EmptySpaceItem12" - Me.EmptySpaceItem12.Size = New System.Drawing.Size(550, 31) + Me.EmptySpaceItem12.Size = New System.Drawing.Size(551, 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(548, 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 +2656,15 @@ 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 + ' 'frmAdmin_Globix ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -2680,12 +2695,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 +2715,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 +2845,7 @@ 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() Me.ResumeLayout(False) Me.PerformLayout() @@ -2897,12 +2912,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 +3065,8 @@ 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 End Class diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx index 882d0694..04bdffbf 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.resx @@ -159,6 +159,9 @@ 350, 17 + + 350, 17 + 17, 17 @@ -171,6 +174,9 @@ 981, 17 + + 17, 134 + 246, 56 @@ -206,9 +212,6 @@ NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== - - 752, 56 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -273,26 +276,6 @@ MC41LTAuMSwwLjctMC4yYzAuMi0wLjEsMC40LTAuMiwwLjYtMC41YzAuMi0wLjIsMC41LTAuNywxLTEu NEwyMSwyNC4zaC0xLjFsMC4zLTEuNCAgYzAuNi0wLjEsMS4yLTAuMywxLjctMC42SDIyLjV6IiBjbGFz cz0iQmx1ZSIgLz4NCjwvc3ZnPgs= - - - - 17, 95 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEACAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFycm93MUxlZnQiPg0KICAgIDxwb2x5Z29uIHBvaW50 - cz0iMjgsMTQgMTQsMTQgMTQsMTMuMyAxNCw2IDQsMTYgMTQsMjYgMTQsMTguNyAxNCwxOCAyOCwxOCAg - IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -316,26 +299,6 @@ MTBoLTR2NGg0VjEweiBNMTQsMTZoLTR2MTJoNFYxNnoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQog IDxwYXRoIGQ9Ik0yNSwxNmwtNCw0aDNjMCwyLjItMS44LDQtNCw0di0zbC00LDRsNCw0di0zYzMuMyww LDYtMi43LDYtNmgzTDI1LDE2eiIgY2xhc3M9IkJsdWUiIC8+DQo8L3N2Zz4L - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD - MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls - bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iQWRkRmlsZSI+DQogICAgPHBhdGggZD0iTTE2LDI2SDZWNGgxOHYxNGgyVjNjMC0w - LjUtMC41LTEtMS0xSDVDNC41LDIsNCwyLjUsNCwzdjI0YzAsMC41LDAuNSwxLDEsMWgxMVYyNnoiIGNs - YXNzPSJCbGFjayIgLz4NCiAgICA8cG9seWdvbiBwb2ludHM9IjMwLDI0IDI2LDI0IDI2LDIwIDIyLDIw - IDIyLDI0IDE4LDI0IDE4LDI4IDIyLDI4IDIyLDMyIDI2LDMyIDI2LDI4IDMwLDI4ICAiIGNsYXNzPSJH - cmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== @@ -354,22 +317,6 @@ 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== @@ -423,6 +370,93 @@ 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== @@ -474,28 +508,6 @@ 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 @@ -513,6 +525,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..eafa00a8 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb @@ -21,8 +21,11 @@ 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 @@ -30,6 +33,7 @@ Public Class frmAdmin_Globix 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) 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/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/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb index e7cf3ce3..b8903433 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 + ' sd Dim oProfileId As Integer = SelectedDocType.Guid Dim oAttributes As List(Of UserAttributeValue) = oValues Dim oOptions As New Options.ImportFileOptions