diff --git a/GUIs.ZooFlow/Administration/ClassValidation.vb b/GUIs.ZooFlow/Administration/ClassValidation.vb
new file mode 100644
index 00000000..a7bb706a
--- /dev/null
+++ b/GUIs.ZooFlow/Administration/ClassValidation.vb
@@ -0,0 +1,3 @@
+Public Class ClassValidation
+
+End Class
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb
index f9740555..ed0379ef 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb
@@ -48,13 +48,14 @@ 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()
+ Me.DxValidationProvider1 = New DevExpress.XtraEditors.DXErrorProvider.DXValidationProvider(Me.components)
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.LayoutControl1.SuspendLayout()
@@ -77,11 +78,12 @@ 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()
+ CType(Me.DxValidationProvider1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'RibbonControl
@@ -96,7 +98,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, 63)
+ Me.RibbonControl.Size = New System.Drawing.Size(768, 66)
Me.RibbonControl.StatusBar = Me.RibbonStatusBar
Me.RibbonControl.Toolbar.ShowCustomizeItem = False
'
@@ -146,10 +148,10 @@ Partial Class frmAdmin_SourceSQL
'RibbonStatusBar
'
Me.RibbonStatusBar.ItemLinks.Add(Me.labelStatus)
- Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 583)
+ Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 585)
Me.RibbonStatusBar.Name = "RibbonStatusBar"
Me.RibbonStatusBar.Ribbon = Me.RibbonControl
- Me.RibbonStatusBar.Size = New System.Drawing.Size(768, 24)
+ Me.RibbonStatusBar.Size = New System.Drawing.Size(768, 22)
'
'LayoutControl1
'
@@ -164,22 +166,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, 63)
+ Me.LayoutControl1.Location = New System.Drawing.Point(0, 66)
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, 520)
+ Me.LayoutControl1.Size = New System.Drawing.Size(768, 519)
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(99, 20)
+ Me.TextEdit1.Location = New System.Drawing.Point(105, 20)
Me.TextEdit1.MenuManager = Me.RibbonControl
Me.TextEdit1.Name = "TextEdit1"
Me.TextEdit1.Properties.ReadOnly = True
- Me.TextEdit1.Size = New System.Drawing.Size(649, 20)
+ Me.TextEdit1.Size = New System.Drawing.Size(643, 20)
Me.TextEdit1.StyleController = Me.LayoutControl1
Me.TextEdit1.TabIndex = 4
'
@@ -196,94 +198,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(99, 60)
+ Me.TextEdit2.Location = New System.Drawing.Point(105, 60)
Me.TextEdit2.MenuManager = Me.RibbonControl
Me.TextEdit2.Name = "TextEdit2"
- Me.TextEdit2.Size = New System.Drawing.Size(649, 20)
+ Me.TextEdit2.Size = New System.Drawing.Size(643, 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(99, 100)
+ Me.TextEdit3.Location = New System.Drawing.Point(105, 100)
Me.TextEdit3.MenuManager = Me.RibbonControl
Me.TextEdit3.Name = "TextEdit3"
- Me.TextEdit3.Size = New System.Drawing.Size(649, 20)
+ Me.TextEdit3.Size = New System.Drawing.Size(643, 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(99, 140)
+ Me.TextEdit4.Location = New System.Drawing.Point(105, 140)
Me.TextEdit4.MenuManager = Me.RibbonControl
Me.TextEdit4.Name = "TextEdit4"
- Me.TextEdit4.Size = New System.Drawing.Size(649, 20)
+ Me.TextEdit4.Size = New System.Drawing.Size(643, 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(99, 180)
+ Me.TextEdit5.Location = New System.Drawing.Point(105, 180)
Me.TextEdit5.MenuManager = Me.RibbonControl
Me.TextEdit5.Name = "TextEdit5"
- Me.TextEdit5.Size = New System.Drawing.Size(649, 20)
+ Me.TextEdit5.Size = New System.Drawing.Size(643, 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(99, 220)
+ Me.MemoEdit1.Location = New System.Drawing.Point(105, 220)
Me.MemoEdit1.MenuManager = Me.RibbonControl
Me.MemoEdit1.Name = "MemoEdit1"
- Me.MemoEdit1.Size = New System.Drawing.Size(649, 127)
+ Me.MemoEdit1.Size = New System.Drawing.Size(643, 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(99, 367)
+ Me.txtAddedWho.Location = New System.Drawing.Point(105, 367)
Me.txtAddedWho.MenuManager = Me.RibbonControl
Me.txtAddedWho.Name = "txtAddedWho"
Me.txtAddedWho.Properties.ReadOnly = True
- Me.txtAddedWho.Size = New System.Drawing.Size(275, 20)
+ Me.txtAddedWho.Size = New System.Drawing.Size(269, 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(473, 367)
+ Me.TextEdit7.Location = New System.Drawing.Point(479, 367)
Me.TextEdit7.MenuManager = Me.RibbonControl
Me.TextEdit7.Name = "TextEdit7"
Me.TextEdit7.Properties.ReadOnly = True
- Me.TextEdit7.Size = New System.Drawing.Size(275, 20)
+ Me.TextEdit7.Size = New System.Drawing.Size(269, 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(99, 407)
+ Me.txtChangedWho.Location = New System.Drawing.Point(105, 407)
Me.txtChangedWho.MenuManager = Me.RibbonControl
Me.txtChangedWho.Name = "txtChangedWho"
Me.txtChangedWho.Properties.ReadOnly = True
- Me.txtChangedWho.Size = New System.Drawing.Size(275, 20)
+ Me.txtChangedWho.Size = New System.Drawing.Size(269, 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(473, 407)
+ Me.TextEdit9.Location = New System.Drawing.Point(479, 407)
Me.TextEdit9.MenuManager = Me.RibbonControl
Me.TextEdit9.Name = "TextEdit9"
Me.TextEdit9.Properties.ReadOnly = True
- Me.TextEdit9.Size = New System.Drawing.Size(275, 20)
+ Me.TextEdit9.Size = New System.Drawing.Size(269, 20)
Me.TextEdit9.StyleController = Me.LayoutControl1
Me.TextEdit9.TabIndex = 13
'
@@ -293,7 +295,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, 520)
+ Me.Root.Size = New System.Drawing.Size(768, 519)
Me.Root.TextVisible = False
'
'LayoutControlItem1
@@ -304,7 +306,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(76, 13)
+ Me.LayoutControlItem1.TextSize = New System.Drawing.Size(82, 13)
'
'LayoutControlItem2
'
@@ -314,7 +316,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(76, 13)
+ Me.LayoutControlItem2.TextSize = New System.Drawing.Size(82, 13)
'
'LayoutControlItem3
'
@@ -324,7 +326,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(76, 13)
+ Me.LayoutControlItem3.TextSize = New System.Drawing.Size(82, 13)
'
'LayoutControlItem4
'
@@ -334,7 +336,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(76, 13)
+ Me.LayoutControlItem4.TextSize = New System.Drawing.Size(82, 13)
'
'LayoutControlItem5
'
@@ -344,7 +346,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(76, 13)
+ Me.LayoutControlItem5.TextSize = New System.Drawing.Size(82, 13)
'
'LayoutControlItem6
'
@@ -354,7 +356,15 @@ 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(76, 13)
+ 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)
'
'LayoutControlItem7
'
@@ -364,7 +374,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(76, 13)
+ Me.LayoutControlItem7.TextSize = New System.Drawing.Size(82, 13)
'
'LayoutControlItem9
'
@@ -374,7 +384,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(76, 13)
+ Me.LayoutControlItem9.TextSize = New System.Drawing.Size(82, 13)
'
'LayoutControlItem8
'
@@ -384,7 +394,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(76, 13)
+ Me.LayoutControlItem8.TextSize = New System.Drawing.Size(82, 13)
'
'LayoutControlItem10
'
@@ -394,7 +404,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(76, 13)
+ Me.LayoutControlItem10.TextSize = New System.Drawing.Size(82, 13)
'
'TBZF_ADMIN_SOURCE_SQLTableAdapter
'
@@ -409,14 +419,6 @@ 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!)
@@ -452,11 +454,12 @@ 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()
+ CType(Me.DxValidationProvider1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -497,4 +500,5 @@ Partial Class frmAdmin_SourceSQL
Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem
Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem
Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem
+ Friend WithEvents DxValidationProvider1 As DevExpress.XtraEditors.DXErrorProvider.DXValidationProvider
End Class
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx
index 452569f0..9db89a3e 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx
+++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.resx
@@ -123,13 +123,13 @@
17, 17
-
- 17, 17
-
457, 17
731, 17
+
+ 904, 17
+
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb
index 9d53fd95..5c22c9b5 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb
@@ -1,4 +1,7 @@
-Public Class frmAdmin_SourceSQL
+Imports DevExpress.XtraEditors.DXErrorProvider
+Imports DevExpress.XtraLayout
+
+Public Class frmAdmin_SourceSQL
Implements frmAdmin_Interface
Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey
@@ -15,6 +18,57 @@
Me.PrimaryKey = PrimaryKey
End Sub
+ Private Sub frmAdmin_SourceSQL_Load(sender As Object, e As EventArgs) Handles Me.Load
+ Try
+ If IsInsert Then
+ TBZF_ADMIN_SOURCE_SQLBindingSource.AddNew()
+ Else
+ TBZF_ADMIN_SOURCE_SQLTableAdapter.Fill(DSIDB_Stammdaten.TBZF_ADMIN_SOURCE_SQL, PrimaryKey)
+ End If
+
+ ValidationHelper()
+ Catch ex As Exception
+ ShowError(ex)
+ End Try
+ End Sub
+
+ Public Sub ValidationHelper()
+ Dim oTable As DataTable = DSIDB_Stammdaten.TBZF_ADMIN_SOURCE_SQL
+ Dim oProvider As DXValidationProvider = DxValidationProvider1
+ Dim oRootControl As Control = LayoutControl1
+ Dim oControls As List(Of Control) = oRootControl.Controls.
+ OfType(Of Control).
+ ToList()
+
+ Dim oBoundControls = ListBoundControls(oControls)
+
+ Console.WriteLine(oBoundControls.Count)
+
+ For Each oControl As Control In oBoundControls
+ Dim oBinding As Binding = oControl.DataBindings.Item(0)
+ Next
+ End Sub
+
+
+ Public Function ListBoundControls(Controls As List(Of Control)) As List(Of Control)
+ Dim oControlList As New List(Of Control)
+
+ For Each oControl As Control In Controls
+ If oControl.DataBindings IsNot Nothing AndAlso oControl.DataBindings.Count > 0 Then
+ oControlList.Add(oControl)
+ End If
+
+ If oControl.Controls IsNot Nothing AndAlso oControl.Controls.Count > 0 Then
+ Dim oControls As New List(Of Control)
+ oControls.AddRange(oControl.Controls.OfType(Of Control))
+
+ oControlList.AddRange(ListBoundControls(oControls))
+ End If
+ Next
+
+ Return oControlList
+ End Function
+
Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData
Try
@@ -51,17 +105,7 @@
End Try
End Function
- Private Sub frmAdmin_SourceSQL_Load(sender As Object, e As EventArgs) Handles Me.Load
- Try
- 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
- End Sub
+
Private Sub ResetMessages()
labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
index f4562425..3b1c6ad8 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, 158)
+ Me.RibbonControl1.Size = New System.Drawing.Size(1077, 159)
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
'
@@ -380,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, 652)
+ Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 654)
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
- Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 24)
+ Me.RibbonStatusBar1.Size = New System.Drawing.Size(1077, 22)
'
'RibbonPage2
'
@@ -392,6 +392,8 @@ Partial Class frmAdmin_Start
'
'TreeListMenu
'
+ Me.TreeListMenu.Appearance.FocusedCell.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
+ Me.TreeListMenu.Appearance.FocusedCell.Options.UseBackColor = True
Me.TreeListMenu.Appearance.FocusedRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(192, Byte), Integer), CType(CType(192, Byte), Integer))
Me.TreeListMenu.Appearance.FocusedRow.Options.UseBackColor = True
Me.TreeListMenu.Columns.AddRange(New DevExpress.XtraTreeList.Columns.TreeListColumn() {Me.TreeListColumn1})
@@ -416,7 +418,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, 465)
+ Me.TreeListMenu.Size = New System.Drawing.Size(193, 446)
Me.TreeListMenu.TabIndex = 8
'
'TreeListColumn1
@@ -447,18 +449,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, 158)
+ Me.DockPanel1.Location = New System.Drawing.Point(0, 159)
Me.DockPanel1.Name = "DockPanel1"
Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200)
- Me.DockPanel1.Size = New System.Drawing.Size(200, 494)
+ Me.DockPanel1.Size = New System.Drawing.Size(200, 495)
Me.DockPanel1.Text = "Übersicht"
'
'DockPanel1_Container
'
Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu)
- Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 26)
+ Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46)
Me.DockPanel1_Container.Name = "DockPanel1_Container"
- Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 465)
+ Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 446)
Me.DockPanel1_Container.TabIndex = 0
'
'TBIDB_ATTRIBUTEBindingSource
@@ -508,7 +510,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, 158)
+ Me.Panel1.Location = New System.Drawing.Point(200, 159)
Me.Panel1.Name = "Panel1"
Me.Panel1.Size = New System.Drawing.Size(877, 46)
Me.Panel1.TabIndex = 8
@@ -711,11 +713,11 @@ Partial Class frmAdmin_Start
'GridControl1
'
Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.GridControl1.Location = New System.Drawing.Point(200, 204)
+ Me.GridControl1.Location = New System.Drawing.Point(200, 205)
Me.GridControl1.MainView = Me.GridView1
Me.GridControl1.MenuManager = Me.RibbonControl1
Me.GridControl1.Name = "GridControl1"
- Me.GridControl1.Size = New System.Drawing.Size(877, 448)
+ Me.GridControl1.Size = New System.Drawing.Size(877, 449)
Me.GridControl1.TabIndex = 12
Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
'
diff --git a/GUIs.ZooFlow/DSIDB_Stammdaten.xss b/GUIs.ZooFlow/DSIDB_Stammdaten.xss
index b523a91e..26b68ac6 100644
--- a/GUIs.ZooFlow/DSIDB_Stammdaten.xss
+++ b/GUIs.ZooFlow/DSIDB_Stammdaten.xss
@@ -10,7 +10,7 @@
-
+
diff --git a/GUIs.ZooFlow/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Globix/frmGlobix_Index.vb
index 6754553c..8f6ee03b 100644
--- a/GUIs.ZooFlow/Globix/frmGlobix_Index.vb
+++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.vb
@@ -1847,7 +1847,7 @@ Public Class frmGlobix_Index
' ergebnis = ClassDatabase.OracleExecute_Scalar(sql, connectionString)
'Else
'MSQL
- ergebnis = My.Database.GetScalarValueConStr(sql, connectionString)
+ ergebnis = My.Database.GetScalarValueWithConnection(sql, connectionString)
' End If
Select Case ergebnis
@@ -2022,7 +2022,7 @@ Public Class frmGlobix_Index
'If vProvider.ToLower = "oracle" Then
'oErgebnis = My.Database.leExecute_Scalar(SQLCommand, oConnectionString)
'Else 'im Moment nur SQL-Server
- oErgebnis = My.Database.GetScalarValueConStr(SQLCommand, oConnectionString)
+ oErgebnis = My.Database.GetScalarValueWithConnection(SQLCommand, oConnectionString)
'End If
_Logger.Debug("SQL-ConnectionString: " & oConnectionString.Substring(0, oConnectionString.LastIndexOf("=")))
If oErgebnis Is Nothing Then
diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj
index 42ac722e..231f014f 100644
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -116,6 +116,7 @@
+
Form