From 882b5b9718bcf3aa7509fcb0bc94137c2c4124b6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 11 Feb 2021 13:04:50 +0100 Subject: [PATCH] ZooFlow: Add Attribute Edit Form --- .../Administration/ZooFlow_AdminEditForm.vb | 6 - .../frmAdmin_Attribute.Designer.vb | 412 +++++++++--------- .../Administration/frmAdmin_Attribute.vb | 60 ++- GUIs.ZooFlow/Administration/frmAdmin_Start.vb | 38 +- .../Administration/interfaceAdmin_Form.vb | 10 + GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb | 107 +++++ GUIs.ZooFlow/DSIDB_Stammdaten.xsc | 18 +- GUIs.ZooFlow/DSIDB_Stammdaten.xsd | 26 +- GUIs.ZooFlow/My Project/Resources.Designer.vb | 20 + GUIs.ZooFlow/My Project/Resources.resx | 10 +- GUIs.ZooFlow/Resources/about.svg | 19 + GUIs.ZooFlow/Resources/save.svg | 7 + GUIs.ZooFlow/ZooFlow.vbproj | 8 +- 13 files changed, 492 insertions(+), 249 deletions(-) delete mode 100644 GUIs.ZooFlow/Administration/ZooFlow_AdminEditForm.vb create mode 100644 GUIs.ZooFlow/Administration/interfaceAdmin_Form.vb create mode 100644 GUIs.ZooFlow/Resources/about.svg create mode 100644 GUIs.ZooFlow/Resources/save.svg diff --git a/GUIs.ZooFlow/Administration/ZooFlow_AdminEditForm.vb b/GUIs.ZooFlow/Administration/ZooFlow_AdminEditForm.vb deleted file mode 100644 index b006b3ba..00000000 --- a/GUIs.ZooFlow/Administration/ZooFlow_AdminEditForm.vb +++ /dev/null @@ -1,6 +0,0 @@ -Imports DigitalData.Modules.Logging - -Friend Interface ZooFlow_AdminEditForm - Property PrimaryKey As Long - Property Logger As Logger -End Interface diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Attribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Attribute.Designer.vb index 71ecdd36..70b5f168 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Attribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Attribute.Designer.vb @@ -25,6 +25,8 @@ Partial Class frmAdmin_Attribute Me.components = New System.ComponentModel.Container() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.labelStatus = New DevExpress.XtraBars.BarStaticItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() @@ -35,28 +37,28 @@ Partial Class frmAdmin_Attribute Me.DSIDB_Stammdaten = New DigitalData.GUIs.ZooFlow.DSIDB_Stammdaten() Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit() Me.SpinEdit1 = New DevExpress.XtraEditors.SpinEdit() + Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() + Me.CheckEdit2 = New DevExpress.XtraEditors.CheckEdit() + Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() + Me.txtAddedWho = New DevExpress.XtraEditors.TextEdit() + Me.txtAddedWhen = New DevExpress.XtraEditors.TextEdit() + Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() + Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() + Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TBIDB_ATTRIBUTETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTETableAdapter() - Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() - Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() - Me.CheckEdit2 = New DevExpress.XtraEditors.CheckEdit() - Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit() Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit() - Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TextEdit6 = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TextEdit7 = New DevExpress.XtraEditors.TextEdit() + Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() - Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem() + Me.TBIDB_ATTRIBUTETableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTETableAdapter() + Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() @@ -65,35 +67,35 @@ Partial Class frmAdmin_Attribute CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAddedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl1 ' Me.RibbonControl1.CommandLayout = DevExpress.XtraBars.Ribbon.CommandLayout.Simplified Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.labelStatus}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 3 + Me.RibbonControl1.MaxItemId = 6 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -103,11 +105,26 @@ Partial Class frmAdmin_Attribute ' 'BarButtonItem1 ' - Me.BarButtonItem1.Caption = "Speichern" + Me.BarButtonItem1.Caption = "Speichern und Schließen" Me.BarButtonItem1.Id = 1 Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_check Me.BarButtonItem1.Name = "BarButtonItem1" ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Speichern" + Me.BarButtonItem2.Id = 3 + Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.save + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'labelStatus + ' + Me.labelStatus.Caption = "labelStatus" + Me.labelStatus.Id = 5 + Me.labelStatus.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.about + Me.labelStatus.Name = "labelStatus" + Me.labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) @@ -117,11 +134,13 @@ Partial Class frmAdmin_Attribute 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Daten" ' 'RibbonStatusBar1 ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 428) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 @@ -140,10 +159,10 @@ Partial Class frmAdmin_Attribute Me.LayoutControl1.Controls.Add(Me.CheckEdit1) Me.LayoutControl1.Controls.Add(Me.CheckEdit2) Me.LayoutControl1.Controls.Add(Me.TextEdit3) - Me.LayoutControl1.Controls.Add(Me.TextEdit4) - Me.LayoutControl1.Controls.Add(Me.TextEdit5) - Me.LayoutControl1.Controls.Add(Me.TextEdit6) - Me.LayoutControl1.Controls.Add(Me.TextEdit7) + Me.LayoutControl1.Controls.Add(Me.txtAddedWho) + Me.LayoutControl1.Controls.Add(Me.txtAddedWhen) + Me.LayoutControl1.Controls.Add(Me.txtChangedWho) + Me.LayoutControl1.Controls.Add(Me.txtChangedWhen) Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit1) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControl1.Location = New System.Drawing.Point(0, 66) @@ -156,11 +175,11 @@ Partial Class frmAdmin_Attribute 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "GUID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(121, 20) + Me.TextEdit1.Location = New System.Drawing.Point(130, 20) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(659, 20) + Me.TextEdit1.Size = New System.Drawing.Size(650, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' @@ -177,10 +196,10 @@ Partial Class frmAdmin_Attribute 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "TITLE", True)) - Me.TextEdit2.Location = New System.Drawing.Point(121, 60) + Me.TextEdit2.Location = New System.Drawing.Point(130, 60) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(659, 20) + Me.TextEdit2.Size = New System.Drawing.Size(650, 20) Me.TextEdit2.StyleController = Me.LayoutControl1 Me.TextEdit2.TabIndex = 5 ' @@ -188,14 +207,101 @@ Partial Class frmAdmin_Attribute ' Me.SpinEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True)) Me.SpinEdit1.EditValue = New Decimal(New Integer() {0, 0, 0, 0}) - Me.SpinEdit1.Location = New System.Drawing.Point(510, 180) + Me.SpinEdit1.Location = New System.Drawing.Point(520, 180) Me.SpinEdit1.MenuManager = Me.RibbonControl1 Me.SpinEdit1.Name = "SpinEdit1" Me.SpinEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.SpinEdit1.Size = New System.Drawing.Size(270, 20) + Me.SpinEdit1.Size = New System.Drawing.Size(260, 20) Me.SpinEdit1.StyleController = Me.LayoutControl1 Me.SpinEdit1.TabIndex = 6 ' + 'CheckEdit1 + ' + Me.CheckEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "MULTI_CONTEXT", True)) + Me.CheckEdit1.Location = New System.Drawing.Point(20, 220) + Me.CheckEdit1.MenuManager = Me.RibbonControl1 + Me.CheckEdit1.Name = "CheckEdit1" + Me.CheckEdit1.Properties.Caption = "Vektor/Multi" + Me.CheckEdit1.Size = New System.Drawing.Size(760, 18) + Me.CheckEdit1.StyleController = Me.LayoutControl1 + Me.CheckEdit1.TabIndex = 7 + ' + 'CheckEdit2 + ' + Me.CheckEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "VIEW_VISIBLE", True)) + Me.CheckEdit2.Location = New System.Drawing.Point(20, 180) + Me.CheckEdit2.MenuManager = Me.RibbonControl1 + Me.CheckEdit2.Name = "CheckEdit2" + Me.CheckEdit2.Properties.Caption = "Sichtbar" + Me.CheckEdit2.Size = New System.Drawing.Size(370, 18) + Me.CheckEdit2.StyleController = Me.LayoutControl1 + Me.CheckEdit2.TabIndex = 8 + ' + 'TextEdit3 + ' + Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "COMMENT", True)) + Me.TextEdit3.Location = New System.Drawing.Point(130, 140) + Me.TextEdit3.MenuManager = Me.RibbonControl1 + Me.TextEdit3.Name = "TextEdit3" + Me.TextEdit3.Size = New System.Drawing.Size(650, 20) + Me.TextEdit3.StyleController = Me.LayoutControl1 + Me.TextEdit3.TabIndex = 9 + ' + 'txtAddedWho + ' + Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "ADDED_WHO", True)) + Me.txtAddedWho.Location = New System.Drawing.Point(130, 258) + Me.txtAddedWho.MenuManager = Me.RibbonControl1 + Me.txtAddedWho.Name = "txtAddedWho" + Me.txtAddedWho.Properties.ReadOnly = True + Me.txtAddedWho.Size = New System.Drawing.Size(260, 20) + Me.txtAddedWho.StyleController = Me.LayoutControl1 + Me.txtAddedWho.TabIndex = 10 + ' + 'txtAddedWhen + ' + Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "ADDED_WHEN", True)) + Me.txtAddedWhen.Location = New System.Drawing.Point(520, 258) + Me.txtAddedWhen.MenuManager = Me.RibbonControl1 + Me.txtAddedWhen.Name = "txtAddedWhen" + Me.txtAddedWhen.Properties.ReadOnly = True + Me.txtAddedWhen.Size = New System.Drawing.Size(260, 20) + Me.txtAddedWhen.StyleController = Me.LayoutControl1 + Me.txtAddedWhen.TabIndex = 11 + ' + 'txtChangedWho + ' + Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "CHANGED_WHO", True)) + Me.txtChangedWho.Location = New System.Drawing.Point(130, 298) + Me.txtChangedWho.MenuManager = Me.RibbonControl1 + Me.txtChangedWho.Name = "txtChangedWho" + Me.txtChangedWho.Properties.ReadOnly = True + Me.txtChangedWho.Size = New System.Drawing.Size(260, 20) + Me.txtChangedWho.StyleController = Me.LayoutControl1 + Me.txtChangedWho.TabIndex = 12 + ' + 'txtChangedWhen + ' + Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "CHANGED_WHEN", True)) + Me.txtChangedWhen.Location = New System.Drawing.Point(520, 298) + Me.txtChangedWhen.MenuManager = Me.RibbonControl1 + Me.txtChangedWhen.Name = "txtChangedWhen" + Me.txtChangedWhen.Properties.ReadOnly = True + Me.txtChangedWhen.Size = New System.Drawing.Size(260, 20) + Me.txtChangedWhen.StyleController = Me.LayoutControl1 + Me.txtChangedWhen.TabIndex = 13 + ' + 'ComboBoxEdit1 + ' + Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "TYP_ID", True)) + Me.ComboBoxEdit1.Location = New System.Drawing.Point(130, 100) + Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 + Me.ComboBoxEdit1.Name = "ComboBoxEdit1" + Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(650, 20) + Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 + Me.ComboBoxEdit1.TabIndex = 14 + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] @@ -214,7 +320,7 @@ Partial Class frmAdmin_Attribute Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem1.Size = New System.Drawing.Size(780, 40) Me.LayoutControlItem1.Text = "GUID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(107, 13) ' 'LayoutControlItem2 ' @@ -224,41 +330,7 @@ Partial Class frmAdmin_Attribute Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem2.Size = New System.Drawing.Size(780, 40) Me.LayoutControlItem2.Text = "Bezeichnung" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(98, 13) - ' - 'LayoutControlItem3 - ' - Me.LayoutControlItem3.Control = Me.SpinEdit1 - Me.LayoutControlItem3.CustomizationFormText = "Anzeige Reihenfolge" - Me.LayoutControlItem3.Location = New System.Drawing.Point(389, 160) - Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(391, 40) - Me.LayoutControlItem3.Text = "Anzeige Reihenfolge" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(98, 13) - ' - 'TBIDB_ATTRIBUTETableAdapter - ' - Me.TBIDB_ATTRIBUTETableAdapter.ClearBeforeFill = True - ' - 'TableAdapterManager - ' - Me.TableAdapterManager.BackupDataSetBeforeUpdate = False - Me.TableAdapterManager.Connection = Nothing - Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing - Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing - Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete - ' - 'CheckEdit1 - ' - Me.CheckEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "MULTI_CONTEXT", True)) - Me.CheckEdit1.Location = New System.Drawing.Point(20, 220) - Me.CheckEdit1.MenuManager = Me.RibbonControl1 - Me.CheckEdit1.Name = "CheckEdit1" - Me.CheckEdit1.Properties.Caption = "Vektor/Multi" - Me.CheckEdit1.Size = New System.Drawing.Size(760, 18) - Me.CheckEdit1.StyleController = Me.LayoutControl1 - Me.CheckEdit1.TabIndex = 7 + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(107, 13) ' 'LayoutControlItem4 ' @@ -270,37 +342,6 @@ Partial Class frmAdmin_Attribute Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem4.TextVisible = False ' - 'CheckEdit2 - ' - Me.CheckEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "VIEW_VISIBLE", True)) - Me.CheckEdit2.Location = New System.Drawing.Point(20, 180) - Me.CheckEdit2.MenuManager = Me.RibbonControl1 - Me.CheckEdit2.Name = "CheckEdit2" - Me.CheckEdit2.Properties.Caption = "Sichtbar" - Me.CheckEdit2.Size = New System.Drawing.Size(369, 18) - Me.CheckEdit2.StyleController = Me.LayoutControl1 - Me.CheckEdit2.TabIndex = 8 - ' - 'LayoutControlItem5 - ' - Me.LayoutControlItem5.Control = Me.CheckEdit2 - Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 160) - Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem5.Size = New System.Drawing.Size(389, 40) - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem5.TextVisible = False - ' - 'TextEdit3 - ' - Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "COMMENT", True)) - Me.TextEdit3.Location = New System.Drawing.Point(121, 140) - Me.TextEdit3.MenuManager = Me.RibbonControl1 - Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(659, 20) - Me.TextEdit3.StyleController = Me.LayoutControl1 - Me.TextEdit3.TabIndex = 9 - ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.TextEdit3 @@ -309,112 +350,91 @@ Partial Class frmAdmin_Attribute Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem6.Size = New System.Drawing.Size(780, 40) Me.LayoutControlItem6.Text = "Kommentar" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(98, 13) - ' - 'TextEdit4 - ' - Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "ADDED_WHO", True)) - Me.TextEdit4.Location = New System.Drawing.Point(121, 258) - Me.TextEdit4.MenuManager = Me.RibbonControl1 - Me.TextEdit4.Name = "TextEdit4" - Me.TextEdit4.Properties.ReadOnly = True - Me.TextEdit4.Size = New System.Drawing.Size(268, 20) - Me.TextEdit4.StyleController = Me.LayoutControl1 - Me.TextEdit4.TabIndex = 10 + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(107, 13) ' 'LayoutControlItem7 ' - Me.LayoutControlItem7.Control = Me.TextEdit4 + Me.LayoutControlItem7.Control = Me.txtAddedWho Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 238) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem7.Size = New System.Drawing.Size(389, 40) + Me.LayoutControlItem7.Size = New System.Drawing.Size(390, 40) Me.LayoutControlItem7.Text = "Erstellt Wer" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(98, 13) - ' - 'TextEdit5 - ' - Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "ADDED_WHEN", True)) - Me.TextEdit5.Location = New System.Drawing.Point(510, 258) - Me.TextEdit5.MenuManager = Me.RibbonControl1 - Me.TextEdit5.Name = "TextEdit5" - Me.TextEdit5.Properties.ReadOnly = True - Me.TextEdit5.Size = New System.Drawing.Size(270, 20) - Me.TextEdit5.StyleController = Me.LayoutControl1 - Me.TextEdit5.TabIndex = 11 + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(107, 13) ' - 'LayoutControlItem8 + 'LayoutControlItem3 ' - Me.LayoutControlItem8.Control = Me.TextEdit5 - Me.LayoutControlItem8.Location = New System.Drawing.Point(389, 238) - Me.LayoutControlItem8.Name = "LayoutControlItem8" - Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem8.Size = New System.Drawing.Size(391, 40) - Me.LayoutControlItem8.Text = "Erstellt Wann" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem3.Control = Me.SpinEdit1 + Me.LayoutControlItem3.CustomizationFormText = "Anzeige Reihenfolge" + Me.LayoutControlItem3.Location = New System.Drawing.Point(390, 160) + Me.LayoutControlItem3.Name = "LayoutControlItem3" + Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem3.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem3.Text = "Anzeige Reihenfolge" + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(107, 13) ' - 'TextEdit6 + 'LayoutControlItem11 ' - Me.TextEdit6.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "CHANGED_WHO", True)) - Me.TextEdit6.Location = New System.Drawing.Point(121, 298) - Me.TextEdit6.MenuManager = Me.RibbonControl1 - Me.TextEdit6.Name = "TextEdit6" - Me.TextEdit6.Properties.ReadOnly = True - Me.TextEdit6.Size = New System.Drawing.Size(269, 20) - Me.TextEdit6.StyleController = Me.LayoutControl1 - Me.TextEdit6.TabIndex = 12 + Me.LayoutControlItem11.Control = Me.ComboBoxEdit1 + Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 80) + Me.LayoutControlItem11.Name = "LayoutControlItem11" + Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem11.Size = New System.Drawing.Size(780, 40) + Me.LayoutControlItem11.Text = "Attribut-Typ" + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(107, 13) ' 'LayoutControlItem9 ' - Me.LayoutControlItem9.Control = Me.TextEdit6 + Me.LayoutControlItem9.Control = Me.txtChangedWho Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 278) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem9.Size = New System.Drawing.Size(390, 64) Me.LayoutControlItem9.Text = "Geändert Wer" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(107, 13) ' - 'TextEdit7 + 'LayoutControlItem5 ' - Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit7.Location = New System.Drawing.Point(511, 298) - Me.TextEdit7.MenuManager = Me.RibbonControl1 - Me.TextEdit7.Name = "TextEdit7" - Me.TextEdit7.Properties.ReadOnly = True - Me.TextEdit7.Size = New System.Drawing.Size(269, 20) - Me.TextEdit7.StyleController = Me.LayoutControl1 - Me.TextEdit7.TabIndex = 13 + Me.LayoutControlItem5.Control = Me.CheckEdit2 + Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 160) + Me.LayoutControlItem5.Name = "LayoutControlItem5" + Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem5.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem5.TextVisible = False + ' + 'LayoutControlItem8 + ' + Me.LayoutControlItem8.Control = Me.txtAddedWhen + Me.LayoutControlItem8.Location = New System.Drawing.Point(390, 238) + Me.LayoutControlItem8.Name = "LayoutControlItem8" + Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.LayoutControlItem8.Size = New System.Drawing.Size(390, 40) + Me.LayoutControlItem8.Text = "Erstellt Wann" + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(107, 13) ' 'LayoutControlItem10 ' - Me.LayoutControlItem10.Control = Me.TextEdit7 + Me.LayoutControlItem10.Control = Me.txtChangedWhen Me.LayoutControlItem10.Location = New System.Drawing.Point(390, 278) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem10.Size = New System.Drawing.Size(390, 64) Me.LayoutControlItem10.Text = "Geändert Wann" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(98, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(107, 13) ' - 'ComboBoxEdit1 + 'TBIDB_ATTRIBUTETableAdapter ' - Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBIDB_ATTRIBUTEBindingSource, "TYP_ID", True)) - Me.ComboBoxEdit1.Location = New System.Drawing.Point(121, 100) - Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 - Me.ComboBoxEdit1.Name = "ComboBoxEdit1" - Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.ComboBoxEdit1.Size = New System.Drawing.Size(659, 20) - Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 - Me.ComboBoxEdit1.TabIndex = 14 + Me.TBIDB_ATTRIBUTETableAdapter.ClearBeforeFill = True ' - 'LayoutControlItem11 + 'TableAdapterManager ' - Me.LayoutControlItem11.Control = Me.ComboBoxEdit1 - Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 80) - Me.LayoutControlItem11.Name = "LayoutControlItem11" - Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem11.Size = New System.Drawing.Size(780, 40) - Me.LayoutControlItem11.Text = "Attribut-Typ" - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(98, 13) + Me.TableAdapterManager.BackupDataSetBeforeUpdate = False + Me.TableAdapterManager.Connection = Nothing + Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing + Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing + Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing + Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' 'frmAdmin_Attribute ' @@ -436,26 +456,26 @@ Partial Class frmAdmin_Attribute CType(Me.DSIDB_Stammdaten, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAddedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.CheckEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit6.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit7.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -484,10 +504,10 @@ Partial Class frmAdmin_Attribute Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents TextEdit3 As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit4 As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit5 As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit6 As DevExpress.XtraEditors.TextEdit - Friend WithEvents TextEdit7 As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtAddedWho As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtAddedWhen As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtChangedWho As DevExpress.XtraEditors.TextEdit + Friend WithEvents txtChangedWhen As DevExpress.XtraEditors.TextEdit Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem @@ -495,4 +515,6 @@ Partial Class frmAdmin_Attribute Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Attribute.vb b/GUIs.ZooFlow/Administration/frmAdmin_Attribute.vb index 540d691d..0818721a 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Attribute.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Attribute.vb @@ -1,18 +1,21 @@ Imports DigitalData.Modules.Logging Public Class frmAdmin_Attribute - Implements ZooFlow_AdminEditForm + Implements interfaceAdmin_Form - Private Property PrimaryKey As Long Implements ZooFlow_AdminEditForm.PrimaryKey - Private Property Logger As Logger Implements ZooFlow_AdminEditForm.Logger + Private Property PrimaryKey As Integer Implements interfaceAdmin_Form.PrimaryKey + Private Property Logger As Logger Implements interfaceAdmin_Form.Logger + Public Property HasChanges As Boolean = False Implements interfaceAdmin_Form.HasChanges + Public Property IsInsert As Boolean = False Implements interfaceAdmin_Form.IsInsert - Public Sub New(PrimaryKey As String) + Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. Logger = My.LogConfig.GetLogger() Me.PrimaryKey = PrimaryKey + Me.IsInsert = IsInsert End Sub Private Sub frmAdmin_Attribute_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -22,4 +25,53 @@ Public Class frmAdmin_Attribute Logger.Error(ex) End Try End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + ResetMessages() + + If SaveData() And HasChanges Then + ShowStatus("Attribute gespeichert!") + End If + End Sub + + Private Sub ResetMessages() + labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End Sub + + Private Sub ShowStatus(Message As String) + labelStatus.Caption = Message + labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + ResetMessages() + + If SaveData() Then + Close() + End If + End Sub + + Public Function SaveData() As Boolean Implements interfaceAdmin_Form.SaveData + Try + TBIDB_ATTRIBUTEBindingSource.EndEdit() + + If DSIDB_Stammdaten.TBIDB_ATTRIBUTE.GetChanges() IsNot Nothing Then + HasChanges = True + + If IsInsert Then + txtAddedWho.Text = My.Application.User.UserName + Else + txtChangedWho.Text = My.Application.User.UserName + End If + + TBIDB_ATTRIBUTEBindingSource.EndEdit() + TBIDB_ATTRIBUTETableAdapter.Update(DSIDB_Stammdaten.TBIDB_ATTRIBUTE) + End If + + Return True + Catch ex As Exception + Logger.Error(ex) + Return False + End Try + End Function End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index b96be50e..55da26b0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -18,6 +18,8 @@ Public Class frmAdmin_Start Private PrimaryKey As String = Nothing Private SourceCommands As New Dictionary(Of String, SourceSql) + Private CurrentPage As String + Private Class SourceSql Public Title As String @@ -83,6 +85,9 @@ Public Class frmAdmin_Start Exit Sub End If + CurrentPage = e.Node.Tag.ToString + Dim oSource As SourceSql = SourceCommands.Item(CurrentPage) + Select Case e.Node.Tag.ToString Case IDB_START Display_Tab(XtraTabPage_IDB, XtraTabControl) @@ -91,7 +96,6 @@ Public Class frmAdmin_Start Display_Tab(XtraTabPage_IDB, XtraTabControl) Display_Tab(XtraTabPageIDB_Attributes_New, XtraTabControlIDB) - Dim oSource As SourceSql = SourceCommands.Item(e.Node.Tag.ToString) Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL) Load_Grid(oTable, oSource.PrimaryKey, GridAttributes) @@ -135,29 +139,6 @@ Public Class frmAdmin_Start End Try End Sub - Private Sub TBIDB_ATTRIBUTEBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) - Validate() - TBIDB_ATTRIBUTEBindingSource.EndEdit() - TableAdapterManager.UpdateAll(DSIDB_Stammdaten) - End Sub - - Private Sub BarButtonItemSaveAttribute_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemSaveAttribute.ItemClick - 'Save_Attribute() - End Sub - 'Sub Save_Attribute() - ' Try - ' TBIDB_ATTRIBUTEBindingSource.EndEdit() - ' If Not IsNothing(DSIDB_Stammdaten.GetChanges) Then - ' CHANGED_WHOTextBox.Text = My.Application.User.UserName - ' TBIDB_ATTRIBUTEBindingSource.EndEdit() - ' TBIDB_ATTRIBUTETableAdapter.Update(DSIDB_Stammdaten.TBIDB_ATTRIBUTE) - ' labelStatus.Caption = $"IDB Attribute saved - {Now.ToLongTimeString}" - ' End If - ' Catch ex As Exception - ' Logger.Error(ex) - ' End Try - 'End Sub - Private Sub ViewAttributes_DoubleClick(sender As Object, e As EventArgs) Handles ViewAttributes.DoubleClick Dim view As GridView = TryCast(sender, GridView) Dim hitInfo As GridHitInfo = view.CalcHitInfo((TryCast(e, DXMouseEventArgs)).Location) @@ -166,7 +147,16 @@ Public Class frmAdmin_Start Dim oRow As DataRow = ViewAttributes.GetFocusedDataRow Dim oPrimaryKey As Integer = oRow.Item(PrimaryKey) Dim oForm As New frmAdmin_Attribute(oPrimaryKey) + + GridView1.ShowLoadingPanel() oForm.ShowDialog() + GridView1.HideLoadingPanel() + + If oForm.HasChanges Then + Dim oSource As SourceSql = SourceCommands.Item(CurrentPage) + Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL) + Load_Grid(oTable, oSource.PrimaryKey, GridAttributes) + End If Catch ex As Exception Logger.Error(ex) End Try diff --git a/GUIs.ZooFlow/Administration/interfaceAdmin_Form.vb b/GUIs.ZooFlow/Administration/interfaceAdmin_Form.vb new file mode 100644 index 00000000..724b235d --- /dev/null +++ b/GUIs.ZooFlow/Administration/interfaceAdmin_Form.vb @@ -0,0 +1,10 @@ +Imports DigitalData.Modules.Logging + +Public Interface interfaceAdmin_Form + Property PrimaryKey As Integer + Property Logger As Logger + Property HasChanges As Boolean + Property IsInsert As Boolean + + Function SaveData() As Boolean +End Interface diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb index 4186f0c8..5d6bc217 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -2863,6 +2863,19 @@ Namespace DSIDB_StammdatenTableAdapters tableMapping.ColumnMappings.Add("DELETED_WHEN", "DELETED_WHEN") tableMapping.ColumnMappings.Add("ATTR_TYPE", "ATTR_TYPE") Me._adapter.TableMappings.Add(tableMapping) + Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.UpdateCommand.Connection = Me.Connection + Me._adapter.UpdateCommand.CommandText = "UPDATE TBIDB_ATTRIBUTE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET TITLE = @TITLE, TYP_ID = @TYP_ID"& _ + ", MULTI_CONTEXT = @MULTI_CONTEXT, VIEW_SEQUENCE = @VIEW_SEQUENCE, VIEW_VISIBLE ="& _ + " @VIEW_VISIBLE, COMMENT = @COMMENT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TITLE", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "TITLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYP_ID", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "TYP_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MULTI_CONTEXT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "MULTI_CONTEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VIEW_SEQUENCE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "VIEW_SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VIEW_VISIBLE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VIEW_VISIBLE", 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, "", "", "")) + 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 _ + Public Overloads Overridable Function Update(ByVal dataTable As DSIDB_Stammdaten.TBIDB_ATTRIBUTEDataTable) As Integer + Return Me.Adapter.Update(dataTable) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataSet As DSIDB_Stammdaten) As Integer + Return Me.Adapter.Update(dataSet, "TBIDB_ATTRIBUTE") + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(dataRows) + End Function End Class ''' @@ -3490,6 +3531,8 @@ Namespace DSIDB_StammdatenTableAdapters Private _tBIDB_BUSINESS_ENTITYTableAdapter As TBIDB_BUSINESS_ENTITYTableAdapter + Private _tBIDB_ATTRIBUTETableAdapter As TBIDB_ATTRIBUTETableAdapter + Private _tBIDB_ATTRIBUTE_TYPETableAdapter As TBIDB_ATTRIBUTE_TYPETableAdapter Private _backupDataSetBeforeUpdate As Boolean @@ -3521,6 +3564,20 @@ Namespace DSIDB_StammdatenTableAdapters End Set End Property + _ + Public Property TBIDB_ATTRIBUTETableAdapter() As TBIDB_ATTRIBUTETableAdapter + Get + Return Me._tBIDB_ATTRIBUTETableAdapter + End Get + Set + Me._tBIDB_ATTRIBUTETableAdapter = value + End Set + End Property + - - + - - + - - + - - + - - + - - + diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index 052af7a2..5635fea8 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -75,7 +75,7 @@ SELECT GUID, PARENT_ENT_ID, TITLE, INHERITS_ATTRIBUTES, COMMENT, ADDED_WHO, ADDE - + SELECT TBIDB_ATTRIBUTE.GUID, TBIDB_ATTRIBUTE.TITLE, TBIDB_ATTRIBUTE.TYP_ID, TBIDB_ATTRIBUTE.MULTI_CONTEXT, TBIDB_ATTRIBUTE.VIEW_SEQUENCE, TBIDB_ATTRIBUTE.VIEW_VISIBLE, TBIDB_ATTRIBUTE.COMMENT, @@ -89,6 +89,22 @@ WHERE TBIDB_ATTRIBUTE.GUID = @GUID + + + UPDATE TBIDB_ATTRIBUTE +SET TITLE = @TITLE, TYP_ID = @TYP_ID, MULTI_CONTEXT = @MULTI_CONTEXT, VIEW_SEQUENCE = @VIEW_SEQUENCE, VIEW_VISIBLE = @VIEW_VISIBLE, COMMENT = @COMMENT +WHERE (GUID = @GUID) + + + + + + + + + + + @@ -217,7 +233,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + @@ -256,7 +272,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + @@ -313,7 +329,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + @@ -371,7 +387,7 @@ SELECT GUID, NAME_TYPE, COMMENT, BIT1, BIT2, BIT3, BIT4, ADDED_WHO, ADDED_WHEN, - + \ No newline at end of file diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 6b93e0e1..0b39ceba 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -180,6 +180,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property about() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("about", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -310,6 +320,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property save() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("save", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index daf59ade..b5eed34a 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -157,6 +157,9 @@ ..\Resources\Editdatasetwithdesigner_8449.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -199,6 +202,9 @@ ..\Resources\StatusAnnotations_Stop_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -208,7 +214,7 @@ ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/about.svg b/GUIs.ZooFlow/Resources/about.svg new file mode 100644 index 00000000..1f67213d --- /dev/null +++ b/GUIs.ZooFlow/Resources/about.svg @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/save.svg b/GUIs.ZooFlow/Resources/save.svg new file mode 100644 index 00000000..fb4f9a13 --- /dev/null +++ b/GUIs.ZooFlow/Resources/save.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 77958f00..83c57266 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -120,7 +120,7 @@ Form - + @@ -483,6 +483,12 @@ + + + + + +