diff --git a/GUIs.ZooFlow/Administration/ClassConstants.vb b/GUIs.ZooFlow/Administration/ClassConstants.vb new file mode 100644 index 00000000..584dca54 --- /dev/null +++ b/GUIs.ZooFlow/Administration/ClassConstants.vb @@ -0,0 +1,19 @@ +Namespace Administration + Public Class ClassConstants + Public Const MODULE_IDB = "IDB" + Public Const PAGE_IDB_ATTRIBUTES = "IDB_ATTRIBUTES" + Public Const PAGE_IDB_BUSINESS_ENTITIES = "IDB_BUSINESS_ENTITIES" + Public Const PAGE_IDB_SOURCE_SQL = "IDB_SOURCE_SQL" + + Public Const MODULE_GLOBIX = "GLOBIX" + Public Const PAGE_GLOBIX_PROFILES = "GLOBIX_PROFILES" + + Public Const MODULE_CW = "CW" + Public Const PAGE_CW_PROFILES = "CW_PROFILES" + + Public Const MODULE_META = "META" + Public Const PAGE_META_SOURCE_SQL = "META_SOURCE_SQL" + + Public Const COLUMN_NAME_ACTIVE = "ACTIVE" + End Class +End Namespace \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/ClassDetailForm.vb b/GUIs.ZooFlow/Administration/ClassDetailForm.vb new file mode 100644 index 00000000..47cdb5f0 --- /dev/null +++ b/GUIs.ZooFlow/Administration/ClassDetailForm.vb @@ -0,0 +1,155 @@ +Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants + +Public Class ClassDetailForm + Inherits Base.BaseClass + + Public Event DetailFormClosed As EventHandler(Of Form) + + Public ReadOnly Property DetailDataList As New Dictionary(Of String, DetailData) + Public ReadOnly Property DetailSettingsList As New Dictionary(Of String, DetailSettings) From { + {PAGE_IDB_ATTRIBUTES, ' This Key will be matched with the Entity Id from the Database + New DetailSettings With { + .GridTitle = "IDB Attribute", ' This will be shown above the Data Grid + .NewRecordTitle = "Neues Attribut", ' This will be shown on the "New" Button + .[Module] = MODULE_IDB, + .Entity = PAGE_IDB_ATTRIBUTES + }}, + {PAGE_IDB_BUSINESS_ENTITIES, + New DetailSettings With { + .GridTitle = "IDB Entitäten", + .NewRecordTitle = "Neue Entität", + .[Module] = MODULE_IDB, + .Entity = PAGE_IDB_BUSINESS_ENTITIES + }}, + {PAGE_META_SOURCE_SQL, + New DetailSettings With { + .GridTitle = "Source SQL", + .NewRecordTitle = "Neuer Source SQL", + .[Module] = MODULE_META, + .Entity = PAGE_META_SOURCE_SQL + }}, + {PAGE_GLOBIX_PROFILES, + New DetailSettings With { + .GridTitle = "Global Indexer Profile", + .NewRecordTitle = "Neues GLOBIX Profil", + .[Module] = MODULE_GLOBIX, + .Entity = PAGE_GLOBIX_PROFILES + }}, + {PAGE_CW_PROFILES, + New DetailSettings With { + .GridTitle = "Clipboard Watcher Profile", + .NewRecordTitle = "Neues CW Profil", + .[Module] = MODULE_CW, + .Entity = PAGE_CW_PROFILES + }} + } + + Public Sub New(LogConfig As Modules.Logging.LogConfig) + MyBase.New(LogConfig) + End Sub + + Public Function Handle_OpenDetail(PrimaryKey As Integer, Page As String, IsInsert As Boolean) As Boolean + Select Case Page + Case PAGE_IDB_ATTRIBUTES + Load_IDBAttribute(PrimaryKey, IsInsert) + Return True + + Case PAGE_IDB_BUSINESS_ENTITIES + Load_IDBEntity(PrimaryKey, IsInsert) + Return True + + Case PAGE_CW_PROFILES + Load_CWProfile(PrimaryKey, IsInsert) + Return True + + Case PAGE_GLOBIX_PROFILES + GLOBIX_JUMP_DOCTYPE_ID = PrimaryKey + Load_GLOBIXProfile(PrimaryKey, IsInsert) + Return True + + Case PAGE_META_SOURCE_SQL + Load_SourceSQL(PrimaryKey, IsInsert) + Return True + + Case Else + Return False + End Select + End Function + + Private Sub Load_SourceSQL(PrimaryKey As Integer, IsInsert As Boolean) + Try + Dim oForm As New frmAdmin_SourceSQL(PrimaryKey) With {.IsInsert = IsInsert} + oForm.ShowDialog() + + RaiseEvent DetailFormClosed(Me, oForm) + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Sub + + Private Sub Load_IDBAttribute(PrimaryKey As Integer, IsInsert As Boolean) + Try + Dim oForm As New frmAdmin_IDBAttribute(PrimaryKey) With {.IsInsert = IsInsert} + oForm.ShowDialog() + + RaiseEvent DetailFormClosed(Me, oForm) + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Sub + + Private Sub Load_IDBEntity(PrimaryKey As Integer, IsInsert As Boolean) + Try + Dim oForm As New frmAdmin_IDBEntity(PrimaryKey) With {.IsInsert = IsInsert} + oForm.ShowDialog() + + RaiseEvent DetailFormClosed(Me, oForm) + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Sub + + Private Sub Load_CWProfile(PrimaryKey As Integer, IsInsert As Boolean) + Try + Dim oForm As New frmAdmin_CWProfile(PrimaryKey) With {.IsInsert = IsInsert} + oForm.ShowDialog() + + RaiseEvent DetailFormClosed(Me, oForm) + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Sub + Private Sub Load_GLOBIXProfile(PrimaryKey As Integer, IsInsert As Boolean) + Try + Dim oForm As New frmGlobixAdministration(PrimaryKey) With {.IsInsert = IsInsert} + oForm.ShowDialog() + + RaiseEvent DetailFormClosed(Me, oForm) + Catch ex As Exception + Logger.Error(ex) + Throw ex + End Try + End Sub + + Public Class DetailSettings + Public Property GridTitle As String + Public Property [Module] As String + Public Property Entity As String + Public Property NewRecordTitle As String + End Class + + Public Class DetailData + Public Property Guid As Integer + Public Property ParentId As Integer + Public Property Entity As String + Public Property Scope As String + Public Property PrimaryKey As String + Public Property ForeignKey As String + Public Property SQLCommand As String + Public Property SQLResult As DataTable + End Class +End Class diff --git a/GUIs.ZooFlow/Administration/SourceBundle.vb b/GUIs.ZooFlow/Administration/ClassSourceBundle.vb similarity index 90% rename from GUIs.ZooFlow/Administration/SourceBundle.vb rename to GUIs.ZooFlow/Administration/ClassSourceBundle.vb index 8d15f21a..c8586a43 100644 --- a/GUIs.ZooFlow/Administration/SourceBundle.vb +++ b/GUIs.ZooFlow/Administration/ClassSourceBundle.vb @@ -1,4 +1,4 @@ -Public Class SourceBundle +Public Class ClassSourceBundle Public Overview As SourceSql Public Update As SourceSql Public Insert As SourceSql diff --git a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb index 5c9a9896..28340374 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb @@ -104,8 +104,10 @@ Partial Class frmAdmin_IDBAttribute Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide - Me.RibbonControl1.Size = New System.Drawing.Size(857, 66) + Me.RibbonControl1.ShowToolbarCustomizeItem = False + Me.RibbonControl1.Size = New System.Drawing.Size(857, 63) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' 'BarButtonItem1 ' @@ -154,10 +156,10 @@ Partial Class frmAdmin_IDBAttribute 'RibbonStatusBar1 ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 502) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 500) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(857, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(857, 24) ' 'RibbonPage2 ' @@ -178,21 +180,21 @@ Partial Class frmAdmin_IDBAttribute 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) + Me.LayoutControl1.Location = New System.Drawing.Point(0, 63) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(857, 436) + Me.LayoutControl1.Size = New System.Drawing.Size(857, 437) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ATTR_ID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(168, 20) + Me.TextEdit1.Location = New System.Drawing.Point(154, 20) Me.TextEdit1.MenuManager = Me.RibbonControl1 Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(669, 20) + Me.TextEdit1.Size = New System.Drawing.Size(683, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' @@ -209,10 +211,10 @@ Partial Class frmAdmin_IDBAttribute 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ATTR_TITLE", True)) - Me.TextEdit2.Location = New System.Drawing.Point(168, 60) + Me.TextEdit2.Location = New System.Drawing.Point(154, 60) Me.TextEdit2.MenuManager = Me.RibbonControl1 Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(669, 20) + Me.TextEdit2.Size = New System.Drawing.Size(683, 20) Me.TextEdit2.StyleController = Me.LayoutControl1 Me.TextEdit2.TabIndex = 5 ' @@ -220,11 +222,11 @@ Partial Class frmAdmin_IDBAttribute ' Me.SpinEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True)) Me.SpinEdit1.EditValue = New Decimal(New Integer() {0, 0, 0, 0}) - Me.SpinEdit1.Location = New System.Drawing.Point(586, 180) + Me.SpinEdit1.Location = New System.Drawing.Point(572, 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(251, 20) + Me.SpinEdit1.Size = New System.Drawing.Size(265, 20) Me.SpinEdit1.StyleController = Me.LayoutControl1 Me.SpinEdit1.TabIndex = 6 ' @@ -234,7 +236,7 @@ Partial Class frmAdmin_IDBAttribute Me.CheckEdit1.MenuManager = Me.RibbonControl1 Me.CheckEdit1.Name = "CheckEdit1" Me.CheckEdit1.Properties.Caption = "Attribut mehrzeilig" - Me.CheckEdit1.Size = New System.Drawing.Size(817, 18) + Me.CheckEdit1.Size = New System.Drawing.Size(817, 20) Me.CheckEdit1.StyleController = Me.LayoutControl1 Me.CheckEdit1.TabIndex = 7 ' @@ -245,67 +247,67 @@ Partial Class frmAdmin_IDBAttribute Me.CheckEdit2.MenuManager = Me.RibbonControl1 Me.CheckEdit2.Name = "CheckEdit2" Me.CheckEdit2.Properties.Caption = "Standard in Ergebnisliste" - Me.CheckEdit2.Size = New System.Drawing.Size(398, 18) + Me.CheckEdit2.Size = New System.Drawing.Size(398, 20) Me.CheckEdit2.StyleController = Me.LayoutControl1 Me.CheckEdit2.TabIndex = 8 ' 'TextEdit3 ' - Me.TextEdit3.Location = New System.Drawing.Point(168, 140) + Me.TextEdit3.Location = New System.Drawing.Point(154, 140) Me.TextEdit3.MenuManager = Me.RibbonControl1 Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(669, 20) + Me.TextEdit3.Size = New System.Drawing.Size(683, 20) Me.TextEdit3.StyleController = Me.LayoutControl1 Me.TextEdit3.TabIndex = 9 ' 'txtAddedWho ' Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(168, 258) + Me.txtAddedWho.Location = New System.Drawing.Point(154, 260) Me.txtAddedWho.MenuManager = Me.RibbonControl1 Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Properties.ReadOnly = True - Me.txtAddedWho.Size = New System.Drawing.Size(250, 20) + Me.txtAddedWho.Size = New System.Drawing.Size(264, 20) Me.txtAddedWho.StyleController = Me.LayoutControl1 Me.txtAddedWho.TabIndex = 10 ' 'txtAddedWhen ' Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "ADDED_WHEN", True)) - Me.txtAddedWhen.Location = New System.Drawing.Point(586, 258) + Me.txtAddedWhen.Location = New System.Drawing.Point(572, 260) Me.txtAddedWhen.MenuManager = Me.RibbonControl1 Me.txtAddedWhen.Name = "txtAddedWhen" Me.txtAddedWhen.Properties.ReadOnly = True - Me.txtAddedWhen.Size = New System.Drawing.Size(251, 20) + Me.txtAddedWhen.Size = New System.Drawing.Size(265, 20) Me.txtAddedWhen.StyleController = Me.LayoutControl1 Me.txtAddedWhen.TabIndex = 11 ' 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "CHANGED_WHO", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(168, 298) + Me.txtChangedWho.Location = New System.Drawing.Point(154, 300) Me.txtChangedWho.MenuManager = Me.RibbonControl1 Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(250, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(264, 20) Me.txtChangedWho.StyleController = Me.LayoutControl1 Me.txtChangedWho.TabIndex = 12 ' 'txtChangedWhen ' Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "CHANGED_WHEN", True)) - Me.txtChangedWhen.Location = New System.Drawing.Point(586, 298) + Me.txtChangedWhen.Location = New System.Drawing.Point(572, 300) Me.txtChangedWhen.MenuManager = Me.RibbonControl1 Me.txtChangedWhen.Name = "txtChangedWhen" Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(251, 20) + Me.txtChangedWhen.Size = New System.Drawing.Size(265, 20) Me.txtChangedWhen.StyleController = Me.LayoutControl1 Me.txtChangedWhen.TabIndex = 13 ' 'ComboBoxEdit1 ' Me.ComboBoxEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.VWIDB_BE_ATTRIBUTEBindingSource, "TYPE_ID", True)) - Me.ComboBoxEdit1.Location = New System.Drawing.Point(168, 100) + Me.ComboBoxEdit1.Location = New System.Drawing.Point(154, 100) Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1 Me.ComboBoxEdit1.Name = "ComboBoxEdit1" Me.ComboBoxEdit1.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFit @@ -315,7 +317,7 @@ Partial Class frmAdmin_IDBAttribute Me.ComboBoxEdit1.Properties.NullText = "" Me.ComboBoxEdit1.Properties.PopupSizeable = False Me.ComboBoxEdit1.Properties.ValueMember = "GUID" - Me.ComboBoxEdit1.Size = New System.Drawing.Size(669, 20) + Me.ComboBoxEdit1.Size = New System.Drawing.Size(683, 20) Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 Me.ComboBoxEdit1.TabIndex = 14 ' @@ -330,7 +332,7 @@ Partial Class frmAdmin_IDBAttribute Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem3, Me.LayoutControlItem11, Me.LayoutControlItem9, Me.LayoutControlItem5, Me.LayoutControlItem8, Me.LayoutControlItem10}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(857, 436) + Me.Root.Size = New System.Drawing.Size(857, 437) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -342,7 +344,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem1.Size = New System.Drawing.Size(837, 40) Me.LayoutControlItem1.Text = "GUID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem2 ' @@ -352,7 +354,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem2.Size = New System.Drawing.Size(837, 40) Me.LayoutControlItem2.Text = "Bezeichnung" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem4 ' @@ -360,7 +362,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 200) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem4.Size = New System.Drawing.Size(837, 38) + Me.LayoutControlItem4.Size = New System.Drawing.Size(837, 40) Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem4.TextVisible = False ' @@ -372,17 +374,17 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem6.Size = New System.Drawing.Size(837, 40) Me.LayoutControlItem6.Text = "Kommentar" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.txtAddedWho - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 238) + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 240) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem7.Size = New System.Drawing.Size(418, 40) Me.LayoutControlItem7.Text = "Erstellt Wer" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem3 ' @@ -393,7 +395,7 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem3.Size = New System.Drawing.Size(419, 40) Me.LayoutControlItem3.Text = "Reihenfolge in Ergebnisliste" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem11 ' @@ -403,17 +405,17 @@ Partial Class frmAdmin_IDBAttribute Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem11.Size = New System.Drawing.Size(837, 40) Me.LayoutControlItem11.Text = "Attribut-Typ" - Me.LayoutControlItem11.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem11.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.txtChangedWho - Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 278) + Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 280) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem9.Size = New System.Drawing.Size(418, 138) + Me.LayoutControlItem9.Size = New System.Drawing.Size(418, 137) Me.LayoutControlItem9.Text = "Geändert Wer" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem5 ' @@ -428,22 +430,22 @@ Partial Class frmAdmin_IDBAttribute 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.txtAddedWhen - Me.LayoutControlItem8.Location = New System.Drawing.Point(418, 238) + Me.LayoutControlItem8.Location = New System.Drawing.Point(418, 240) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem8.Size = New System.Drawing.Size(419, 40) Me.LayoutControlItem8.Text = "Erstellt Wann" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(131, 13) ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.txtChangedWhen - Me.LayoutControlItem10.Location = New System.Drawing.Point(418, 278) + Me.LayoutControlItem10.Location = New System.Drawing.Point(418, 280) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(419, 138) + Me.LayoutControlItem10.Size = New System.Drawing.Size(419, 137) Me.LayoutControlItem10.Text = "Geändert Wann" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(145, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(131, 13) ' 'TableAdapterManager ' diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb index d713b9ad..f9740555 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb @@ -48,13 +48,13 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem() - Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem() Me.TBZF_ADMIN_SOURCE_SQLTableAdapter = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TBZF_ADMIN_SOURCE_SQLTableAdapter() Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager() + Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() @@ -77,11 +77,11 @@ Partial Class frmAdmin_SourceSQL CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl @@ -96,7 +96,7 @@ Partial Class frmAdmin_SourceSQL Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl.ShowToolbarCustomizeItem = False - Me.RibbonControl.Size = New System.Drawing.Size(768, 66) + Me.RibbonControl.Size = New System.Drawing.Size(768, 63) Me.RibbonControl.StatusBar = Me.RibbonStatusBar Me.RibbonControl.Toolbar.ShowCustomizeItem = False ' @@ -146,10 +146,10 @@ Partial Class frmAdmin_SourceSQL 'RibbonStatusBar ' Me.RibbonStatusBar.ItemLinks.Add(Me.labelStatus) - Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 585) + Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 583) Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl - Me.RibbonStatusBar.Size = New System.Drawing.Size(768, 22) + Me.RibbonStatusBar.Size = New System.Drawing.Size(768, 24) ' 'LayoutControl1 ' @@ -164,21 +164,22 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControl1.Controls.Add(Me.txtChangedWho) Me.LayoutControl1.Controls.Add(Me.TextEdit9) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 66) + Me.LayoutControl1.Location = New System.Drawing.Point(0, 63) Me.LayoutControl1.Name = "LayoutControl1" + Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(816, 316, 650, 400) Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(768, 519) + Me.LayoutControl1.Size = New System.Drawing.Size(768, 520) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' 'TextEdit1 ' Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "GUID", True)) - Me.TextEdit1.Location = New System.Drawing.Point(105, 20) + Me.TextEdit1.Location = New System.Drawing.Point(99, 20) Me.TextEdit1.MenuManager = Me.RibbonControl Me.TextEdit1.Name = "TextEdit1" Me.TextEdit1.Properties.ReadOnly = True - Me.TextEdit1.Size = New System.Drawing.Size(643, 20) + Me.TextEdit1.Size = New System.Drawing.Size(649, 20) Me.TextEdit1.StyleController = Me.LayoutControl1 Me.TextEdit1.TabIndex = 4 ' @@ -195,94 +196,94 @@ Partial Class frmAdmin_SourceSQL 'TextEdit2 ' Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ENTITY_TITLE", True)) - Me.TextEdit2.Location = New System.Drawing.Point(105, 60) + Me.TextEdit2.Location = New System.Drawing.Point(99, 60) Me.TextEdit2.MenuManager = Me.RibbonControl Me.TextEdit2.Name = "TextEdit2" - Me.TextEdit2.Size = New System.Drawing.Size(643, 20) + Me.TextEdit2.Size = New System.Drawing.Size(649, 20) Me.TextEdit2.StyleController = Me.LayoutControl1 Me.TextEdit2.TabIndex = 5 ' 'TextEdit3 ' Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "PK_COLUMN", True)) - Me.TextEdit3.Location = New System.Drawing.Point(105, 100) + Me.TextEdit3.Location = New System.Drawing.Point(99, 100) Me.TextEdit3.MenuManager = Me.RibbonControl Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.Size = New System.Drawing.Size(643, 20) + Me.TextEdit3.Size = New System.Drawing.Size(649, 20) Me.TextEdit3.StyleController = Me.LayoutControl1 Me.TextEdit3.TabIndex = 6 ' 'TextEdit4 ' Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "FK_COLUMN", True)) - Me.TextEdit4.Location = New System.Drawing.Point(105, 140) + Me.TextEdit4.Location = New System.Drawing.Point(99, 140) Me.TextEdit4.MenuManager = Me.RibbonControl Me.TextEdit4.Name = "TextEdit4" - Me.TextEdit4.Size = New System.Drawing.Size(643, 20) + Me.TextEdit4.Size = New System.Drawing.Size(649, 20) Me.TextEdit4.StyleController = Me.LayoutControl1 Me.TextEdit4.TabIndex = 7 ' 'TextEdit5 ' Me.TextEdit5.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SCOPE", True)) - Me.TextEdit5.Location = New System.Drawing.Point(105, 180) + Me.TextEdit5.Location = New System.Drawing.Point(99, 180) Me.TextEdit5.MenuManager = Me.RibbonControl Me.TextEdit5.Name = "TextEdit5" - Me.TextEdit5.Size = New System.Drawing.Size(643, 20) + Me.TextEdit5.Size = New System.Drawing.Size(649, 20) Me.TextEdit5.StyleController = Me.LayoutControl1 Me.TextEdit5.TabIndex = 8 ' 'MemoEdit1 ' Me.MemoEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "SQL_COMMAND", True)) - Me.MemoEdit1.Location = New System.Drawing.Point(105, 220) + Me.MemoEdit1.Location = New System.Drawing.Point(99, 220) Me.MemoEdit1.MenuManager = Me.RibbonControl Me.MemoEdit1.Name = "MemoEdit1" - Me.MemoEdit1.Size = New System.Drawing.Size(643, 127) + Me.MemoEdit1.Size = New System.Drawing.Size(649, 127) Me.MemoEdit1.StyleController = Me.LayoutControl1 Me.MemoEdit1.TabIndex = 9 ' 'txtAddedWho ' Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHO", True)) - Me.txtAddedWho.Location = New System.Drawing.Point(105, 367) + Me.txtAddedWho.Location = New System.Drawing.Point(99, 367) Me.txtAddedWho.MenuManager = Me.RibbonControl Me.txtAddedWho.Name = "txtAddedWho" Me.txtAddedWho.Properties.ReadOnly = True - Me.txtAddedWho.Size = New System.Drawing.Size(269, 20) + Me.txtAddedWho.Size = New System.Drawing.Size(275, 20) Me.txtAddedWho.StyleController = Me.LayoutControl1 Me.txtAddedWho.TabIndex = 10 ' 'TextEdit7 ' Me.TextEdit7.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "ADDED_WHEN", True)) - Me.TextEdit7.Location = New System.Drawing.Point(479, 367) + Me.TextEdit7.Location = New System.Drawing.Point(473, 367) Me.TextEdit7.MenuManager = Me.RibbonControl Me.TextEdit7.Name = "TextEdit7" Me.TextEdit7.Properties.ReadOnly = True - Me.TextEdit7.Size = New System.Drawing.Size(269, 20) + Me.TextEdit7.Size = New System.Drawing.Size(275, 20) Me.TextEdit7.StyleController = Me.LayoutControl1 Me.TextEdit7.TabIndex = 11 ' 'txtChangedWho ' Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "CHANGED_WHO", True)) - Me.txtChangedWho.Location = New System.Drawing.Point(105, 407) + Me.txtChangedWho.Location = New System.Drawing.Point(99, 407) Me.txtChangedWho.MenuManager = Me.RibbonControl Me.txtChangedWho.Name = "txtChangedWho" Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(269, 20) + Me.txtChangedWho.Size = New System.Drawing.Size(275, 20) Me.txtChangedWho.StyleController = Me.LayoutControl1 Me.txtChangedWho.TabIndex = 12 ' 'TextEdit9 ' Me.TextEdit9.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBZF_ADMIN_SOURCE_SQLBindingSource, "CHANGED_WHEN", True)) - Me.TextEdit9.Location = New System.Drawing.Point(479, 407) + Me.TextEdit9.Location = New System.Drawing.Point(473, 407) Me.TextEdit9.MenuManager = Me.RibbonControl Me.TextEdit9.Name = "TextEdit9" Me.TextEdit9.Properties.ReadOnly = True - Me.TextEdit9.Size = New System.Drawing.Size(269, 20) + Me.TextEdit9.Size = New System.Drawing.Size(275, 20) Me.TextEdit9.StyleController = Me.LayoutControl1 Me.TextEdit9.TabIndex = 13 ' @@ -292,7 +293,7 @@ Partial Class frmAdmin_SourceSQL Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.EmptySpaceItem1, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem8, Me.LayoutControlItem10}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(768, 519) + Me.Root.Size = New System.Drawing.Size(768, 520) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -303,7 +304,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem1.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem1.Text = "GUID" - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlItem2 ' @@ -313,7 +314,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem2.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem2.Text = "Entity Title" - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlItem3 ' @@ -323,7 +324,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem3.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem3.Text = "Primary Key" - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlItem4 ' @@ -333,7 +334,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem4.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem4.Text = "Foreign Key" - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlItem5 ' @@ -343,7 +344,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem5.Size = New System.Drawing.Size(748, 40) Me.LayoutControlItem5.Text = "Scope" - Me.LayoutControlItem5.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem5.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlItem6 ' @@ -353,15 +354,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem6.Size = New System.Drawing.Size(748, 147) Me.LayoutControlItem6.Text = "SQL Command" - Me.LayoutControlItem6.TextSize = New System.Drawing.Size(82, 13) - ' - 'EmptySpaceItem1 - ' - Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 427) - Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(748, 72) - Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem6.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlItem7 ' @@ -371,7 +364,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem7.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem7.Text = "Erstellt Wer" - Me.LayoutControlItem7.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem7.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlItem9 ' @@ -381,7 +374,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem9.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem9.Text = "Geändert Wer" - Me.LayoutControlItem9.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem9.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlItem8 ' @@ -391,7 +384,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem8.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem8.Text = "Erstellt Wann" - Me.LayoutControlItem8.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem8.TextSize = New System.Drawing.Size(76, 13) ' 'LayoutControlItem10 ' @@ -401,7 +394,7 @@ Partial Class frmAdmin_SourceSQL Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlItem10.Size = New System.Drawing.Size(374, 40) Me.LayoutControlItem10.Text = "Geändert Wann" - Me.LayoutControlItem10.TextSize = New System.Drawing.Size(82, 13) + Me.LayoutControlItem10.TextSize = New System.Drawing.Size(76, 13) ' 'TBZF_ADMIN_SOURCE_SQLTableAdapter ' @@ -416,6 +409,14 @@ Partial Class frmAdmin_SourceSQL Me.TableAdapterManager.TBZF_ADMIN_SOURCE_SQLTableAdapter = Me.TBZF_ADMIN_SOURCE_SQLTableAdapter Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete ' + 'EmptySpaceItem1 + ' + Me.EmptySpaceItem1.AllowHotTrack = False + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 427) + Me.EmptySpaceItem1.Name = "EmptySpaceItem1" + Me.EmptySpaceItem1.Size = New System.Drawing.Size(748, 73) + Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) + ' 'frmAdmin_SourceSQL ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -451,11 +452,11 @@ Partial Class frmAdmin_SourceSQL CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -482,7 +483,6 @@ Partial Class frmAdmin_SourceSQL Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem6 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents DSIDB_Stammdaten As DSIDB_Stammdaten Friend WithEvents TBZF_ADMIN_SOURCE_SQLBindingSource As BindingSource Friend WithEvents TBZF_ADMIN_SOURCE_SQLTableAdapter As DSIDB_StammdatenTableAdapters.TBZF_ADMIN_SOURCE_SQLTableAdapter @@ -496,4 +496,5 @@ Partial Class frmAdmin_SourceSQL Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem + Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem End Class diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx index fbbe0e94..452569f0 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx @@ -123,6 +123,9 @@ 17, 17 + + 17, 17 + 457, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb index 48c452af..9d53fd95 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb @@ -17,6 +17,8 @@ Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData Try + + TBZF_ADMIN_SOURCE_SQLBindingSource.EndEdit() If DSIDB_Stammdaten.TBZF_ADMIN_SOURCE_SQL.GetChanges() IsNot Nothing Then @@ -51,7 +53,11 @@ Private Sub frmAdmin_SourceSQL_Load(sender As Object, e As EventArgs) Handles Me.Load Try - TBZF_ADMIN_SOURCE_SQLTableAdapter.Fill(DSIDB_Stammdaten.TBZF_ADMIN_SOURCE_SQL, PrimaryKey) + If IsInsert Then + TBZF_ADMIN_SOURCE_SQLBindingSource.AddNew() + Else + TBZF_ADMIN_SOURCE_SQLTableAdapter.Fill(DSIDB_Stammdaten.TBZF_ADMIN_SOURCE_SQL, PrimaryKey) + End If Catch ex As Exception ShowError(ex) End Try diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 80d9a769..f4562425 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -138,7 +138,7 @@ Partial Class frmAdmin_Start Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1077, 159) + Me.RibbonControl1.Size = New System.Drawing.Size(1077, 158) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -370,6 +370,7 @@ Partial Class frmAdmin_Start ' 'RibbonPageGroup1 ' + Me.RibbonPageGroup1.Enabled = False Me.RibbonPageGroup1.ItemLinks.Add(Me.btnAddRecord) Me.RibbonPageGroup1.ItemLinks.Add(Me.btnEditRecord) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" @@ -379,10 +380,10 @@ Partial Class frmAdmin_Start ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 654) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 652) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 22) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 24) ' 'RibbonPage2 ' @@ -415,7 +416,7 @@ Partial Class frmAdmin_Start Me.TreeListMenu.OptionsView.ShowIndicator = False Me.TreeListMenu.OptionsView.ShowVertLines = False Me.TreeListMenu.SelectImageList = Me.MainTreeImages - Me.TreeListMenu.Size = New System.Drawing.Size(193, 446) + Me.TreeListMenu.Size = New System.Drawing.Size(193, 465) Me.TreeListMenu.TabIndex = 8 ' 'TreeListColumn1 @@ -446,18 +447,18 @@ Partial Class frmAdmin_Start Me.DockPanel1.Controls.Add(Me.DockPanel1_Container) Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left Me.DockPanel1.ID = New System.Guid("ce81b5b5-eff5-4006-8018-548aa8413799") - Me.DockPanel1.Location = New System.Drawing.Point(0, 159) + Me.DockPanel1.Location = New System.Drawing.Point(0, 158) Me.DockPanel1.Name = "DockPanel1" Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200) - Me.DockPanel1.Size = New System.Drawing.Size(200, 495) + Me.DockPanel1.Size = New System.Drawing.Size(200, 494) Me.DockPanel1.Text = "Übersicht" ' 'DockPanel1_Container ' Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu) - Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46) + Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 26) Me.DockPanel1_Container.Name = "DockPanel1_Container" - Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 446) + Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 465) Me.DockPanel1_Container.TabIndex = 0 ' 'TBIDB_ATTRIBUTEBindingSource @@ -507,7 +508,7 @@ Partial Class frmAdmin_Start ' Me.Panel1.Controls.Add(Me.labelTitle) Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Location = New System.Drawing.Point(200, 159) + Me.Panel1.Location = New System.Drawing.Point(200, 158) Me.Panel1.Name = "Panel1" Me.Panel1.Size = New System.Drawing.Size(877, 46) Me.Panel1.TabIndex = 8 @@ -710,11 +711,11 @@ Partial Class frmAdmin_Start 'GridControl1 ' Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl1.Location = New System.Drawing.Point(200, 205) + Me.GridControl1.Location = New System.Drawing.Point(200, 204) Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.MenuManager = Me.RibbonControl1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(877, 449) + Me.GridControl1.Size = New System.Drawing.Size(877, 448) Me.GridControl1.TabIndex = 12 Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx index ced501fb..13d08356 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx @@ -286,9 +286,6 @@ 531, 17 - - 531, 17 - 1141, 17 diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index 4cbe5572..c232565e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -1,109 +1,68 @@ Imports DevExpress.Utils -Imports DevExpress.XtraBars.Ribbon Imports DevExpress.XtraEditors.Controls Imports DevExpress.XtraEditors.Repository -Imports DevExpress.XtraGrid Imports DevExpress.XtraGrid.Columns Imports DevExpress.XtraGrid.Views.Grid -Imports DevExpress.XtraGrid.Views.Grid.ViewInfo -Imports DevExpress.XtraTab Imports DigitalData.Modules.Logging +Imports DigitalData.GUIs.ZooFlow.Administration.ClassConstants +Imports DevExpress.XtraGrid Public Class frmAdmin_Start Inherits frmAdmin_Base - Private Const COLUMN_NAME_ACTIVE = "ACTIVE" - - Private Const MODULE_IDB = "IDB" - Private Const PAGE_IDB_ATTRIBUTES = "IDB_ATTRIBUTES" - Private Const PAGE_IDB_BUSINESS_ENTITIES = "IDB_BUSINESS_ENTITIES" - Private Const PAGE_IDB_SOURCE_SQL = "IDB_SOURCE_SQL" - - Private Const MODULE_GLOBIX = "GLOBIX" - Private Const PAGE_GLOBIX_PROFILES = "GLOBIX_PROFILES" - - Private Const MODULE_CW = "CW" - Private Const PAGE_CW_PROFILES = "CW_PROFILES" - - Private Const MODULE_META = "META" - Private Const PAGE_META_SOURCE_SQL = "META_SOURCE_SQL" - - Private PrimaryKey As String = Nothing - - Private AdminItems As New Dictionary(Of String, AdminItem) - Private AdminNodes As New Dictionary(Of String, AdminNode) From { - {PAGE_IDB_ATTRIBUTES, - New AdminNode With { - .Title = "IDB Attribute", - .[Module] = MODULE_IDB, - .Entity = PAGE_IDB_ATTRIBUTES, - .NewRecordTitle = "Neues Attribut" - }}, - {PAGE_IDB_BUSINESS_ENTITIES, - New AdminNode With { - .Title = "IDB Entitäten", - .[Module] = MODULE_IDB, - .Entity = PAGE_IDB_BUSINESS_ENTITIES, - .NewRecordTitle = "Neue Entität" - }}, - {PAGE_META_SOURCE_SQL, - New AdminNode With { - .Title = "Source SQL", - .[Module] = MODULE_META, - .Entity = PAGE_META_SOURCE_SQL, - .NewRecordTitle = "Neuer Source SQL" - }}, - {PAGE_GLOBIX_PROFILES, - New AdminNode With { - .Title = "Global Indexer Profile", - .[Module] = MODULE_GLOBIX, - .Entity = PAGE_GLOBIX_PROFILES, - .NewRecordTitle = "Neues GLOBIX Profil" - }}, - {PAGE_CW_PROFILES, - New AdminNode With { - .Title = "Clipboard Watcher Profile", - .[Module] = MODULE_CW, - .Entity = PAGE_CW_PROFILES, - .NewRecordTitle = "Neues CW Profil" - }} - } - Private CurrentModule As String Private CurrentPage As String - Private CurrentItem As AdminItem + Private CurrentItem As ClassDetailForm.DetailData - Private Class AdminNode - Public Property Title As String - Public Property [Module] As String - Public Property Entity As String - Public Property NewRecordTitle As String - End Class - - Private Class AdminItem - Public Property Guid As Integer - Public Property ParentId As Integer - Public Property Entity As String - Public Property Scope As String - Public Property PrimaryKey As String - Public Property ForeignKey As String - Public Property SQLCommand As String - Public Property SQLResult As DataTable - End Class + Private DetailForm As ClassDetailForm Private Sub frmAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load - Load_SQLData() + DetailForm = New ClassDetailForm(My.LogConfig) + AddHandler DetailForm.DetailFormClosed, AddressOf DetailForm_Closed + Load_SQLData() TreeListMenu.ExpandAll() End Sub + Private Sub DetailForm_Closed(sender As Object, e As frmAdmin_Interface) + If e.HasChanges Then + Load_SQLData() + Load_GridData(DetailForm.DetailDataList.Item(CurrentPage)) + End If + End Sub + + Private Function Handle_LoadPage(Page As String) As Boolean + If DetailForm.DetailSettingsList.ContainsKey(Page) Then + Dim oNode = DetailForm.DetailSettingsList.Item(Page) + CurrentModule = oNode.Module + labelTitle.Text = oNode.GridTitle + btnAddRecord.Caption = oNode.NewRecordTitle + Else + MsgBox($"Page [{Page}] not found in AdminNodes! Exiting." & vbNewLine & + "Check your definitions in the TreeList NodeEditor and in SourceSQL", MsgBoxStyle.Critical, Text) + Return False + End If + + If DetailForm.DetailDataList.ContainsKey(Page) Then + Dim oItem = DetailForm.DetailDataList.Item(Page) + Load_GridData(oItem) + CurrentItem = oItem + Else + MsgBox($"Page [{Page}] not found in AdminItems! Exiting." & vbNewLine & + "Check your definitions in the TreeList NodeEditor and in SourceSQL", MsgBoxStyle.Critical, Text) + Return False + End If + + Return True + End Function + Private Function Load_SQLData() As Boolean Try Dim oTable As DataTable = My.Database.GetDatatable("SELECT * FROM TBZF_ADMIN_SOURCE_SQL") - AdminItems.Clear() + DetailForm.DetailDataList.Clear() For Each oRow As DataRow In oTable.Rows - Dim oItem As New AdminItem With { + Dim oItem As New ClassDetailForm.DetailData With { .Guid = CInt(oRow.Item("GUID")), .ParentId = CInt(oRow.Item("PARENT_ID")), .Entity = oRow.Item("ENTITY_TITLE").ToString, @@ -120,8 +79,9 @@ Public Class frmAdmin_Start Logger.Error(ex) End Try - AdminItems.Add(oItem.Entity, oItem) + DetailForm.DetailDataList.Add(oItem.Entity, oItem) Next + Return True Catch ex As Exception Logger.Error(ex) @@ -132,37 +92,21 @@ Public Class frmAdmin_Start Private Sub TreeListMenu_FocusedNodeChanged(sender As Object, e As DevExpress.XtraTreeList.FocusedNodeChangedEventArgs) Handles TreeListMenu.FocusedNodeChanged Try If e.Node Is Nothing OrElse e.Node.Tag Is Nothing OrElse e.Node.Tag = String.Empty Then + RibbonPageGroup1.Enabled = False labelTitle.Text = "Start" Exit Sub End If - CurrentPage = e.Node.Tag.ToString - - If AdminNodes.ContainsKey(CurrentPage) Then - Dim oNode = AdminNodes.Item(CurrentPage) - CurrentModule = oNode.Module - labelTitle.Text = oNode.Title - btnAddRecord.Caption = oNode.NewRecordTitle - Else - MsgBox($"Page [{CurrentPage}] not found in AdminNodes! Exiting." & vbNewLine & - "Check your definitions in the TreeList NodeEditor and in SourceSQL", MsgBoxStyle.Critical, Text) - Exit Sub - End If - - If AdminItems.ContainsKey(CurrentPage) Then - CurrentItem = AdminItems.Item(CurrentPage) - Load_GridData(CurrentItem) - Else - MsgBox($"Page [{CurrentPage}] not found in AdminItems! Exiting." & vbNewLine & - "Check your definitions in the TreeList NodeEditor and in SourceSQL", MsgBoxStyle.Critical, Text) - Exit Sub + If Handle_LoadPage(e.Node.Tag.ToString) Then + RibbonPageGroup1.Enabled = True + CurrentPage = e.Node.Tag.ToString End If Catch ex As Exception ShowError(ex) End Try End Sub - Private Sub Style_ActiveColumn(ActiveColumn) + Private Sub Style_ActiveColumn(ActiveColumn As GridColumn) Dim oActiveEditor As New RepositoryItemImageComboBox With { .SmallImages = ActiveImages, .GlyphAlignment = HorzAlignment.Center @@ -186,7 +130,7 @@ Public Class frmAdmin_Start End With End Sub - Private Sub Load_GridData(Source As AdminItem) + Private Sub Load_GridData(Source As ClassDetailForm.DetailData) If Source Is Nothing OrElse Source.SQLResult Is Nothing Then Exit Sub End If @@ -195,7 +139,6 @@ Public Class frmAdmin_Start GridControl1.ForceInitialize() GridView1.PopulateColumns() - If GridView1.Columns.Item(COLUMN_NAME_ACTIVE) Is Nothing Then Dim oActiveColumn = New GridColumn() With {.FieldName = COLUMN_NAME_ACTIVE} GridView1.Columns.Add(oActiveColumn) @@ -235,50 +178,30 @@ Public Class frmAdmin_Start .AlwaysVisible = True End With - AddHandler GridView1.KeyDown, Sub(sender As GridView, e As KeyEventArgs) - Dim oView As GridView = sender - If e.Control AndAlso e.KeyCode = Keys.C And e.Modifiers = Keys.Control Then - Dim oCellValue = oView.GetRowCellValue(oView.FocusedRowHandle, oView.FocusedColumn) - If oCellValue IsNot Nothing AndAlso oCellValue.ToString() <> String.Empty Then - Clipboard.SetText(oCellValue.ToString) - End If - e.Handled = True - End If - End Sub + AddHandler GridView1.KeyDown, AddressOf GridView1_KeyDown GridView1.BestFitColumns() End Sub + Public Sub GridView1_KeyDown(sender As GridView, e As KeyEventArgs) + Dim oView As GridView = sender + If e.Control AndAlso e.KeyCode = Keys.C And e.Modifiers = Keys.Control Then + Dim oCellValue = oView.GetRowCellValue(oView.FocusedRowHandle, oView.FocusedColumn) + If oCellValue IsNot Nothing AndAlso oCellValue.ToString() <> String.Empty Then + Clipboard.SetText(oCellValue.ToString) + End If + e.Handled = True + End If + End Sub + Private Sub GridView1_RowClick(sender As Object, e As RowClickEventArgs) Handles GridView1.RowClick Try If e.Clicks = 2 And e.Button = MouseButtons.Left Then - Dim oView As GridView = TryCast(sender, GridView) - Dim oRowView As DataRowView = oView.GetRow(e.RowHandle) - Dim oItem As AdminItem = CurrentItem - Dim oGuid = oRowView.Row.Item(oItem.PrimaryKey) + Dim oPrimaryKey = Get_PrimaryKey(e.RowHandle) - If oRowView IsNot Nothing Then - Select Case CurrentPage - Case PAGE_IDB_ATTRIBUTES - Load_IDBAttribute(oGuid) - - Case PAGE_IDB_BUSINESS_ENTITIES - Load_IDBEntity(oGuid) - - Case PAGE_CW_PROFILES - Load_CWProfile(oGuid) - - Case PAGE_GLOBIX_PROFILES - GLOBIX_JUMP_DOCTYPE_ID = oGuid - Load_GLOBIXProfile(oGuid) - - Case PAGE_META_SOURCE_SQL - Load_SourceSQL(oGuid) - - Case Else - MsgBox($"The Form for the Tag [{CurrentPage}] has no Form assigned. Maybe you have a typo in your definitions (Database, NodeEditor)?", MsgBoxStyle.Exclamation, Text) - End Select + If oPrimaryKey IsNot Nothing Then + DetailForm.Handle_OpenDetail(oPrimaryKey, CurrentPage, False) End If End If Catch ex As Exception @@ -286,86 +209,19 @@ Public Class frmAdmin_Start End Try End Sub - Private Sub Load_SourceSQL(PrimaryKey As Integer) + Private Function Get_PrimaryKey(RowHandle As Integer) Try - Dim oForm As New frmAdmin_SourceSQL(PrimaryKey) - oForm.ShowDialog() + Dim oView As GridView = GridView1 + Dim oRowView As DataRowView = oView.GetRow(RowHandle) + Dim oItem As ClassDetailForm.DetailData = CurrentItem + Dim oGuid = oRowView.Row.Item(oItem.PrimaryKey) - If oForm.HasChanges Then - Load_SQLData() - Load_GridData(AdminItems.Item(CurrentPage)) - End If + Return oGuid Catch ex As Exception - ShowError(ex) + Logger.Error(ex) + Return Nothing End Try - End Sub - - Private Sub Load_IDBAttribute(PrimaryKey As Integer) - Try - Dim oForm As New frmAdmin_IDBAttribute(PrimaryKey) - oForm.ShowDialog() - - If oForm.HasChanges Then - Load_SQLData() - Load_GridData(AdminItems.Item(CurrentPage)) - End If - Catch ex As Exception - ShowError(ex) - End Try - End Sub - - Private Sub Load_IDBEntity(PrimaryKey As Integer) - Try - Dim oForm As New frmAdmin_IDBEntity(PrimaryKey) - oForm.ShowDialog() - - If oForm.HasChanges Then - Load_SQLData() - Load_GridData(AdminItems.Item(CurrentPage)) - End If - Catch ex As Exception - ShowError(ex) - End Try - End Sub - - Private Sub Load_CWProfile(PrimaryKey As Integer) - Try - Dim oForm As New frmAdmin_CWProfile(PrimaryKey) - oForm.ShowDialog() - - If oForm.HasChanges Then - Load_SQLData() - Load_GridData(AdminItems.Item(CurrentPage)) - End If - Catch ex As Exception - ShowError(ex) - End Try - End Sub - Private Sub Load_GLOBIXProfile(PrimaryKey As Integer) - Try - Dim oForm As New frmGlobixAdministration(PrimaryKey) - oForm.ShowDialog() - - If oForm.HasChanges Then - Load_SQLData() - Load_GridData(AdminItems.Item(CurrentPage)) - End If - Catch ex As Exception - ShowError(ex) - End Try - End Sub - - Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick - Try - Dim oRow As DataRow = GridView1.GetFocusedRow - If oRow IsNot Nothing Then - Dim oPrimaryKey As Integer = DirectCast(oRow.Item(PrimaryKey), Integer) - Load_IDBAttribute(oPrimaryKey) - End If - Catch ex As Exception - ShowError(ex) - End Try - End Sub + End Function Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick Load_SQLData() @@ -380,4 +236,28 @@ Public Class frmAdmin_Start Private Sub ResetStatus() labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End Sub + + Private Sub btnAddRecord_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnAddRecord.ItemClick + Try + DetailForm.Handle_OpenDetail(Nothing, CurrentPage, True) + Catch ex As Exception + Logger.Error(ex) + End Try + End Sub + + Private Sub btnEditRecord_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnEditRecord.ItemClick + Try + If GridView1.FocusedRowHandle = GridControl.InvalidRowHandle Then + Exit Sub + End If + + Dim oPrimaryKey = Get_PrimaryKey(GridView1.FocusedRowHandle) + + If oPrimaryKey IsNot Nothing Then + DetailForm.Handle_OpenDetail(oPrimaryKey, CurrentPage, False) + End If + Catch ex As Exception + Logger.Error(ex) + 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 00012dc3..c6c16572 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.Designer.vb @@ -2403,8 +2403,9 @@ Partial Public Class DSIDB_Stammdaten Me.columnGUID.AllowDBNull = false Me.columnGUID.ReadOnly = true Me.columnGUID.Unique = true - Me.columnPARENT_ID.AllowDBNull = false + Me.columnPARENT_ID.DefaultValue = CType(0,Integer) Me.columnENTITY_TITLE.AllowDBNull = false + Me.columnENTITY_TITLE.DefaultValue = CType("Unbenannt",String) Me.columnENTITY_TITLE.MaxLength = 100 Me.columnSCOPE.AllowDBNull = false Me.columnSCOPE.MaxLength = 100 @@ -3434,7 +3435,11 @@ Partial Public Class DSIDB_Stammdaten Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property PARENT_ID() As Integer Get - Return CType(Me(Me.tableTBZF_ADMIN_SOURCE_SQL.PARENT_IDColumn),Integer) + Try + Return CType(Me(Me.tableTBZF_ADMIN_SOURCE_SQL.PARENT_IDColumn),Integer) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte PARENT_ID in Tabelle TBZF_ADMIN_SOURCE_SQL ist DBNull.", e) + End Try End Get Set Me(Me.tableTBZF_ADMIN_SOURCE_SQL.PARENT_IDColumn) = value @@ -3575,6 +3580,18 @@ Partial Public Class DSIDB_Stammdaten End Set End Property + _ + Public Function IsPARENT_IDNull() As Boolean + Return Me.IsNull(Me.tableTBZF_ADMIN_SOURCE_SQL.PARENT_IDColumn) + End Function + + _ + Public Sub SetPARENT_IDNull() + Me(Me.tableTBZF_ADMIN_SOURCE_SQL.PARENT_IDColumn) = Global.System.Convert.DBNull + End Sub + _ Public Function IsCOMMENTNull() As Boolean @@ -5492,8 +5509,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 PARENT_ID As Integer, ByVal ENTITY_TITLE As String, ByVal SCOPE As String, ByVal PK_COLUMN As String, ByVal COMMENT As String, ByVal SQL_COMMAND As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal FK_COLUMN As String) As Integer - Me.Adapter.InsertCommand.Parameters(0).Value = CType(PARENT_ID,Integer) + Public Overloads Overridable Function Insert(ByVal PARENT_ID As Global.System.Nullable(Of Integer), ByVal ENTITY_TITLE As String, ByVal SCOPE As String, ByVal PK_COLUMN As String, ByVal COMMENT As String, ByVal SQL_COMMAND As String, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal FK_COLUMN As String) As Integer + If (PARENT_ID.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(0).Value = CType(PARENT_ID.Value,Integer) + Else + Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value + End If If (ENTITY_TITLE Is Nothing) Then Throw New Global.System.ArgumentNullException("ENTITY_TITLE") Else @@ -5564,7 +5585,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ Public Overloads Overridable Function Update( _ - ByVal PARENT_ID As Integer, _ + ByVal PARENT_ID As Global.System.Nullable(Of Integer), _ ByVal ENTITY_TITLE As String, _ ByVal SCOPE As String, _ ByVal PK_COLUMN As String, _ @@ -5576,7 +5597,7 @@ Namespace DSIDB_StammdatenTableAdapters ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), _ ByVal FK_COLUMN As String, _ ByVal Original_GUID As Integer, _ - ByVal Original_PARENT_ID As Integer, _ + ByVal Original_PARENT_ID As Global.System.Nullable(Of Integer), _ ByVal Original_ENTITY_TITLE As String, _ ByVal Original_SCOPE As String, _ ByVal Original_PK_COLUMN As String, _ @@ -5587,7 +5608,11 @@ Namespace DSIDB_StammdatenTableAdapters ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), _ ByVal Original_FK_COLUMN As String, _ ByVal GUID As Integer) As Integer - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PARENT_ID,Integer) + If (PARENT_ID.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PARENT_ID.Value,Integer) + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = Global.System.DBNull.Value + End If If (ENTITY_TITLE Is Nothing) Then Throw New Global.System.ArgumentNullException("ENTITY_TITLE") Else @@ -5639,7 +5664,11 @@ Namespace DSIDB_StammdatenTableAdapters Me.Adapter.UpdateCommand.Parameters(10).Value = CType(FK_COLUMN,String) End If Me.Adapter.UpdateCommand.Parameters(11).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_PARENT_ID,Integer) + If (Original_PARENT_ID.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_PARENT_ID.Value,Integer) + Else + Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value + End If If (Original_ENTITY_TITLE Is Nothing) Then Throw New Global.System.ArgumentNullException("Original_ENTITY_TITLE") Else @@ -5718,7 +5747,7 @@ Namespace DSIDB_StammdatenTableAdapters Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ Public Overloads Overridable Function Update( _ - ByVal PARENT_ID As Integer, _ + ByVal PARENT_ID As Global.System.Nullable(Of Integer), _ ByVal ENTITY_TITLE As String, _ ByVal SCOPE As String, _ ByVal PK_COLUMN As String, _ @@ -5730,7 +5759,7 @@ Namespace DSIDB_StammdatenTableAdapters ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), _ ByVal FK_COLUMN As String, _ ByVal Original_GUID As Integer, _ - ByVal Original_PARENT_ID As Integer, _ + ByVal Original_PARENT_ID As Global.System.Nullable(Of Integer), _ ByVal Original_ENTITY_TITLE As String, _ ByVal Original_SCOPE As String, _ ByVal Original_PK_COLUMN As String, _ diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd index c8cf5be7..423272a8 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xsd +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xsd @@ -299,7 +299,7 @@ WHERE (GUID = @Original_GUID) INSERT INTO [TBZF_ADMIN_SOURCE_SQL] ([PARENT_ID], [ENTITY_TITLE], [SCOPE], [PK_COLUMN], [COMMENT], [SQL_COMMAND], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [FK_COLUMN]) VALUES (@PARENT_ID, @ENTITY_TITLE, @SCOPE, @PK_COLUMN, @COMMENT, @SQL_COMMAND, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @FK_COLUMN); SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FK_COLUMN FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = SCOPE_IDENTITY()) - + @@ -327,7 +327,7 @@ FROM TBZF_ADMIN_SOURCE_SQL WHERE GUID = @GUID UPDATE [TBZF_ADMIN_SOURCE_SQL] SET [PARENT_ID] = @PARENT_ID, [ENTITY_TITLE] = @ENTITY_TITLE, [SCOPE] = @SCOPE, [PK_COLUMN] = @PK_COLUMN, [COMMENT] = @COMMENT, [SQL_COMMAND] = @SQL_COMMAND, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [FK_COLUMN] = @FK_COLUMN WHERE (([GUID] = @Original_GUID) AND ([PARENT_ID] = @Original_PARENT_ID) AND ([ENTITY_TITLE] = @Original_ENTITY_TITLE) AND ([SCOPE] = @Original_SCOPE) AND ([PK_COLUMN] = @Original_PK_COLUMN) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ((@IsNull_ADDED_WHO = 1 AND [ADDED_WHO] IS NULL) OR ([ADDED_WHO] = @Original_ADDED_WHO)) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ((@IsNull_FK_COLUMN = 1 AND [FK_COLUMN] IS NULL) OR ([FK_COLUMN] = @Original_FK_COLUMN))); SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, FK_COLUMN FROM TBZF_ADMIN_SOURCE_SQL WHERE (GUID = @GUID) - + @@ -339,7 +339,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -385,7 +385,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -424,7 +424,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -481,7 +481,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -538,7 +538,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + @@ -579,12 +579,12 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + - - + + @@ -670,7 +670,7 @@ SELECT GUID, PARENT_ID, ENTITY_TITLE, SCOPE, PK_COLUMN, COMMENT, SQL_COMMAND, AD - + \ No newline at end of file diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xss b/GUIs.ZooFlow/DSIDB_Stammdaten.xss index 2d1dc461..b523a91e 100644 --- a/GUIs.ZooFlow/DSIDB_Stammdaten.xss +++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xss @@ -10,7 +10,7 @@ - + diff --git a/GUIs.ZooFlow/My Project/licenses.licx b/GUIs.ZooFlow/My Project/licenses.licx index 2567975b..9ade16fd 100644 --- a/GUIs.ZooFlow/My Project/licenses.licx +++ b/GUIs.ZooFlow/My Project/licenses.licx @@ -1,19 +1,20 @@ +DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.FormAssistant, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 8ee2720c..42ac722e 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -114,6 +114,8 @@ + + Form @@ -154,7 +156,7 @@ Form - +