diff --git a/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.Designer.vb index ec7ac33a..7e8cdcb5 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.Designer.vb @@ -27,14 +27,17 @@ Partial Class frmAdmin_DoctypeConfig Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() - Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit() + Me.LookUpEdit1 = New DevExpress.XtraEditors.LookUpEdit() Me.TBIDB_DOCTYPE_HANDLINGBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() + Me.VWIDB_DOCTYPES_DEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() @@ -48,17 +51,19 @@ Partial Class frmAdmin_DoctypeConfig Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() Me.TBIDB_DOCTYPE_HANDLINGTableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_DOCTYPE_HANDLINGTableAdapter() Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() Me.TBIDB_CATALOGTableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_CATALOGTableAdapter() - Me.DoctypeTextBox = New System.Windows.Forms.TextBox() - Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() + Me.VWIDB_DOCTYPES_DETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.VWIDB_DOCTYPES_DETableAdapter() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() - CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBIDB_DOCTYPE_HANDLINGBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.VWIDB_DOCTYPES_DEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() @@ -71,19 +76,19 @@ Partial Class frmAdmin_DoctypeConfig CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.labelStatus}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.labelStatus, Me.BarButtonItem2}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 3 + Me.RibbonControl1.MaxItemId = 4 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(837, 160) + Me.RibbonControl1.Size = New System.Drawing.Size(874, 160) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonItem1 @@ -101,6 +106,13 @@ Partial Class frmAdmin_DoctypeConfig Me.labelStatus.Name = "labelStatus" Me.labelStatus.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Hinzufügen" + Me.BarButtonItem2.Id = 3 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -109,6 +121,7 @@ Partial Class frmAdmin_DoctypeConfig ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Aktionen" @@ -116,10 +129,10 @@ Partial Class frmAdmin_DoctypeConfig 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 465) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 502) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(837, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(874, 22) ' 'RibbonPage2 ' @@ -128,7 +141,7 @@ Partial Class frmAdmin_DoctypeConfig ' 'LayoutControl1 ' - Me.LayoutControl1.Controls.Add(Me.DoctypeTextBox) + Me.LayoutControl1.Controls.Add(Me.LookUpEdit1) Me.LayoutControl1.Controls.Add(Me.TextEdit5) Me.LayoutControl1.Controls.Add(Me.TextEdit4) Me.LayoutControl1.Controls.Add(Me.TextEdit3) @@ -139,20 +152,23 @@ Partial Class frmAdmin_DoctypeConfig Me.LayoutControl1.Location = New System.Drawing.Point(0, 160) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(837, 305) + Me.LayoutControl1.Size = New System.Drawing.Size(874, 342) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' - 'TextEdit5 + 'LookUpEdit1 ' - Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_DOCTYPE_HANDLINGBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit5.Location = New System.Drawing.Point(568, 106) - Me.TextEdit5.MenuManager = Me.RibbonControl1 - Me.TextEdit5.Name = "TextEdit5" - Me.TextEdit5.Properties.ReadOnly = True - Me.TextEdit5.Size = New System.Drawing.Size(254, 20) - Me.TextEdit5.StyleController = Me.LayoutControl1 - Me.TextEdit5.TabIndex = 5 + Me.LookUpEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_DOCTYPE_HANDLINGBindingSource, "DOCTYPE", True)) + Me.LookUpEdit1.Location = New System.Drawing.Point(400, 15) + Me.LookUpEdit1.MenuManager = Me.RibbonControl1 + Me.LookUpEdit1.Name = "LookUpEdit1" + Me.LookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.LookUpEdit1.Properties.DataSource = Me.VWIDB_DOCTYPES_DEBindingSource + Me.LookUpEdit1.Properties.DisplayMember = "Doctype" + Me.LookUpEdit1.Properties.ValueMember = "Doctype" + Me.LookUpEdit1.Size = New System.Drawing.Size(459, 20) + Me.LookUpEdit1.StyleController = Me.LayoutControl1 + Me.LookUpEdit1.TabIndex = 11 ' 'TBIDB_DOCTYPE_HANDLINGBindingSource ' @@ -164,6 +180,22 @@ Partial Class frmAdmin_DoctypeConfig Me.DSIDB_Stammdaten.DataSetName = "DSIDB_Stammdaten" Me.DSIDB_Stammdaten.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema ' + 'VWIDB_DOCTYPES_DEBindingSource + ' + Me.VWIDB_DOCTYPES_DEBindingSource.DataMember = "VWIDB_DOCTYPES_DE" + Me.VWIDB_DOCTYPES_DEBindingSource.DataSource = Me.DSIDB_Stammdaten + ' + 'TextEdit5 + ' + Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_DOCTYPE_HANDLINGBindingSource, "CHANGED_WHEN", True)) + Me.TextEdit5.Location = New System.Drawing.Point(586, 106) + Me.TextEdit5.MenuManager = Me.RibbonControl1 + Me.TextEdit5.Name = "TextEdit5" + Me.TextEdit5.Properties.ReadOnly = True + Me.TextEdit5.Size = New System.Drawing.Size(273, 20) + Me.TextEdit5.StyleController = Me.LayoutControl1 + Me.TextEdit5.TabIndex = 5 + ' 'TextEdit4 ' Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_DOCTYPE_HANDLINGBindingSource, "CHANGED_WHO", True)) @@ -171,18 +203,18 @@ Partial Class frmAdmin_DoctypeConfig Me.TextEdit4.MenuManager = Me.RibbonControl1 Me.TextEdit4.Name = "TextEdit4" Me.TextEdit4.Properties.ReadOnly = True - Me.TextEdit4.Size = New System.Drawing.Size(253, 20) + Me.TextEdit4.Size = New System.Drawing.Size(271, 20) Me.TextEdit4.StyleController = Me.LayoutControl1 Me.TextEdit4.TabIndex = 10 ' 'TextEdit3 ' Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_DOCTYPE_HANDLINGBindingSource, "ADDED_WHEN", True)) - Me.TextEdit3.Location = New System.Drawing.Point(568, 76) + Me.TextEdit3.Location = New System.Drawing.Point(586, 76) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" Me.TextEdit3.Properties.ReadOnly = True - Me.TextEdit3.Size = New System.Drawing.Size(254, 20) + Me.TextEdit3.Size = New System.Drawing.Size(273, 20) Me.TextEdit3.StyleController = Me.LayoutControl1 Me.TextEdit3.TabIndex = 9 ' @@ -193,20 +225,19 @@ Partial Class frmAdmin_DoctypeConfig Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" Me.TextEdit2.Properties.ReadOnly = True - Me.TextEdit2.Size = New System.Drawing.Size(253, 20) + Me.TextEdit2.Size = New System.Drawing.Size(271, 20) Me.TextEdit2.StyleController = Me.LayoutControl1 Me.TextEdit2.TabIndex = 8 ' 'CHANGED_ACTIONComboBox ' - Me.CHANGED_ACTIONComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_DOCTYPE_HANDLINGBindingSource, "CHANGED_ACTION", True)) Me.CHANGED_ACTIONComboBox.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBIDB_DOCTYPE_HANDLINGBindingSource, "CHANGED_ACTION", True)) Me.CHANGED_ACTIONComboBox.DataSource = Me.TBIDB_CATALOGBindingSource Me.CHANGED_ACTIONComboBox.DisplayMember = "CAT_STRING" Me.CHANGED_ACTIONComboBox.FormattingEnabled = True Me.CHANGED_ACTIONComboBox.Location = New System.Drawing.Point(160, 45) Me.CHANGED_ACTIONComboBox.Name = "CHANGED_ACTIONComboBox" - Me.CHANGED_ACTIONComboBox.Size = New System.Drawing.Size(662, 21) + Me.CHANGED_ACTIONComboBox.Size = New System.Drawing.Size(699, 21) Me.CHANGED_ACTIONComboBox.TabIndex = 7 Me.CHANGED_ACTIONComboBox.ValueMember = "GUID" ' @@ -221,8 +252,10 @@ Partial Class frmAdmin_DoctypeConfig Me.TextEdit1.Location = New System.Drawing.Point(160, 15) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" + Me.TextEdit1.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.TextEdit1.Properties.AppearanceReadOnly.Options.UseBackColor = True Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(99, 20) + Me.TextEdit1.Size = New System.Drawing.Size(85, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' @@ -230,9 +263,9 @@ Partial Class frmAdmin_DoctypeConfig ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem4, Me.LayoutControlItem2, Me.LayoutControlItem5, Me.LayoutControlItem3, Me.LayoutControlItem6, Me.LayoutControlItem8}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem4, Me.LayoutControlItem2, Me.LayoutControlItem5, Me.LayoutControlItem3, Me.LayoutControlItem6, Me.LayoutControlItem7}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(837, 305) + Me.Root.Size = New System.Drawing.Size(874, 342) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -241,7 +274,7 @@ Partial Class frmAdmin_DoctypeConfig Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem1.Size = New System.Drawing.Size(254, 30) + Me.LayoutControlItem1.Size = New System.Drawing.Size(240, 30) Me.LayoutControlItem1.Text = "ID" Me.LayoutControlItem1.TextSize = New System.Drawing.Size(133, 13) ' @@ -251,7 +284,7 @@ Partial Class frmAdmin_DoctypeConfig Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 30) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem4.Size = New System.Drawing.Size(817, 31) + Me.LayoutControlItem4.Size = New System.Drawing.Size(854, 31) Me.LayoutControlItem4.Text = "Verhalten Datei geändert:" Me.LayoutControlItem4.TextSize = New System.Drawing.Size(133, 13) ' @@ -262,7 +295,7 @@ Partial Class frmAdmin_DoctypeConfig Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 61) Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem2.Size = New System.Drawing.Size(408, 30) + Me.LayoutControlItem2.Size = New System.Drawing.Size(426, 30) Me.LayoutControlItem2.Text = "Erstellt wer" Me.LayoutControlItem2.TextSize = New System.Drawing.Size(133, 13) ' @@ -272,30 +305,40 @@ Partial Class frmAdmin_DoctypeConfig Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 91) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem5.Size = New System.Drawing.Size(408, 194) + Me.LayoutControlItem5.Size = New System.Drawing.Size(426, 231) Me.LayoutControlItem5.Text = "Geändert wer" Me.LayoutControlItem5.TextSize = New System.Drawing.Size(133, 13) ' 'LayoutControlItem3 ' Me.LayoutControlItem3.Control = Me.TextEdit3 - Me.LayoutControlItem3.Location = New System.Drawing.Point(408, 61) + Me.LayoutControlItem3.Location = New System.Drawing.Point(426, 61) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem3.Size = New System.Drawing.Size(409, 30) + Me.LayoutControlItem3.Size = New System.Drawing.Size(428, 30) Me.LayoutControlItem3.Text = "Erstellt wann" Me.LayoutControlItem3.TextSize = New System.Drawing.Size(133, 13) ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.TextEdit5 - Me.LayoutControlItem6.Location = New System.Drawing.Point(408, 91) + Me.LayoutControlItem6.Location = New System.Drawing.Point(426, 91) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem6.Size = New System.Drawing.Size(409, 194) + Me.LayoutControlItem6.Size = New System.Drawing.Size(428, 231) Me.LayoutControlItem6.Text = "Geändert wann" Me.LayoutControlItem6.TextSize = New System.Drawing.Size(133, 13) ' + 'LayoutControlItem7 + ' + Me.LayoutControlItem7.Control = Me.LookUpEdit1 + Me.LayoutControlItem7.Location = New System.Drawing.Point(240, 0) + Me.LayoutControlItem7.Name = "LayoutControlItem7" + Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) + Me.LayoutControlItem7.Size = New System.Drawing.Size(614, 30) + Me.LayoutControlItem7.Text = "Dokumentart" + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(133, 13) + ' 'TBIDB_DOCTYPE_HANDLINGTableAdapter ' Me.TBIDB_DOCTYPE_HANDLINGTableAdapter.ClearBeforeFill = True @@ -317,30 +360,15 @@ Partial Class frmAdmin_DoctypeConfig ' Me.TBIDB_CATALOGTableAdapter.ClearBeforeFill = True ' - 'DoctypeTextBox + 'VWIDB_DOCTYPES_DETableAdapter ' - Me.DoctypeTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_DOCTYPE_HANDLINGBindingSource, "Doctype", True)) - Me.DoctypeTextBox.Location = New System.Drawing.Point(414, 15) - Me.DoctypeTextBox.Name = "DoctypeTextBox" - Me.DoctypeTextBox.ReadOnly = True - Me.DoctypeTextBox.Size = New System.Drawing.Size(408, 20) - Me.DoctypeTextBox.TabIndex = 11 - ' - 'LayoutControlItem8 - ' - Me.LayoutControlItem8.Control = Me.DoctypeTextBox - Me.LayoutControlItem8.Location = New System.Drawing.Point(254, 0) - Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(5, 5, 5, 5) - Me.LayoutControlItem8.Size = New System.Drawing.Size(563, 30) - Me.LayoutControlItem8.Text = "Doctype:" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(133, 13) + Me.VWIDB_DOCTYPES_DETableAdapter.ClearBeforeFill = True ' 'frmAdmin_DoctypeConfig ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(837, 487) + Me.ClientSize = New System.Drawing.Size(874, 524) Me.Controls.Add(Me.LayoutControl1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) @@ -352,9 +380,11 @@ Partial Class frmAdmin_DoctypeConfig CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) - CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBIDB_DOCTYPE_HANDLINGBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.VWIDB_DOCTYPES_DEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() @@ -367,7 +397,7 @@ Partial Class frmAdmin_DoctypeConfig CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -400,6 +430,9 @@ Partial Class frmAdmin_DoctypeConfig Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents DoctypeTextBox As TextBox - Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents VWIDB_DOCTYPES_DEBindingSource As BindingSource + Friend WithEvents VWIDB_DOCTYPES_DETableAdapter As DSIDB_StammdatenTableAdapters.VWIDB_DOCTYPES_DETableAdapter + Friend WithEvents LookUpEdit1 As DevExpress.XtraEditors.LookUpEdit + Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.resx b/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.resx index fec29d34..e2d20fdb 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.resx @@ -156,6 +156,25 @@ MnogTTE2LDZjMS4xLDAsMiwwLjksMiwycy0wLjksMi0yLDJzLTItMC45LTItMiAgIFMxNC45LDYsMTYs NnogTTIwLDI0aC04di0yaDJ2LThoLTJ2LTJoMmg0djEwaDJWMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg PC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKcCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZCI+DQogICAgPHBhdGggZD0iTTI3LDE0aC05VjVj + MC0wLjUtMC41LTEtMS0xaC0yYy0wLjUsMC0xLDAuNS0xLDF2OUg1Yy0wLjUsMC0xLDAuNS0xLDF2MmMw + LDAuNSwwLjUsMSwxLDFoOXY5ICAgYzAsMC41LDAuNSwxLDEsMWgyYzAuNSwwLDEtMC41LDEtMXYtOWg5 + YzAuNSwwLDEtMC41LDEtMXYtMkMyOCwxNC41LDI3LjUsMTQsMjcsMTR6IiBjbGFzcz0iR3JlZW4iIC8+ + DQogIDwvZz4NCjwvc3ZnPgs= @@ -164,6 +183,9 @@ 17, 17 + + 233, 56 + 918, 17 @@ -176,6 +198,9 @@ 17, 56 + + 485, 56 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.vb b/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.vb index 1c50199f..3d76943d 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_DoctypeConfig.vb @@ -31,11 +31,20 @@ End Sub Private Sub frmAdmin_DoctypeConfig_Load(sender As Object, e As EventArgs) Handles Me.Load + 'TODO: Diese Codezeile lädt Daten in die Tabelle "DSIDB_Stammdaten.VWIDB_DOCTYPES_DE". Sie können sie bei Bedarf verschieben oder entfernen. + Try TBIDB_CATALOGTableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString TBIDB_DOCTYPE_HANDLINGTableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString + VWIDB_DOCTYPES_DETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString Me.TBIDB_CATALOGTableAdapter.FillByDOCTYPE_CHANGED(Me.DSIDB_Stammdaten.TBIDB_CATALOG) Me.TBIDB_DOCTYPE_HANDLINGTableAdapter.Fill(Me.DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLING, PrimaryKey) + Me.VWIDB_DOCTYPES_DETableAdapter.Fill(Me.DSIDB_Stammdaten.VWIDB_DOCTYPES_DE) + If IsInsert Then + Me.DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLING.ADDED_WHOColumn.DefaultValue = My.Application.User.UserName + TBIDB_DOCTYPE_HANDLINGBindingSource.AddNew() + TextEdit2.Text = My.Application.User.UserName + End If Catch ex As Exception End Try @@ -69,4 +78,12 @@ labelStatus.Caption = Message labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Try + TBIDB_DOCTYPE_HANDLINGBindingSource.AddNew() + Catch ex As Exception + + End Try + End Sub End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index 8efc983d..c4adef09 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -43,6 +43,8 @@ Partial Public Class DSIDB_Stammdaten Private tableVWIDB_OBJECT_STORE As VWIDB_OBJECT_STOREDataTable + Private tableVWIDB_DOCTYPES_DE As VWIDB_DOCTYPES_DEDataTable + Private tableTBIDB_DOCTYPE_HANDLING As TBIDB_DOCTYPE_HANDLINGDataTable Private relationFK_TYP_ID As Global.System.Data.DataRelation @@ -107,6 +109,9 @@ Partial Public Class DSIDB_Stammdaten If (Not (ds.Tables("VWIDB_OBJECT_STORE")) Is Nothing) Then MyBase.Tables.Add(New VWIDB_OBJECT_STOREDataTable(ds.Tables("VWIDB_OBJECT_STORE"))) End If + If (Not (ds.Tables("VWIDB_DOCTYPES_DE")) Is Nothing) Then + MyBase.Tables.Add(New VWIDB_DOCTYPES_DEDataTable(ds.Tables("VWIDB_DOCTYPES_DE"))) + End If If (Not (ds.Tables("TBIDB_DOCTYPE_HANDLING")) Is Nothing) Then MyBase.Tables.Add(New TBIDB_DOCTYPE_HANDLINGDataTable(ds.Tables("TBIDB_DOCTYPE_HANDLING"))) End If @@ -217,6 +222,16 @@ Partial Public Class DSIDB_Stammdaten End Get End Property + _ + Public ReadOnly Property VWIDB_DOCTYPES_DE() As VWIDB_DOCTYPES_DEDataTable + Get + Return Me.tableVWIDB_DOCTYPES_DE + End Get + End Property + _ + Private Function ShouldSerializeVWIDB_DOCTYPES_DE() As Boolean + Return false + End Function + _ Private Function ShouldSerializeTBIDB_DOCTYPE_HANDLING() As Boolean @@ -602,6 +634,9 @@ Partial Public Class DSIDB_Stammdaten _ Public Delegate Sub VWIDB_OBJECT_STORERowChangeEventHandler(ByVal sender As Object, ByVal e As VWIDB_OBJECT_STORERowChangeEvent) + _ + Public Delegate Sub VWIDB_DOCTYPES_DERowChangeEventHandler(ByVal sender As Object, ByVal e As VWIDB_DOCTYPES_DERowChangeEvent) + _ Public Delegate Sub TBIDB_DOCTYPE_HANDLINGRowChangeEventHandler(ByVal sender As Object, ByVal e As TBIDB_DOCTYPE_HANDLINGRowChangeEvent) @@ -4148,6 +4183,260 @@ Partial Public Class DSIDB_Stammdaten End Function End Class + ''' + '''Represents the strongly named DataTable class. + ''' + _ + Partial Public Class VWIDB_DOCTYPES_DEDataTable + Inherits Global.System.Data.TypedTableBase(Of VWIDB_DOCTYPES_DERow) + + Private columnDoctype As Global.System.Data.DataColumn + + _ + Public Sub New() + MyBase.New + Me.TableName = "VWIDB_DOCTYPES_DE" + Me.BeginInit + Me.InitClass + Me.EndInit + End Sub + + _ + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub + + _ + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context) + Me.InitVars + End Sub + + _ + Public ReadOnly Property DoctypeColumn() As Global.System.Data.DataColumn + Get + Return Me.columnDoctype + End Get + End Property + + _ + Public ReadOnly Property Count() As Integer + Get + Return Me.Rows.Count + End Get + End Property + + _ + Public Default ReadOnly Property Item(ByVal index As Integer) As VWIDB_DOCTYPES_DERow + Get + Return CType(Me.Rows(index),VWIDB_DOCTYPES_DERow) + End Get + End Property + + _ + Public Event VWIDB_DOCTYPES_DERowChanging As VWIDB_DOCTYPES_DERowChangeEventHandler + + _ + Public Event VWIDB_DOCTYPES_DERowChanged As VWIDB_DOCTYPES_DERowChangeEventHandler + + _ + Public Event VWIDB_DOCTYPES_DERowDeleting As VWIDB_DOCTYPES_DERowChangeEventHandler + + _ + Public Event VWIDB_DOCTYPES_DERowDeleted As VWIDB_DOCTYPES_DERowChangeEventHandler + + _ + Public Overloads Sub AddVWIDB_DOCTYPES_DERow(ByVal row As VWIDB_DOCTYPES_DERow) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddVWIDB_DOCTYPES_DERow(ByVal Doctype As String) As VWIDB_DOCTYPES_DERow + Dim rowVWIDB_DOCTYPES_DERow As VWIDB_DOCTYPES_DERow = CType(Me.NewRow,VWIDB_DOCTYPES_DERow) + Dim columnValuesArray() As Object = New Object() {Doctype} + rowVWIDB_DOCTYPES_DERow.ItemArray = columnValuesArray + Me.Rows.Add(rowVWIDB_DOCTYPES_DERow) + Return rowVWIDB_DOCTYPES_DERow + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As VWIDB_DOCTYPES_DEDataTable = CType(MyBase.Clone,VWIDB_DOCTYPES_DEDataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New VWIDB_DOCTYPES_DEDataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnDoctype = MyBase.Columns("Doctype") + End Sub + + _ + Private Sub InitClass() + Me.columnDoctype = New Global.System.Data.DataColumn("Doctype", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnDoctype) + Me.columnDoctype.AllowDBNull = false + Me.columnDoctype.MaxLength = 900 + End Sub + + _ + Public Function NewVWIDB_DOCTYPES_DERow() As VWIDB_DOCTYPES_DERow + Return CType(Me.NewRow,VWIDB_DOCTYPES_DERow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New VWIDB_DOCTYPES_DERow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(VWIDB_DOCTYPES_DERow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.VWIDB_DOCTYPES_DERowChangedEvent) Is Nothing) Then + RaiseEvent VWIDB_DOCTYPES_DERowChanged(Me, New VWIDB_DOCTYPES_DERowChangeEvent(CType(e.Row,VWIDB_DOCTYPES_DERow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.VWIDB_DOCTYPES_DERowChangingEvent) Is Nothing) Then + RaiseEvent VWIDB_DOCTYPES_DERowChanging(Me, New VWIDB_DOCTYPES_DERowChangeEvent(CType(e.Row,VWIDB_DOCTYPES_DERow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.VWIDB_DOCTYPES_DERowDeletedEvent) Is Nothing) Then + RaiseEvent VWIDB_DOCTYPES_DERowDeleted(Me, New VWIDB_DOCTYPES_DERowChangeEvent(CType(e.Row,VWIDB_DOCTYPES_DERow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.VWIDB_DOCTYPES_DERowDeletingEvent) Is Nothing) Then + RaiseEvent VWIDB_DOCTYPES_DERowDeleting(Me, New VWIDB_DOCTYPES_DERowChangeEvent(CType(e.Row,VWIDB_DOCTYPES_DERow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveVWIDB_DOCTYPES_DERow(ByVal row As VWIDB_DOCTYPES_DERow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As DSIDB_Stammdaten = New DSIDB_Stammdaten() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "VWIDB_DOCTYPES_DEDataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class + ''' '''Represents the strongly named DataTable class. ''' @@ -4158,7 +4447,7 @@ Partial Public Class DSIDB_Stammdaten Private columnGUID As Global.System.Data.DataColumn - Private columnDOCTYPE_ID As Global.System.Data.DataColumn + Private columnDOCTYPE As Global.System.Data.DataColumn Private columnCHANGED_ACTION As Global.System.Data.DataColumn @@ -4174,8 +4463,6 @@ Partial Public Class DSIDB_Stammdaten Private columnCHANGED_WHEN As Global.System.Data.DataColumn - Private columnDoctype As Global.System.Data.DataColumn - _ Public Sub New() @@ -4221,9 +4508,9 @@ Partial Public Class DSIDB_Stammdaten _ - Public ReadOnly Property DOCTYPE_IDColumn() As Global.System.Data.DataColumn + Public ReadOnly Property DOCTYPEColumn() As Global.System.Data.DataColumn Get - Return Me.columnDOCTYPE_ID + Return Me.columnDOCTYPE End Get End Property @@ -4283,14 +4570,6 @@ Partial Public Class DSIDB_Stammdaten End Get End Property - _ - Public ReadOnly Property DoctypeColumn() As Global.System.Data.DataColumn - Get - Return Me.columnDoctype - End Get - End Property - _ @@ -4328,9 +4607,9 @@ Partial Public Class DSIDB_Stammdaten _ - Public Overloads Function AddTBIDB_DOCTYPE_HANDLINGRow(ByVal DOCTYPE_ID As Integer, ByVal parentTBIDB_CATALOGRowByFK_TBIDB_DOCTYPE_HANDLING_CHNGACT As TBIDB_CATALOGRow, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal Doctype As String) As TBIDB_DOCTYPE_HANDLINGRow + Public Overloads Function AddTBIDB_DOCTYPE_HANDLINGRow(ByVal DOCTYPE As String, ByVal parentTBIDB_CATALOGRowByFK_TBIDB_DOCTYPE_HANDLING_CHNGACT As TBIDB_CATALOGRow, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBIDB_DOCTYPE_HANDLINGRow Dim rowTBIDB_DOCTYPE_HANDLINGRow As TBIDB_DOCTYPE_HANDLINGRow = CType(Me.NewRow,TBIDB_DOCTYPE_HANDLINGRow) - Dim columnValuesArray() As Object = New Object() {Nothing, DOCTYPE_ID, Nothing, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, Doctype} + Dim columnValuesArray() As Object = New Object() {Nothing, DOCTYPE, Nothing, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} If (Not (parentTBIDB_CATALOGRowByFK_TBIDB_DOCTYPE_HANDLING_CHNGACT) Is Nothing) Then columnValuesArray(2) = parentTBIDB_CATALOGRowByFK_TBIDB_DOCTYPE_HANDLING_CHNGACT(0) End If @@ -4363,7 +4642,7 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Friend Sub InitVars() Me.columnGUID = MyBase.Columns("GUID") - Me.columnDOCTYPE_ID = MyBase.Columns("DOCTYPE_ID") + Me.columnDOCTYPE = MyBase.Columns("DOCTYPE") Me.columnCHANGED_ACTION = MyBase.Columns("CHANGED_ACTION") Me.columnACTIVE = MyBase.Columns("ACTIVE") Me.columnCOMMENT = MyBase.Columns("COMMENT") @@ -4371,7 +4650,6 @@ Partial Public Class DSIDB_Stammdaten Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") - Me.columnDoctype = MyBase.Columns("Doctype") End Sub + '''Represents strongly named DataRow class. + ''' + Partial Public Class VWIDB_DOCTYPES_DERow + Inherits Global.System.Data.DataRow + + Private tableVWIDB_DOCTYPES_DE As VWIDB_DOCTYPES_DEDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableVWIDB_DOCTYPES_DE = CType(Me.Table,VWIDB_DOCTYPES_DEDataTable) + End Sub + + _ + Public Property Doctype() As String + Get + Return CType(Me(Me.tableVWIDB_DOCTYPES_DE.DoctypeColumn),String) + End Get + Set + Me(Me.tableVWIDB_DOCTYPES_DE.DoctypeColumn) = value + End Set + End Property + End Class + ''' '''Represents strongly named DataRow class. ''' @@ -6406,12 +6709,12 @@ Partial Public Class DSIDB_Stammdaten _ - Public Property DOCTYPE_ID() As Integer + Public Property DOCTYPE() As String Get - Return CType(Me(Me.tableTBIDB_DOCTYPE_HANDLING.DOCTYPE_IDColumn),Integer) + Return CType(Me(Me.tableTBIDB_DOCTYPE_HANDLING.DOCTYPEColumn),String) End Get Set - Me(Me.tableTBIDB_DOCTYPE_HANDLING.DOCTYPE_IDColumn) = value + Me(Me.tableTBIDB_DOCTYPE_HANDLING.DOCTYPEColumn) = value End Set End Property @@ -6508,17 +6811,6 @@ Partial Public Class DSIDB_Stammdaten End Set End Property - _ - Public Property Doctype() As String - Get - Return CType(Me(Me.tableTBIDB_DOCTYPE_HANDLING.DoctypeColumn),String) - End Get - Set - Me(Me.tableTBIDB_DOCTYPE_HANDLING.DoctypeColumn) = value - End Set - End Property - _ Public Property TBIDB_CATALOGRow() As TBIDB_CATALOGRow @@ -6903,6 +7195,42 @@ Partial Public Class DSIDB_Stammdaten End Property End Class + ''' + '''Row event argument class + ''' + _ + Public Class VWIDB_DOCTYPES_DERowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As VWIDB_DOCTYPES_DERow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As VWIDB_DOCTYPES_DERow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As VWIDB_DOCTYPES_DERow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class + ''' '''Row event argument class ''' @@ -10094,6 +10422,179 @@ Namespace DSIDB_StammdatenTableAdapters End Function End Class + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class VWIDB_DOCTYPES_DETableAdapter + Inherits Global.System.ComponentModel.Component + + Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter + + Private _connection As Global.System.Data.SqlClient.SqlConnection + + Private _transaction As Global.System.Data.SqlClient.SqlTransaction + + Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand + + Private _clearBeforeFill As Boolean + + _ + Public Sub New() + MyBase.New + Me.ClearBeforeFill = true + End Sub + + _ + Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter + Get + If (Me._adapter Is Nothing) Then + Me.InitAdapter + End If + Return Me._adapter + End Get + End Property + + _ + Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection + Get + If (Me._connection Is Nothing) Then + Me.InitConnection + End If + Return Me._connection + End Get + Set + Me._connection = value + If (Not (Me.Adapter.InsertCommand) Is Nothing) Then + Me.Adapter.InsertCommand.Connection = value + End If + If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then + Me.Adapter.DeleteCommand.Connection = value + End If + If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then + Me.Adapter.UpdateCommand.Connection = value + End If + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + If (Not (Me.CommandCollection(i)) Is Nothing) Then + CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value + End If + i = (i + 1) + Loop + End Set + End Property + + _ + Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction + Get + Return Me._transaction + End Get + Set + Me._transaction = value + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + Me.CommandCollection(i).Transaction = Me._transaction + i = (i + 1) + Loop + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then + Me.Adapter.DeleteCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then + Me.Adapter.InsertCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then + Me.Adapter.UpdateCommand.Transaction = Me._transaction + End If + End Set + End Property + + _ + Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() + Get + If (Me._commandCollection Is Nothing) Then + Me.InitCommandCollection + End If + Return Me._commandCollection + End Get + End Property + + _ + Public Property ClearBeforeFill() As Boolean + Get + Return Me._clearBeforeFill + End Get + Set + Me._clearBeforeFill = value + End Set + End Property + + _ + Private Sub InitAdapter() + Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() + Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() + tableMapping.SourceTable = "Table" + tableMapping.DataSetTable = "VWIDB_DOCTYPES_DE" + tableMapping.ColumnMappings.Add("Doctype", "Doctype") + Me._adapter.TableMappings.Add(tableMapping) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.DigitalData.GUIs.ZooFlow.Settings.Default.IDBConnectionStringDEFAULT + End Sub + + _ + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT * FROM VWIDB_DOCTYPES_DE" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + 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 GetData() As DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Dim dataTable As DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable = New DSIDB_Stammdaten.VWIDB_DOCTYPES_DEDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + End Class + ''' '''Represents the connection and commands used to retrieve and save data. ''' @@ -10222,7 +10723,7 @@ Namespace DSIDB_StammdatenTableAdapters tableMapping.SourceTable = "Table" tableMapping.DataSetTable = "TBIDB_DOCTYPE_HANDLING" tableMapping.ColumnMappings.Add("GUID", "GUID") - tableMapping.ColumnMappings.Add("DOCTYPE_ID", "DOCTYPE_ID") + tableMapping.ColumnMappings.Add("DOCTYPE", "DOCTYPE") tableMapping.ColumnMappings.Add("CHANGED_ACTION", "CHANGED_ACTION") tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") tableMapping.ColumnMappings.Add("COMMENT", "COMMENT") @@ -10230,7 +10731,6 @@ Namespace DSIDB_StammdatenTableAdapters tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") - tableMapping.ColumnMappings.Add("Doctype", "Doctype") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection @@ -10239,26 +10739,26 @@ Namespace DSIDB_StammdatenTableAdapters Me._adapter.DeleteCommand.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.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (DOCTYPE_ID, CHANGED"& _ - "_ACTION, ACTIVE, COMMENT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@DOCTYPE_ID,@CHANGED_ACTION"& _ - ",@ACTIVE,@COMMENT,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE"& _ - ", COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_DOCTYPE_H"& _ - "ANDLING WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (DOCTYPE, CHANGED_AC"& _ + "TION, ACTIVE, COMMENT, ADDED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@DOCTYPE,@CHANGED_ACTION,@ACTI"& _ + "VE,@COMMENT,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT"& _ + ", ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_DOCTYPE_HANDLING W"& _ + "HERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_ACTION", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_ACTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", 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 TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET DOCTYPE_ID = @DOCTYPE_ID,"& _ - " CHANGED_ACTION = @CHANGED_ACTION, ACTIVE = @ACTIVE, COMMENT = @COMMENT, CHANGED"& _ - "_WHO = @CHANGED_WHO"&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, DOCTYP"& _ - "E_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANG"& _ - "ED_WHEN FROM TBIDB_DOCTYPE_HANDLING WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE TBIDB_DOCTYPE_HANDLING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET DOCTYPE = @DOCTYPE, CHANG"& _ + "ED_ACTION = @CHANGED_ACTION, ACTIVE = @ACTIVE, COMMENT = @COMMENT, CHANGED_WHO ="& _ + " @CHANGED_WHO"&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, DOCTYPE, CHA"& _ + "NGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN F"& _ + "ROM TBIDB_DOCTYPE_HANDLING WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_ACTION", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_ACTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -10280,26 +10780,20 @@ Namespace DSIDB_StammdatenTableAdapters Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT TBIDB_DOCTYPE_HANDLING.GUID, TBIDB_DOCTYPE_HANDLING.DOCTYPE_ID, TBI"& _ - "DB_DOCTYPE_HANDLING.CHANGED_ACTION, TBIDB_DOCTYPE_HANDLING.ACTIVE, TBIDB_DOCTYPE"& _ - "_HANDLING.COMMENT, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" TBIDB_DOCTYPE_HANDLING.ADDED_WHO, "& _ - "TBIDB_DOCTYPE_HANDLING.ADDED_WHEN, TBIDB_DOCTYPE_HANDLING.CHANGED_WHO, TBIDB_DOC"& _ - "TYPE_HANDLING.CHANGED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" DD_ECM.dbo.TBDD_DOKUMENTA"& _ - "RT.BEZEICHNUNG AS Doctype"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBIDB_DOCTYPE_HANDLING INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - " DD_ECM.dbo.TBDD_DOKUMENTART ON TBIDB_DOCTYPE_HANDLING.DOC"& _ - "TYPE_ID = DD_ECM.dbo.TBDD_DOKUMENTART.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (TBIDB_DOCTYPE_HANDLING"& _ - ".DOCTYPE_ID = @DOCTYPE_ID)" + Me._commandCollection(0).CommandText = "SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WH"& _ + "EN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBIDB_DOCTYPE_HANDLING"&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("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + 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, "", "", "")) End Sub _ - Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable, ByVal DOCTYPE_ID As Integer) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable, ByVal GUID As Integer) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(DOCTYPE_ID,Integer) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer) If (Me.ClearBeforeFill = true) Then dataTable.Clear End If @@ -10311,9 +10805,9 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData(ByVal DOCTYPE_ID As Integer) As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable + Public Overloads Overridable Function GetData(ByVal GUID As Integer) As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Me.Adapter.SelectCommand.Parameters(0).Value = CType(DOCTYPE_ID,Integer) + Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer) Dim dataTable As DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable = New DSIDB_Stammdaten.TBIDB_DOCTYPE_HANDLINGDataTable() Me.Adapter.Fill(dataTable) Return dataTable @@ -10372,8 +10866,12 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal DOCTYPE_ID As Integer, ByVal CHANGED_ACTION As Integer, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer - Me.Adapter.InsertCommand.Parameters(0).Value = CType(DOCTYPE_ID,Integer) + Public Overloads Overridable Function Insert(ByVal DOCTYPE As String, ByVal CHANGED_ACTION As Integer, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal ADDED_WHO As String) As Integer + If (DOCTYPE Is Nothing) Then + Throw New Global.System.ArgumentNullException("DOCTYPE") + Else + Me.Adapter.InsertCommand.Parameters(0).Value = CType(DOCTYPE,String) + End If Me.Adapter.InsertCommand.Parameters(1).Value = CType(CHANGED_ACTION,Integer) Me.Adapter.InsertCommand.Parameters(2).Value = CType(ACTIVE,Boolean) If (COMMENT Is Nothing) Then @@ -10405,8 +10903,12 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ - Public Overloads Overridable Function Update(ByVal DOCTYPE_ID As Integer, ByVal CHANGED_ACTION As Integer, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(DOCTYPE_ID,Integer) + Public Overloads Overridable Function Update(ByVal DOCTYPE As String, ByVal CHANGED_ACTION As Integer, ByVal ACTIVE As Boolean, ByVal COMMENT As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + If (DOCTYPE Is Nothing) Then + Throw New Global.System.ArgumentNullException("DOCTYPE") + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(DOCTYPE,String) + End If Me.Adapter.UpdateCommand.Parameters(1).Value = CType(CHANGED_ACTION,Integer) Me.Adapter.UpdateCommand.Parameters(2).Value = CType(ACTIVE,Boolean) If (COMMENT Is Nothing) Then diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsc b/GUIs.ZooFlow/DSIDB_Stammdaten.xsc index aeada491..a99687e5 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsc +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsc @@ -39,29 +39,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index 4ed8309a..93ce6517 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -617,60 +617,73 @@ FROM TBIDB_ATTRIBUTE_TYPE + + + + + + SELECT * FROM VWIDB_DOCTYPES_DE + + + + + + + + + + - + - + DELETE FROM TBIDB_DOCTYPE_HANDLING WHERE (GUID = @Original_GUID) - + - + INSERT INTO TBIDB_DOCTYPE_HANDLING - (DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO) -VALUES (@DOCTYPE_ID,@CHANGED_ACTION,@ACTIVE,@COMMENT,@ADDED_WHO); -SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_DOCTYPE_HANDLING WHERE (GUID = SCOPE_IDENTITY()) + (DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO) +VALUES (@DOCTYPE,@CHANGED_ACTION,@ACTIVE,@COMMENT,@ADDED_WHO); +SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_DOCTYPE_HANDLING WHERE (GUID = SCOPE_IDENTITY()) - - - - - + + + + + - SELECT TBIDB_DOCTYPE_HANDLING.GUID, TBIDB_DOCTYPE_HANDLING.DOCTYPE_ID, TBIDB_DOCTYPE_HANDLING.CHANGED_ACTION, TBIDB_DOCTYPE_HANDLING.ACTIVE, TBIDB_DOCTYPE_HANDLING.COMMENT, - TBIDB_DOCTYPE_HANDLING.ADDED_WHO, TBIDB_DOCTYPE_HANDLING.ADDED_WHEN, TBIDB_DOCTYPE_HANDLING.CHANGED_WHO, TBIDB_DOCTYPE_HANDLING.CHANGED_WHEN, - DD_ECM.dbo.TBDD_DOKUMENTART.BEZEICHNUNG AS Doctype -FROM TBIDB_DOCTYPE_HANDLING INNER JOIN - DD_ECM.dbo.TBDD_DOKUMENTART ON TBIDB_DOCTYPE_HANDLING.DOCTYPE_ID = DD_ECM.dbo.TBDD_DOKUMENTART.GUID -WHERE (TBIDB_DOCTYPE_HANDLING.DOCTYPE_ID = @DOCTYPE_ID) + SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN +FROM TBIDB_DOCTYPE_HANDLING +WHERE (GUID = @GUID) - + - + UPDATE TBIDB_DOCTYPE_HANDLING -SET DOCTYPE_ID = @DOCTYPE_ID, CHANGED_ACTION = @CHANGED_ACTION, ACTIVE = @ACTIVE, COMMENT = @COMMENT, CHANGED_WHO = @CHANGED_WHO +SET DOCTYPE = @DOCTYPE, CHANGED_ACTION = @CHANGED_ACTION, ACTIVE = @ACTIVE, COMMENT = @COMMENT, CHANGED_WHO = @CHANGED_WHO WHERE (GUID = @Original_GUID); -SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_DOCTYPE_HANDLING WHERE (GUID = @GUID) +SELECT GUID, DOCTYPE, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBIDB_DOCTYPE_HANDLING WHERE (GUID = @GUID) - - - - - - - + + + + + + + @@ -678,7 +691,7 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + @@ -686,7 +699,6 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - @@ -698,7 +710,7 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + @@ -737,7 +749,7 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + @@ -795,7 +807,7 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + @@ -852,7 +864,7 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + @@ -893,7 +905,7 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + @@ -959,7 +971,7 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + @@ -1012,7 +1024,7 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + @@ -1049,7 +1061,7 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + @@ -1063,7 +1075,7 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + @@ -1101,11 +1113,30 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - + - - + + + + + + + + + + + + + + + + + + + + + @@ -1131,13 +1162,6 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - - - - - - - @@ -1182,9 +1206,9 @@ SELECT GUID, DOCTYPE_ID, CHANGED_ACTION, ACTIVE, COMMENT, ADDED_WHO, ADDED_WHEN, - - - + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xss b/GUIs.ZooFlow/DSIDB_Stammdaten.xss index 36c207fc..f34a1ab6 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xss +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xss @@ -6,19 +6,20 @@ --> - - - - - - - - - - + + + + + + + + + + + - + 677 @@ -30,7 +31,7 @@ - + 896 @@ -42,7 +43,7 @@ - + 913